diff options
| -rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-devattr.c | 18 | ||||
| -rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-devattr.h | 12 |
2 files changed, 24 insertions, 6 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-devattr.c b/drivers/media/video/pvrusb2/pvrusb2-devattr.c index 87526666bc9..4522ad6320c 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-devattr.c +++ b/drivers/media/video/pvrusb2/pvrusb2-devattr.c @@ -56,7 +56,10 @@ static const struct pvr2_device_desc pvr2_device_29xxx = { .fx2_firmware.lst = pvr2_fw1_names_29xxx, .fx2_firmware.cnt = ARRAY_SIZE(pvr2_fw1_names_29xxx), .flag_has_hauppauge_rom = !0, + .flag_has_analogtuner = !0, .flag_has_fmradio = !0, + .flag_has_composite = !0, + .flag_has_svideo = !0, .signal_routing_scheme = PVR2_ROUTING_SCHEME_HAUPPAUGE, }; @@ -86,7 +89,10 @@ static const struct pvr2_device_desc pvr2_device_24xxx = { .flag_has_wm8775 = !0, .flag_has_hauppauge_rom = !0, .flag_has_hauppauge_custom_ir = !0, + .flag_has_analogtuner = !0, .flag_has_fmradio = !0, + .flag_has_composite = !0, + .flag_has_svideo = !0, .signal_routing_scheme = PVR2_ROUTING_SCHEME_HAUPPAUGE, }; @@ -107,6 +113,9 @@ static const struct pvr2_device_desc pvr2_device_gotview_2 = { .client_modules.cnt = ARRAY_SIZE(pvr2_client_gotview_2), .flag_has_cx25840 = !0, .default_tuner_type = TUNER_PHILIPS_FM1216ME_MK3, + .flag_has_analogtuner = !0, + .flag_has_composite = !0, + .flag_has_svideo = !0, .signal_routing_scheme = PVR2_ROUTING_SCHEME_GOTVIEW, }; @@ -129,6 +138,9 @@ static const struct pvr2_device_desc pvr2_device_onair_creator = { .client_modules.cnt = ARRAY_SIZE(pvr2_client_onair_creator), .default_tuner_type = TUNER_LG_TDVS_H06XF, .flag_has_digitaltuner = !0, + .flag_has_analogtuner = !0, + .flag_has_composite = !0, + .flag_has_svideo = !0, .signal_routing_scheme = PVR2_ROUTING_SCHEME_HAUPPAUGE, }; #endif @@ -152,6 +164,9 @@ static const struct pvr2_device_desc pvr2_device_onair_usb2 = { .client_modules.cnt = ARRAY_SIZE(pvr2_client_onair_usb2), .default_tuner_type = TUNER_PHILIPS_ATSC, .flag_has_digitaltuner = !0, + .flag_has_analogtuner = !0, + .flag_has_composite = !0, + .flag_has_svideo = !0, .signal_routing_scheme = PVR2_ROUTING_SCHEME_HAUPPAUGE, }; #endif @@ -215,6 +230,9 @@ static const struct pvr2_device_desc pvr2_device_75xxx = { .flag_has_cx25840 = !0, .flag_has_hauppauge_rom = !0, .flag_has_digitaltuner = !0, + .flag_has_analogtuner = !0, + .flag_has_composite = !0, + .flag_has_svideo = !0, .signal_routing_scheme = PVR2_ROUTING_SCHEME_HAUPPAUGE, .default_std_mask = V4L2_STD_NTSC_M, }; diff --git a/drivers/media/video/pvrusb2/pvrusb2-devattr.h b/drivers/media/video/pvrusb2/pvrusb2-devattr.h index d89a44071cc..b564121803b 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-devattr.h +++ b/drivers/media/video/pvrusb2/pvrusb2-devattr.h @@ -103,12 +103,12 @@ struct pvr2_device_desc { commands. */ char flag_has_hauppauge_custom_ir; - /* Device has FM radio capability. */ - char flag_has_fmradio; - - /* Device has a digital tuner; if this is set then we enable extra - functionality to switch between analog and digital modes. */ - char flag_has_digitaltuner; + /* These bits define which kinds of sources the device can handle. */ + char flag_has_fmradio; /* Has FM radio receiver */ + char flag_has_analogtuner; /* Has analog tuner */ + char flag_has_digitaltuner; /* Has digital tuner */ + char flag_has_composite; /* Has composite input */ + char flag_has_svideo; /* Has s-video input */ }; extern struct usb_device_id pvr2_device_table[]; |