aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@linuxtv.org>2008-03-15 22:59:29 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-04-06 17:28:02 -0400
commit92c9d07507f0a90b64172bfede7e6fa845e8e66b (patch)
treea155aec0c795312bccafa312d8dbcfd5eaaa0412 /drivers/media
parentdd6e9467e0a7ddf02788f30adfe1cf2851c25fb8 (diff)
V4L/DVB (7497): pvrusb2: add new usb pid for 73xxx models
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/pvrusb2/pvrusb2-devattr.c33
1 files changed, 33 insertions, 0 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-devattr.c b/drivers/media/video/pvrusb2/pvrusb2-devattr.c
index 2b7b1fa0094c..98557ce950cd 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-devattr.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-devattr.c
@@ -155,6 +155,37 @@ static const struct pvr2_device_desc pvr2_device_onair_usb2 = {
155 155
156 156
157/*------------------------------------------------------------------------*/ 157/*------------------------------------------------------------------------*/
158/* Hauppauge PVR-USB2 Model 73xxx */
159
160static const char *pvr2_client_73xxx[] = {
161 "cx25840",
162 "tuner",
163};
164
165static const char *pvr2_fw1_names_73xxx[] = {
166 "v4l-pvrusb2-73xxx-01.fw",
167};
168
169static const struct pvr2_device_desc pvr2_device_73xxx = {
170 .description = "WinTV PVR USB2 Model Category 73xxxx",
171 .shortname = "73xxx",
172 .client_modules.lst = pvr2_client_73xxx,
173 .client_modules.cnt = ARRAY_SIZE(pvr2_client_73xxx),
174 .fx2_firmware.lst = pvr2_fw1_names_73xxx,
175 .fx2_firmware.cnt = ARRAY_SIZE(pvr2_fw1_names_73xxx),
176 .flag_has_cx25840 = !0,
177 .flag_has_hauppauge_rom = !0,
178 .flag_has_analogtuner = !0,
179 .flag_has_composite = !0,
180 .flag_has_svideo = !0,
181 .signal_routing_scheme = PVR2_ROUTING_SCHEME_HAUPPAUGE,
182 .digital_control_scheme = PVR2_DIGITAL_SCHEME_HAUPPAUGE,
183 .led_scheme = PVR2_LED_SCHEME_HAUPPAUGE,
184};
185
186
187
188/*------------------------------------------------------------------------*/
158/* Hauppauge PVR-USB2 Model 75xxx */ 189/* Hauppauge PVR-USB2 Model 75xxx */
159 190
160static const char *pvr2_client_75xxx[] = { 191static const char *pvr2_client_75xxx[] = {
@@ -198,6 +229,8 @@ struct usb_device_id pvr2_device_table[] = {
198 { USB_DEVICE(0x11ba, 0x1001), 229 { USB_DEVICE(0x11ba, 0x1001),
199 .driver_info = (kernel_ulong_t)&pvr2_device_onair_usb2}, 230 .driver_info = (kernel_ulong_t)&pvr2_device_onair_usb2},
200#endif 231#endif
232 { USB_DEVICE(0x2040, 0x7300),
233 .driver_info = (kernel_ulong_t)&pvr2_device_73xxx},
201 { USB_DEVICE(0x2040, 0x7500), 234 { USB_DEVICE(0x2040, 0x7500),
202 .driver_info = (kernel_ulong_t)&pvr2_device_75xxx}, 235 .driver_info = (kernel_ulong_t)&pvr2_device_75xxx},
203 { USB_DEVICE(0x2040, 0x7501), 236 { USB_DEVICE(0x2040, 0x7501),