diff options
author | Trent Piepho <xyzzy@speakeasy.org> | 2007-08-18 05:57:55 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-09 21:05:54 -0400 |
commit | 8ddac9ee4b6f08d7cacf79202ab882eefc55b0c0 (patch) | |
tree | 7b14520928ff9417c1ea9d0de1cbff73068dcb73 /drivers/media/video/cx88/cx88-mpeg.c | |
parent | 7c03a4488bf6d28078488c70c82357d4286cacc5 (diff) |
V4L/DVB (6064): cx88: Add symbolic names for the PCI interrupt bits
Used for the PCI_INTMSK and PCI_INT_STAT registers.
Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/cx88/cx88-mpeg.c')
-rw-r--r-- | drivers/media/video/cx88/cx88-mpeg.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/media/video/cx88/cx88-mpeg.c b/drivers/media/video/cx88/cx88-mpeg.c index 5da47e251e66..d46114685ed1 100644 --- a/drivers/media/video/cx88/cx88-mpeg.c +++ b/drivers/media/video/cx88/cx88-mpeg.c | |||
@@ -148,7 +148,7 @@ static int cx8802_start_dma(struct cx8802_dev *dev, | |||
148 | 148 | ||
149 | /* enable irqs */ | 149 | /* enable irqs */ |
150 | dprintk( 1, "setting the interrupt mask\n" ); | 150 | dprintk( 1, "setting the interrupt mask\n" ); |
151 | cx_set(MO_PCI_INTMSK, core->pci_irqmask | 0x04); | 151 | cx_set(MO_PCI_INTMSK, core->pci_irqmask | PCI_INT_TSINT); |
152 | cx_set(MO_TS_INTMSK, 0x1f0011); | 152 | cx_set(MO_TS_INTMSK, 0x1f0011); |
153 | 153 | ||
154 | /* start dma */ | 154 | /* start dma */ |
@@ -166,7 +166,7 @@ static int cx8802_stop_dma(struct cx8802_dev *dev) | |||
166 | cx_clear(MO_TS_DMACNTRL, 0x11); | 166 | cx_clear(MO_TS_DMACNTRL, 0x11); |
167 | 167 | ||
168 | /* disable irqs */ | 168 | /* disable irqs */ |
169 | cx_clear(MO_PCI_INTMSK, 0x000004); | 169 | cx_clear(MO_PCI_INTMSK, PCI_INT_TSINT); |
170 | cx_clear(MO_TS_INTMSK, 0x1f0011); | 170 | cx_clear(MO_TS_INTMSK, 0x1f0011); |
171 | 171 | ||
172 | /* Reset the controller */ | 172 | /* Reset the controller */ |
@@ -413,7 +413,8 @@ static irqreturn_t cx8802_irq(int irq, void *dev_id) | |||
413 | int loop, handled = 0; | 413 | int loop, handled = 0; |
414 | 414 | ||
415 | for (loop = 0; loop < MAX_IRQ_LOOP; loop++) { | 415 | for (loop = 0; loop < MAX_IRQ_LOOP; loop++) { |
416 | status = cx_read(MO_PCI_INTSTAT) & (core->pci_irqmask | 0x04); | 416 | status = cx_read(MO_PCI_INTSTAT) & |
417 | (core->pci_irqmask | PCI_INT_TSINT); | ||
417 | if (0 == status) | 418 | if (0 == status) |
418 | goto out; | 419 | goto out; |
419 | dprintk( 1, "cx8802_irq\n" ); | 420 | dprintk( 1, "cx8802_irq\n" ); |
@@ -424,7 +425,7 @@ static irqreturn_t cx8802_irq(int irq, void *dev_id) | |||
424 | 425 | ||
425 | if (status & core->pci_irqmask) | 426 | if (status & core->pci_irqmask) |
426 | cx88_core_irq(core,status); | 427 | cx88_core_irq(core,status); |
427 | if (status & 0x04) | 428 | if (status & PCI_INT_TSINT) |
428 | cx8802_mpeg_irq(dev); | 429 | cx8802_mpeg_irq(dev); |
429 | }; | 430 | }; |
430 | if (MAX_IRQ_LOOP == loop) { | 431 | if (MAX_IRQ_LOOP == loop) { |