diff options
| author | Gerd Knorr <devnull@localhost> | 2004-11-30 17:00:13 +0000 |
|---|---|---|
| committer | Gerd Knorr <devnull@localhost> | 2004-11-30 17:00:13 +0000 |
| commit | 3ab65e59d64a1ab37ad62acd54af78b4f559d990 (patch) | |
| tree | 6809d45697c5a78a30af1e378fc7d81c39fc2344 /linux/drivers/media/video/cx88/cx88-mpeg.c | |
| parent | cec65069b7466d850408a58576dbff9a0ddbf782 (diff) | |
| download | mediapointer-dvb-s2-3ab65e59d64a1ab37ad62acd54af78b4f559d990.tar.gz mediapointer-dvb-s2-3ab65e59d64a1ab37ad62acd54af78b4f559d990.tar.bz2 | |
- new cx88-based dvb card by Christopher Pascoe.
- cx88: IR support by Christopher Pascoe and me.
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88-mpeg.c')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-mpeg.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-mpeg.c b/linux/drivers/media/video/cx88/cx88-mpeg.c index d2e9767e8..3ae413e8a 100644 --- a/linux/drivers/media/video/cx88/cx88-mpeg.c +++ b/linux/drivers/media/video/cx88/cx88-mpeg.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-mpeg.c,v 1.14 2004/10/25 11:26:36 kraxel Exp $ + * $Id: cx88-mpeg.c,v 1.15 2004/11/30 17:00:13 kraxel Exp $ * * Support for the mpeg transport stream transfers * PCI function #2 of the cx2388x. @@ -93,7 +93,7 @@ static int cx8802_start_dma(struct cx8802_dev *dev, q->count = 1; /* enable irqs */ - cx_set(MO_PCI_INTMSK, 0x00fc04); + cx_set(MO_PCI_INTMSK, core->pci_irqmask | 0x04); cx_write(MO_TS_INTMSK, 0x1f0011); /* start dma */ @@ -292,19 +292,18 @@ static irqreturn_t cx8802_irq(int irq, void *dev_id, struct pt_regs *regs) { struct cx8802_dev *dev = dev_id; struct cx88_core *core = dev->core; - u32 status, mask; + u32 status; int loop, handled = 0; for (loop = 0; loop < 10; loop++) { - status = cx_read(MO_PCI_INTSTAT) & (~0x1f | 0x04); - mask = cx_read(MO_PCI_INTMSK); - if (0 == (status & mask)) + status = cx_read(MO_PCI_INTSTAT) & (core->pci_irqmask | 0x04); + if (0 == status) goto out; handled = 1; cx_write(MO_PCI_INTSTAT, status); - if (status & mask & ~0x1f) - cx88_irq(core,status,mask); + if (status & core->pci_irqmask) + cx88_core_irq(core,status); if (status & 0x04) cx8802_mpeg_irq(dev); }; |