-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Signed-off-by: Zbynek Hrabovsky <hrabosh@t-email.cz>
Reviewed-by: Zbynek Hrabovsky <hrabosh@t-email.cz>

diff -r 04ddbe145932 linux/drivers/media/video/cx88/cx88-cards.c
- --- a/linux/drivers/media/video/cx88/cx88-cards.c Tue Jun 10 15:27:29 2008 -0300
+++ b/linux/drivers/media/video/cx88/cx88-cards.c Fri Jun 13 15:07:33 2008 -0300
@@ -1284,7 +1284,7 @@
},
[CX88_BOARD_WINFAST_DTV2000H] = {
/* video inputs and radio still in testing */
- - .name = "WinFast DTV2000 H",
+ .name = "WinFast DTV2000 H ver. I (old)",
.tuner_type = TUNER_PHILIPS_FMD1216ME_MK3,
.radio_type = UNSET,
.tuner_addr = ADDR_UNSET,
@@ -1298,6 +1298,45 @@
.gpio2 = 0x00017304,
.gpio3 = 0x02000000,
}},
+ .mpeg = CX88_MPEG_DVB,
+ },
+ [CX88_BOARD_WINFAST_DTV2000H_2] = {
+ /* this is just a try */
+ .name = "WinFast DTV2000 H ver. J (new)",
+ .tuner_type = TUNER_PHILIPS_FMD1216ME_MK3,
+ .radio_type = UNSET,
+ .tuner_addr = ADDR_UNSET,
+ .radio_addr = ADDR_UNSET,
+ .tda9887_conf = TDA9887_PRESENT,
+ .input = { {
+ .type = CX88_VMUX_TELEVISION,
+ .vmux = 0,
+ .gpio0 = 0x00017300,
+ .gpio1 = 0x00008207,
+ .gpio2 = 0x00000000,
+ .gpio3 = 0x02000000,
+ }, {
+ .type = CX88_VMUX_TELEVISION,
+ .vmux = 0,
+ .gpio0 = 0x00018300,
+ .gpio1 = 0x0000f207,
+ .gpio2 = 0x00017304,
+ .gpio3 = 0x02000000,
+ }, {
+ .type = CX88_VMUX_COMPOSITE1,
+ .vmux = 1,
+ .gpio0 = 0x00018301,
+ .gpio1 = 0x0000f207,
+ .gpio2 = 0x00017304,
+ .gpio3 = 0x02000000,
+ }, {
+ .type = CX88_VMUX_SVIDEO,
+ .vmux = 2,
+ .gpio0 = 0x00018301,
+ .gpio1 = 0x0000f207,
+ .gpio2 = 0x00017304,
+ .gpio3 = 0x02000000,
+ } },
.mpeg = CX88_MPEG_DVB,
},
[CX88_BOARD_GENIATECH_DVBS] = {
@@ -1963,6 +2002,10 @@
.subdevice = 0x665e,
.card = CX88_BOARD_WINFAST_DTV2000H,
},{
+ .subvendor = 0x107d,
+ .subdevice = 0x6f2b,
+ .card = CX88_BOARD_WINFAST_DTV2000H_2,
+ }, {
.subvendor = 0x18ac,
.subdevice = 0xd800, /* FusionHDTV 3 Gold (original revision) */
.card = CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_Q,
diff -r 04ddbe145932 linux/drivers/media/video/cx88/cx88-dvb.c
- --- a/linux/drivers/media/video/cx88/cx88-dvb.c Tue Jun 10 15:27:29 2008 -0300
+++ b/linux/drivers/media/video/cx88/cx88-dvb.c Fri Jun 13 15:07:34 2008 -0300
@@ -561,6 +561,7 @@
}
break;
case CX88_BOARD_WINFAST_DTV2000H:
+ case CX88_BOARD_WINFAST_DTV2000H_2:
case CX88_BOARD_HAUPPAUGE_HVR1100:
case CX88_BOARD_HAUPPAUGE_HVR1100LP:
case CX88_BOARD_HAUPPAUGE_HVR1300:
diff -r 04ddbe145932 linux/drivers/media/video/cx88/cx88-input.c
- --- a/linux/drivers/media/video/cx88/cx88-input.c Tue Jun 10 15:27:29 2008 -0300
+++ b/linux/drivers/media/video/cx88/cx88-input.c Fri Jun 13 15:07:34 2008 -0300
@@ -242,6 +242,7 @@
ir->sampling = 1;
break;
case CX88_BOARD_WINFAST_DTV2000H:
+ case CX88_BOARD_WINFAST_DTV2000H_2:
ir_codes = ir_codes_winfast;
ir->gpio_addr = MO_GP0_IO;
ir->mask_keycode = 0x8f8;
diff -r 04ddbe145932 linux/drivers/media/video/cx88/cx88.h
- --- a/linux/drivers/media/video/cx88/cx88.h Tue Jun 10 15:27:29 2008 -0300
+++ b/linux/drivers/media/video/cx88/cx88.h Fri Jun 13 15:07:34 2008 -0300
@@ -224,6 +224,7 @@
#define CX88_BOARD_DVICO_FUSIONHDTV_7_GOLD 65
#define CX88_BOARD_PROLINK_PV_8000GT 66
#define CX88_BOARD_KWORLD_ATSC_120 67
+#define CX88_BOARD_WINFAST_DTV2000H_2 68

enum cx88_itype {
CX88_VMUX_COMPOSITE1 = 1,
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.9 (GNU/Linux)

iEYEARECAAYFAkhmXRgACgkQPedPCXgDs+FAwgCghc3wFwpAmeGkMzGKoJi8HnHz
W5EAn2iybN7vkU3nR7gqJ0k7NBOVSGXD
=O/Qr
-----END PGP SIGNATURE-----