diff options
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88-input.c')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-input.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-input.c b/linux/drivers/media/video/cx88/cx88-input.c index ff0d1b95e..63e61748a 100644 --- a/linux/drivers/media/video/cx88/cx88-input.c +++ b/linux/drivers/media/video/cx88/cx88-input.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-input.c,v 1.1 2004/11/30 17:00:46 kraxel Exp $ + * $Id: cx88-input.c,v 1.2 2004/12/01 15:10:26 kraxel Exp $ * * Device driver for GPIO attached remote control interfaces * on Conexant 2388x based TV/DVB cards. @@ -181,7 +181,6 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci) memset(ir,0,sizeof(*ir)); /* detect & configure */ - /* XXX: move this data into cx88-cards? */ switch (core->board) { case CX88_BOARD_DNTV_LIVE_DVB_T: ir_codes = ir_codes_dntv_live_dvb_t; @@ -193,6 +192,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci) case CX88_BOARD_HAUPPAUGE: case CX88_BOARD_HAUPPAUGE_DVB_T1: ir_codes = ir_codes_rc5_tv; + ir_type = IR_TYPE_RC5; ir->sampling = 1; break; } @@ -203,7 +203,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci) /* init input device */ snprintf(ir->name, sizeof(ir->name), "cx88 IR (%s)", - core->name); + cx88_boards[core->board].name); snprintf(ir->phys, sizeof(ir->phys), "pci-%s/ir0", pci_name(pci)); @@ -371,7 +371,7 @@ void cx88_ir_irq(struct cx88_core *core) if ((rc5 & 0xfffff000) != 0x3000) break; ir_input_keydown(&ir->input, &ir->ir, rc5 & 0x3f, rc5); - ir->release = jiffies + msecs_to_jiffies(100); + ir->release = jiffies + msecs_to_jiffies(120); break; } |