From patchwork Thu Sep 4 00:47:48 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Palatin X-Patchwork-Id: 4841361 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E4AF5C0338 for ; Thu, 4 Sep 2014 00:47:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DE2ED20220 for ; Thu, 4 Sep 2014 00:47:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3479D20211 for ; Thu, 4 Sep 2014 00:47:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756807AbaIDArw (ORCPT ); Wed, 3 Sep 2014 20:47:52 -0400 Received: from mail-yk0-f201.google.com ([209.85.160.201]:49633 "EHLO mail-yk0-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750908AbaIDArv (ORCPT ); Wed, 3 Sep 2014 20:47:51 -0400 Received: by mail-yk0-f201.google.com with SMTP id 142so1066133ykq.4 for ; Wed, 03 Sep 2014 17:47:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=b5EqF+FvVP1o8GPWKeJCtob9bQoNIxFPdU3Uxq3OrHo=; b=PYOYvaW1NCGtHRTQxOC2Fi3NeJ59qpBv0F0aArFRX6GmUDwMM7Sesfh2cWhW3tJ9G5 qeCZ0MHsvZDMttP9NwRl6VdA/oSvPZ73L46U1LCQa/THwRMuqpUrn4eRccazuAX2Jkv2 gdv8TCLcTCMI6MbsmU+7xSEY9pF1+IbQd/iCDRLceErXJ66ji2vEfWVlIDKEKBrQdrz1 g/sd5RW24fZTcLBMMBwW5lS531ymaUSk+nENBSqZOaDxZg3rjA3ZOKS6TGOvCMmDSEHY x/47oEKnEdwrRVShcqfe2/jETE/rb7ELbnkP9ALSQaA8K3g01anFf3+wEjg/qxKcyR++ X4LA== X-Gm-Message-State: ALoCoQmDmUBRzsem0MqFY3Q9YCBLfbcaP438a292x5Qp75Et5fAPBUaHPsWjvef2WxbN6kzEPP2r X-Received: by 10.236.77.42 with SMTP id c30mr681035yhe.6.1409791670893; Wed, 03 Sep 2014 17:47:50 -0700 (PDT) Received: from corp2gmr1-1.hot.corp.google.com (corp2gmr1-1.hot.corp.google.com [172.24.189.92]) by gmr-mx.google.com with ESMTPS id h24si1567057yhb.6.2014.09.03.17.47.50 for (version=TLSv1.1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 03 Sep 2014 17:47:50 -0700 (PDT) Received: from vp2.mtv.corp.google.com (vp2.mtv.corp.google.com [172.22.64.204]) by corp2gmr1-1.hot.corp.google.com (Postfix) with ESMTP id B044C31C367; Wed, 3 Sep 2014 17:47:50 -0700 (PDT) Received: by vp2.mtv.corp.google.com (Postfix, from userid 125455) id 47ADF80B8F; Wed, 3 Sep 2014 17:47:50 -0700 (PDT) From: Vincent Palatin To: Hans de Goede , Pawel Osciak , Laurent Pinchart , linux-media@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Olof Johansson , Zach Kuznia , Mauro Carvalho Chehab , Vincent Palatin Subject: [PATCH v4 2/2] V4L: uvcvideo: Add support for pan/tilt speed controls Date: Wed, 3 Sep 2014 17:47:48 -0700 Message-Id: <1409791668-18715-1-git-send-email-vpalatin@chromium.org> X-Mailer: git-send-email 2.1.0.rc2.206.gedb03e5 In-Reply-To: References: Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Map V4L2_CID_TILT_SPEED and V4L2_CID_PAN_SPEED to the standard UVC CT_PANTILT_RELATIVE_CONTROL terminal control request. Tested by plugging a Logitech ConferenceCam C3000e USB camera and controlling pan/tilt from the userspace using the VIDIOC_S_CTRL ioctl. Verified that it can pan and tilt at the same time in both directions. Signed-off-by: Vincent Palatin --- Changes from v1/v2: - rebased Changes from v3: - removed gerrit-id drivers/media/usb/uvc/uvc_ctrl.c | 58 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 55 insertions(+), 3 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c index 0eb82106..d703cb0 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -309,9 +309,8 @@ static struct uvc_control_info uvc_ctrls[] = { .selector = UVC_CT_PANTILT_RELATIVE_CONTROL, .index = 12, .size = 4, - .flags = UVC_CTRL_FLAG_SET_CUR | UVC_CTRL_FLAG_GET_MIN - | UVC_CTRL_FLAG_GET_MAX | UVC_CTRL_FLAG_GET_RES - | UVC_CTRL_FLAG_GET_DEF + .flags = UVC_CTRL_FLAG_SET_CUR + | UVC_CTRL_FLAG_GET_RANGE | UVC_CTRL_FLAG_AUTO_UPDATE, }, { @@ -391,6 +390,35 @@ static void uvc_ctrl_set_zoom(struct uvc_control_mapping *mapping, data[2] = min((int)abs(value), 0xff); } +static __s32 uvc_ctrl_get_rel_speed(struct uvc_control_mapping *mapping, + __u8 query, const __u8 *data) +{ + int first = mapping->offset / 8; + __s8 rel = (__s8)data[first]; + + switch (query) { + case UVC_GET_CUR: + return (rel == 0) ? 0 : (rel > 0 ? data[first+1] + : -data[first+1]); + case UVC_GET_MIN: + return -data[first+1]; + case UVC_GET_MAX: + case UVC_GET_RES: + case UVC_GET_DEF: + default: + return data[first+1]; + } +} + +static void uvc_ctrl_set_rel_speed(struct uvc_control_mapping *mapping, + __s32 value, __u8 *data) +{ + int first = mapping->offset / 8; + + data[first] = value == 0 ? 0 : (value > 0) ? 1 : 0xff; + data[first+1] = min_t(int, abs(value), 0xff); +} + static struct uvc_control_mapping uvc_ctrl_mappings[] = { { .id = V4L2_CID_BRIGHTNESS, @@ -677,6 +705,30 @@ static struct uvc_control_mapping uvc_ctrl_mappings[] = { .data_type = UVC_CTRL_DATA_TYPE_SIGNED, }, { + .id = V4L2_CID_PAN_SPEED, + .name = "Pan (Speed)", + .entity = UVC_GUID_UVC_CAMERA, + .selector = UVC_CT_PANTILT_RELATIVE_CONTROL, + .size = 16, + .offset = 0, + .v4l2_type = V4L2_CTRL_TYPE_INTEGER, + .data_type = UVC_CTRL_DATA_TYPE_SIGNED, + .get = uvc_ctrl_get_rel_speed, + .set = uvc_ctrl_set_rel_speed, + }, + { + .id = V4L2_CID_TILT_SPEED, + .name = "Tilt (Speed)", + .entity = UVC_GUID_UVC_CAMERA, + .selector = UVC_CT_PANTILT_RELATIVE_CONTROL, + .size = 16, + .offset = 16, + .v4l2_type = V4L2_CTRL_TYPE_INTEGER, + .data_type = UVC_CTRL_DATA_TYPE_SIGNED, + .get = uvc_ctrl_get_rel_speed, + .set = uvc_ctrl_set_rel_speed, + }, + { .id = V4L2_CID_PRIVACY, .name = "Privacy", .entity = UVC_GUID_UVC_CAMERA,