diff options
Diffstat (limited to 'drivers/media/video/cx88/cx88-input.c')
-rw-r--r-- | drivers/media/video/cx88/cx88-input.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c index ec05312a9b62..d91f5c51206d 100644 --- a/drivers/media/video/cx88/cx88-input.c +++ b/drivers/media/video/cx88/cx88-input.c | |||
@@ -91,6 +91,8 @@ static void cx88_ir_handle_key(struct cx88_IR *ir) | |||
91 | gpio=(gpio & 0x7fd) + (auxgpio & 0xef); | 91 | gpio=(gpio & 0x7fd) + (auxgpio & 0xef); |
92 | break; | 92 | break; |
93 | case CX88_BOARD_WINFAST_DTV1000: | 93 | case CX88_BOARD_WINFAST_DTV1000: |
94 | case CX88_BOARD_WINFAST_DTV1800H: | ||
95 | case CX88_BOARD_WINFAST_TV2000_XP_GLOBAL: | ||
94 | gpio = (gpio & 0x6ff) | ((cx_read(MO_GP1_IO) << 8) & 0x900); | 96 | gpio = (gpio & 0x6ff) | ((cx_read(MO_GP1_IO) << 8) & 0x900); |
95 | auxgpio = gpio; | 97 | auxgpio = gpio; |
96 | break; | 98 | break; |
@@ -217,11 +219,13 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci) | |||
217 | case CX88_BOARD_HAUPPAUGE_HVR4000LITE: | 219 | case CX88_BOARD_HAUPPAUGE_HVR4000LITE: |
218 | case CX88_BOARD_PCHDTV_HD3000: | 220 | case CX88_BOARD_PCHDTV_HD3000: |
219 | case CX88_BOARD_PCHDTV_HD5500: | 221 | case CX88_BOARD_PCHDTV_HD5500: |
222 | case CX88_BOARD_HAUPPAUGE_IRONLY: | ||
220 | ir_codes = ir_codes_hauppauge_new; | 223 | ir_codes = ir_codes_hauppauge_new; |
221 | ir_type = IR_TYPE_RC5; | 224 | ir_type = IR_TYPE_RC5; |
222 | ir->sampling = 1; | 225 | ir->sampling = 1; |
223 | break; | 226 | break; |
224 | case CX88_BOARD_WINFAST_DTV2000H: | 227 | case CX88_BOARD_WINFAST_DTV2000H: |
228 | case CX88_BOARD_WINFAST_DTV1800H: | ||
225 | ir_codes = ir_codes_winfast; | 229 | ir_codes = ir_codes_winfast; |
226 | ir->gpio_addr = MO_GP0_IO; | 230 | ir->gpio_addr = MO_GP0_IO; |
227 | ir->mask_keycode = 0x8f8; | 231 | ir->mask_keycode = 0x8f8; |
@@ -230,6 +234,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci) | |||
230 | break; | 234 | break; |
231 | case CX88_BOARD_WINFAST2000XP_EXPERT: | 235 | case CX88_BOARD_WINFAST2000XP_EXPERT: |
232 | case CX88_BOARD_WINFAST_DTV1000: | 236 | case CX88_BOARD_WINFAST_DTV1000: |
237 | case CX88_BOARD_WINFAST_TV2000_XP_GLOBAL: | ||
233 | ir_codes = ir_codes_winfast; | 238 | ir_codes = ir_codes_winfast; |
234 | ir->gpio_addr = MO_GP0_IO; | 239 | ir->gpio_addr = MO_GP0_IO; |
235 | ir->mask_keycode = 0x8f8; | 240 | ir->mask_keycode = 0x8f8; |
@@ -459,6 +464,7 @@ void cx88_ir_irq(struct cx88_core *core) | |||
459 | case CX88_BOARD_HAUPPAUGE_HVR4000LITE: | 464 | case CX88_BOARD_HAUPPAUGE_HVR4000LITE: |
460 | case CX88_BOARD_PCHDTV_HD3000: | 465 | case CX88_BOARD_PCHDTV_HD3000: |
461 | case CX88_BOARD_PCHDTV_HD5500: | 466 | case CX88_BOARD_PCHDTV_HD5500: |
467 | case CX88_BOARD_HAUPPAUGE_IRONLY: | ||
462 | ircode = ir_decode_biphase(ir->samples, ir->scount, 5, 7); | 468 | ircode = ir_decode_biphase(ir->samples, ir->scount, 5, 7); |
463 | ir_dprintk("biphase decoded: %x\n", ircode); | 469 | ir_dprintk("biphase decoded: %x\n", ircode); |
464 | /* | 470 | /* |