From patchwork Thu Oct 29 10:10:27 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: 7518051 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 9C00C9F37F for ; Thu, 29 Oct 2015 10:12:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 32F5A209E1 for ; Thu, 29 Oct 2015 10:12:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 095342068D for ; Thu, 29 Oct 2015 10:12:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756916AbbJ2KMY (ORCPT ); Thu, 29 Oct 2015 06:12:24 -0400 Received: from mail-lf0-f54.google.com ([209.85.215.54]:36385 "EHLO mail-lf0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751845AbbJ2KKj (ORCPT ); Thu, 29 Oct 2015 06:10:39 -0400 Received: by lffz202 with SMTP id z202so16185175lff.3; Thu, 29 Oct 2015 03:10:37 -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=SPgQAmRSwLO2YfB6TQDxAJD0aYe1FQp8YYxKow27/44=; b=ecUZdRnZOjm01mmz1dk9gMOQZq46+IiQVedoLZoW1hNxn+Ja6kKMb/upk0riWThKkR VuLnUAltYAu8lWbPq3yoX4/WXBEzxZShDefeVub0QHhlQnB19RfNf8rpR357jVwSazBr ohc8Z5RtWNq+Gd3qb2+A8V5F/xypIte8OPmS6WPocfWBCt3SVlHUv81ljd7J+b794fhq 2V9OOrUXdQVcIuMZjtmckUxWNf+5qI3vJceFQNSAaeUnHb/m8B4aZYkV+1fk0zkA3YZu /QfpTTpktcK2I3eT3MoEUtsdrqNID6sPhBdFAsYbTOPJ6NEMcQakQBS0Eugpvqphndhh +/7g== X-Received: by 10.25.134.198 with SMTP id i189mr334004lfd.22.1446113437481; Thu, 29 Oct 2015 03:10:37 -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 r77sm164022lfr.30.2015.10.29.03.10.35 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 29 Oct 2015 03:10:36 -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 1/6] videodev2.h: Extend struct v4l2_ext_controls Date: Thu, 29 Oct 2015 11:10:27 +0100 Message-Id: <1446113432-27390-2-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-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-6.8 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 So it can be used to get the default value of a control. Without this change it is not possible to get get the default value of array controls. Signed-off-by: Ricardo Ribalda Delgado --- include/uapi/linux/videodev2.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h index a0e87d16b726..4d88ee2d268e 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h @@ -1476,7 +1476,10 @@ struct v4l2_ext_control { } __attribute__ ((packed)); struct v4l2_ext_controls { - __u32 ctrl_class; + union { + __u32 ctrl_class; + __u32 which; + }; __u32 count; __u32 error_idx; __u32 reserved[2]; @@ -1487,6 +1490,8 @@ struct v4l2_ext_controls { #define V4L2_CTRL_ID2CLASS(id) ((id) & 0x0fff0000UL) #define V4L2_CTRL_DRIVER_PRIV(id) (((id) & 0xffff) >= 0x1000) #define V4L2_CTRL_MAX_DIMS (4) +#define V4L2_CTRL_WHICH_CUR_VAL 0 +#define V4L2_CTRL_WHICH_DEF_VAL 0x0f000000 enum v4l2_ctrl_type { V4L2_CTRL_TYPE_INTEGER = 1,