1 files changed, 70 insertions, 54 deletions
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index 95698918bc11..57a10de1d3dd 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -10,51 +10,53 @@
 #define _DVB_USB_IDS_H_
 /* Vendor IDs */
-#define USB_VID_ADSTECH                                         0x06e1
+#define USB_VID_ADSTECH                         0x06e1
-#define USB_VID_ANCHOR                                          0x0547
+#define USB_VID_ANCHOR                          0x0547
-#define USB_VID_WIDEVIEW                                        0x14aa
+#define USB_VID_AVERMEDIA                       0x07ca
-#define USB_VID_AVERMEDIA                                       0x07ca
+#define USB_VID_COMPRO                          0x185b
-#define USB_VID_COMPRO                                          0x185b
+#define USB_VID_COMPRO_UNK                      0x145f
-#define USB_VID_COMPRO_UNK                                      0x145f
+#define USB_VID_CYPRESS                         0x04b4
-#define USB_VID_CYPRESS                                         0x04b4
+#define USB_VID_DIBCOM                          0x10b8
-#define USB_VID_DIBCOM                                          0x10b8
+#define USB_VID_DVICO                           0x0fe9
-#define USB_VID_DVICO                                           0x0fe9
+#define USB_VID_EMPIA                           0xeb1a
-#define USB_VID_EMPIA                                           0xeb1a
+#define USB_VID_GENPIX                          0x09c0
-#define USB_VID_GRANDTEC                                        0x5032
+#define USB_VID_GRANDTEC                        0x5032
-#define USB_VID_HANFTEK                                         0x15f4
+#define USB_VID_HANFTEK                         0x15f4
-#define USB_VID_HAUPPAUGE                                       0x2040
+#define USB_VID_HAUPPAUGE                       0x2040
-#define USB_VID_HYPER_PALTEK                            0x1025
+#define USB_VID_HYPER_PALTEK                    0x1025
-#define USB_VID_KWORLD                                          0xeb2a
+#define USB_VID_KWORLD                          0xeb2a
-#define USB_VID_KYE                                                     0x0458
+#define USB_VID_KYE                             0x0458
-#define USB_VID_MEDION                                          0x1660
+#define USB_VID_LEADTEK                         0x0413
-#define USB_VID_PINNACLE                                        0x2304
+#define USB_VID_LITEON                          0x04ca
-#define USB_VID_VISIONPLUS                                      0x13d3
+#define USB_VID_MEDION                          0x1660
-#define USB_VID_TWINHAN                                         0x1822
+#define USB_VID_PINNACLE                        0x2304
-#define USB_VID_ULTIMA_ELECTRONIC                       0x05d8
+#define USB_VID_VISIONPLUS                      0x13d3
-#define USB_VID_GENPIX                                  0x09c0
+#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
 #define USB_PID_ADSTECH_USB2_WARM                       0xa334
-#define USB_PID_AVERMEDIA_DVBT_USB_COLD         0x0001
+#define USB_PID_AVERMEDIA_DVBT_USB_COLD                 0x0001
-#define USB_PID_AVERMEDIA_DVBT_USB_WARM         0x0002
+#define USB_PID_AVERMEDIA_DVBT_USB_WARM                 0x0002
-#define USB_PID_AVERMEDIA_DVBT_USB2_COLD        0xa800
+#define USB_PID_AVERMEDIA_DVBT_USB2_COLD                0xa800
-#define USB_PID_AVERMEDIA_DVBT_USB2_WARM        0xa801
+#define USB_PID_AVERMEDIA_DVBT_USB2_WARM                0xa801
-#define USB_PID_COMPRO_DVBU2000_COLD            0xd000
+#define USB_PID_COMPRO_DVBU2000_COLD                    0xd000
-#define USB_PID_COMPRO_DVBU2000_WARM            0xd001
+#define USB_PID_COMPRO_DVBU2000_WARM                    0xd001
-#define USB_PID_COMPRO_DVBU2000_UNK_COLD        0x010c
+#define USB_PID_COMPRO_DVBU2000_UNK_COLD                0x010c
-#define USB_PID_COMPRO_DVBU2000_UNK_WARM        0x010d
+#define USB_PID_COMPRO_DVBU2000_UNK_WARM                0x010d
 #define USB_PID_DIBCOM_HOOK_DEFAULT                     0x0064
-#define USB_PID_DIBCOM_HOOK_DEFAULT_REENUM      0x0065
+#define USB_PID_DIBCOM_HOOK_DEFAULT_REENUM              0x0065
 #define USB_PID_DIBCOM_MOD3000_COLD                     0x0bb8
 #define USB_PID_DIBCOM_MOD3000_WARM                     0x0bb9
 #define USB_PID_DIBCOM_MOD3001_COLD                     0x0bc6
 #define USB_PID_DIBCOM_MOD3001_WARM                     0x0bc7
 #define USB_PID_DIBCOM_STK7700                          0x1e14
-#define USB_PID_DIBCOM_STK7700_REENUM           0x1e15
+#define USB_PID_DIBCOM_STK7700_REENUM                   0x1e15
-#define USB_PID_DIBCOM_ANCHOR_2135_COLD         0x2131
+#define USB_PID_DIBCOM_ANCHOR_2135_COLD                 0x2131
-#define USB_PID_GRANDTEC_DVBT_USB_COLD          0x0fa0
+#define USB_PID_GRANDTEC_DVBT_USB_COLD                  0x0fa0
-#define USB_PID_GRANDTEC_DVBT_USB_WARM          0x0fa1
+#define USB_PID_GRANDTEC_DVBT_USB_WARM                  0x0fa1
 #define USB_PID_KWORLD_VSTREAM_COLD                     0x17de
 #define USB_PID_KWORLD_VSTREAM_WARM                     0x17df
 #define USB_PID_TWINHAN_VP7041_COLD                     0x3201
@@ -69,25 +71,30 @@
 #define USB_PID_DNTV_TINYUSB2_WARM                      0x3224
 #define USB_PID_ULTIMA_TVBOX_COLD                       0x8105
 #define USB_PID_ULTIMA_TVBOX_WARM                       0x8106
-#define USB_PID_ULTIMA_TVBOX_AN2235_COLD        0x8107
+#define USB_PID_ULTIMA_TVBOX_AN2235_COLD                0x8107
-#define USB_PID_ULTIMA_TVBOX_AN2235_WARM        0x8108
+#define USB_PID_ULTIMA_TVBOX_AN2235_WARM                0x8108
-#define USB_PID_ULTIMA_TVBOX_ANCHOR_COLD        0x2235
+#define USB_PID_ULTIMA_TVBOX_ANCHOR_COLD                0x2235
-#define USB_PID_ULTIMA_TVBOX_USB2_COLD          0x8109
+#define USB_PID_ULTIMA_TVBOX_USB2_COLD                  0x8109
-#define USB_PID_ULTIMA_TVBOX_USB2_WARM          0x810a
+#define USB_PID_ULTIMA_TVBOX_USB2_WARM                  0x810a
-#define USB_PID_ULTIMA_TVBOX_USB2_FX_COLD       0x8613
+#define USB_PID_ARTEC_T14_COLD                          0x810b
-#define USB_PID_ULTIMA_TVBOX_USB2_FX_WARM       0x1002
+#define USB_PID_ARTEC_T14_WARM                          0x810c
-#define USB_PID_UNK_HYPER_PALTEK_COLD           0x005e
+#define USB_PID_ULTIMA_TVBOX_USB2_FX_COLD               0x8613
-#define USB_PID_UNK_HYPER_PALTEK_WARM           0x005f
+#define USB_PID_ULTIMA_TVBOX_USB2_FX_WARM               0x1002
-#define USB_PID_HANFTEK_UMT_010_COLD            0x0001
+#define USB_PID_UNK_HYPER_PALTEK_COLD                   0x005e
-#define USB_PID_HANFTEK_UMT_010_WARM            0x0015
+#define USB_PID_UNK_HYPER_PALTEK_WARM                   0x005f
+#define USB_PID_HANFTEK_UMT_010_COLD                    0x0001
+#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_ZAP250_COLD                      0x0220
-#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_COLD                  0x9300
-#define USB_PID_WINTV_NOVA_T_USB2_WARM          0x9301
+#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
@@ -103,8 +110,17 @@
 #define USB_PID_MEDION_MD95700                          0x0932
 #define USB_PID_KYE_DVB_T_COLD                          0x701e
 #define USB_PID_KYE_DVB_T_WARM                          0x701f
-#define USB_PID_PCTV_200E                                       0x020e
+#define USB_PID_PCTV_200E                               0x020e
-#define USB_PID_PCTV_400E                                       0x020f
+#define USB_PID_PCTV_400E                               0x020f
-#define USB_PID_GENPIX_8PSK_COLD                                0x0200
+#define USB_PID_LITEON_DVB_T_COLD                       0xf000
-#define USB_PID_GENPIX_8PSK_WARM                                0x0201
+#define USB_PID_LITEON_DVB_T_WARM                       0xf001
+#define USB_PID_DIGIVOX_MINI_SL_COLD                    0xe360
+#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

diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h index 95698918bc11..57a10de1d3dd 100644 --- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h +++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -10,51 +10,53 @@
10	#define _DVB_USB_IDS_H_	10	#define _DVB_USB_IDS_H_
11		11
12	/* Vendor IDs */	12	/* Vendor IDs */
13	#define USB_VID_ADSTECH 0x06e1	13	#define USB_VID_ADSTECH 0x06e1
14	#define USB_VID_ANCHOR 0x0547	14	#define USB_VID_ANCHOR 0x0547
15	#define USB_VID_WIDEVIEW 0x14aa	15	#define USB_VID_AVERMEDIA 0x07ca
16	#define USB_VID_AVERMEDIA 0x07ca	16	#define USB_VID_COMPRO 0x185b
17	#define USB_VID_COMPRO 0x185b	17	#define USB_VID_COMPRO_UNK 0x145f
18	#define USB_VID_COMPRO_UNK 0x145f	18	#define USB_VID_CYPRESS 0x04b4
19	#define USB_VID_CYPRESS 0x04b4	19	#define USB_VID_DIBCOM 0x10b8
20	#define USB_VID_DIBCOM 0x10b8	20	#define USB_VID_DVICO 0x0fe9
21	#define USB_VID_DVICO 0x0fe9	21	#define USB_VID_EMPIA 0xeb1a
22	#define USB_VID_EMPIA 0xeb1a	22	#define USB_VID_GENPIX 0x09c0
23	#define USB_VID_GRANDTEC 0x5032	23	#define USB_VID_GRANDTEC 0x5032
24	#define USB_VID_HANFTEK 0x15f4	24	#define USB_VID_HANFTEK 0x15f4
25	#define USB_VID_HAUPPAUGE 0x2040	25	#define USB_VID_HAUPPAUGE 0x2040
26	#define USB_VID_HYPER_PALTEK 0x1025	26	#define USB_VID_HYPER_PALTEK 0x1025
27	#define USB_VID_KWORLD 0xeb2a	27	#define USB_VID_KWORLD 0xeb2a
28	#define USB_VID_KYE 0x0458	28	#define USB_VID_KYE 0x0458
29	#define USB_VID_MEDION 0x1660	29	#define USB_VID_LEADTEK 0x0413
30	#define USB_VID_PINNACLE 0x2304	30	#define USB_VID_LITEON 0x04ca
31	#define USB_VID_VISIONPLUS 0x13d3	31	#define USB_VID_MEDION 0x1660
32	#define USB_VID_TWINHAN 0x1822	32	#define USB_VID_PINNACLE 0x2304
33	#define USB_VID_ULTIMA_ELECTRONIC 0x05d8	33	#define USB_VID_VISIONPLUS 0x13d3
34	#define USB_VID_GENPIX 0x09c0	34	#define USB_VID_TWINHAN 0x1822
		35	#define USB_VID_ULTIMA_ELECTRONIC 0x05d8
		36	#define USB_VID_WIDEVIEW 0x14aa
35		37
36	/* Product IDs */	38	/* Product IDs */
37	#define USB_PID_ADSTECH_USB2_COLD 0xa333	39	#define USB_PID_ADSTECH_USB2_COLD 0xa333
38	#define USB_PID_ADSTECH_USB2_WARM 0xa334	40	#define USB_PID_ADSTECH_USB2_WARM 0xa334
39	#define USB_PID_AVERMEDIA_DVBT_USB_COLD 0x0001	41	#define USB_PID_AVERMEDIA_DVBT_USB_COLD 0x0001
40	#define USB_PID_AVERMEDIA_DVBT_USB_WARM 0x0002	42	#define USB_PID_AVERMEDIA_DVBT_USB_WARM 0x0002
41	#define USB_PID_AVERMEDIA_DVBT_USB2_COLD 0xa800	43	#define USB_PID_AVERMEDIA_DVBT_USB2_COLD 0xa800
42	#define USB_PID_AVERMEDIA_DVBT_USB2_WARM 0xa801	44	#define USB_PID_AVERMEDIA_DVBT_USB2_WARM 0xa801
43	#define USB_PID_COMPRO_DVBU2000_COLD 0xd000	45	#define USB_PID_COMPRO_DVBU2000_COLD 0xd000
44	#define USB_PID_COMPRO_DVBU2000_WARM 0xd001	46	#define USB_PID_COMPRO_DVBU2000_WARM 0xd001
45	#define USB_PID_COMPRO_DVBU2000_UNK_COLD 0x010c	47	#define USB_PID_COMPRO_DVBU2000_UNK_COLD 0x010c
46	#define USB_PID_COMPRO_DVBU2000_UNK_WARM 0x010d	48	#define USB_PID_COMPRO_DVBU2000_UNK_WARM 0x010d
47	#define USB_PID_DIBCOM_HOOK_DEFAULT 0x0064	49	#define USB_PID_DIBCOM_HOOK_DEFAULT 0x0064
48	#define USB_PID_DIBCOM_HOOK_DEFAULT_REENUM 0x0065	50	#define USB_PID_DIBCOM_HOOK_DEFAULT_REENUM 0x0065
49	#define USB_PID_DIBCOM_MOD3000_COLD 0x0bb8	51	#define USB_PID_DIBCOM_MOD3000_COLD 0x0bb8
50	#define USB_PID_DIBCOM_MOD3000_WARM 0x0bb9	52	#define USB_PID_DIBCOM_MOD3000_WARM 0x0bb9
51	#define USB_PID_DIBCOM_MOD3001_COLD 0x0bc6	53	#define USB_PID_DIBCOM_MOD3001_COLD 0x0bc6
52	#define USB_PID_DIBCOM_MOD3001_WARM 0x0bc7	54	#define USB_PID_DIBCOM_MOD3001_WARM 0x0bc7
53	#define USB_PID_DIBCOM_STK7700 0x1e14	55	#define USB_PID_DIBCOM_STK7700 0x1e14
54	#define USB_PID_DIBCOM_STK7700_REENUM 0x1e15	56	#define USB_PID_DIBCOM_STK7700_REENUM 0x1e15
55	#define USB_PID_DIBCOM_ANCHOR_2135_COLD 0x2131	57	#define USB_PID_DIBCOM_ANCHOR_2135_COLD 0x2131
56	#define USB_PID_GRANDTEC_DVBT_USB_COLD 0x0fa0	58	#define USB_PID_GRANDTEC_DVBT_USB_COLD 0x0fa0
57	#define USB_PID_GRANDTEC_DVBT_USB_WARM 0x0fa1	59	#define USB_PID_GRANDTEC_DVBT_USB_WARM 0x0fa1
58	#define USB_PID_KWORLD_VSTREAM_COLD 0x17de	60	#define USB_PID_KWORLD_VSTREAM_COLD 0x17de
59	#define USB_PID_KWORLD_VSTREAM_WARM 0x17df	61	#define USB_PID_KWORLD_VSTREAM_WARM 0x17df
60	#define USB_PID_TWINHAN_VP7041_COLD 0x3201	62	#define USB_PID_TWINHAN_VP7041_COLD 0x3201
@@ -69,25 +71,30 @@
69	#define USB_PID_DNTV_TINYUSB2_WARM 0x3224	71	#define USB_PID_DNTV_TINYUSB2_WARM 0x3224
70	#define USB_PID_ULTIMA_TVBOX_COLD 0x8105	72	#define USB_PID_ULTIMA_TVBOX_COLD 0x8105
71	#define USB_PID_ULTIMA_TVBOX_WARM 0x8106	73	#define USB_PID_ULTIMA_TVBOX_WARM 0x8106
72	#define USB_PID_ULTIMA_TVBOX_AN2235_COLD 0x8107	74	#define USB_PID_ULTIMA_TVBOX_AN2235_COLD 0x8107
73	#define USB_PID_ULTIMA_TVBOX_AN2235_WARM 0x8108	75	#define USB_PID_ULTIMA_TVBOX_AN2235_WARM 0x8108
74	#define USB_PID_ULTIMA_TVBOX_ANCHOR_COLD 0x2235	76	#define USB_PID_ULTIMA_TVBOX_ANCHOR_COLD 0x2235
75	#define USB_PID_ULTIMA_TVBOX_USB2_COLD 0x8109	77	#define USB_PID_ULTIMA_TVBOX_USB2_COLD 0x8109
76	#define USB_PID_ULTIMA_TVBOX_USB2_WARM 0x810a	78	#define USB_PID_ULTIMA_TVBOX_USB2_WARM 0x810a
77	#define USB_PID_ULTIMA_TVBOX_USB2_FX_COLD 0x8613	79	#define USB_PID_ARTEC_T14_COLD 0x810b
78	#define USB_PID_ULTIMA_TVBOX_USB2_FX_WARM 0x1002	80	#define USB_PID_ARTEC_T14_WARM 0x810c
79	#define USB_PID_UNK_HYPER_PALTEK_COLD 0x005e	81	#define USB_PID_ULTIMA_TVBOX_USB2_FX_COLD 0x8613
80	#define USB_PID_UNK_HYPER_PALTEK_WARM 0x005f	82	#define USB_PID_ULTIMA_TVBOX_USB2_FX_WARM 0x1002
81	#define USB_PID_HANFTEK_UMT_010_COLD 0x0001	83	#define USB_PID_UNK_HYPER_PALTEK_COLD 0x005e
82	#define USB_PID_HANFTEK_UMT_010_WARM 0x0015	84	#define USB_PID_UNK_HYPER_PALTEK_WARM 0x005f
		85	#define USB_PID_HANFTEK_UMT_010_COLD 0x0001
		86	#define USB_PID_HANFTEK_UMT_010_WARM 0x0015
83	#define USB_PID_DTT200U_COLD 0x0201	87	#define USB_PID_DTT200U_COLD 0x0201
84	#define USB_PID_DTT200U_WARM 0x0301	88	#define USB_PID_DTT200U_WARM 0x0301
85	#define USB_PID_WT220U_COLD 0x0222	89	#define USB_PID_WT220U_ZAP250_COLD 0x0220
86	#define USB_PID_WT220U_WARM 0x0221	90	#define USB_PID_WT220U_COLD 0x0222
		91	#define USB_PID_WT220U_WARM 0x0221
		92	#define USB_PID_WT220U_FC_COLD 0x0225
		93	#define USB_PID_WT220U_FC_WARM 0x0226
87	#define USB_PID_WT220U_ZL0353_COLD 0x022a	94	#define USB_PID_WT220U_ZL0353_COLD 0x022a
88	#define USB_PID_WT220U_ZL0353_WARM 0x022b	95	#define USB_PID_WT220U_ZL0353_WARM 0x022b
89	#define USB_PID_WINTV_NOVA_T_USB2_COLD 0x9300	96	#define USB_PID_WINTV_NOVA_T_USB2_COLD 0x9300
90	#define USB_PID_WINTV_NOVA_T_USB2_WARM 0x9301	97	#define USB_PID_WINTV_NOVA_T_USB2_WARM 0x9301
91	#define USB_PID_NEBULA_DIGITV 0x0201	98	#define USB_PID_NEBULA_DIGITV 0x0201
92	#define USB_PID_DVICO_BLUEBIRD_LGDT 0xd820	99	#define USB_PID_DVICO_BLUEBIRD_LGDT 0xd820
93	#define USB_PID_DVICO_BLUEBIRD_LG064F_COLD 0xd500	100	#define USB_PID_DVICO_BLUEBIRD_LG064F_COLD 0xd500
@@ -103,8 +110,17 @@
103	#define USB_PID_MEDION_MD95700 0x0932	110	#define USB_PID_MEDION_MD95700 0x0932
104	#define USB_PID_KYE_DVB_T_COLD 0x701e	111	#define USB_PID_KYE_DVB_T_COLD 0x701e
105	#define USB_PID_KYE_DVB_T_WARM 0x701f	112	#define USB_PID_KYE_DVB_T_WARM 0x701f
106	#define USB_PID_PCTV_200E 0x020e	113	#define USB_PID_PCTV_200E 0x020e
107	#define USB_PID_PCTV_400E 0x020f	114	#define USB_PID_PCTV_400E 0x020f
108	#define USB_PID_GENPIX_8PSK_COLD 0x0200	115	#define USB_PID_LITEON_DVB_T_COLD 0xf000
109	#define USB_PID_GENPIX_8PSK_WARM 0x0201	116	#define USB_PID_LITEON_DVB_T_WARM 0xf001
		117	#define USB_PID_DIGIVOX_MINI_SL_COLD 0xe360
		118	#define USB_PID_DIGIVOX_MINI_SL_WARM 0xe361
		119	#define USB_PID_GRANDTEC_DVBT_USB2_COLD 0x0bc6
		120	#define USB_PID_GRANDTEC_DVBT_USB2_WARM 0x0bc7
		121	#define USB_PID_WINFAST_DTV_DONGLE_COLD 0x6025
		122	#define USB_PID_WINFAST_DTV_DONGLE_WARM 0x6026
		123	#define USB_PID_GENPIX_8PSK_COLD 0x0200
		124	#define USB_PID_GENPIX_8PSK_WARM 0x0201
		125
110	#endif	126	#endif