From patchwork Fri Aug 30 02:17:10 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pawel Osciak X-Patchwork-Id: 19978 X-Patchwork-Delegate: laurent.pinchart@ideasonboard.com Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1VFEHe-0006bU-V1; Fri, 30 Aug 2013 04:17:58 +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.72/mailfrontend-6) with esmtp id 1VFEHc-0007f4-6R; Fri, 30 Aug 2013 04:17:58 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755165Ab3H3CRs (ORCPT + 1 other); Thu, 29 Aug 2013 22:17:48 -0400 Received: from mail-pa0-f49.google.com ([209.85.220.49]:33993 "EHLO mail-pa0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754297Ab3H3CRq (ORCPT ); Thu, 29 Aug 2013 22:17:46 -0400 Received: by mail-pa0-f49.google.com with SMTP id ld10so1693845pab.22 for ; Thu, 29 Aug 2013 19:17:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=AA1b5CjSRG646ddz2ONlY9T2RVrOqkhRenFNBKPjJuo=; b=oKCo5fSNtyX2VoHnvXECxef7eYGgvlbhX48LtQIEW8Qfk0DexSZpDFhCTHEw9zLIfk tPiWCEZWkVTQKGBDjU/AfJiyKUwglo96FJJoVdQbC9OXRzCDdo3ef9TOVnvAbpaVw5ST usKPxvRyi27c0u0eMTtAdzX7SBrinO1pJxTjo= 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=AA1b5CjSRG646ddz2ONlY9T2RVrOqkhRenFNBKPjJuo=; b=F9jWZC8Fnow42UmP9BJrMnWf8u8uEHDXGlmzvqZDwaZvUiOLrcQZx3jdP6Br+c0jTL f0THM+kTTTqPBytnIAcIIAG+zY/RjX8ZPaCHq5YpKfRfo76H0FtmRA5rKV/LY4oiYIG+ cqLPwzAqjf2ifRm9VLJBNn0p9s3XFZlpnnxnk8ORooXC8pjlXVfTrLpFav5E7jfqZd/j Vo5hg9pHrXxBqEUaDtj+vIU+Salo8tvWO3oxyVoiErCleP3V1ERdF1qnAU0/ebzPDeFR FniOPyVJBnn5T7X0/cFPgY3vSdAp3br/8ubVfb/BJIwtPr2YgKiOXJM05HpA5tdQyqaT YRcA== X-Gm-Message-State: ALoCoQmJsu647ZMTWxSt5tKRRv0NzD5xiPKsU8aOGr8EYX0O4Iin+YZCIeSNZOvAJKr76VlsBxae X-Received: by 10.68.106.132 with SMTP id gu4mr7052177pbb.71.1377829066414; Thu, 29 Aug 2013 19:17:46 -0700 (PDT) Received: from kawagoe.tok.corp.google.com (kawagoe.tok.corp.google.com [172.30.88.114]) by mx.google.com with ESMTPSA id ye1sm27935254pab.19.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 29 Aug 2013 19:17:45 -0700 (PDT) From: Pawel Osciak To: linux-media@vger.kernel.org Cc: laurent.pinchart@ideasonboard.com, Pawel Osciak Subject: [PATCH v1 11/19] uvcvideo: Support V4L2_CTRL_TYPE_BITMASK controls. Date: Fri, 30 Aug 2013 11:17:10 +0900 Message-Id: <1377829038-4726-12-git-send-email-posciak@chromium.org> X-Mailer: git-send-email 1.8.4 In-Reply-To: <1377829038-4726-1-git-send-email-posciak@chromium.org> References: <1377829038-4726-1-git-send-email-posciak@chromium.org> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2013.8.30.20624 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_1100_1199 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DKIM_SIGNATURE 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 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 , __YOUTUBE_RCVD 0' Signed-off-by: Pawel Osciak --- drivers/media/usb/uvc/uvc_ctrl.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c index b0a19b9..a0493d6 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -1550,6 +1550,24 @@ int uvc_ctrl_set(struct uvc_video_chain *chain, struct v4l2_ext_control *xctrl, break; + case V4L2_CTRL_TYPE_BITMASK: + value = xctrl->value; + + /* If GET_RES is supported, it will return a bitmask of bits + * that can be set. If it isn't, allow any value. + */ + if (ctrl->info.flags & UVC_CTRL_FLAG_GET_RES) { + if (!ctrl->cached) { + ret = uvc_ctrl_populate_cache(chain, ctrl); + if (ret < 0) + return ret; + } + step = mapping->get(mapping, UVC_GET_RES, + uvc_ctrl_data(ctrl, UVC_CTRL_DATA_RES)); + if (value & ~step) + return -ERANGE; + } + default: value = xctrl->value; break;