[PATCH] v4l: CX88 updates and card additions

- Remove $Id CVS logs for V4L files
- add ioctl indirection via cx88_ioctl_hook and cx88_ioctl_translator to
  cx88-blackbird.c.
- declare the indirection hooks from cx88-blackbird.c.
- dcprintk macro which uses core instead of dev->core on cx88-video.c.
- replace dev->core occurances with core on cx88-video.c.
- CodingStyle fixes.
- MaxInput replaced by a define.
- cx8801 structures moved from cx88.h.
- The output_mode needs to be set for the Hauppauge Nova-T DVB-T
  for versions after 2.6.12.
- Corrected GPIO values for cx88 cards #28 & #31 for s-video and composite.
- Updated DViCO FusionHDTV5 Gold & added DVB support.
- Fixed DViCO FusionHDTV 3 Gold-Q GPIO.
- Some clean up in cx88-tvaudio.c
- replaced hex values when writing to AUD_CTL to EN_xx for better reading.
- Allow select by hand between Mono, Lang1, Lang2 and Stereo for BTSC.
- Support for stereo NICAM and BTSC improved.
- Broken stereo check removed.
- Added support for remote control to Cinergy DVBT-1400.
- local var renamed from rc5 to a better name (ircode).
- LGDT330X QAM lock bug fixes.
- Some reorg: move some bits to struct cx88_core, factor out common ioctl's
  to cx88_do_ioctl.
- Get rid of '//' comments, replace them with #if 0 and /**/.
- Minor clean-ups: remove dcprintk and replace all instances of "dev->core"
  with "core".
- Added some registers to control PCI controller at CX2388x chips.
- New tuner standby API.
- Small mpeg fixes and cleanups for blackbird.
- fix mpeg packet size & count
- add VIDIOC_QUERYCAP ioctl for the mpeg stream
- return more information in struct v4l2_format
- fix default window height
- small cleanups

Signed-off-by: Uli Luckas <luckas@musoft.de>
Signed-off-by: Torsten Seeboth <Torsten.Seeboth@t-online.de>
Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru>
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Patrick Boettcher <patrick.boettcher@desy.de>
Signed-off-by: Catalin Climov <catalin@climov.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 7 insertions, 10 deletions

diff --git a/drivers/media/video/cx88/cx88-mpeg.c b/drivers/media/video/cx88/cx88-mpeg.c
index fe2767c0ff94..6d0d15c3a1c6 100644
--- a/drivers/media/video/cx88/cx88-mpeg.c
+++ b/drivers/media/video/cx88/cx88-mpeg.c
@@ -1,5 +1,4 @@
 /*
- * $Id: cx88-mpeg.c,v 1.31 2005/07/07 14:17:47 mchehab Exp $
  *
  *  Support for the mpeg transport stream transfers
  *  PCI function #2 of the cx2388x.
@@ -73,11 +72,15 @@ static int cx8802_start_dma(struct cx8802_dev    *dev,
                 udelay(100);
                 cx_write(MO_PINMUX_IO, 0x00);
                 cx_write(TS_HW_SOP_CNTRL,0x47<<16|188<<4|0x01);
-                if ((core->board == CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_Q) ||
-                    (core->board == CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_T)) {
+                switch (core->board) {
+                case CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_Q:
+                case CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_T:
+                case CX88_BOARD_DVICO_FUSIONHDTV_5_GOLD:
                         cx_write(TS_SOP_STAT, 1<<13);
-                } else {
+                        break;
+                default:
                         cx_write(TS_SOP_STAT, 0x00);
+                        break;
                 }
                 cx_write(TS_GEN_CNTRL, dev->ts_gen_cntrl);
                 udelay(100);
@@ -86,12 +89,10 @@ static int cx8802_start_dma(struct cx8802_dev    *dev,
         if (cx88_boards[core->board].blackbird) {
                 cx_write(MO_PINMUX_IO, 0x88); /* enable MPEG parallel IO */
 
-                // cx_write(TS_F2_CMD_STAT_MM, 0x2900106); /* F2_CMD_STAT_MM defaults + master + memory space */
                 cx_write(TS_GEN_CNTRL, 0x46); /* punctured clock TS & posedge driven & software reset */
                 udelay(100);
 
                 cx_write(TS_HW_SOP_CNTRL, 0x408); /* mpeg start byte */
-                //cx_write(TS_HW_SOP_CNTRL, 0x2F0BC0); /* mpeg start byte ts: 0x2F0BC0 ? */
                 cx_write(TS_VALERR_CNTRL, 0x2000);
 
                 cx_write(TS_GEN_CNTRL, 0x06); /* punctured clock TS & posedge driven */
@@ -106,7 +107,6 @@ static int cx8802_start_dma(struct cx8802_dev    *dev,
         dprintk( 0, "setting the interrupt mask\n" );
         cx_set(MO_PCI_INTMSK, core->pci_irqmask | 0x04);
         cx_set(MO_TS_INTMSK,  0x1f0011);
-        //cx_write(MO_TS_INTMSK,  0x0f0011);
 
         /* start dma */
         cx_set(MO_DEV_CNTRL2, (1<<5));
@@ -206,7 +206,6 @@ void cx8802_buf_queue(struct cx8802_dev *dev, struct cx88_buffer *buf)
                 mod_timer(&q->timeout, jiffies+BUFFER_TIMEOUT);
                 dprintk(0,"[%p/%d] %s - first active\n",
                         buf, buf->vb.i, __FUNCTION__);
-                //udelay(100);
 
         } else {
                 dprintk( 1, "queue is not empty - append to active\n" );
@@ -217,7 +216,6 @@ void cx8802_buf_queue(struct cx8802_dev *dev, struct cx88_buffer *buf)
                 prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
                 dprintk( 1, "[%p/%d] %s - append to active\n",
                         buf, buf->vb.i, __FUNCTION__);
-                //udelay(100);
         }
 }
 
@@ -387,7 +385,6 @@ int cx8802_init_common(struct cx8802_dev *dev)
                dev->pci_lat,pci_resource_start(dev->pci,0));
 
         /* initialize driver struct */
-        init_MUTEX(&dev->lock);
         spin_lock_init(&dev->slock);
 
         /* init dma queue */