diff options
author | Patrick Boettcher <pb@linuxtv.org> | 2005-07-07 20:58:16 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-07 21:24:00 -0400 |
commit | 2f7f96b95991bcbe52dee5aa50a19130873738bf (patch) | |
tree | 749bfd2cf42d867cfe35eab94de6e5848c71e851 | |
parent | 8257e8a444a2b81952de9f8bfeb3a4726c0f7d5b (diff) |
[PATCH] dvb: usb: add VideoWalker DVB-T USB ids
Add another USB ID pair for the VideoWalker USB DVB-T.
Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | drivers/media/dvb/dvb-usb/dibusb-mb.c | 12 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 3 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-usb/dvb-usb.h | 2 |
3 files changed, 13 insertions, 4 deletions
diff --git a/drivers/media/dvb/dvb-usb/dibusb-mb.c b/drivers/media/dvb/dvb-usb/dibusb-mb.c index 691900578ee3..1cd490252890 100644 --- a/drivers/media/dvb/dvb-usb/dibusb-mb.c +++ b/drivers/media/dvb/dvb-usb/dibusb-mb.c | |||
@@ -123,11 +123,13 @@ static struct usb_device_id dibusb_dib3000mb_table [] = { | |||
123 | 123 | ||
124 | /* device ID with default DIBUSB2_0-firmware and with the hacked firmware */ | 124 | /* device ID with default DIBUSB2_0-firmware and with the hacked firmware */ |
125 | /* 24 */ { USB_DEVICE(USB_VID_ADSTECH, USB_PID_ADSTECH_USB2_WARM) }, | 125 | /* 24 */ { USB_DEVICE(USB_VID_ADSTECH, USB_PID_ADSTECH_USB2_WARM) }, |
126 | /* 25 */ { USB_DEVICE(USB_VID_KYE, USB_PID_KYE_DVB_T_COLD) }, | ||
127 | /* 26 */ { USB_DEVICE(USB_VID_KYE, USB_PID_KYE_DVB_T_WARM) }, | ||
126 | 128 | ||
127 | // #define DVB_USB_DIBUSB_MB_FAULTY_USB_IDs | 129 | // #define DVB_USB_DIBUSB_MB_FAULTY_USB_IDs |
128 | 130 | ||
129 | #ifdef DVB_USB_DIBUSB_MB_FAULTY_USB_IDs | 131 | #ifdef DVB_USB_DIBUSB_MB_FAULTY_USB_IDs |
130 | /* 25 */ { USB_DEVICE(USB_VID_ANCHOR, USB_PID_ULTIMA_TVBOX_ANCHOR_COLD) }, | 132 | /* 27 */ { USB_DEVICE(USB_VID_ANCHOR, USB_PID_ULTIMA_TVBOX_ANCHOR_COLD) }, |
131 | #endif | 133 | #endif |
132 | { } /* Terminating entry */ | 134 | { } /* Terminating entry */ |
133 | }; | 135 | }; |
@@ -170,7 +172,7 @@ static struct dvb_usb_properties dibusb1_1_properties = { | |||
170 | } | 172 | } |
171 | }, | 173 | }, |
172 | 174 | ||
173 | .num_device_descs = 8, | 175 | .num_device_descs = 9, |
174 | .devices = { | 176 | .devices = { |
175 | { "AVerMedia AverTV DVBT USB1.1", | 177 | { "AVerMedia AverTV DVBT USB1.1", |
176 | { &dibusb_dib3000mb_table[0], NULL }, | 178 | { &dibusb_dib3000mb_table[0], NULL }, |
@@ -204,6 +206,10 @@ static struct dvb_usb_properties dibusb1_1_properties = { | |||
204 | { &dibusb_dib3000mb_table[19], NULL }, | 206 | { &dibusb_dib3000mb_table[19], NULL }, |
205 | { &dibusb_dib3000mb_table[20], NULL }, | 207 | { &dibusb_dib3000mb_table[20], NULL }, |
206 | }, | 208 | }, |
209 | { "VideoWalker DVB-T USB", | ||
210 | { &dibusb_dib3000mb_table[25], NULL }, | ||
211 | { &dibusb_dib3000mb_table[26], NULL }, | ||
212 | }, | ||
207 | } | 213 | } |
208 | }; | 214 | }; |
209 | 215 | ||
@@ -256,7 +262,7 @@ static struct dvb_usb_properties dibusb1_1_an2235_properties = { | |||
256 | }, | 262 | }, |
257 | #ifdef DVB_USB_DIBUSB_MB_FAULTY_USB_IDs | 263 | #ifdef DVB_USB_DIBUSB_MB_FAULTY_USB_IDs |
258 | { "Artec T1 USB1.1 TVBOX with AN2235 (faulty USB IDs)", | 264 | { "Artec T1 USB1.1 TVBOX with AN2235 (faulty USB IDs)", |
259 | { &dibusb_dib3000mb_table[25], NULL }, | 265 | { &dibusb_dib3000mb_table[27], NULL }, |
260 | { NULL }, | 266 | { NULL }, |
261 | }, | 267 | }, |
262 | #endif | 268 | #endif |
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h index de2463bae225..9fea93df6ab4 100644 --- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h +++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h | |||
@@ -24,6 +24,7 @@ | |||
24 | #define USB_VID_HANFTEK 0x15f4 | 24 | #define USB_VID_HANFTEK 0x15f4 |
25 | #define USB_VID_HAUPPAUGE 0x2040 | 25 | #define USB_VID_HAUPPAUGE 0x2040 |
26 | #define USB_VID_HYPER_PALTEK 0x1025 | 26 | #define USB_VID_HYPER_PALTEK 0x1025 |
27 | #define USB_VID_KYE 0x0458 | ||
27 | #define USB_VID_MEDION 0x1660 | 28 | #define USB_VID_MEDION 0x1660 |
28 | #define USB_VID_VISIONPLUS 0x13d3 | 29 | #define USB_VID_VISIONPLUS 0x13d3 |
29 | #define USB_VID_TWINHAN 0x1822 | 30 | #define USB_VID_TWINHAN 0x1822 |
@@ -80,6 +81,8 @@ | |||
80 | #define USB_PID_DVICO_BLUEBIRD_LGZ201_1 0xdb01 | 81 | #define USB_PID_DVICO_BLUEBIRD_LGZ201_1 0xdb01 |
81 | #define USB_PID_DVICO_BLUEBIRD_TH7579_2 0xdb11 | 82 | #define USB_PID_DVICO_BLUEBIRD_TH7579_2 0xdb11 |
82 | #define USB_PID_MEDION_MD95700 0x0932 | 83 | #define USB_PID_MEDION_MD95700 0x0932 |
84 | #define USB_PID_KYE_DVB_T_COLD 0x701e | ||
85 | #define USB_PID_KYE_DVB_T_WARM 0x701f | ||
83 | 86 | ||
84 | 87 | ||
85 | #endif | 88 | #endif |
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb.h b/drivers/media/dvb/dvb-usb/dvb-usb.h index 6c627e9ea648..a80567caf508 100644 --- a/drivers/media/dvb/dvb-usb/dvb-usb.h +++ b/drivers/media/dvb/dvb-usb/dvb-usb.h | |||
@@ -195,7 +195,7 @@ struct dvb_usb_properties { | |||
195 | } urb; | 195 | } urb; |
196 | 196 | ||
197 | int num_device_descs; | 197 | int num_device_descs; |
198 | struct dvb_usb_device_description devices[8]; | 198 | struct dvb_usb_device_description devices[9]; |
199 | }; | 199 | }; |
200 | 200 | ||
201 | 201 | ||