From: Steven Toth Enable IR support for the Nova-S-Plus. Signed-off-by: Steven Toth Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton --- Documentation/video4linux/CARDLIST.cx88 | 4 ++-- drivers/media/video/cx88/cx88-cards.c | 6 +++++- drivers/media/video/cx88/cx88-input.c | 4 ++++ 3 files changed, 11 insertions(+), 3 deletions(-) diff -puN Documentation/video4linux/CARDLIST.cx88~v4l-0990-enable-ir-support-for-the-nova-s-plus Documentation/video4linux/CARDLIST.cx88 --- devel/Documentation/video4linux/CARDLIST.cx88~v4l-0990-enable-ir-support-for-the-nova-s-plus 2005-12-09 22:50:12.000000000 -0800 +++ devel-akpm/Documentation/video4linux/CARDLIST.cx88 2005-12-09 22:50:12.000000000 -0800 @@ -35,5 +35,5 @@ 34 -> ATI HDTV Wonder [1002:a101] 35 -> WinFast DTV1000-T [107d:665f] 36 -> AVerTV 303 (M126) [1461:000a] - 37 -> Hauppauge Nova-S-Plus DVB-S [0070:9200] - 38 -> Hauppauge Nova-SE2 DVB-S [0070:9202] + 37 -> Hauppauge Nova-S-Plus DVB-S [0070:9201,0070:9202] + 38 -> Hauppauge Nova-SE2 DVB-S [0070:9200] diff -puN drivers/media/video/cx88/cx88-cards.c~v4l-0990-enable-ir-support-for-the-nova-s-plus drivers/media/video/cx88/cx88-cards.c --- devel/drivers/media/video/cx88/cx88-cards.c~v4l-0990-enable-ir-support-for-the-nova-s-plus 2005-12-09 22:50:12.000000000 -0800 +++ devel-akpm/drivers/media/video/cx88/cx88-cards.c 2005-12-09 22:50:12.000000000 -0800 @@ -1078,11 +1078,15 @@ struct cx88_subid cx88_subids[] = { },{ .subvendor = 0x0070, .subdevice = 0x9200, + .card = CX88_BOARD_HAUPPAUGE_NOVASE2_S1, + },{ + .subvendor = 0x0070, + .subdevice = 0x9201, .card = CX88_BOARD_HAUPPAUGE_NOVASPLUS_S1, },{ .subvendor = 0x0070, .subdevice = 0x9202, - .card = CX88_BOARD_HAUPPAUGE_NOVASE2_S1, + .card = CX88_BOARD_HAUPPAUGE_NOVASPLUS_S1, }, }; const unsigned int cx88_idcount = ARRAY_SIZE(cx88_subids); diff -puN drivers/media/video/cx88/cx88-input.c~v4l-0990-enable-ir-support-for-the-nova-s-plus drivers/media/video/cx88/cx88-input.c --- devel/drivers/media/video/cx88/cx88-input.c~v4l-0990-enable-ir-support-for-the-nova-s-plus 2005-12-09 22:50:12.000000000 -0800 +++ devel-akpm/drivers/media/video/cx88/cx88-input.c 2005-12-09 22:50:12.000000000 -0800 @@ -388,6 +388,8 @@ int cx88_ir_init(struct cx88_core *core, break; case CX88_BOARD_HAUPPAUGE: case CX88_BOARD_HAUPPAUGE_DVB_T1: + case CX88_BOARD_HAUPPAUGE_NOVASE2_S1: + case CX88_BOARD_HAUPPAUGE_NOVASPLUS_S1: ir_codes = ir_codes_hauppauge_new; ir_type = IR_TYPE_RC5; ir->sampling = 1; @@ -567,6 +569,8 @@ void cx88_ir_irq(struct cx88_core *core) break; case CX88_BOARD_HAUPPAUGE: case CX88_BOARD_HAUPPAUGE_DVB_T1: + case CX88_BOARD_HAUPPAUGE_NOVASE2_S1: + case CX88_BOARD_HAUPPAUGE_NOVASPLUS_S1: ircode = ir_decode_biphase(ir->samples, ir->scount, 5, 7); ir_dprintk("biphase decoded: %x\n", ircode); if ((ircode & 0xfffff000) != 0x3000) _