lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

V4L/DVB (7295): pvrusb2: add device attributes for fm radio and digital tuner

Browse Source 
Signed-off-by: Mike Isely <isely@pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Mike Isely
2008-04-22 14:45:36 -03:00
committed by Mauro Carvalho Chehab
parent 27dea3eb66
commit d068c6eec9
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/media/video/pvrusb2/pvrusb2-devattr.c
View File

@@ -56,6 +56,7 @@ static const struct pvr2_device_desc pvr2_device_29xxx = {
.fx2_firmware.lst = pvr2_fw1_names_29xxx, .fx2_firmware.lst = pvr2_fw1_names_29xxx,
.fx2_firmware.cnt = ARRAY_SIZE(pvr2_fw1_names_29xxx), .fx2_firmware.cnt = ARRAY_SIZE(pvr2_fw1_names_29xxx),
.flag_has_hauppauge_rom = !0, .flag_has_hauppauge_rom = !0,
.flag_has_fmradio = !0,
.signal_routing_scheme = PVR2_ROUTING_SCHEME_HAUPPAUGE, .signal_routing_scheme = PVR2_ROUTING_SCHEME_HAUPPAUGE,
}; };
@@ -85,6 +86,7 @@ static const struct pvr2_device_desc pvr2_device_24xxx = {
.flag_has_wm8775 = !0, .flag_has_wm8775 = !0,
.flag_has_hauppauge_rom = !0, .flag_has_hauppauge_rom = !0,
.flag_has_hauppauge_custom_ir = !0, .flag_has_hauppauge_custom_ir = !0,
.flag_has_fmradio = !0,
.signal_routing_scheme = PVR2_ROUTING_SCHEME_HAUPPAUGE, .signal_routing_scheme = PVR2_ROUTING_SCHEME_HAUPPAUGE,
}; };
@@ -126,6 +128,7 @@ static const struct pvr2_device_desc pvr2_device_onair_creator = {
.client_modules.lst = pvr2_client_onair_creator, .client_modules.lst = pvr2_client_onair_creator,
.client_modules.cnt = ARRAY_SIZE(pvr2_client_onair_creator), .client_modules.cnt = ARRAY_SIZE(pvr2_client_onair_creator),
.default_tuner_type = TUNER_LG_TDVS_H06XF, .default_tuner_type = TUNER_LG_TDVS_H06XF,
.flag_has_digitaltuner = !0,
.signal_routing_scheme = PVR2_ROUTING_SCHEME_HAUPPAUGE, .signal_routing_scheme = PVR2_ROUTING_SCHEME_HAUPPAUGE,
}; };
#endif #endif
@@ -148,6 +151,7 @@ static const struct pvr2_device_desc pvr2_device_onair_usb2 = {
.client_modules.lst = pvr2_client_onair_usb2, .client_modules.lst = pvr2_client_onair_usb2,
.client_modules.cnt = ARRAY_SIZE(pvr2_client_onair_usb2), .client_modules.cnt = ARRAY_SIZE(pvr2_client_onair_usb2),
.default_tuner_type = TUNER_PHILIPS_ATSC, .default_tuner_type = TUNER_PHILIPS_ATSC,
.flag_has_digitaltuner = !0,
.signal_routing_scheme = PVR2_ROUTING_SCHEME_HAUPPAUGE, .signal_routing_scheme = PVR2_ROUTING_SCHEME_HAUPPAUGE,
}; };
#endif #endif
@@ -210,6 +214,7 @@ static const struct pvr2_device_desc pvr2_device_75xxx = {
.fx2_firmware.cnt = ARRAY_SIZE(pvr2_fw1_names_75xxx), .fx2_firmware.cnt = ARRAY_SIZE(pvr2_fw1_names_75xxx),
.flag_has_cx25840 = !0, .flag_has_cx25840 = !0,
.flag_has_hauppauge_rom = !0, .flag_has_hauppauge_rom = !0,
.flag_has_digitaltuner = !0,
.signal_routing_scheme = PVR2_ROUTING_SCHEME_HAUPPAUGE, .signal_routing_scheme = PVR2_ROUTING_SCHEME_HAUPPAUGE,
.default_std_mask = V4L2_STD_NTSC_M, .default_std_mask = V4L2_STD_NTSC_M,
}; };

7
drivers/media/video/pvrusb2/pvrusb2-devattr.h
View File

@@ -102,6 +102,13 @@ struct pvr2_device_desc {
implement the virtual receiver in terms of appropriate FX2 implement the virtual receiver in terms of appropriate FX2
commands. */ commands. */
char flag_has_hauppauge_custom_ir; 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;
}; };
extern struct usb_device_id pvr2_device_table[]; extern struct usb_device_id pvr2_device_table[];