Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[sfrench/cifs-2.6.git] / drivers / media / video / cx88 / cx88-input.c

diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c
index 78b3635178afe33584256e516211acbf60555a30..92b8cdf9fb815296ee102cffe98666416bafe192 100644 (file)
--- a/drivers/media/video/cx88/cx88-input.c
+++ b/drivers/media/video/cx88/cx88-input.c
@@ -118,13 +118,13 @@ static void cx88_ir_handle_key(struct cx88_IR *ir)
 
                data = (data << 4) | ((gpio_key & 0xf0) >> 4);
 
-               ir_input_keydown(ir->input, &ir->ir, data, data);
+               ir_input_keydown(ir->input, &ir->ir, data);
                ir_input_nokey(ir->input, &ir->ir);
 
        } else if (ir->mask_keydown) {
                /* bit set on keydown */
                if (gpio & ir->mask_keydown) {
-                       ir_input_keydown(ir->input, &ir->ir, data, data);
+                       ir_input_keydown(ir->input, &ir->ir, data);
                } else {
                        ir_input_nokey(ir->input, &ir->ir);
                }
@@ -132,14 +132,14 @@ static void cx88_ir_handle_key(struct cx88_IR *ir)
        } else if (ir->mask_keyup) {
                /* bit cleared on keydown */
                if (0 == (gpio & ir->mask_keyup)) {
-                       ir_input_keydown(ir->input, &ir->ir, data, data);
+                       ir_input_keydown(ir->input, &ir->ir, data);
                } else {
                        ir_input_nokey(ir->input, &ir->ir);
                }
 
        } else {
                /* can't distinguish keydown/up :-/ */
-               ir_input_keydown(ir->input, &ir->ir, data, data);
+               ir_input_keydown(ir->input, &ir->ir, data);
                ir_input_nokey(ir->input, &ir->ir);
        }
 }
@@ -303,6 +303,23 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
                ir->mask_keydown = 0x02;
                ir->polling      = 50; /* ms */
                break;
+       case CX88_BOARD_OMICOM_SS4_PCI:
+       case CX88_BOARD_SATTRADE_ST4200:
+       case CX88_BOARD_TBS_8920:
+       case CX88_BOARD_TBS_8910:
+       case CX88_BOARD_PROF_7300:
+       case CX88_BOARD_PROF_7301:
+       case CX88_BOARD_PROF_6200:
+               ir_codes = &ir_codes_tbs_nec_table;
+               ir_type = IR_TYPE_PD;
+               ir->sampling = 0xff00; /* address */
+               break;
+       case CX88_BOARD_TEVII_S460:
+       case CX88_BOARD_TEVII_S420:
+               ir_codes = &ir_codes_tevii_nec_table;
+               ir_type = IR_TYPE_PD;
+               ir->sampling = 0xff00; /* address */
+               break;
        case CX88_BOARD_DNTV_LIVE_DVB_T_PRO:
                ir_codes         = &ir_codes_dntv_live_dvbt_pro_table;
                ir_type          = IR_TYPE_PD;
@@ -343,7 +360,10 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
        snprintf(ir->name, sizeof(ir->name), "cx88 IR (%s)", core->board.name);
        snprintf(ir->phys, sizeof(ir->phys), "pci-%s/ir0", pci_name(pci));
 
-       ir_input_init(input_dev, &ir->ir, ir_type, ir_codes);
+       err = ir_input_init(input_dev, &ir->ir, ir_type, ir_codes);
+       if (err < 0)
+               goto err_out_free;
+
        input_dev->name = ir->name;
        input_dev->phys = ir->phys;
        input_dev->id.bustype = BUS_PCI;
@@ -373,6 +393,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
        cx88_ir_stop(core, ir);
        core->ir = NULL;
  err_out_free:
+       ir_input_free(input_dev);
        input_free_device(input_dev);
        kfree(ir);
        return err;
@@ -387,6 +408,7 @@ int cx88_ir_fini(struct cx88_core *core)
                return 0;
 
        cx88_ir_stop(core, ir);
+       ir_input_free(ir->input);
        input_unregister_device(ir->input);
        kfree(ir);
 
@@ -432,8 +454,17 @@ void cx88_ir_irq(struct cx88_core *core)
 
        /* decode it */
        switch (core->boardnr) {
+       case CX88_BOARD_TEVII_S460:
+       case CX88_BOARD_TEVII_S420:
        case CX88_BOARD_TERRATEC_CINERGY_1400_DVB_T1:
        case CX88_BOARD_DNTV_LIVE_DVB_T_PRO:
+       case CX88_BOARD_OMICOM_SS4_PCI:
+       case CX88_BOARD_SATTRADE_ST4200:
+       case CX88_BOARD_TBS_8920:
+       case CX88_BOARD_TBS_8910:
+       case CX88_BOARD_PROF_7300:
+       case CX88_BOARD_PROF_7301:
+       case CX88_BOARD_PROF_6200:
                ircode = ir_decode_pulsedistance(ir->samples, ir->scount, 1, 4);
 
                if (ircode == 0xffffffff) { /* decoding error */
@@ -461,7 +492,7 @@ void cx88_ir_irq(struct cx88_core *core)
 
                ir_dprintk("Key Code: %x\n", (ircode >> 16) & 0x7f);
 
-               ir_input_keydown(ir->input, &ir->ir, (ircode >> 16) & 0x7f, (ircode >> 16) & 0xff);
+               ir_input_keydown(ir->input, &ir->ir, (ircode >> 16) & 0x7f);
                ir->release = jiffies + msecs_to_jiffies(120);
                break;
        case CX88_BOARD_HAUPPAUGE:
@@ -498,7 +529,7 @@ void cx88_ir_irq(struct cx88_core *core)
                if ( dev != 0x1e && dev != 0x1f )
                        /* not a hauppauge remote */
                        break;
-               ir_input_keydown(ir->input, &ir->ir, code, ircode);
+               ir_input_keydown(ir->input, &ir->ir, code);
                ir->release = jiffies + msecs_to_jiffies(120);
                break;
        case CX88_BOARD_PINNACLE_PCTV_HD_800i:
@@ -506,7 +537,7 @@ void cx88_ir_irq(struct cx88_core *core)
                ir_dprintk("biphase decoded: %x\n", ircode);
                if ((ircode & 0xfffff000) != 0x3000)
                        break;
-               ir_input_keydown(ir->input, &ir->ir, ircode & 0x3f, ircode);
+               ir_input_keydown(ir->input, &ir->ir, ircode & 0x3f);
                ir->release = jiffies + msecs_to_jiffies(120);
                break;
        }