Merge ../linux-2.6

[linux-2.6-omap-h63xx.git] / 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 740e543311af8c1930c8161332cc6a98395d8b59..95bacf435414ead307c6230cd65479f42a9369dc 100644 (file)
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -44,51 +44,17 @@
 #include <media/ir-common.h>
 #include <media/ir-kbd-i2c.h>
 
-/* Mark Phalan <phalanm@o2.ie> */
-static IR_KEYTAB_TYPE ir_codes_pv951[IR_KEYTAB_SIZE] = {
-       [  0 ] = KEY_KP0,
-       [  1 ] = KEY_KP1,
-       [  2 ] = KEY_KP2,
-       [  3 ] = KEY_KP3,
-       [  4 ] = KEY_KP4,
-       [  5 ] = KEY_KP5,
-       [  6 ] = KEY_KP6,
-       [  7 ] = KEY_KP7,
-       [  8 ] = KEY_KP8,
-       [  9 ] = KEY_KP9,
-
-       [ 18 ] = KEY_POWER,
-       [ 16 ] = KEY_MUTE,
-       [ 31 ] = KEY_VOLUMEDOWN,
-       [ 27 ] = KEY_VOLUMEUP,
-       [ 26 ] = KEY_CHANNELUP,
-       [ 30 ] = KEY_CHANNELDOWN,
-       [ 14 ] = KEY_PAGEUP,
-       [ 29 ] = KEY_PAGEDOWN,
-       [ 19 ] = KEY_SOUND,
-
-       [ 24 ] = KEY_KPPLUSMINUS,       /* CH +/- */
-       [ 22 ] = KEY_SUBTITLE,          /* CC */
-       [ 13 ] = KEY_TEXT,              /* TTX */
-       [ 11 ] = KEY_TV,                /* AIR/CBL */
-       [ 17 ] = KEY_PC,                /* PC/TV */
-       [ 23 ] = KEY_OK,                /* CH RTN */
-       [ 25 ] = KEY_MODE,              /* FUNC */
-       [ 12 ] = KEY_SEARCH,            /* AUTOSCAN */
-
-       /* Not sure what to do with these ones! */
-       [ 15 ] = KEY_SELECT,            /* SOURCE */
-       [ 10 ] = KEY_KPPLUS,            /* +100 */
-       [ 20 ] = KEY_KPEQUAL,           /* SYNC */
-       [ 28 ] = KEY_MEDIA,             /* PC/TV */
-};
-
 /* ----------------------------------------------------------------------- */
 /* insmod parameters                                                       */
 
 static int debug;
 module_param(debug, int, 0644);    /* debug level (0,1,2) */
 
+static int hauppauge = 0;
+module_param(hauppauge, int, 0644);    /* Choose Hauppauge remote */
+MODULE_PARM_DESC(hauppauge, "Specify Hauppauge remote: 0=black, 1=grey (defaults to 0)");
+
+
 #define DEVNAME "ir-kbd-i2c"
 #define dprintk(level, fmt, arg...)    if (debug >= level) \
        printk(KERN_DEBUG DEVNAME ": " fmt , ## arg)
@@ -278,9 +244,10 @@ static int ir_detach(struct i2c_client *client);
 static int ir_probe(struct i2c_adapter *adap);
 
 static struct i2c_driver driver = {
-       .name           = "ir remote kbd driver",
+       .driver = {
+               .name   = "ir-kbd-i2c",
+       },
        .id             = I2C_DRIVERID_INFRARED,
-       .flags          = I2C_DF_NOTIFY,
        .attach_adapter = ir_probe,
        .detach_client  = ir_detach,
 };
@@ -303,18 +270,20 @@ static int ir_attach(struct i2c_adapter *adap, int addr,
        ir = kzalloc(sizeof(struct IR_i2c),GFP_KERNEL);
        input_dev = input_allocate_device();
        if (!ir || !input_dev) {
-               kfree(ir);
                input_free_device(input_dev);
+               kfree(ir);
                return -ENOMEM;
        }
+       memset(ir,0,sizeof(*ir));
 
        ir->c = client_template;
        ir->input = input_dev;
 
-       i2c_set_clientdata(&ir->c, ir);
        ir->c.adapter = adap;
        ir->c.addr    = addr;
 
+       i2c_set_clientdata(&ir->c, ir);
+
        switch(addr) {
        case 0x64:
                name        = "Pixelview";
@@ -333,7 +302,11 @@ static int ir_attach(struct i2c_adapter *adap, int addr,
                name        = "Hauppauge";
                ir->get_key = get_key_haup;
                ir_type     = IR_TYPE_RC5;
-               ir_codes    = ir_codes_rc5_tv;
+               if (hauppauge == 1) {
+                       ir_codes    = ir_codes_hauppauge_new;
+               } else {
+                       ir_codes    = ir_codes_rc5_tv;
+               }
                break;
        case 0x30:
                name        = "KNC One";
@@ -377,13 +350,15 @@ static int ir_attach(struct i2c_adapter *adap, int addr,
                 ir->c.dev.bus_id);
 
        /* init + register input device */
-       ir_input_init(input_dev, &ir->ir, ir_type, ir_codes);
-       input_dev->id.bustype   = BUS_I2C;
-       input_dev->name         = ir->c.name;
-       input_dev->phys         = ir->phys;
+       ir_input_init(input_dev,&ir->ir,ir_type,ir->ir_codes);
+       input_dev->id.bustype = BUS_I2C;
+       input_dev->name       = ir->c.name;
+       input_dev->phys       = ir->phys;
 
        /* register event device */
        input_register_device(ir->input);
+       printk(DEVNAME ": %s detected at %s [%s]\n",
+              ir->input->name,ir->input->phys,adap->name);
 
        /* start polling via eventd */
        INIT_WORK(&ir->work, ir_work, ir);