diff options
author | Michael Krufky <mkrufky@linuxtv.org> | 2006-02-07 03:49:14 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@brturbo.com.br> | 2006-02-07 03:49:14 -0500 |
commit | 44256de13ecc72291b616fda5f2c7ca8b110feec (patch) | |
tree | c87412fa747aa33978a4d4c29cdc60974d786bef | |
parent | 3dfb729f4513184d06a0c618179489ac7bb277e0 (diff) |
V4L/DVB (3316): Add initial support for KWorld HardwareMpegTV XPert
- Add initial support for KWorld HardwareMpegTV XPert.
- uses silicon tuner: tda8290 + tda8275
- standard video using cx88 broadcast decoder is working.
- blackbird mpeg encoder support (cx23416) not yet working.
- FM radio untested.
- audio is only working correctly in television mode,
all other modes disabled.
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r-- | Documentation/video4linux/CARDLIST.cx88 | 1 | ||||
-rw-r--r-- | drivers/media/video/cx88/cx88-cards.c | 23 | ||||
-rw-r--r-- | drivers/media/video/cx88/cx88.h | 1 |
3 files changed, 25 insertions, 0 deletions
diff --git a/Documentation/video4linux/CARDLIST.cx88 b/Documentation/video4linux/CARDLIST.cx88 index 8bea3fbd0548..d852ad4f93a2 100644 --- a/Documentation/video4linux/CARDLIST.cx88 +++ b/Documentation/video4linux/CARDLIST.cx88 | |||
@@ -43,3 +43,4 @@ | |||
43 | 42 -> digitalnow DNTV Live! DVB-T Pro [1822:0025] | 43 | 42 -> digitalnow DNTV Live! DVB-T Pro [1822:0025] |
44 | 43 -> KWorld/VStream XPert DVB-T with cx22702 [17de:08a1] | 44 | 43 -> KWorld/VStream XPert DVB-T with cx22702 [17de:08a1] |
45 | 44 -> DViCO FusionHDTV DVB-T Dual Digital [18ac:db50,18ac:db54] | 45 | 44 -> DViCO FusionHDTV DVB-T Dual Digital [18ac:db50,18ac:db54] |
46 | 45 -> KWorld HardwareMpegTV XPert [17de:0840] | ||
diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c index 1bc999247fdc..f2ae0478c33a 100644 --- a/drivers/media/video/cx88/cx88-cards.c +++ b/drivers/media/video/cx88/cx88-cards.c | |||
@@ -1048,6 +1048,25 @@ struct cx88_board cx88_boards[] = { | |||
1048 | }}, | 1048 | }}, |
1049 | .dvb = 1, | 1049 | .dvb = 1, |
1050 | }, | 1050 | }, |
1051 | [CX88_BOARD_KWORLD_HARDWARE_MPEG_TV_XPERT] = { | ||
1052 | /* FIXME: This card is shipped without a windows tv app, | ||
1053 | * so I haven't been able to use regspy to figure out the GPIO | ||
1054 | * settings. Standard video using the cx88 broadcast decoder is | ||
1055 | * working, but blackbird isn't working yet, audio is only | ||
1056 | * working correctly for television mode. S-Video and Composite | ||
1057 | * are working for video-only, so I have them disabled for now. | ||
1058 | */ | ||
1059 | .name = "KWorld HardwareMpegTV XPert", | ||
1060 | .tuner_type = TUNER_PHILIPS_TDA8290, | ||
1061 | .radio_type = UNSET, | ||
1062 | .tuner_addr = ADDR_UNSET, | ||
1063 | .radio_addr = ADDR_UNSET, | ||
1064 | .input = {{ | ||
1065 | .type = CX88_VMUX_TELEVISION, | ||
1066 | .vmux = 0, | ||
1067 | .gpio0 = 0x07fa, | ||
1068 | }}, | ||
1069 | }, | ||
1051 | 1070 | ||
1052 | }; | 1071 | }; |
1053 | const unsigned int cx88_bcount = ARRAY_SIZE(cx88_boards); | 1072 | const unsigned int cx88_bcount = ARRAY_SIZE(cx88_boards); |
@@ -1254,6 +1273,10 @@ struct cx88_subid cx88_subids[] = { | |||
1254 | .subdevice = 0xdb11, | 1273 | .subdevice = 0xdb11, |
1255 | .card = CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PLUS, | 1274 | .card = CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PLUS, |
1256 | /* Re-branded DViCO: UltraView DVB-T Plus */ | 1275 | /* Re-branded DViCO: UltraView DVB-T Plus */ |
1276 | },{ | ||
1277 | .subvendor = 0x17de, | ||
1278 | .subdevice = 0x0840, | ||
1279 | .card = CX88_BOARD_KWORLD_HARDWARE_MPEG_TV_XPERT, | ||
1257 | }, | 1280 | }, |
1258 | }; | 1281 | }; |
1259 | const unsigned int cx88_idcount = ARRAY_SIZE(cx88_subids); | 1282 | const unsigned int cx88_idcount = ARRAY_SIZE(cx88_subids); |
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h index e9fd55b57fa6..31a688a3fb77 100644 --- a/drivers/media/video/cx88/cx88.h +++ b/drivers/media/video/cx88/cx88.h | |||
@@ -187,6 +187,7 @@ extern struct sram_channel cx88_sram_channels[]; | |||
187 | #define CX88_BOARD_DNTV_LIVE_DVB_T_PRO 42 | 187 | #define CX88_BOARD_DNTV_LIVE_DVB_T_PRO 42 |
188 | #define CX88_BOARD_KWORLD_DVB_T_CX22702 43 | 188 | #define CX88_BOARD_KWORLD_DVB_T_CX22702 43 |
189 | #define CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL 44 | 189 | #define CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL 44 |
190 | #define CX88_BOARD_KWORLD_HARDWARE_MPEG_TV_XPERT 45 | ||
190 | 191 | ||
191 | enum cx88_itype { | 192 | enum cx88_itype { |
192 | CX88_VMUX_COMPOSITE1 = 1, | 193 | CX88_VMUX_COMPOSITE1 = 1, |