aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx88/cx88-video.c
diff options
context:
space:
mode:
authorTrent Piepho <xyzzy@speakeasy.org>2007-08-18 05:57:55 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-10-09 21:05:54 -0400
commit8ddac9ee4b6f08d7cacf79202ab882eefc55b0c0 (patch)
tree7b14520928ff9417c1ea9d0de1cbff73068dcb73 /drivers/media/video/cx88/cx88-video.c
parent7c03a4488bf6d28078488c70c82357d4286cacc5 (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-video.c')
-rw-r--r--drivers/media/video/cx88/cx88-video.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index e158ea2454af..e96c688cba9f 100644
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -423,7 +423,7 @@ static int start_video_dma(struct cx8800_dev *dev,
423 q->count = 1; 423 q->count = 1;
424 424
425 /* enable irqs */ 425 /* enable irqs */
426 cx_set(MO_PCI_INTMSK, core->pci_irqmask | 0x01); 426 cx_set(MO_PCI_INTMSK, core->pci_irqmask | PCI_INT_VIDINT);
427 427
428 /* Enables corresponding bits at PCI_INT_STAT: 428 /* Enables corresponding bits at PCI_INT_STAT:
429 bits 0 to 4: video, audio, transport stream, VIP, Host 429 bits 0 to 4: video, audio, transport stream, VIP, Host
@@ -456,7 +456,7 @@ static int stop_video_dma(struct cx8800_dev *dev)
456 cx_clear(VID_CAPTURE_CONTROL,0x06); 456 cx_clear(VID_CAPTURE_CONTROL,0x06);
457 457
458 /* disable irqs */ 458 /* disable irqs */
459 cx_clear(MO_PCI_INTMSK, 0x000001); 459 cx_clear(MO_PCI_INTMSK, PCI_INT_VIDINT);
460 cx_clear(MO_VID_INTMSK, 0x0f0011); 460 cx_clear(MO_VID_INTMSK, 0x0f0011);
461 return 0; 461 return 0;
462} 462}
@@ -1604,7 +1604,8 @@ static irqreturn_t cx8800_irq(int irq, void *dev_id)
1604 int loop, handled = 0; 1604 int loop, handled = 0;
1605 1605
1606 for (loop = 0; loop < 10; loop++) { 1606 for (loop = 0; loop < 10; loop++) {
1607 status = cx_read(MO_PCI_INTSTAT) & (core->pci_irqmask | 0x01); 1607 status = cx_read(MO_PCI_INTSTAT) &
1608 (core->pci_irqmask | PCI_INT_VIDINT);
1608 if (0 == status) 1609 if (0 == status)
1609 goto out; 1610 goto out;
1610 cx_write(MO_PCI_INTSTAT, status); 1611 cx_write(MO_PCI_INTSTAT, status);
@@ -1612,7 +1613,7 @@ static irqreturn_t cx8800_irq(int irq, void *dev_id)
1612 1613
1613 if (status & core->pci_irqmask) 1614 if (status & core->pci_irqmask)
1614 cx88_core_irq(core,status); 1615 cx88_core_irq(core,status);
1615 if (status & 0x01) 1616 if (status & PCI_INT_VIDINT)
1616 cx8800_vid_irq(dev); 1617 cx8800_vid_irq(dev);
1617 }; 1618 };
1618 if (10 == loop) { 1619 if (10 == loop) {