From 38ea67b839abf0e8f150106314bc4dff33312e18 Mon Sep 17 00:00:00 2001 From: Gerd Knorr Date: Thu, 29 Jul 2004 21:35:48 +0000 Subject: - cx88: big code reorganization. - cx88: started merging blackbird patches, not working yet. --- linux/drivers/media/video/cx88/cx88-vbi.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'linux/drivers/media/video/cx88/cx88-vbi.c') diff --git a/linux/drivers/media/video/cx88/cx88-vbi.c b/linux/drivers/media/video/cx88/cx88-vbi.c index 068955ec8..cdd6953fb 100644 --- a/linux/drivers/media/video/cx88/cx88-vbi.c +++ b/linux/drivers/media/video/cx88/cx88-vbi.c @@ -14,7 +14,7 @@ MODULE_PARM(vbi_debug,"i"); MODULE_PARM_DESC(vbi_debug,"enable debug messages [video]"); #define dprintk(level,fmt, arg...) if (vbi_debug >= level) \ - printk(KERN_DEBUG "%s: " fmt, dev->name , ## arg) + printk(KERN_DEBUG "%s: " fmt, dev->core->name , ## arg) /* ------------------------------------------------------------------ */ @@ -46,8 +46,10 @@ int cx8800_start_vbi_dma(struct cx8800_dev *dev, struct cx88_dmaqueue *q, struct cx88_buffer *buf) { + struct cx88_core *core = dev->core; + /* setup fifo + format */ - cx88_sram_channel_setup(dev, &cx88_sram_channels[SRAM_CH24], + cx88_sram_channel_setup(dev->core, &cx88_sram_channels[SRAM_CH24], buf->vb.width, buf->risc.dma); cx_write(MO_VBOS_CONTROL, ( (1 << 18) | // comb filter delay fixup @@ -96,11 +98,12 @@ int cx8800_restart_vbi_queue(struct cx8800_dev *dev, void cx8800_vbi_timeout(unsigned long data) { struct cx8800_dev *dev = (struct cx8800_dev*)data; + struct cx88_core *core = dev->core; struct cx88_dmaqueue *q = &dev->vbiq; struct cx88_buffer *buf; unsigned long flags; - cx88_sram_channel_dump(dev, &cx88_sram_channels[SRAM_CH24]); + cx88_sram_channel_dump(dev->core, &cx88_sram_channels[SRAM_CH24]); cx_clear(MO_VID_DMACNTRL, 0x88); cx_clear(VID_CAPTURE_CONTROL, 0x18); @@ -111,7 +114,7 @@ void cx8800_vbi_timeout(unsigned long data) list_del(&buf->vb.queue); buf->vb.state = STATE_ERROR; wake_up(&buf->vb.done); - printk("%s: [%p/%d] timeout - dma=0x%08lx\n", dev->name, + printk("%s/0: [%p/%d] timeout - dma=0x%08lx\n", dev->core->name, buf, buf->vb.i, (unsigned long)buf->risc.dma); } cx8800_restart_vbi_queue(dev,q); -- cgit v1.2.3