From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751714AbcCACak (ORCPT ); Mon, 29 Feb 2016 21:30:40 -0500 Received: from sg-smtp01.263.net ([54.255.195.220]:34209 "EHLO sg-smtp01.263.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751028AbcCACaG (ORCPT ); Mon, 29 Feb 2016 21:30:06 -0500 X-RL-SENDER: jung.zhao@rock-chips.com X-FST-TO: tfiga@chromium.org X-SENDER-IP: 103.29.142.67 X-LOGIN-NAME: jung.zhao@rock-chips.com X-UNIQUE-TAG: <47fdc8d93e4c15c34f0d87a6f722f697> X-ATTACHMENT-NUM: 0 X-DNS-TYPE: 0 From: Jung Zhao To: tfiga@chromium.org, posciak@chromium.org, Mauro Carvalho Chehab , Hans Verkuil , Laurent Pinchart , Guennadi Liakhovetski , Philipp Zabel Cc: linux-rockchip@lists.infradead.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Pawel Osciak , eddie.cai@rock-chips.com, alpha.lin@rock-chips.com, jeffy.chen@rock-chips.com, herman.chen@rock-chips.com Subject: [PATCH v3 1/3] [NOT FOR REVIEW] v4l: Add private compound control type. Date: Tue, 1 Mar 2016 10:23:23 +0800 Message-Id: <1456799003-8565-1-git-send-email-jung.zhao@rock-chips.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1456798977-8514-1-git-send-email-jung.zhao@rock-chips.com> References: <1456798977-8514-1-git-send-email-jung.zhao@rock-chips.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Pawel Osciak V4L2_CTRL_TYPE_PRIVATE is to be used for private driver compound controls that use the "ptr" member of struct v4l2_ext_control. Signed-off-by: Pawel Osciak Signed-off-by: Jung Zhao --- Changes in v3: None Changes in v2: - add [NOT FOR REVIEW] tag for patches from Chromium OS Tree suggested by Tomasz - update copyright message - list all the related signed-off names - add more description suggested by Enric - fix format error of commit message suggested by Tomasz drivers/media/v4l2-core/v4l2-ctrls.c | 4 ++++ include/uapi/linux/videodev2.h | 2 ++ 2 files changed, 6 insertions(+) diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c index 890520d..527d65c 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls.c +++ b/drivers/media/v4l2-core/v4l2-ctrls.c @@ -1525,6 +1525,10 @@ static int std_validate(const struct v4l2_ctrl *ctrl, u32 idx, return -ERANGE; return 0; + /* FIXME:just return 0 for now */ + case V4L2_CTRL_TYPE_PRIVATE: + return 0; + default: return -EINVAL; } diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h index 29a6b78..53ac896 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h @@ -1517,6 +1517,8 @@ enum v4l2_ctrl_type { V4L2_CTRL_TYPE_U8 = 0x0100, V4L2_CTRL_TYPE_U16 = 0x0101, V4L2_CTRL_TYPE_U32 = 0x0102, + + V4L2_CTRL_TYPE_PRIVATE = 0xffff, }; /* Used in the VIDIOC_QUERYCTRL ioctl for querying controls */ -- 1.9.1