r5u870

commit f204801cac9cabbae387697b32c3b45bddf82e8b
parent 688baaea9d28288087d293170df9388b61dcdd14
Author: alex <alex@022568fa-442e-4ef8-a3e8-54dcafdb011a>
Date:   Tue, 22 Apr 2008 00:33:59 +0000

Trivial patches from TJ from September 2007.
* Use constant naming of 'Disabled' for no powerline setting.
* Added missing IOCTL query for Night Mode paramter.


git-svn-id: http://svn.mediati.org/svn/r5u870/trunk@79 022568fa-442e-4ef8-a3e8-54dcafdb011a

Diffstat:
M
r5u870.c
 | 
6
+++++-

1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/r5u870.c b/r5u870.c
@@ -867,7 +867,9 @@ enum {
 #define V4L2_CID_SHARPNESS		(V4L2_CID_BASE+30)
 #define V4L2_CID_LASTP1			(V4L2_CID_BASE+31) /* last CID + 1 */
 
-static const char *r5u870_powerline_names[] = { "Off", "50Hz", "60Hz" };
+/* 2007-09-09 TJ Ensure names are identical to uvcvideo,
+ * so user applications aren't confused by differing results for UVC queries */
+static const char *r5u870_powerline_names[] = { "Disabled", "50 Hz", "60 Hz" };
 
 /* TODO: Use our own internal control IDs, instead of crap unmerged ones. */
 static struct r5u870_ctrl r5u870_wdm_ctrls[] = {
@@ -1184,6 +1186,8 @@ static struct r5u870_ctrl r5u870_wdm_ctrls[] = {
 					  .step = 1,
 					  .default_value = 0,
 					  .flags = 0 },
+			  /*  2007-09-09 TJ Add missing IOCTL query */
+			  .query_fn = r5u870_query_ctrl, 
 			  .get_fn = r5u870_get_ctrl,
 			  .set_fn = r5u870_set_ctrl_wdm },
 		.reg = R5U870_REG_NIGHT_MODE_EX,