From patchwork Fri Apr 20 15:19:11 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonio Ospite X-Patchwork-Id: 10784 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1SLFce-00086D-TT for patchwork@linuxtv.org; Fri, 20 Apr 2012 17:19:44 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-4) with esmtp for id 1SLFce-0006hL-AW; Fri, 20 Apr 2012 17:19:44 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932591Ab2DTPTl (ORCPT ); Fri, 20 Apr 2012 11:19:41 -0400 Received: from smtp207.alice.it ([82.57.200.103]:44968 "EHLO smtp207.alice.it" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932512Ab2DTPTj (ORCPT ); Fri, 20 Apr 2012 11:19:39 -0400 Received: from jcn (82.61.46.157) by smtp207.alice.it (8.6.023.02) id 4F05A6650C4DA6A6; Fri, 20 Apr 2012 17:19:38 +0200 Received: from ao2 by jcn with local (Exim 4.77) (envelope-from ) id 1SLFcW-0004DR-05; Fri, 20 Apr 2012 17:19:36 +0200 From: Antonio Ospite To: linux-media@vger.kernel.org Cc: Antonio Ospite , Jean-Francois Moine , =?UTF-8?q?Erik=20Andr=C3=A9n?= Subject: [RFC PATCH 3/3] [media] gspca - main: implement vidioc_g_ext_ctrls and vidioc_s_ext_ctrls Date: Fri, 20 Apr 2012 17:19:11 +0200 Message-Id: <1334935152-16165-4-git-send-email-ospite@studenti.unina.it> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1334935152-16165-1-git-send-email-ospite@studenti.unina.it> References: <20120418153720.1359c7d2f2a3efc2c7c17b88@studenti.unina.it> <1334935152-16165-1-git-send-email-ospite@studenti.unina.it> X-Face: z*RaLf`X<@C75u6Ig9}{oW$H; 1_\2t5)({*|jhM/Vb; ]yA5\I~93>J<_`<4)A{':UrE Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2012.4.20.150616 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_2000_2999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_MEDIA_BODY 0, __CP_URI_IN_BODY 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' This makes it possible for applications to handle controls with a class different than V4L2_CTRL_CLASS_USER for gspca subdevices, like for instance V4L2_CID_EXPOSURE_AUTO which some subdrivers use and which can't be controlled right now. See http://thread.gmane.org/gmane.linux.drivers.video-input-infrastructure/47010 for an example of a problem fixed by this change. NOTE: gspca currently won't handle control types like V4L2_CTRL_TYPE_INTEGER64 or V4L2_CTRL_TYPE_STRING, so just the __s32 field 'value' of 'struct v4l2_ext_control' is handled for now. Signed-off-by: Antonio Ospite --- drivers/media/video/gspca/gspca.c | 42 +++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c index ba1bda9..7906093 100644 --- a/drivers/media/video/gspca/gspca.c +++ b/drivers/media/video/gspca/gspca.c @@ -1567,6 +1567,46 @@ static int vidioc_g_ctrl(struct file *file, void *priv, return gspca_get_ctrl(gspca_dev, ctrl->id, &ctrl->value); } +static int vidioc_s_ext_ctrls(struct file *file, void *priv, + struct v4l2_ext_controls *ext_ctrls) +{ + struct gspca_dev *gspca_dev = priv; + int ret = 0; + int i; + + for (i = 0; i < ext_ctrls->count; i++) { + struct v4l2_ext_control *ctrl; + + ctrl = ext_ctrls->controls + i; + ret = gspca_set_ctrl(gspca_dev, ctrl->id, ctrl->value); + if (ret < 0) { + ext_ctrls->error_idx = i; + return ret; + } + } + return ret; +} + +static int vidioc_g_ext_ctrls(struct file *file, void *priv, + struct v4l2_ext_controls *ext_ctrls) +{ + struct gspca_dev *gspca_dev = priv; + int i; + int ret = 0; + + for (i = 0; i < ext_ctrls->count; i++) { + struct v4l2_ext_control *ctrl; + + ctrl = ext_ctrls->controls + i; + ret = gspca_get_ctrl(gspca_dev, ctrl->id, &ctrl->value); + if (ret < 0) { + ext_ctrls->error_idx = i; + return ret; + } + } + return ret; +} + static int vidioc_querymenu(struct file *file, void *priv, struct v4l2_querymenu *qmenu) { @@ -2260,6 +2300,8 @@ static const struct v4l2_ioctl_ops dev_ioctl_ops = { .vidioc_queryctrl = vidioc_queryctrl, .vidioc_g_ctrl = vidioc_g_ctrl, .vidioc_s_ctrl = vidioc_s_ctrl, + .vidioc_g_ext_ctrls = vidioc_g_ext_ctrls, + .vidioc_s_ext_ctrls = vidioc_s_ext_ctrls, .vidioc_querymenu = vidioc_querymenu, .vidioc_enum_input = vidioc_enum_input, .vidioc_g_input = vidioc_g_input,