From patchwork Fri Feb 25 12:46:03 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kim, HeungJun" X-Patchwork-Id: 589971 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p1PCkAmr016046 for ; Fri, 25 Feb 2011 12:46:10 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932280Ab1BYMqG (ORCPT ); Fri, 25 Feb 2011 07:46:06 -0500 Received: from mailout2.samsung.com ([203.254.224.25]:60754 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932166Ab1BYMqF (ORCPT ); Fri, 25 Feb 2011 07:46:05 -0500 Received: from epmmp1 (mailout2.samsung.com [203.254.224.25]) by mailout2.samsung.com (Oracle Communications Messaging Exchange Server 7u4-19.01 64bit (built Sep 7 2010)) with ESMTP id <0LH6005EZBGRWB20@mailout2.samsung.com> for linux-media@vger.kernel.org; Fri, 25 Feb 2011 21:46:04 +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 <0LH600EGOBGRJR@mmp1.samsung.com> for linux-media@vger.kernel.org; Fri, 25 Feb 2011 21:46:03 +0900 (KST) Received: from [165.213.219.118] ([165.213.219.118]) by TNRNDGASPAPP1.tn.corp.samsungelectronics.net with Microsoft SMTPSVC(6.0.3790.4675); Fri, 25 Feb 2011 21:46:03 +0900 Date: Fri, 25 Feb 2011 21:46:03 +0900 From: "Kim, HeungJun" Subject: [RFC PATCH RESEND v2 3/3] v4l2-ctrls: 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: <4D67A48B.6030700@samsung.com> MIME-version: 1.0 Content-type: text/plain; charset=UTF-8 Content-transfer-encoding: 7BIT User-Agent: Mozilla/5.0 (Windows; U; Windows NT 6.1; ko; rv:1.9.2.13) Gecko/20101207 Thunderbird/3.1.7 X-OriginalArrivalTime: 25 Feb 2011 12:46:03.0859 (UTC) FILETIME=[F6854A30:01CBD4E9] Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 25 Feb 2011 12:46:10 +0000 (UTC) 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)