aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorYusuf Altin <yusuf.altin@t-online.de>2009-01-08 05:58:45 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-01-29 05:35:36 -0500
commitbb1b082ed65292fc6fc7e01bbe0dd005d5a4140e (patch)
tree232ca25acf6f847cda641b6f8713ecca6adf80b7 /drivers/media
parent16e68d7cb8eb1c671867d2a0ecd4aa2e17124364 (diff)
V4L/DVB (10195): [PATCH] add Terratec Cinergy T Express to dibcom driver
This patch introduces support for dvb-t for the following dibcom based card: Terratec Cinergy T Express (USB-ID: 0ccd:0062) Signed-off-by: Yusuf Altin <yusuf.altin@t-online.de> Signed-off-by: Albert Comerma <albert.comerma@gmail.com> Signed-off-by: Patrick Boettcher <pb@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/dvb/dvb-usb/dib0700_devices.c10
-rw-r--r--drivers/media/dvb/dvb-usb/dvb-usb-ids.h1
2 files changed, 9 insertions, 2 deletions
diff --git a/drivers/media/dvb/dvb-usb/dib0700_devices.c b/drivers/media/dvb/dvb-usb/dib0700_devices.c
index 391732788911..5e837668fb00 100644
--- a/drivers/media/dvb/dvb-usb/dib0700_devices.c
+++ b/drivers/media/dvb/dvb-usb/dib0700_devices.c
@@ -1393,6 +1393,7 @@ struct usb_device_id dib0700_usb_id_table[] = {
1393 { USB_DEVICE(USB_VID_ASUS, USB_PID_ASUS_U3000H) }, 1393 { USB_DEVICE(USB_VID_ASUS, USB_PID_ASUS_U3000H) },
1394/* 40 */{ USB_DEVICE(USB_VID_PINNACLE, USB_PID_PINNACLE_PCTV801E) }, 1394/* 40 */{ USB_DEVICE(USB_VID_PINNACLE, USB_PID_PINNACLE_PCTV801E) },
1395 { USB_DEVICE(USB_VID_PINNACLE, USB_PID_PINNACLE_PCTV801E_SE) }, 1395 { USB_DEVICE(USB_VID_PINNACLE, USB_PID_PINNACLE_PCTV801E_SE) },
1396 { USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_T_EXPRESS) },
1396 { 0 } /* Terminating entry */ 1397 { 0 } /* Terminating entry */
1397}; 1398};
1398MODULE_DEVICE_TABLE(usb, dib0700_usb_id_table); 1399MODULE_DEVICE_TABLE(usb, dib0700_usb_id_table);
@@ -1537,7 +1538,8 @@ struct dvb_usb_device_properties dib0700_devices[] = {
1537 { "DiBcom STK7700D reference design", 1538 { "DiBcom STK7700D reference design",
1538 { &dib0700_usb_id_table[14], NULL }, 1539 { &dib0700_usb_id_table[14], NULL },
1539 { NULL }, 1540 { NULL },
1540 } 1541 },
1542
1541 }, 1543 },
1542 1544
1543 .rc_interval = DEFAULT_RC_INTERVAL, 1545 .rc_interval = DEFAULT_RC_INTERVAL,
@@ -1557,7 +1559,7 @@ struct dvb_usb_device_properties dib0700_devices[] = {
1557 }, 1559 },
1558 }, 1560 },
1559 1561
1560 .num_device_descs = 2, 1562 .num_device_descs = 3,
1561 .devices = { 1563 .devices = {
1562 { "ASUS My Cinema U3000 Mini DVBT Tuner", 1564 { "ASUS My Cinema U3000 Mini DVBT Tuner",
1563 { &dib0700_usb_id_table[23], NULL }, 1565 { &dib0700_usb_id_table[23], NULL },
@@ -1566,6 +1568,10 @@ struct dvb_usb_device_properties dib0700_devices[] = {
1566 { "Yuan EC372S", 1568 { "Yuan EC372S",
1567 { &dib0700_usb_id_table[31], NULL }, 1569 { &dib0700_usb_id_table[31], NULL },
1568 { NULL }, 1570 { NULL },
1571 },
1572 { "Terratec Cinergy T Express",
1573 { &dib0700_usb_id_table[42], NULL },
1574 { NULL },
1569 } 1575 }
1570 }, 1576 },
1571 1577
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index a4fca3fca5ee..2c6f4be05c07 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -164,6 +164,7 @@
164#define USB_PID_TERRATEC_CINERGY_DT_XS_DIVERSITY 0x005a 164#define USB_PID_TERRATEC_CINERGY_DT_XS_DIVERSITY 0x005a
165#define USB_PID_TERRATEC_CINERGY_HT_USB_XE 0x0058 165#define USB_PID_TERRATEC_CINERGY_HT_USB_XE 0x0058
166#define USB_PID_TERRATEC_CINERGY_HT_EXPRESS 0x0060 166#define USB_PID_TERRATEC_CINERGY_HT_EXPRESS 0x0060
167#define USB_PID_TERRATEC_CINERGY_T_EXPRESS 0x0062
167#define USB_PID_TERRATEC_CINERGY_T_XXS 0x0078 168#define USB_PID_TERRATEC_CINERGY_T_XXS 0x0078
168#define USB_PID_PINNACLE_EXPRESSCARD_320CX 0x022e 169#define USB_PID_PINNACLE_EXPRESSCARD_320CX 0x022e
169#define USB_PID_PINNACLE_PCTV2000E 0x022c 170#define USB_PID_PINNACLE_PCTV2000E 0x022c