From: Hans de Goede <hdegoede@redhat.com>
Date: Sat, 20 Feb 2010 07:45:49 +0000 (-0300)
Subject: V4L/DVB: gspca_ov519: add support for the button on ov511 based cams
X-Git-Tag: v2.6.34-rc1~280^2~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=88e8d20a8c7c84533e1aa89dd45354cb5edded37;p=profile%2Fcommon%2Fkernel-common.git

V4L/DVB: gspca_ov519: add support for the button on ov511 based cams

Due to hardware limitations this only works while the camera is
streaming.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---

diff --git a/drivers/media/video/gspca/ov519.c b/drivers/media/video/gspca/ov519.c
index 016f8bb..bc4ced6 100644
--- a/drivers/media/video/gspca/ov519.c
+++ b/drivers/media/video/gspca/ov519.c
@@ -2702,6 +2702,11 @@ static void sd_reset_snapshot(struct gspca_dev *gspca_dev)
 	sd->snapshot_needs_reset = 0;
 
 	switch (sd->bridge) {
+	case BRIDGE_OV511:
+	case BRIDGE_OV511PLUS:
+		reg_w(sd, R51x_SYS_SNAP, 0x02);
+		reg_w(sd, R51x_SYS_SNAP, 0x00);
+		break;
 	case BRIDGE_OV518:
 	case BRIDGE_OV518PLUS:
 		reg_w(sd, R51x_SYS_SNAP, 0x02); /* Reset */
@@ -3996,11 +4001,17 @@ static void ov51x_handle_button(struct gspca_dev *gspca_dev, u8 state)
 
 		sd->snapshot_pressed = state;
 	} else {
-		/* On the ov519 we need to reset the button state multiple
-		   times, as resetting does not work as long as the button
-		   stays pressed */
-		if (sd->bridge == BRIDGE_OV519 && state)
-			sd->snapshot_needs_reset = 1;
+		/* On the ov511 / ov519 we need to reset the button state
+		   multiple times, as resetting does not work as long as the
+		   button stays pressed */
+		switch (sd->bridge) {
+		case BRIDGE_OV511:
+		case BRIDGE_OV511PLUS:
+		case BRIDGE_OV519:
+			if (state)
+				sd->snapshot_needs_reset = 1;
+			break;
+		}
 	}
 }
 
@@ -4025,6 +4036,7 @@ static void ov511_pkt_scan(struct gspca_dev *gspca_dev,
 	 */
 	if (!(in[0] | in[1] | in[2] | in[3] | in[4] | in[5] | in[6] | in[7]) &&
 	    (in[8] & 0x08)) {
+		ov51x_handle_button(gspca_dev, (in[8] >> 2) & 1);
 		if (in[8] & 0x80) {
 			/* Frame end */
 			if ((in[9] + 1) * 8 != gspca_dev->width ||