From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mailout3.samsung.com ([203.254.224.33]:28064 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754651Ab1BYGVj (ORCPT ); Fri, 25 Feb 2011 01:21:39 -0500 Received: from epmmp1 (mailout3.samsung.com [203.254.224.33]) by mailout3.samsung.com (Oracle Communications Messaging Exchange Server 7u4-19.01 64bit (built Sep 7 2010)) with ESMTP id <0LH500FWCTO1K760@mailout3.samsung.com> for linux-media@vger.kernel.org; Fri, 25 Feb 2011 15:21:38 +0900 (KST) Received: from TNRNDGASPAPP1.tn.corp.samsungelectronics.net ([165.213.149.150]) by mmp1.samsung.com (iPlanet Messaging Server 5.2 Patch 2 (built Jul 14 2004)) with ESMTPA id <0LH500K5CTO1Q3@mmp1.samsung.com> for linux-media@vger.kernel.org; Fri, 25 Feb 2011 15:21:37 +0900 (KST) Date: Fri, 25 Feb 2011 15:21:38 +0900 From: "Kim, HeungJun" Subject: [RFC PATCH v2 3/3] v4l2-crls: document the changes about auto focus mode To: "linux-media@vger.kernel.org" Cc: Hans Verkuil , Laurent Pinchart , Sylwester Nawrocki , "kyungmin.park@samsung.com" Reply-to: riverful.kim@samsung.com Message-id: <4D674A72.8030409@samsung.com> MIME-version: 1.0 Content-type: text/plain; charset=UTF-8 Content-transfer-encoding: 7BIT List-ID: Sender: Document about the type changes and the enumeration of the auto focus control. Signed-off-by: Heungjun Kim Signed-off-by: Kyungmin Park --- Documentation/DocBook/v4l/controls.xml | 31 +++++++++++++++++++++++++--- Documentation/DocBook/v4l/videodev2.h.xml | 6 +++++ 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/Documentation/DocBook/v4l/controls.xml b/Documentation/DocBook/v4l/controls.xml index 2fae3e8..889fa84 100644 --- a/Documentation/DocBook/v4l/controls.xml +++ b/Documentation/DocBook/v4l/controls.xml @@ -1801,12 +1801,35 @@ negative values towards infinity. This is a write-only control. - + V4L2_CID_FOCUS_AUTO  - boolean + enum v4l2_focus_auto_type Enables automatic focus -adjustments. The effect of manual focus adjustments while this feature -is enabled is undefined, drivers should ignore such requests. +adjustments of the normal or macro or continuous(CAF) mode. The effect of +manual focus adjustments while this feature is enabled is undefined, +drivers should ignore such requests. Possible values are: + + + + + + V4L2_FOCUS_MANUAL  + Manual focus mode. + + + V4L2_FOCUS_AUTO  + Auto focus mode with normal operation. + + + V4L2_FOCUS_MACRO  + Auto focus mode with macro operation. + + + V4L2_FOCUS_CONTINUOUS  + Auto focus mode with continuous(CAF) operation. + + + diff --git a/Documentation/DocBook/v4l/videodev2.h.xml b/Documentation/DocBook/v4l/videodev2.h.xml index 325b23b..ccf6c2b 100644 --- a/Documentation/DocBook/v4l/videodev2.h.xml +++ b/Documentation/DocBook/v4l/videodev2.h.xml @@ -1291,6 +1291,12 @@ enum v4l2_exposure_auto_type { #define V4L2_CID_FOCUS_ABSOLUTE (V4L2_CID_CAMERA_CLASS_BASE+10) #define V4L2_CID_FOCUS_RELATIVE (V4L2_CID_CAMERA_CLASS_BASE+11) #define V4L2_CID_FOCUS_AUTO (V4L2_CID_CAMERA_CLASS_BASE+12) +enum v4l2_exposure_auto_type { + V4L2_FOCUS_MANUAL = 0, + V4L2_FOCUS_AUTO = 1, + V4L2_FOCUS_MACRO = 2, + V4L2_FOCUS_CONTINUOUS = 3 +}; #define V4L2_CID_ZOOM_ABSOLUTE (V4L2_CID_CAMERA_CLASS_BASE+13) #define V4L2_CID_ZOOM_RELATIVE (V4L2_CID_CAMERA_CLASS_BASE+14) -- 1.7.0.4