aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb
diff options
context:
space:
mode:
authorPatrick Boettcher <pb@linuxtv.org>2009-05-20 04:35:02 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-06-16 17:21:09 -0400
commita9b8fe30a6d2a49749327ff18c4daa488ef73ab3 (patch)
tree659afc07274421f2f8d802104d78fdaf5146f2a1 /drivers/media/dvb
parentf0f4ae763b3dc04de3745a75c3518925d1b8325e (diff)
V4L/DVB (11831): dib0700: added USB IDs for Terratec T3 and T5
This patch adds the USB IDs for the Terratec devices T3 and T5. Signed-off-by: Patrick Boettcher <pb@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb')
-rw-r--r--drivers/media/dvb/dvb-usb/dib0700_devices.c12
-rw-r--r--drivers/media/dvb/dvb-usb/dvb-usb-ids.h2
2 files changed, 10 insertions, 4 deletions
diff --git a/drivers/media/dvb/dvb-usb/dib0700_devices.c b/drivers/media/dvb/dvb-usb/dib0700_devices.c
index b208f249a3a9..818b2ab584bf 100644
--- a/drivers/media/dvb/dvb-usb/dib0700_devices.c
+++ b/drivers/media/dvb/dvb-usb/dib0700_devices.c
@@ -1495,6 +1495,8 @@ struct usb_device_id dib0700_usb_id_table[] = {
1495 { USB_DEVICE(USB_VID_ELGATO, USB_PID_ELGATO_EYETV_DTT) }, 1495 { USB_DEVICE(USB_VID_ELGATO, USB_PID_ELGATO_EYETV_DTT) },
1496/* 50 */{ USB_DEVICE(USB_VID_ELGATO, USB_PID_ELGATO_EYETV_DTT_Dlx) }, 1496/* 50 */{ USB_DEVICE(USB_VID_ELGATO, USB_PID_ELGATO_EYETV_DTT_Dlx) },
1497 { USB_DEVICE(USB_VID_LEADTEK, USB_PID_WINFAST_DTV_DONGLE_H) }, 1497 { USB_DEVICE(USB_VID_LEADTEK, USB_PID_WINFAST_DTV_DONGLE_H) },
1498 { USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_T3) },
1499 { USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_T5) },
1498 { 0 } /* Terminating entry */ 1500 { 0 } /* Terminating entry */
1499}; 1501};
1500MODULE_DEVICE_TABLE(usb, dib0700_usb_id_table); 1502MODULE_DEVICE_TABLE(usb, dib0700_usb_id_table);
@@ -1728,8 +1730,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
1728 { &dib0700_usb_id_table[30], NULL }, 1730 { &dib0700_usb_id_table[30], NULL },
1729 { NULL }, 1731 { NULL },
1730 }, 1732 },
1731 { "Terratec Cinergy T USB XXS", 1733 { "Terratec Cinergy T USB XXS/ T3",
1732 { &dib0700_usb_id_table[33], NULL }, 1734 { &dib0700_usb_id_table[33],
1735 &dib0700_usb_id_table[52], NULL },
1733 { NULL }, 1736 { NULL },
1734 }, 1737 },
1735 { "Elgato EyeTV DTT", 1738 { "Elgato EyeTV DTT",
@@ -1790,8 +1793,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
1790 { &dib0700_usb_id_table[36], NULL }, 1793 { &dib0700_usb_id_table[36], NULL },
1791 { NULL }, 1794 { NULL },
1792 }, 1795 },
1793 { "Terratec Cinergy DT USB XS Diversity", 1796 { "Terratec Cinergy DT USB XS Diversity/ T5",
1794 { &dib0700_usb_id_table[43], NULL }, 1797 { &dib0700_usb_id_table[43],
1798 &dib0700_usb_id_table[53], NULL},
1795 { NULL }, 1799 { NULL },
1796 }, 1800 },
1797 { "Sony PlayTV", 1801 { "Sony PlayTV",
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index 07227979e29d..7340ef4cd1ec 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -181,6 +181,8 @@
181#define USB_PID_TERRATEC_CINERGY_HT_EXPRESS 0x0060 181#define USB_PID_TERRATEC_CINERGY_HT_EXPRESS 0x0060
182#define USB_PID_TERRATEC_CINERGY_T_EXPRESS 0x0062 182#define USB_PID_TERRATEC_CINERGY_T_EXPRESS 0x0062
183#define USB_PID_TERRATEC_CINERGY_T_XXS 0x0078 183#define USB_PID_TERRATEC_CINERGY_T_XXS 0x0078
184#define USB_PID_TERRATEC_T3 0x10a0
185#define USB_PID_TERRATEC_T5 0x10a1
184#define USB_PID_PINNACLE_EXPRESSCARD_320CX 0x022e 186#define USB_PID_PINNACLE_EXPRESSCARD_320CX 0x022e
185#define USB_PID_PINNACLE_PCTV2000E 0x022c 187#define USB_PID_PINNACLE_PCTV2000E 0x022c
186#define USB_PID_PINNACLE_PCTV_DVB_T_FLASH 0x0228 188#define USB_PID_PINNACLE_PCTV_DVB_T_FLASH 0x0228