aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/dvb/dvb-usb/dibusb-mc.c10
-rw-r--r--drivers/media/dvb/dvb-usb/dvb-usb-ids.h3
2 files changed, 11 insertions, 2 deletions
diff --git a/drivers/media/dvb/dvb-usb/dibusb-mc.c b/drivers/media/dvb/dvb-usb/dibusb-mc.c
index 059cec955318..a05b9f875663 100644
--- a/drivers/media/dvb/dvb-usb/dibusb-mc.c
+++ b/drivers/media/dvb/dvb-usb/dibusb-mc.c
@@ -42,6 +42,8 @@ static struct usb_device_id dibusb_dib3000mc_table [] = {
42/* 11 */ { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC, USB_PID_ARTEC_T14_WARM) }, 42/* 11 */ { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC, USB_PID_ARTEC_T14_WARM) },
43/* 12 */ { USB_DEVICE(USB_VID_LEADTEK, USB_PID_WINFAST_DTV_DONGLE_COLD) }, 43/* 12 */ { USB_DEVICE(USB_VID_LEADTEK, USB_PID_WINFAST_DTV_DONGLE_COLD) },
44/* 13 */ { USB_DEVICE(USB_VID_LEADTEK, USB_PID_WINFAST_DTV_DONGLE_WARM) }, 44/* 13 */ { USB_DEVICE(USB_VID_LEADTEK, USB_PID_WINFAST_DTV_DONGLE_WARM) },
45/* 14 */ { USB_DEVICE(USB_VID_HUMAX_COEX, USB_PID_DVB_T_USB_STICK_HIGH_SPEED_COLD) },
46/* 15 */ { USB_DEVICE(USB_VID_HUMAX_COEX, USB_PID_DVB_T_USB_STICK_HIGH_SPEED_WARM) },
45 { } /* Terminating entry */ 47 { } /* Terminating entry */
46}; 48};
47MODULE_DEVICE_TABLE (usb, dibusb_dib3000mc_table); 49MODULE_DEVICE_TABLE (usb, dibusb_dib3000mc_table);
@@ -66,7 +68,7 @@ static struct dvb_usb_device_properties dibusb_mc_properties = {
66 /* parameter for the MPEG2-data transfer */ 68 /* parameter for the MPEG2-data transfer */
67 .stream = { 69 .stream = {
68 .type = USB_BULK, 70 .type = USB_BULK,
69 .count = 7, 71 .count = 8,
70 .endpoint = 0x06, 72 .endpoint = 0x06,
71 .u = { 73 .u = {
72 .bulk = { 74 .bulk = {
@@ -88,7 +90,7 @@ static struct dvb_usb_device_properties dibusb_mc_properties = {
88 90
89 .generic_bulk_ctrl_endpoint = 0x01, 91 .generic_bulk_ctrl_endpoint = 0x01,
90 92
91 .num_device_descs = 7, 93 .num_device_descs = 8,
92 .devices = { 94 .devices = {
93 { "DiBcom USB2.0 DVB-T reference design (MOD3000P)", 95 { "DiBcom USB2.0 DVB-T reference design (MOD3000P)",
94 { &dibusb_dib3000mc_table[0], NULL }, 96 { &dibusb_dib3000mc_table[0], NULL },
@@ -119,6 +121,10 @@ static struct dvb_usb_device_properties dibusb_mc_properties = {
119 { &dibusb_dib3000mc_table[12], NULL }, 121 { &dibusb_dib3000mc_table[12], NULL },
120 { &dibusb_dib3000mc_table[13], NULL }, 122 { &dibusb_dib3000mc_table[13], NULL },
121 }, 123 },
124 { "Humax/Coex DVB-T USB Stick 2.0 High Speed",
125 { &dibusb_dib3000mc_table[14], NULL },
126 { &dibusb_dib3000mc_table[15], NULL },
127 },
122 { NULL }, 128 { NULL },
123 } 129 }
124}; 130};
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index 6eccce1a76f3..bf732016797b 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -58,6 +58,7 @@
58#define USB_VID_GIGABYTE 0x1044 58#define USB_VID_GIGABYTE 0x1044
59#define USB_VID_YUAN 0x1164 59#define USB_VID_YUAN 0x1164
60#define USB_VID_XTENSIONS 0x1ae7 60#define USB_VID_XTENSIONS 0x1ae7
61#define USB_VID_HUMAX_COEX 0x10b9
61 62
62/* Product IDs */ 63/* Product IDs */
63#define USB_PID_ADSTECH_USB2_COLD 0xa333 64#define USB_PID_ADSTECH_USB2_COLD 0xa333
@@ -260,5 +261,7 @@
260#define USB_PID_SONY_PLAYTV 0x0003 261#define USB_PID_SONY_PLAYTV 0x0003
261#define USB_PID_ELGATO_EYETV_DTT 0x0021 262#define USB_PID_ELGATO_EYETV_DTT 0x0021
262#define USB_PID_ELGATO_EYETV_DTT_Dlx 0x0020 263#define USB_PID_ELGATO_EYETV_DTT_Dlx 0x0020
264#define USB_PID_DVB_T_USB_STICK_HIGH_SPEED_COLD 0x5000
265#define USB_PID_DVB_T_USB_STICK_HIGH_SPEED_WARM 0x5001
263 266
264#endif 267#endif