Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/cooloney...

[linux-2.6] / drivers / media / video / ir-kbd-i2c.c

diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index ed92b6f7187a6eac7b3e5da338b20995abc2a0bb..29779d8bf7fbecbc0e33ade96d51a75ef0c30e03 100644 (file)
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -10,6 +10,8 @@
  *      Ulrich Mueller <ulrich.mueller42@web.de>
  * modified for em2820 based USB TV tuners by
  *      Markus Rechberger <mrechberger@gmail.com>
+ * modified for DViCO Fusion HDTV 5 RT GOLD by
+ *      Chaogui Zhang <czhang1974@gmail.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -28,7 +30,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/moduleparam.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
@@ -37,6 +38,7 @@
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/i2c.h>
+#include <linux/i2c-id.h>
 #include <linux/workqueue.h>
 #include <asm/semaphore.h>
 
@@ -60,21 +62,22 @@ MODULE_PARM_DESC(hauppauge, "Specify Hauppauge remote: 0=black, 1=grey (defaults
 
 /* ----------------------------------------------------------------------- */
 
-static int get_key_haup(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
+static int get_key_haup_common(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw,
+                              int size, int offset)
 {
-       unsigned char buf[3];
+       unsigned char buf[6];
        int start, range, toggle, dev, code;
 
        /* poll IR chip */
-       if (3 != i2c_master_recv(&ir->c,buf,3))
+       if (size != i2c_master_recv(&ir->c,buf,size))
                return -EIO;
 
        /* split rc5 data block ... */
-       start  = (buf[0] >> 7) &    1;
-       range  = (buf[0] >> 6) &    1;
-       toggle = (buf[0] >> 5) &    1;
-       dev    =  buf[0]       & 0x1f;
-       code   = (buf[1] >> 2) & 0x3f;
+       start  = (buf[offset] >> 7) &    1;
+       range  = (buf[offset] >> 6) &    1;
+       toggle = (buf[offset] >> 5) &    1;
+       dev    =  buf[offset]       & 0x1f;
+       code   = (buf[offset+1] >> 2) & 0x3f;
 
        /* rc5 has two start bits
         * the first bit must be one
@@ -96,6 +99,16 @@ static int get_key_haup(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
        return 1;
 }
 
+static inline int get_key_haup(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
+{
+       return get_key_haup_common (ir, ir_key, ir_raw, 3, 0);
+}
+
+static inline int get_key_haup_xvr(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
+{
+       return get_key_haup_common (ir, ir_key, ir_raw, 6, 3);
+}
+
 static int get_key_pixelview(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
 {
        unsigned char b;
@@ -130,6 +143,30 @@ static int get_key_pv951(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
        return 1;
 }
 
+static int get_key_fusionhdtv(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
+{
+       unsigned char buf[4];
+
+       /* poll IR chip */
+       if (4 != i2c_master_recv(&ir->c,buf,4)) {
+               dprintk(1,"read error\n");
+               return -EIO;
+       }
+
+       if(buf[0] !=0 || buf[1] !=0 || buf[2] !=0 || buf[3] != 0)
+               dprintk(2, "%s: 0x%2x 0x%2x 0x%2x 0x%2x\n", __FUNCTION__,
+                       buf[0], buf[1], buf[2], buf[3]);
+
+       /* no key pressed or signal from other ir remote */
+       if(buf[0] != 0x1 ||  buf[1] != 0xfe)
+               return 0;
+
+       *ir_key = buf[2];
+       *ir_raw = (buf[2] << 8) | buf[3];
+
+       return 1;
+}
+
 static int get_key_knc1(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
 {
        unsigned char b;
@@ -270,8 +307,9 @@ static void ir_timer(unsigned long data)
 static void ir_work(struct work_struct *work)
 {
        struct IR_i2c *ir = container_of(work, struct IR_i2c, work);
+
        ir_key_poll(ir);
-       mod_timer(&ir->timer, jiffies+HZ/10);
+       mod_timer(&ir->timer, jiffies + msecs_to_jiffies(100));
 }
 
 /* ----------------------------------------------------------------------- */
@@ -351,12 +389,30 @@ static int ir_attach(struct i2c_adapter *adap, int addr,
                ir_type     = IR_TYPE_OTHER;
                ir_codes    = ir_codes_empty;
                break;
+       case 0x6b:
+               name        = "FusionHDTV";
+               ir->get_key = get_key_fusionhdtv;
+               ir_type     = IR_TYPE_RC5;
+               ir_codes    = ir_codes_fusionhdtv_mce;
+               break;
        case 0x7a:
        case 0x47:
        case 0x71:
-               /* Handled by saa7134-input */
-               name        = "SAA713x remote";
-               ir_type     = IR_TYPE_OTHER;
+               if (adap->id == I2C_HW_B_CX2388x) {
+                       /* Handled by cx88-input */
+                       name        = "CX2388x remote";
+                       ir_type     = IR_TYPE_RC5;
+                       ir->get_key = get_key_haup_xvr;
+                       if (hauppauge == 1) {
+                               ir_codes    = ir_codes_hauppauge_new;
+                       } else {
+                               ir_codes    = ir_codes_rc5_tv;
+                       }
+               } else {
+                       /* Handled by saa7134-input */
+                       name        = "SAA713x remote";
+                       ir_type     = IR_TYPE_OTHER;
+               }
                break;
        default:
                /* shouldn't happen */
@@ -450,6 +506,8 @@ static int ir_probe(struct i2c_adapter *adap)
        static const int probe_bttv[] = { 0x1a, 0x18, 0x4b, 0x64, 0x30, -1};
        static const int probe_saa7134[] = { 0x7a, 0x47, 0x71, -1 };
        static const int probe_em28XX[] = { 0x30, 0x47, -1 };
+       static const int probe_cx88[] = { 0x18, 0x6b, 0x71, -1 };
+       static const int probe_cx23885[] = { 0x6b, -1 };
        const int *probe = NULL;
        struct i2c_client c;
        unsigned char buf;
@@ -468,6 +526,12 @@ static int ir_probe(struct i2c_adapter *adap)
        case I2C_HW_B_EM28XX:
                probe = probe_em28XX;
                break;
+       case I2C_HW_B_CX2388x:
+               probe = probe_cx88;
+               break;
+       case I2C_HW_B_CX23885:
+               probe = probe_cx23885;
+               break;
        }
        if (NULL == probe)
                return 0;