From 8c7e33be2f14540aa4fd4ae80b42797399a7178a Mon Sep 17 00:00:00 2001
From: Mike Isely <isely@pobox.com>
Date: Tue, 22 Apr 2008 14:45:36 -0300
Subject: [PATCH] --- yaml --- r: 92431 b: refs/heads/master c:
 1aaac60fec0d3ba8043838c6eac86de987cfe5c1 h: refs/heads/master i:   92429:
 ff1efac414f13a95e4aa85645609156e99f4bd1c   92427:
 ad3c8866c4a907150166173cc9d4be9e7c4ae556   92423:
 2ec18be7a2d6c300e12005eac32dbc4c40fe417a   92415:
 e2d8c90b1617a6f3eb8f1fce2f7cee49f9244ef9 v: v3

---
 [refs]                                         |  2 +-
 .../media/video/pvrusb2/pvrusb2-devattr.c      | 18 ++++++++++++++++++
 .../media/video/pvrusb2/pvrusb2-devattr.h      | 12 ++++++------
 3 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 98f4e26a3861..9aa688bb32cf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d068c6eec94c370a445a32f2f092c90798d47ca3
+refs/heads/master: 1aaac60fec0d3ba8043838c6eac86de987cfe5c1
diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-devattr.c b/trunk/drivers/media/video/pvrusb2/pvrusb2-devattr.c
index 87526666bc9e..4522ad6320c2 100644
--- a/trunk/drivers/media/video/pvrusb2/pvrusb2-devattr.c
+++ b/trunk/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/trunk/drivers/media/video/pvrusb2/pvrusb2-devattr.h b/trunk/drivers/media/video/pvrusb2/pvrusb2-devattr.h
index d89a44071cc1..b564121803bb 100644
--- a/trunk/drivers/media/video/pvrusb2/pvrusb2-devattr.h
+++ b/trunk/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[];