aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@linuxtv.org>2008-03-28 04:48:44 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-04-24 13:09:48 -0400
commitc881284151e35479ffee26a571b6e9769c351095 (patch)
tree91f95689472f1eb14ec96caaff26c5292373b08d /drivers/media
parent906a495741bf63a7448ca4c452d70f937549e9ad (diff)
V4L/DVB (7706): pvrusb2: create a separate pvr2_device_desc structure for 751xx 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.c28
1 files changed, 23 insertions, 5 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-devattr.c b/drivers/media/video/pvrusb2/pvrusb2-devattr.c
index 6794862bbb19..9598f80ecd4d 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-devattr.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-devattr.c
@@ -313,9 +313,27 @@ static const char *pvr2_fw1_names_75xxx[] = {
313 "v4l-pvrusb2-73xxx-01.fw", 313 "v4l-pvrusb2-73xxx-01.fw",
314}; 314};
315 315
316static const struct pvr2_device_desc pvr2_device_75xxx = { 316static const struct pvr2_device_desc pvr2_device_750xx = {
317 .description = "WinTV PVR USB2 Model Category 75xxx", 317 .description = "WinTV PVR USB2 Model Category 750xx",
318 .shortname = "75xxx", 318 .shortname = "750xx",
319 .client_modules.lst = pvr2_client_75xxx,
320 .client_modules.cnt = ARRAY_SIZE(pvr2_client_75xxx),
321 .fx2_firmware.lst = pvr2_fw1_names_75xxx,
322 .fx2_firmware.cnt = ARRAY_SIZE(pvr2_fw1_names_75xxx),
323 .flag_has_cx25840 = !0,
324 .flag_has_hauppauge_rom = !0,
325 .flag_has_analogtuner = !0,
326 .flag_has_composite = !0,
327 .flag_has_svideo = !0,
328 .signal_routing_scheme = PVR2_ROUTING_SCHEME_HAUPPAUGE,
329 .digital_control_scheme = PVR2_DIGITAL_SCHEME_HAUPPAUGE,
330 .default_std_mask = V4L2_STD_NTSC_M,
331 .led_scheme = PVR2_LED_SCHEME_HAUPPAUGE,
332};
333
334static const struct pvr2_device_desc pvr2_device_751xx = {
335 .description = "WinTV PVR USB2 Model Category 751xx",
336 .shortname = "751xx",
319 .client_modules.lst = pvr2_client_75xxx, 337 .client_modules.lst = pvr2_client_75xxx,
320 .client_modules.cnt = ARRAY_SIZE(pvr2_client_75xxx), 338 .client_modules.cnt = ARRAY_SIZE(pvr2_client_75xxx),
321 .fx2_firmware.lst = pvr2_fw1_names_75xxx, 339 .fx2_firmware.lst = pvr2_fw1_names_75xxx,
@@ -355,9 +373,9 @@ struct usb_device_id pvr2_device_table[] = {
355 { USB_DEVICE(0x2040, 0x7300), 373 { USB_DEVICE(0x2040, 0x7300),
356 .driver_info = (kernel_ulong_t)&pvr2_device_73xxx}, 374 .driver_info = (kernel_ulong_t)&pvr2_device_73xxx},
357 { USB_DEVICE(0x2040, 0x7500), 375 { USB_DEVICE(0x2040, 0x7500),
358 .driver_info = (kernel_ulong_t)&pvr2_device_75xxx}, 376 .driver_info = (kernel_ulong_t)&pvr2_device_750xx},
359 { USB_DEVICE(0x2040, 0x7501), 377 { USB_DEVICE(0x2040, 0x7501),
360 .driver_info = (kernel_ulong_t)&pvr2_device_75xxx}, 378 .driver_info = (kernel_ulong_t)&pvr2_device_751xx},
361 { } 379 { }
362}; 380};
363 381