aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Simon <alexander.simon@informatik.tu-muenchen.de>2008-03-29 20:37:54 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-04-24 13:07:56 -0400
commitdc88807ed61ed0fc0d57bd80a92508b9de638f5d (patch)
tree4155a0c5c22fa68373e035e9b2e0b7fedd39f3da
parent58e6f95e613b37372a58fd504646ae1b1964c2ed (diff)
V4L/DVB (7475): Added support for Terratec Cinergy T USB XXS
Alexander Simon found out that the Terratec Cinergy T USB XXS is just a clone of another DiB7070P-based device. Signed-off-by: Patrick Boettcher <pb@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--drivers/media/dvb/dvb-usb/dib0700_devices.c7
-rw-r--r--drivers/media/dvb/dvb-usb/dvb-usb-ids.h3
2 files changed, 8 insertions, 2 deletions
diff --git a/drivers/media/dvb/dvb-usb/dib0700_devices.c b/drivers/media/dvb/dvb-usb/dib0700_devices.c
index fe96f795792b..e052e89bfb34 100644
--- a/drivers/media/dvb/dvb-usb/dib0700_devices.c
+++ b/drivers/media/dvb/dvb-usb/dib0700_devices.c
@@ -1114,6 +1114,7 @@ struct usb_device_id dib0700_usb_id_table[] = {
1114/* 30 */{ USB_DEVICE(USB_VID_PINNACLE, USB_PID_PINNACLE_PCTV73E) }, 1114/* 30 */{ USB_DEVICE(USB_VID_PINNACLE, USB_PID_PINNACLE_PCTV73E) },
1115 { USB_DEVICE(USB_VID_YUAN, USB_PID_YUAN_EC372S) }, 1115 { USB_DEVICE(USB_VID_YUAN, USB_PID_YUAN_EC372S) },
1116 { USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_HT_EXPRESS) }, 1116 { USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_HT_EXPRESS) },
1117 { USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_T_XXS) },
1117 { 0 } /* Terminating entry */ 1118 { 0 } /* Terminating entry */
1118}; 1119};
1119MODULE_DEVICE_TABLE(usb, dib0700_usb_id_table); 1120MODULE_DEVICE_TABLE(usb, dib0700_usb_id_table);
@@ -1303,7 +1304,7 @@ struct dvb_usb_device_properties dib0700_devices[] = {
1303 }, 1304 },
1304 }, 1305 },
1305 1306
1306 .num_device_descs = 8, 1307 .num_device_descs = 9,
1307 .devices = { 1308 .devices = {
1308 { "DiBcom STK7070P reference design", 1309 { "DiBcom STK7070P reference design",
1309 { &dib0700_usb_id_table[15], NULL }, 1310 { &dib0700_usb_id_table[15], NULL },
@@ -1337,6 +1338,10 @@ struct dvb_usb_device_properties dib0700_devices[] = {
1337 { &dib0700_usb_id_table[30], NULL }, 1338 { &dib0700_usb_id_table[30], NULL },
1338 { NULL }, 1339 { NULL },
1339 }, 1340 },
1341 { "Terratec Cinergy T USB XXS",
1342 { &dib0700_usb_id_table[33], NULL },
1343 { NULL },
1344 },
1340 }, 1345 },
1341 1346
1342 .rc_interval = DEFAULT_RC_INTERVAL, 1347 .rc_interval = DEFAULT_RC_INTERVAL,
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index 2214bfe80940..9757fb2c3b4c 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -139,6 +139,7 @@
139#define USB_PID_TERRATEC_CINERGY_DT_XS_DIVERSITY 0x005a 139#define USB_PID_TERRATEC_CINERGY_DT_XS_DIVERSITY 0x005a
140#define USB_PID_TERRATEC_CINERGY_HT_USB_XE 0x0058 140#define USB_PID_TERRATEC_CINERGY_HT_USB_XE 0x0058
141#define USB_PID_TERRATEC_CINERGY_HT_EXPRESS 0x0060 141#define USB_PID_TERRATEC_CINERGY_HT_EXPRESS 0x0060
142#define USB_PID_TERRATEC_CINERGY_T_XXS 0x0078
142#define USB_PID_PINNACLE_EXPRESSCARD_320CX 0x022e 143#define USB_PID_PINNACLE_EXPRESSCARD_320CX 0x022e
143#define USB_PID_PINNACLE_PCTV2000E 0x022c 144#define USB_PID_PINNACLE_PCTV2000E 0x022c
144#define USB_PID_PINNACLE_PCTV_DVB_T_FLASH 0x0228 145#define USB_PID_PINNACLE_PCTV_DVB_T_FLASH 0x0228
@@ -193,6 +194,6 @@
193#define USB_PID_GIGABYTE_U7000 0x7001 194#define USB_PID_GIGABYTE_U7000 0x7001
194#define USB_PID_ASUS_U3000 0x171f 195#define USB_PID_ASUS_U3000 0x171f
195#define USB_PID_ASUS_U3100 0x173f 196#define USB_PID_ASUS_U3100 0x173f
196#define USB_PID_YUAN_EC372S 0x1edc 197#define USB_PID_YUAN_EC372S 0x1edc
197 198
198#endif 199#endif