From patchwork Fri Aug 21 13:19:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda Delgado X-Patchwork-Id: 7051801 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 03821C05AC for ; Fri, 21 Aug 2015 13:20:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 16AA920620 for ; Fri, 21 Aug 2015 13:20:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 221B9205D6 for ; Fri, 21 Aug 2015 13:20:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753788AbbHUNTw (ORCPT ); Fri, 21 Aug 2015 09:19:52 -0400 Received: from mail-lb0-f182.google.com ([209.85.217.182]:35091 "EHLO mail-lb0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753694AbbHUNTu (ORCPT ); Fri, 21 Aug 2015 09:19:50 -0400 Received: by lbcbn3 with SMTP id bn3so43326886lbc.2; Fri, 21 Aug 2015 06:19:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=11sL6hKBgCp1qJ61MBLWl1RU199gqUT1uJAoz1NmpHg=; b=ll46EqGjU5cUmCvceKuAYi5qVOj24rkU4jCnGy02QTn8L6cBytiIIEVh4qkbjO2LK/ DMTjXPLGCpx1wFkwbl82yM4X3CMGNBXmqELn8UTGlagyARcyW4Rjg7HwxvxUJt6xQu9X yWNMsKtEzYYHzQkoC2o4V+IpQNJUtovnbEYJ+DQKdWLQ/9yz6iIjMPA4mMeKczBXQpx4 SbxT1Llvv/fG8AXmyofY6egi2OXoUh8VrmXwEHEBJfntFBiQ/3y6X2GIvQ5e7MVhcyCe vPQi30DmbDHY/DoDQJSEvDl4G4E8Eu4yEX8ClGZvMx9bH2NiQjuA97c5NQSXSfhYDEL6 Cp8A== X-Received: by 10.152.87.52 with SMTP id u20mr7909222laz.48.1440163188110; Fri, 21 Aug 2015 06:19:48 -0700 (PDT) Received: from neopili.qtec.com (cpe.xe-3-0-1-778.vbrnqe10.dk.customer.tdc.net. [80.197.57.18]) by smtp.gmail.com with ESMTPSA id ph4sm2293746lbb.3.2015.08.21.06.19.46 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 21 Aug 2015 06:19:46 -0700 (PDT) From: Ricardo Ribalda Delgado To: Mauro Carvalho Chehab , Mike Isely , Laurent Pinchart , Hans Verkuil , Steven Toth , Sakari Ailus , Vincent Palatin , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ricardo Ribalda Delgado Subject: [PATCH v2 10/10] Docbook: media: Document changes on struct v4l2_ext_controls Date: Fri, 21 Aug 2015 15:19:29 +0200 Message-Id: <1440163169-18047-11-git-send-email-ricardo.ribalda@gmail.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1440163169-18047-1-git-send-email-ricardo.ribalda@gmail.com> References: <1440163169-18047-1-git-send-email-ricardo.ribalda@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable 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 Vidioc-g-ext-ctrls can now be used to get the default value of the controls. Signed-off-by: Ricardo Ribalda Delgado --- Documentation/DocBook/media/v4l/v4l2.xml | 9 +++++++++ .../DocBook/media/v4l/vidioc-g-ext-ctrls.xml | 22 ++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/Documentation/DocBook/media/v4l/v4l2.xml b/Documentation/DocBook/media/v4l/v4l2.xml index e98caa1c39bd..be52bd2fb335 100644 --- a/Documentation/DocBook/media/v4l/v4l2.xml +++ b/Documentation/DocBook/media/v4l/v4l2.xml @@ -153,6 +153,15 @@ structs, ioctls) must be noted in more detail in the history chapter applications. --> + 4.4 + 2015-08-20 + rr + Extend vidioc-g-ext-ctrls;. Replace ctrl_class with a new +union with ctrl_class and which. Which is used to select the current value of +the control or the default value. + + + 3.21 2015-02-13 mcc diff --git a/Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml b/Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml index 8f4eb395665d..3b7bf68a8250 100644 --- a/Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml +++ b/Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml @@ -216,7 +216,12 @@ Valid if V4L2_CTRL_FLAG_HAS_PAYLOAD is set for this control &cs-str; + + union + (anonymous) + + __u32 ctrl_class The control class to which all controls belong, see @@ -228,6 +233,23 @@ with a count of 0. If that succeeds, then the driver supports this feature. + + __u32 + which + Which value of the control to get/set/try. V4L2_CTRL_WHICH_CUR_VAL +will return the current value of the control and V4L2_CTRL_WHICH_DEF_VAL will +return the default value of the control. Please note that you can only get the default value of the +control, you cannot set or try it. +For backwards compatibility you can also use a control class here (see +). In that case all controls have to belong to that +control class. This usage is deprecated, instead just use V4L2_CTRL_WHICH_CUR_VAL. +There are some very old drivers that do not yet support V4L2_CTRL_WHICH_CUR_VAL +and that require a control class here. You can test for such drivers by setting ctrl_class to +V4L2_CTRL_WHICH_CUR_VAL and calling VIDIOC_TRY_EXT_CTRLS with a count of 0. +If that fails, then the driver does not support V4L2_CTRL_WHICH_CUR_VAL. + + + __u32 count The number of controls in the controls array. May