aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorTim Taubert <ttmails@gmx.de>2008-01-25 04:16:36 -0500
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-01-25 16:05:16 -0500
commitc7637b1a31bb0470e1247f1923a323c90927ac37 (patch)
tree17220b6105debe8dfdfc10f511374797ad98b848 /drivers/media
parent3a0311c6c539bd022a65d298355471aacbd7a618 (diff)
V4L/DVB (7068): Add support for WinTV Nova-T-CE driver
Add support for WinTV Nova-T-CE driver Signed-off-by: Tim Taubert <ttmails@gmx.de> 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.c15
-rw-r--r--drivers/media/dvb/dvb-usb/dvb-usb-ids.h1
2 files changed, 14 insertions, 2 deletions
diff --git a/drivers/media/dvb/dvb-usb/dib0700_devices.c b/drivers/media/dvb/dvb-usb/dib0700_devices.c
index de36790899b3..4c8c71206581 100644
--- a/drivers/media/dvb/dvb-usb/dib0700_devices.c
+++ b/drivers/media/dvb/dvb-usb/dib0700_devices.c
@@ -875,6 +875,7 @@ struct usb_device_id dib0700_usb_id_table[] = {
875 { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC, USB_PID_ARTEC_T14BR) }, 875 { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC, USB_PID_ARTEC_T14BR) },
876 { USB_DEVICE(USB_VID_ASUS, USB_PID_ASUS_U3000) }, 876 { USB_DEVICE(USB_VID_ASUS, USB_PID_ASUS_U3000) },
877 { USB_DEVICE(USB_VID_ASUS, USB_PID_ASUS_U3100) }, 877 { USB_DEVICE(USB_VID_ASUS, USB_PID_ASUS_U3100) },
878/* 25 */ { USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_NOVA_T_STICK_3) },
878 { 0 } /* Terminating entry */ 879 { 0 } /* Terminating entry */
879}; 880};
880MODULE_DEVICE_TABLE(usb, dib0700_usb_id_table); 881MODULE_DEVICE_TABLE(usb, dib0700_usb_id_table);
@@ -1060,7 +1061,7 @@ struct dvb_usb_device_properties dib0700_devices[] = {
1060 }, 1061 },
1061 }, 1062 },
1062 1063
1063 .num_device_descs = 4, 1064 .num_device_descs = 5,
1064 .devices = { 1065 .devices = {
1065 { "DiBcom STK7070P reference design", 1066 { "DiBcom STK7070P reference design",
1066 { &dib0700_usb_id_table[15], NULL }, 1067 { &dib0700_usb_id_table[15], NULL },
@@ -1078,7 +1079,17 @@ struct dvb_usb_device_properties dib0700_devices[] = {
1078 { &dib0700_usb_id_table[24], NULL }, 1079 { &dib0700_usb_id_table[24], NULL },
1079 { NULL }, 1080 { NULL },
1080 }, 1081 },
1081 } 1082 { "Hauppauge Nova-T Stick",
1083 { &dib0700_usb_id_table[25], NULL },
1084 { NULL },
1085 },
1086 },
1087
1088 .rc_interval = DEFAULT_RC_INTERVAL,
1089 .rc_key_map = dib0700_rc_keys,
1090 .rc_key_map_size = ARRAY_SIZE(dib0700_rc_keys),
1091 .rc_query = dib0700_rc_query
1092
1082 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES, 1093 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
1083 1094
1084 .num_adapters = 2, 1095 .num_adapters = 2,
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index a411430f827b..35df40f5f7ef 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -128,6 +128,7 @@
128#define USB_PID_HAUPPAUGE_NOVA_T_500_2 0x9950 128#define USB_PID_HAUPPAUGE_NOVA_T_500_2 0x9950
129#define USB_PID_HAUPPAUGE_NOVA_T_STICK 0x7050 129#define USB_PID_HAUPPAUGE_NOVA_T_STICK 0x7050
130#define USB_PID_HAUPPAUGE_NOVA_T_STICK_2 0x7060 130#define USB_PID_HAUPPAUGE_NOVA_T_STICK_2 0x7060
131#define USB_PID_HAUPPAUGE_NOVA_T_STICK_3 0x7070
131#define USB_PID_HAUPPAUGE_NOVA_TD_STICK 0x9580 132#define USB_PID_HAUPPAUGE_NOVA_TD_STICK 0x9580
132#define USB_PID_AVERMEDIA_EXPRESS 0xb568 133#define USB_PID_AVERMEDIA_EXPRESS 0xb568
133#define USB_PID_AVERMEDIA_VOLAR 0xa807 134#define USB_PID_AVERMEDIA_VOLAR 0xa807