V4L/DVB: Added support for LeadTek DVB-T USB clone

Adding the USB ids for the LeadTek clone of the STK3000P-ref-design.

Signed-off-by: Olivier DANET <odanet@caramail.com>
Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

diff --git a/drivers/media/dvb/dvb-usb/dibusb-mc.c b/drivers/media/dvb/dvb-usb/dibusb-mc.c
index 2170e11d101420cac62ac8adc21306e874223c25..71aa6bba0735f2798d5af083d2014bfbf513e195 100644 (file)
--- a/drivers/media/dvb/dvb-usb/dibusb-mc.c
+++ b/drivers/media/dvb/dvb-usb/dibusb-mc.c
@@ -37,6 +37,8 @@ static struct usb_device_id dibusb_dib3000mc_table [] = {
 /* 09 */       { USB_DEVICE(USB_VID_GRANDTEC,          USB_PID_GRANDTEC_DVBT_USB2_WARM) },
 /* 10 */       { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC, USB_PID_ARTEC_T14_COLD) },
 /* 11 */       { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC, USB_PID_ARTEC_T14_WARM) },
+/* 12 */       { USB_DEVICE(USB_VID_LEADTEK,           USB_PID_WINFAST_DTV_DONGLE_COLD) },
+/* 13 */       { USB_DEVICE(USB_VID_LEADTEK,           USB_PID_WINFAST_DTV_DONGLE_WARM) },
                        { }             /* Terminating entry */
 };
 MODULE_DEVICE_TABLE (usb, dibusb_dib3000mc_table);
@@ -77,7 +79,7 @@ static struct dvb_usb_properties dibusb_mc_properties = {
                }
        },
 
-       .num_device_descs = 6,
+       .num_device_descs = 7,
        .devices = {
                {   "DiBcom USB2.0 DVB-T reference design (MOD3000P)",
                        { &dibusb_dib3000mc_table[0], NULL },
@@ -104,6 +106,10 @@ static struct dvb_usb_properties dibusb_mc_properties = {
                        { &dibusb_dib3000mc_table[10], NULL },
                        { &dibusb_dib3000mc_table[11], NULL },
                },
+               {   "Leadtek - USB2.0 Winfast DTV dongle",
+                       { &dibusb_dib3000mc_table[12], NULL },
+                       { &dibusb_dib3000mc_table[13], NULL },
+               },
                { NULL },
        }
 };

diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index cea1763b426b4ed1a8be537dc1af2ddd865e980a..f841663dd31b4d0c03dc71288ab8f03ea814a39b 100644 (file)
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -10,28 +10,30 @@
 #define _DVB_USB_IDS_H_
 
 /* Vendor IDs */
-#define USB_VID_ADSTECH                        0x06e1
-#define USB_VID_ANCHOR                 0x0547
-#define USB_VID_WIDEVIEW               0x14aa
-#define USB_VID_AVERMEDIA              0x07ca
-#define USB_VID_COMPRO                 0x185b
-#define USB_VID_COMPRO_UNK             0x145f
-#define USB_VID_CYPRESS                        0x04b4
-#define USB_VID_DIBCOM                 0x10b8
-#define USB_VID_DVICO                  0x0fe9
-#define USB_VID_EMPIA                  0xeb1a
-#define USB_VID_GRANDTEC               0x5032
-#define USB_VID_HANFTEK                        0x15f4
-#define USB_VID_HAUPPAUGE              0x2040
-#define USB_VID_HYPER_PALTEK           0x1025
-#define USB_VID_KWORLD                 0xeb2a
-#define USB_VID_KYE                    0x0458
-#define USB_VID_MEDION                 0x1660
-#define USB_VID_PINNACLE               0x2304
-#define USB_VID_VISIONPLUS             0x13d3
-#define USB_VID_TWINHAN                        0x1822
-#define USB_VID_ULTIMA_ELECTRONIC      0x05d8
-#define USB_VID_LITEON                 0x04ca
+#define USB_VID_ADSTECH                                0x06e1
+#define USB_VID_ANCHOR                         0x0547
+#define USB_VID_AVERMEDIA                      0x07ca
+#define USB_VID_COMPRO                         0x185b
+#define USB_VID_COMPRO_UNK                     0x145f
+#define USB_VID_CYPRESS                                0x04b4
+#define USB_VID_DIBCOM                         0x10b8
+#define USB_VID_DVICO                          0x0fe9
+#define USB_VID_EMPIA                          0xeb1a
+#define USB_VID_GENPIX                         0x09c0
+#define USB_VID_GRANDTEC                       0x5032
+#define USB_VID_HANFTEK                                0x15f4
+#define USB_VID_HAUPPAUGE                      0x2040
+#define USB_VID_HYPER_PALTEK                   0x1025
+#define USB_VID_KWORLD                         0xeb2a
+#define USB_VID_KYE                            0x0458
+#define USB_VID_LEADTEK                                0x0413
+#define USB_VID_LITEON                         0x04ca
+#define USB_VID_MEDION                         0x1660
+#define USB_VID_PINNACLE                       0x2304
+#define USB_VID_VISIONPLUS                     0x13d3
+#define USB_VID_TWINHAN                                0x1822
+#define USB_VID_ULTIMA_ELECTRONIC              0x05d8
+#define USB_VID_WIDEVIEW                       0x14aa
 
 /* Product IDs */
 #define USB_PID_ADSTECH_USB2_COLD                      0xa333
@@ -84,12 +86,14 @@
 #define USB_PID_HANFTEK_UMT_010_WARM                   0x0015
 #define USB_PID_DTT200U_COLD                           0x0201
 #define USB_PID_DTT200U_WARM                           0x0301
-#define USB_PID_WT220U_COLD                                    0x0222
-#define USB_PID_WT220U_WARM                                    0x0221
+#define USB_PID_WT220U_COLD                            0x0222
+#define USB_PID_WT220U_WARM                            0x0221
+#define USB_PID_WT220U_FC_COLD                         0x0225
+#define USB_PID_WT220U_FC_WARM                         0x0226
 #define USB_PID_WT220U_ZL0353_COLD                     0x022a
 #define USB_PID_WT220U_ZL0353_WARM                     0x022b
-#define USB_PID_WINTV_NOVA_T_USB2_COLD         0x9300
-#define USB_PID_WINTV_NOVA_T_USB2_WARM         0x9301
+#define USB_PID_WINTV_NOVA_T_USB2_COLD                 0x9300
+#define USB_PID_WINTV_NOVA_T_USB2_WARM                 0x9301
 #define USB_PID_NEBULA_DIGITV                          0x0201
 #define USB_PID_DVICO_BLUEBIRD_LGDT                    0xd820
 #define USB_PID_DVICO_BLUEBIRD_LG064F_COLD             0xd500
@@ -113,5 +117,9 @@
 #define USB_PID_DIGIVOX_MINI_SL_WARM                   0xe361
 #define USB_PID_GRANDTEC_DVBT_USB2_COLD                        0x0bc6
 #define USB_PID_GRANDTEC_DVBT_USB2_WARM                        0x0bc7
+#define USB_PID_WINFAST_DTV_DONGLE_COLD                        0x6025
+#define USB_PID_WINFAST_DTV_DONGLE_WARM                        0x6026
+#define USB_PID_GENPIX_8PSK_COLD                       0x0200
+#define USB_PID_GENPIX_8PSK_WARM                       0x0201
 
 #endif