From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756843AbbJ2KK5 (ORCPT ); Thu, 29 Oct 2015 06:10:57 -0400 Received: from mail-lf0-f65.google.com ([209.85.215.65]:34908 "EHLO mail-lf0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756108AbbJ2KKq (ORCPT ); Thu, 29 Oct 2015 06:10:46 -0400 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 6/6] Docbook: media: Document changes on struct v4l2_ext_controls Date: Thu, 29 Oct 2015 11:10:32 +0100 Message-Id: <1446113432-27390-7-git-send-email-ricardo.ribalda@gmail.com> X-Mailer: git-send-email 2.6.1 In-Reply-To: <1446113432-27390-1-git-send-email-ricardo.ribalda@gmail.com> References: <1446113432-27390-1-git-send-email-ricardo.ribalda@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 | 10 ++++++++++ .../DocBook/media/v4l/vidioc-g-ext-ctrls.xml | 22 ++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/Documentation/DocBook/media/v4l/v4l2.xml b/Documentation/DocBook/media/v4l/v4l2.xml index 7e61643358de..42e626d6c936 100644 --- a/Documentation/DocBook/media/v4l/v4l2.xml +++ b/Documentation/DocBook/media/v4l/v4l2.xml @@ -152,6 +152,16 @@ structs, ioctls) must be noted in more detail in the history chapter (compat.xml), along with the possible impact on existing drivers and applications. --> + 4.5 + 2015-10-29 + 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. + + + + 4.4 2015-05-26 ap diff --git a/Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml b/Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml index 47f9fee91442..eb82f7e7d06b 100644 --- a/Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml +++ b/Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml @@ -223,7 +223,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 @@ -235,6 +240,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 -- 2.6.1