diff options
author | Steven Toth <stoth@linuxtv.org> | 2009-03-28 13:22:21 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-16 17:20:50 -0400 |
commit | 501d8cd4e248feebd465b016a7d5b7bc084f5f1f (patch) | |
tree | ff5af71b50bdc6b0435adf75766df74ee29916a8 | |
parent | f1ff355a2c32dbe93cfe05160e05cbccc789ca33 (diff) |
V4L/DVB (11665): cx88: Add support for the Hauppauge IROnly board.
cx88: Add support for the Hauppauge IROnly board.
Signed-off-by: Steven Toth <stoth@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | Documentation/video4linux/CARDLIST.cx88 | 1 | ||||
-rw-r--r-- | drivers/media/video/cx88/cx88-cards.c | 13 | ||||
-rw-r--r-- | drivers/media/video/cx88/cx88-input.c | 2 | ||||
-rw-r--r-- | drivers/media/video/cx88/cx88.h | 1 |
4 files changed, 17 insertions, 0 deletions
diff --git a/Documentation/video4linux/CARDLIST.cx88 b/Documentation/video4linux/CARDLIST.cx88 index 71e9db0b26f7..80527b292dd4 100644 --- a/Documentation/video4linux/CARDLIST.cx88 +++ b/Documentation/video4linux/CARDLIST.cx88 | |||
@@ -78,3 +78,4 @@ | |||
78 | 77 -> TBS 8910 DVB-S [8910:8888] | 78 | 77 -> TBS 8910 DVB-S [8910:8888] |
79 | 78 -> Prof 6200 DVB-S [b022:3022] | 79 | 78 -> Prof 6200 DVB-S [b022:3022] |
80 | 79 -> Terratec Cinergy HT PCI MKII [153b:1177] | 80 | 79 -> Terratec Cinergy HT PCI MKII [153b:1177] |
81 | 80 -> Hauppauge WinTV-IR Only [0070:9290] | ||
diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c index 6bbbfc66bb4b..1039757e2c4e 100644 --- a/drivers/media/video/cx88/cx88-cards.c +++ b/drivers/media/video/cx88/cx88-cards.c | |||
@@ -1969,6 +1969,13 @@ static const struct cx88_board cx88_boards[] = { | |||
1969 | }, | 1969 | }, |
1970 | .mpeg = CX88_MPEG_DVB, | 1970 | .mpeg = CX88_MPEG_DVB, |
1971 | }, | 1971 | }, |
1972 | [CX88_BOARD_HAUPPAUGE_IRONLY] = { | ||
1973 | .name = "Hauppauge WinTV-IR Only", | ||
1974 | .tuner_type = UNSET, | ||
1975 | .radio_type = UNSET, | ||
1976 | .tuner_addr = ADDR_UNSET, | ||
1977 | .radio_addr = ADDR_UNSET, | ||
1978 | }, | ||
1972 | }; | 1979 | }; |
1973 | 1980 | ||
1974 | /* ------------------------------------------------------------------ */ | 1981 | /* ------------------------------------------------------------------ */ |
@@ -2382,6 +2389,10 @@ static const struct cx88_subid cx88_subids[] = { | |||
2382 | .subvendor = 0x153b, | 2389 | .subvendor = 0x153b, |
2383 | .subdevice = 0x1177, | 2390 | .subdevice = 0x1177, |
2384 | .card = CX88_BOARD_TERRATEC_CINERGY_HT_PCI_MKII, | 2391 | .card = CX88_BOARD_TERRATEC_CINERGY_HT_PCI_MKII, |
2392 | }, { | ||
2393 | .subvendor = 0x0070, | ||
2394 | .subdevice = 0x9290, | ||
2395 | .card = CX88_BOARD_HAUPPAUGE_IRONLY, | ||
2385 | }, | 2396 | }, |
2386 | }; | 2397 | }; |
2387 | 2398 | ||
@@ -2448,6 +2459,7 @@ static void hauppauge_eeprom(struct cx88_core *core, u8 *eeprom_data) | |||
2448 | case 90500: /* Nova-T-PCI (oem) */ | 2459 | case 90500: /* Nova-T-PCI (oem) */ |
2449 | case 90501: /* Nova-T-PCI (oem/IR) */ | 2460 | case 90501: /* Nova-T-PCI (oem/IR) */ |
2450 | case 92000: /* Nova-SE2 (OEM, No Video or IR) */ | 2461 | case 92000: /* Nova-SE2 (OEM, No Video or IR) */ |
2462 | case 92900: /* WinTV-IROnly (No analog or digital Video inputs) */ | ||
2451 | case 94009: /* WinTV-HVR1100 (Video and IR Retail) */ | 2463 | case 94009: /* WinTV-HVR1100 (Video and IR Retail) */ |
2452 | case 94501: /* WinTV-HVR1100 (Video and IR OEM) */ | 2464 | case 94501: /* WinTV-HVR1100 (Video and IR OEM) */ |
2453 | case 96009: /* WinTV-HVR1300 (PAL Video, MPEG Video and IR RX) */ | 2465 | case 96009: /* WinTV-HVR1300 (PAL Video, MPEG Video and IR RX) */ |
@@ -2907,6 +2919,7 @@ static void cx88_card_setup(struct cx88_core *core) | |||
2907 | case CX88_BOARD_HAUPPAUGE_HVR1300: | 2919 | case CX88_BOARD_HAUPPAUGE_HVR1300: |
2908 | case CX88_BOARD_HAUPPAUGE_HVR4000: | 2920 | case CX88_BOARD_HAUPPAUGE_HVR4000: |
2909 | case CX88_BOARD_HAUPPAUGE_HVR4000LITE: | 2921 | case CX88_BOARD_HAUPPAUGE_HVR4000LITE: |
2922 | case CX88_BOARD_HAUPPAUGE_IRONLY: | ||
2910 | if (0 == core->i2c_rc) | 2923 | if (0 == core->i2c_rc) |
2911 | hauppauge_eeprom(core, eeprom); | 2924 | hauppauge_eeprom(core, eeprom); |
2912 | break; | 2925 | break; |
diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c index ec05312a9b62..bd2baa76203f 100644 --- a/drivers/media/video/cx88/cx88-input.c +++ b/drivers/media/video/cx88/cx88-input.c | |||
@@ -217,6 +217,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci) | |||
217 | case CX88_BOARD_HAUPPAUGE_HVR4000LITE: | 217 | case CX88_BOARD_HAUPPAUGE_HVR4000LITE: |
218 | case CX88_BOARD_PCHDTV_HD3000: | 218 | case CX88_BOARD_PCHDTV_HD3000: |
219 | case CX88_BOARD_PCHDTV_HD5500: | 219 | case CX88_BOARD_PCHDTV_HD5500: |
220 | case CX88_BOARD_HAUPPAUGE_IRONLY: | ||
220 | ir_codes = ir_codes_hauppauge_new; | 221 | ir_codes = ir_codes_hauppauge_new; |
221 | ir_type = IR_TYPE_RC5; | 222 | ir_type = IR_TYPE_RC5; |
222 | ir->sampling = 1; | 223 | ir->sampling = 1; |
@@ -459,6 +460,7 @@ void cx88_ir_irq(struct cx88_core *core) | |||
459 | case CX88_BOARD_HAUPPAUGE_HVR4000LITE: | 460 | case CX88_BOARD_HAUPPAUGE_HVR4000LITE: |
460 | case CX88_BOARD_PCHDTV_HD3000: | 461 | case CX88_BOARD_PCHDTV_HD3000: |
461 | case CX88_BOARD_PCHDTV_HD5500: | 462 | case CX88_BOARD_PCHDTV_HD5500: |
463 | case CX88_BOARD_HAUPPAUGE_IRONLY: | ||
462 | ircode = ir_decode_biphase(ir->samples, ir->scount, 5, 7); | 464 | ircode = ir_decode_biphase(ir->samples, ir->scount, 5, 7); |
463 | ir_dprintk("biphase decoded: %x\n", ircode); | 465 | ir_dprintk("biphase decoded: %x\n", ircode); |
464 | /* | 466 | /* |
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h index 7724d168fc04..2190b600e2ee 100644 --- a/drivers/media/video/cx88/cx88.h +++ b/drivers/media/video/cx88/cx88.h | |||
@@ -232,6 +232,7 @@ extern struct sram_channel cx88_sram_channels[]; | |||
232 | #define CX88_BOARD_TBS_8910 77 | 232 | #define CX88_BOARD_TBS_8910 77 |
233 | #define CX88_BOARD_PROF_6200 78 | 233 | #define CX88_BOARD_PROF_6200 78 |
234 | #define CX88_BOARD_TERRATEC_CINERGY_HT_PCI_MKII 79 | 234 | #define CX88_BOARD_TERRATEC_CINERGY_HT_PCI_MKII 79 |
235 | #define CX88_BOARD_HAUPPAUGE_IRONLY 80 | ||
235 | 236 | ||
236 | enum cx88_itype { | 237 | enum cx88_itype { |
237 | CX88_VMUX_COMPOSITE1 = 1, | 238 | CX88_VMUX_COMPOSITE1 = 1, |