From 23a8256be8e1c226622e22edfecad67921ae96ed Mon Sep 17 00:00:00 2001 From: Tim Taubert Date: Fri, 25 Jan 2008 06:16:36 -0300 Subject: [PATCH] --- yaml --- r: 76773 b: refs/heads/master c: c7637b1a31bb0470e1247f1923a323c90927ac37 h: refs/heads/master i: 76771: 847626c288497ebb9ed569ec62b02c1ee4dd3a3c v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/dvb-usb/dib0700_devices.c | 15 +++++++++++++-- trunk/drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 1 + 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0e24b1f0f722..fc98a9d0cdce 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3a0311c6c539bd022a65d298355471aacbd7a618 +refs/heads/master: c7637b1a31bb0470e1247f1923a323c90927ac37 diff --git a/trunk/drivers/media/dvb/dvb-usb/dib0700_devices.c b/trunk/drivers/media/dvb/dvb-usb/dib0700_devices.c index de36790899b3..4c8c71206581 100644 --- a/trunk/drivers/media/dvb/dvb-usb/dib0700_devices.c +++ b/trunk/drivers/media/dvb/dvb-usb/dib0700_devices.c @@ -875,6 +875,7 @@ struct usb_device_id dib0700_usb_id_table[] = { { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC, USB_PID_ARTEC_T14BR) }, { USB_DEVICE(USB_VID_ASUS, USB_PID_ASUS_U3000) }, { USB_DEVICE(USB_VID_ASUS, USB_PID_ASUS_U3100) }, +/* 25 */ { USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_NOVA_T_STICK_3) }, { 0 } /* Terminating entry */ }; MODULE_DEVICE_TABLE(usb, dib0700_usb_id_table); @@ -1060,7 +1061,7 @@ struct dvb_usb_device_properties dib0700_devices[] = { }, }, - .num_device_descs = 4, + .num_device_descs = 5, .devices = { { "DiBcom STK7070P reference design", { &dib0700_usb_id_table[15], NULL }, @@ -1078,7 +1079,17 @@ struct dvb_usb_device_properties dib0700_devices[] = { { &dib0700_usb_id_table[24], NULL }, { NULL }, }, - } + { "Hauppauge Nova-T Stick", + { &dib0700_usb_id_table[25], NULL }, + { NULL }, + }, + }, + + .rc_interval = DEFAULT_RC_INTERVAL, + .rc_key_map = dib0700_rc_keys, + .rc_key_map_size = ARRAY_SIZE(dib0700_rc_keys), + .rc_query = dib0700_rc_query + }, { DIB0700_DEFAULT_DEVICE_PROPERTIES, .num_adapters = 2, diff --git a/trunk/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/trunk/drivers/media/dvb/dvb-usb/dvb-usb-ids.h index a411430f827b..35df40f5f7ef 100644 --- a/trunk/drivers/media/dvb/dvb-usb/dvb-usb-ids.h +++ b/trunk/drivers/media/dvb/dvb-usb/dvb-usb-ids.h @@ -128,6 +128,7 @@ #define USB_PID_HAUPPAUGE_NOVA_T_500_2 0x9950 #define USB_PID_HAUPPAUGE_NOVA_T_STICK 0x7050 #define USB_PID_HAUPPAUGE_NOVA_T_STICK_2 0x7060 +#define USB_PID_HAUPPAUGE_NOVA_T_STICK_3 0x7070 #define USB_PID_HAUPPAUGE_NOVA_TD_STICK 0x9580 #define USB_PID_AVERMEDIA_EXPRESS 0xb568 #define USB_PID_AVERMEDIA_VOLAR 0xa807