From patchwork Fri Feb 27 16:31:32 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sakari Ailus X-Patchwork-Id: 9204 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n1RGWI93022479 for ; Fri, 27 Feb 2009 16:32:18 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755208AbZB0QcS (ORCPT ); Fri, 27 Feb 2009 11:32:18 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755624AbZB0QcS (ORCPT ); Fri, 27 Feb 2009 11:32:18 -0500 Received: from smtp.nokia.com ([192.100.105.134]:61276 "EHLO mgw-mx09.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755208AbZB0QcS (ORCPT ); Fri, 27 Feb 2009 11:32:18 -0500 Received: from vaebh106.NOE.Nokia.com (vaebh106.europe.nokia.com [10.160.244.32]) by mgw-mx09.nokia.com (Switch-3.2.6/Switch-3.2.6) with ESMTP id n1RGVa89013213; Fri, 27 Feb 2009 10:32:00 -0600 Received: from esebh102.NOE.Nokia.com ([172.21.138.183]) by vaebh106.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 27 Feb 2009 18:31:35 +0200 Received: from mgw-int01.ntc.nokia.com ([172.21.143.96]) by esebh102.NOE.Nokia.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.3959); Fri, 27 Feb 2009 18:31:35 +0200 Received: from maxwell.research.nokia.com (maxwell.research.nokia.com [172.21.50.162]) by mgw-int01.ntc.nokia.com (Switch-3.2.5/Switch-3.2.5) with ESMTP id n1RGVXXh004080; Fri, 27 Feb 2009 18:31:33 +0200 Received: from kaali.localdomain (kaali.localdomain [192.168.239.7]) by maxwell.research.nokia.com (Postfix) with ESMTP id 60D267000D; Fri, 27 Feb 2009 18:31:33 +0200 (EET) Received: from sailus by kaali.localdomain with local (Exim 4.69) (envelope-from ) id 1Ld5cb-0003lU-AF; Fri, 27 Feb 2009 18:31:33 +0200 From: Sakari Ailus To: linux-media@vger.kernel.org Cc: video4linux-list@redhat.com, tuukka.o.toivonen@nokia.com, saaguirre@ti.com, antti.koskipaa@nokia.com, david.cohen@nokia.com, Sakari Ailus Subject: [PATCH 3/4] V4L: int device: add support for VIDIOC_QUERYMENU Date: Fri, 27 Feb 2009 18:31:32 +0200 Message-Id: <1235752293-14452-3-git-send-email-sakari.ailus@maxwell.research.nokia.com> X-Mailer: git-send-email 1.5.6.5 In-Reply-To: <1235752293-14452-2-git-send-email-sakari.ailus@maxwell.research.nokia.com> References: <49A81502.3090002@maxwell.research.nokia.com> <1235752293-14452-1-git-send-email-sakari.ailus@maxwell.research.nokia.com> <1235752293-14452-2-git-send-email-sakari.ailus@maxwell.research.nokia.com> X-OriginalArrivalTime: 27 Feb 2009 16:31:35.0082 (UTC) FILETIME=[DB0810A0:01C998F8] X-Nokia-AV: Clean Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org From: Sakari Ailus Signed-off-by: Tuukka Toivonen --- include/media/v4l2-int-device.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/media/v4l2-int-device.h b/include/media/v4l2-int-device.h index 5d254c4..81f4863 100644 --- a/include/media/v4l2-int-device.h +++ b/include/media/v4l2-int-device.h @@ -178,6 +178,7 @@ enum v4l2_int_ioctl_num { vidioc_int_s_fmt_cap_num, vidioc_int_try_fmt_cap_num, vidioc_int_queryctrl_num, + vidioc_int_querymenu_num, vidioc_int_g_ctrl_num, vidioc_int_s_ctrl_num, vidioc_int_cropcap_num, @@ -282,6 +283,7 @@ V4L2_INT_WRAPPER_1(g_fmt_cap, struct v4l2_format, *); V4L2_INT_WRAPPER_1(s_fmt_cap, struct v4l2_format, *); V4L2_INT_WRAPPER_1(try_fmt_cap, struct v4l2_format, *); V4L2_INT_WRAPPER_1(queryctrl, struct v4l2_queryctrl, *); +V4L2_INT_WRAPPER_1(querymenu, struct v4l2_querymenu, *); V4L2_INT_WRAPPER_1(g_ctrl, struct v4l2_control, *); V4L2_INT_WRAPPER_1(s_ctrl, struct v4l2_control, *); V4L2_INT_WRAPPER_1(cropcap, struct v4l2_cropcap, *);