lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

V4L (0990): Enable IR support for the Nova-S-Plus

Browse Source 
- Enable IR support for the Nova-S-Plus.

Signed-off-by: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
This commit is contained in:
Steven Toth
2006-01-09 15:25:02 -02:00
committed by Mauro Carvalho Chehab
parent 0fa14aa621
commit fb56cb65e4
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/video4linux/CARDLIST.cx88
View File

@@ -35,5 +35,5 @@
34 -> ATI HDTV Wonder [1002:a101] 34 -> ATI HDTV Wonder [1002:a101]
35 -> WinFast DTV1000-T [107d:665f] 35 -> WinFast DTV1000-T [107d:665f]
36 -> AVerTV 303 (M126) [1461:000a] 36 -> AVerTV 303 (M126) [1461:000a]
37 -> Hauppauge Nova-S-Plus DVB-S [0070:9200] 37 -> Hauppauge Nova-S-Plus DVB-S [0070:9201,0070:9202]
38 -> Hauppauge Nova-SE2 DVB-S [0070:9202] 38 -> Hauppauge Nova-SE2 DVB-S [0070:9200]

6
drivers/media/video/cx88/cx88-cards.c
View File

@@ -1078,11 +1078,15 @@ struct cx88_subid cx88_subids[] = {
},{ },{
.subvendor = 0x0070, .subvendor = 0x0070,
.subdevice = 0x9200, .subdevice = 0x9200,
.card = CX88_BOARD_HAUPPAUGE_NOVASE2_S1,
},{
.subvendor = 0x0070,
.subdevice = 0x9201,
.card = CX88_BOARD_HAUPPAUGE_NOVASPLUS_S1, .card = CX88_BOARD_HAUPPAUGE_NOVASPLUS_S1,
},{ },{
.subvendor = 0x0070, .subvendor = 0x0070,
.subdevice = 0x9202, .subdevice = 0x9202,
.card = CX88_BOARD_HAUPPAUGE_NOVASE2_S1, .card = CX88_BOARD_HAUPPAUGE_NOVASPLUS_S1,
}, },
}; };
const unsigned int cx88_idcount = ARRAY_SIZE(cx88_subids); const unsigned int cx88_idcount = ARRAY_SIZE(cx88_subids);

4
drivers/media/video/cx88/cx88-input.c
View File

@@ -388,6 +388,8 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
break; break;
case CX88_BOARD_HAUPPAUGE: case CX88_BOARD_HAUPPAUGE:
case CX88_BOARD_HAUPPAUGE_DVB_T1: 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_codes = ir_codes_hauppauge_new;
ir_type = IR_TYPE_RC5; ir_type = IR_TYPE_RC5;
ir->sampling = 1; ir->sampling = 1;
@@ -567,6 +569,8 @@ void cx88_ir_irq(struct cx88_core *core)
break; break;
case CX88_BOARD_HAUPPAUGE: case CX88_BOARD_HAUPPAUGE:
case CX88_BOARD_HAUPPAUGE_DVB_T1: 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); ircode = ir_decode_biphase(ir->samples, ir->scount, 5, 7);
ir_dprintk("biphase decoded: %x\n", ircode); ir_dprintk("biphase decoded: %x\n", ircode);
if ((ircode & 0xfffff000) != 0x3000) if ((ircode & 0xfffff000) != 0x3000)