aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorYousef Lamlum <yousef@youseflamlum.com>2008-01-25 03:51:48 -0500
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-01-25 16:05:15 -0500
commit7999a8161d06326f3c4cb797fcf0de8b2eb08253 (patch)
treee6e843ea718a5e730b034ebf195e58a8cd773f4b /drivers/media
parent5ea60531c1c6164788ea7d6efecdf575adc543ff (diff)
V4L/DVB (7065): Artec T14BR patches
Added Artec T14BR support Signed-off-by: Yousef Lamlum <yousef@youseflamlum.com> Signed-off-by: Patrick Boettcher <pb@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/dvb/dvb-usb/dib0700_devices.c7
-rw-r--r--drivers/media/dvb/dvb-usb/dvb-usb-ids.h1
2 files changed, 7 insertions, 1 deletions
diff --git a/drivers/media/dvb/dvb-usb/dib0700_devices.c b/drivers/media/dvb/dvb-usb/dib0700_devices.c
index 1aa335d5aa97..a7088cee1ef9 100644
--- a/drivers/media/dvb/dvb-usb/dib0700_devices.c
+++ b/drivers/media/dvb/dvb-usb/dib0700_devices.c
@@ -851,6 +851,7 @@ struct usb_device_id dib0700_usb_id_table[] = {
851 { USB_DEVICE(USB_VID_COMPRO, USB_PID_COMPRO_VIDEOMATE_U500_PC) }, 851 { USB_DEVICE(USB_VID_COMPRO, USB_PID_COMPRO_VIDEOMATE_U500_PC) },
852/* 20 */{ USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_EXPRESS) }, 852/* 20 */{ USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_EXPRESS) },
853/* 21 */{ USB_DEVICE(USB_VID_GIGABYTE, USB_PID_GIGABYTE_U7000) }, 853/* 21 */{ USB_DEVICE(USB_VID_GIGABYTE, USB_PID_GIGABYTE_U7000) },
854/* 22 */{ USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC, USB_PID_ARTEC_T14BR) },
854 { 0 } /* Terminating entry */ 855 { 0 } /* Terminating entry */
855}; 856};
856MODULE_DEVICE_TABLE(usb, dib0700_usb_id_table); 857MODULE_DEVICE_TABLE(usb, dib0700_usb_id_table);
@@ -1018,7 +1019,7 @@ struct dvb_usb_device_properties dib0700_devices[] = {
1018 }, 1019 },
1019 }, 1020 },
1020 1021
1021 .num_device_descs = 2, 1022 .num_device_descs = 3,
1022 .devices = { 1023 .devices = {
1023 { "DiBcom STK7070P reference design", 1024 { "DiBcom STK7070P reference design",
1024 { &dib0700_usb_id_table[15], NULL }, 1025 { &dib0700_usb_id_table[15], NULL },
@@ -1028,6 +1029,10 @@ struct dvb_usb_device_properties dib0700_devices[] = {
1028 { &dib0700_usb_id_table[16], NULL }, 1029 { &dib0700_usb_id_table[16], NULL },
1029 { NULL }, 1030 { NULL },
1030 }, 1031 },
1032 { "Artec T14BR DVB-T",
1033 { &dib0700_usb_id_table[22], NULL },
1034 { NULL },
1035 }
1031 } 1036 }
1032 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES, 1037 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
1033 1038
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index aee5a6ef8217..36aeda2b1716 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -105,6 +105,7 @@
105#define USB_PID_ULTIMA_TVBOX_USB2_WARM 0x810a 105#define USB_PID_ULTIMA_TVBOX_USB2_WARM 0x810a
106#define USB_PID_ARTEC_T14_COLD 0x810b 106#define USB_PID_ARTEC_T14_COLD 0x810b
107#define USB_PID_ARTEC_T14_WARM 0x810c 107#define USB_PID_ARTEC_T14_WARM 0x810c
108#define USB_PID_ARTEC_T14BR 0x810f
108#define USB_PID_ULTIMA_TVBOX_USB2_FX_COLD 0x8613 109#define USB_PID_ULTIMA_TVBOX_USB2_FX_COLD 0x8613
109#define USB_PID_ULTIMA_TVBOX_USB2_FX_WARM 0x1002 110#define USB_PID_ULTIMA_TVBOX_USB2_FX_WARM 0x1002
110#define USB_PID_UNK_HYPER_PALTEK_COLD 0x005e 111#define USB_PID_UNK_HYPER_PALTEK_COLD 0x005e