Skip to contentSkip to conversation

The button on the camera is KEY_CAMERA

PATCH New Bastien Nocera 1 participant 1 message Dec 2, 2008 Media (V4L/DVB)

lore
Share & tools
lore

Bastien Nocera

author
#0 lore raw

PATCH 1/1 The button on the camera is KEY_CAMERA

2 small bug fixes for the input part of the UVC driver.

Please keep me CC:ed as I'm not subscribed to LKML.

Cheers

Quoted 1 line

From df4dfe7370c71647e89acd2db22c46c10ca8faea Mon Sep 17 00:00:00 2001

From: Bastien Nocera <[email protected]>
Date: Tue, 2 Dec 2008 19:08:59 +0000
Subject: [PATCH] [uvc] The button on the camera is KEY_CAMERA

Not BTN_0. Also call input_sync() on the device once the button has been pressed.

---
 drivers/media/video/uvc/uvc_status.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
drivers/media/video/uvc/uvc_status.c +5 -3
index 5d60b26..ca93245 100644
@@ -48,7 +48,7 @@ static int uvc_input_init(struct uvc_device *dev)
 	input->dev.parent = &dev->intf->dev;
 
 	set_bit(EV_KEY, input->evbit);
-	set_bit(BTN_0, input->keybit);
+	set_bit(KEY_CAMERA, input->keybit);
 
 	if ((ret = input_register_device(input)) < 0)
 		goto error;

@@ -71,8 +71,10 @@ static void uvc_input_cleanup(struct uvc_device *dev)
 static void uvc_input_report_key(struct uvc_device *dev, unsigned int code,
 	int value)
 {
-	if (dev->input)
+	if (dev->input) {
 		input_report_key(dev->input, code, value);
+		input_sync(dev->input);
+	}
 }
 
 #else

@@ -97,7 +99,7 @@ static void uvc_event_streaming(struct uvc_device *dev, __u8 *data, int len)
 			return;
 		uvc_trace(UVC_TRACE_STATUS, "Button (intf %u) %s len %d\n",
 			data[1], data[3] ? "pressed" : "released", len);
-		uvc_input_report_key(dev, BTN_0, data[3]);
+		uvc_input_report_key(dev, KEY_CAMERA, data[3]);
 	} else {
 		uvc_trace(UVC_TRACE_STATUS, "Stream %u error event %02x %02x "
 			"len %d.\n", data[1], data[2], data[3], len);
Signature · 1 line
1.6.0.4