[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, 89 insertions, 7 deletions

diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c
index 21488779819..d7980c51478 100644
--- a/drivers/media/video/cx88/cx88-input.c
+++ b/drivers/media/video/cx88/cx88-input.c
@@ -1,5 +1,4 @@
 /*
- * $Id: cx88-input.c,v 1.15 2005/07/07 13:58:38 mchehab Exp $
  *
  * Device driver for GPIO attached remote control interfaces
  * on Conexant 2388x based TV/DVB cards.
@@ -212,6 +211,53 @@ static IR_KEYTAB_TYPE ir_codes_msi_tvanywhere[IR_KEYTAB_SIZE] = {
 
 /* ---------------------------------------------------------------------- */
 
+/* Cinergy 1400 DVB-T */
+static IR_KEYTAB_TYPE ir_codes_cinergy_1400[IR_KEYTAB_SIZE] = {
+        [0x01] = KEY_POWER,
+        [0x02] = KEY_1,
+        [0x03] = KEY_2,
+        [0x04] = KEY_3,
+        [0x05] = KEY_4,
+        [0x06] = KEY_5,
+        [0x07] = KEY_6,
+        [0x08] = KEY_7,
+        [0x09] = KEY_8,
+        [0x0a] = KEY_9,
+        [0x0c] = KEY_0,
+
+        [0x0b] = KEY_VIDEO,
+        [0x0d] = KEY_REFRESH,
+        [0x0e] = KEY_SELECT,
+        [0x0f] = KEY_EPG,
+        [0x10] = KEY_UP,
+        [0x11] = KEY_LEFT,
+        [0x12] = KEY_OK,
+        [0x13] = KEY_RIGHT,
+        [0x14] = KEY_DOWN,
+        [0x15] = KEY_TEXT,
+        [0x16] = KEY_INFO,
+
+        [0x17] = KEY_RED,
+        [0x18] = KEY_GREEN,
+        [0x19] = KEY_YELLOW,
+        [0x1a] = KEY_BLUE,
+
+        [0x1b] = KEY_CHANNELUP,
+        [0x1c] = KEY_VOLUMEUP,
+        [0x1d] = KEY_MUTE,
+        [0x1e] = KEY_VOLUMEDOWN,
+        [0x1f] = KEY_CHANNELDOWN,
+
+        [0x40] = KEY_PAUSE,
+        [0x4c] = KEY_PLAY,
+        [0x58] = KEY_RECORD,
+        [0x54] = KEY_PREVIOUS,
+        [0x48] = KEY_STOP,
+        [0x5c] = KEY_NEXT,
+};
+
+/* ---------------------------------------------------------------------- */
+
 struct cx88_IR {
         struct cx88_core *core;
         struct input_dev input;
@@ -241,7 +287,7 @@ module_param(ir_debug, int, 0644);	/* debug level [IR] */
 MODULE_PARM_DESC(ir_debug, "enable debug messages [IR]");
 
 #define ir_dprintk(fmt, arg...) if (ir_debug) \
-        printk(KERN_DEBUG "%s IR: " fmt , ir->core->name, ## arg)
+        printk(KERN_DEBUG "%s IR: " fmt , ir->core->name , ##arg)
 
 /* ---------------------------------------------------------------------- */
 
@@ -329,6 +375,11 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
                 ir->mask_keyup = 0x60;
                 ir->polling = 50; /* ms */
                 break;
+        case CX88_BOARD_TERRATEC_CINERGY_1400_DVB_T1:
+                ir_codes = ir_codes_cinergy_1400;
+                ir_type = IR_TYPE_PD;
+                ir->sampling = 1;
+                break;
         case CX88_BOARD_HAUPPAUGE:
         case CX88_BOARD_HAUPPAUGE_DVB_T1:
                 ir_codes = ir_codes_hauppauge_new;
@@ -445,7 +496,7 @@ int cx88_ir_fini(struct cx88_core *core)
 void cx88_ir_irq(struct cx88_core *core)
 {
         struct cx88_IR *ir = core->ir;
-        u32 samples, rc5;
+        u32 samples, ircode;
         int i;
 
         if (NULL == ir)
@@ -477,13 +528,44 @@ void cx88_ir_irq(struct cx88_core *core)
 
         /* decode it */
         switch (core->board) {
+        case CX88_BOARD_TERRATEC_CINERGY_1400_DVB_T1:
+                ircode = ir_decode_pulsedistance(ir->samples, ir->scount, 1, 4);
+
+                if (ircode == 0xffffffff) { /* decoding error */
+                        ir_dprintk("pulse distance decoding error\n");
+                        break;
+                }
+
+                ir_dprintk("pulse distance decoded: %x\n", ircode);
+
+                if (ircode == 0) { /* key still pressed */
+                        ir_dprintk("pulse distance decoded repeat code\n");
+                        ir->release = jiffies + msecs_to_jiffies(120);
+                        break;
+                }
+
+                if ((ircode & 0xffff) != 0xeb04) { /* wrong address */
+                        ir_dprintk("pulse distance decoded wrong address\n");
+                        break;
+                }
+
+                if (((~ircode >> 24) & 0xff) != ((ircode >> 16) & 0xff)) { /* wrong checksum */
+                        ir_dprintk("pulse distance decoded wrong check sum\n");
+                        break;
+                }
+
+                ir_dprintk("Key Code: %x\n", (ircode >> 16) & 0x7f);
+
+                ir_input_keydown(&ir->input, &ir->ir, (ircode >> 16) & 0x7f, (ircode >> 16) & 0xff);
+                ir->release = jiffies + msecs_to_jiffies(120);
+                break;
         case CX88_BOARD_HAUPPAUGE:
         case CX88_BOARD_HAUPPAUGE_DVB_T1:
-                rc5 = ir_decode_biphase(ir->samples, ir->scount, 5, 7);
-                ir_dprintk("biphase decoded: %x\n", rc5);
-                if ((rc5 & 0xfffff000) != 0x3000)
+                ircode = ir_decode_biphase(ir->samples, ir->scount, 5, 7);
+                ir_dprintk("biphase decoded: %x\n", ircode);
+                if ((ircode & 0xfffff000) != 0x3000)
                         break;
-                ir_input_keydown(&ir->input, &ir->ir, rc5 & 0x3f, rc5);
+                ir_input_keydown(&ir->input, &ir->ir, ircode & 0x3f, ircode);
                 ir->release = jiffies + msecs_to_jiffies(120);
                 break;
         }