Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755627AbaFQGMo (ORCPT ); Tue, 17 Jun 2014 02:12:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:8277 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752160AbaFQGMn (ORCPT ); Tue, 17 Jun 2014 02:12:43 -0400 Message-ID: <539FDC4F.4030000@redhat.com> Date: Tue, 17 Jun 2014 08:12:31 +0200 From: Hans de Goede User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.6.0 MIME-Version: 1.0 To: Vincent Palatin , Laurent Pinchart , linux-media@vger.kernel.org CC: linux-kernel@vger.kernel.org, Olof Johansson , Pawel Osciak , Zach Kuznia , Mauro Carvalho Chehab Subject: Re: [PATCH] V4L: uvcvideo: Add support for relative pan/tilt controls References: <1402965480-19560-1-git-send-email-vpalatin@chromium.org> In-Reply-To: <1402965480-19560-1-git-send-email-vpalatin@chromium.org> X-Enigmail-Version: 1.6 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, On 06/17/2014 02:38 AM, Vincent Palatin wrote: > Map V4L2_CID_TILT_RELATIVE and V4L2_CID_PAN_RELATIVE to the standard UVC > CT_PANTILT_ABSOLUTE_CONTROL terminal control request. s/ABSOLUTE/RELATIVE in the commit message here. Otherwise looks good to me. Regards, Hans > > 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 > > Change-Id: I7b70b228e5c0126683f5f0be34ffd2807f5783dc > --- > 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..af18120 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_RELATIVE, > + .name = "Pan (Relative)", > + .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_RELATIVE, > + .name = "Tilt (Relative)", > + .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, > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/