From patchwork Fri Jun 4 10:34:19 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: m7aalton X-Patchwork-Id: 3598 Return-path: Envelope-to: mchehab@infradead.org Delivery-date: Fri, 04 Jun 2010 10:34:44 +0000 Received: from bombadil.infradead.org [18.85.46.34] by pedra with IMAP (fetchmail-6.3.17) for (single-drop); Fri, 04 Jun 2010 11:14:36 -0300 (BRT) Received: from vger.kernel.org ([209.132.180.67]) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1OKUEe-0006c1-N7; Fri, 04 Jun 2010 10:34:44 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752357Ab0FDKem (ORCPT + 1 other); Fri, 4 Jun 2010 06:34:42 -0400 Received: from smtp.nokia.com ([192.100.122.233]:40065 "EHLO mgw-mx06.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751937Ab0FDKek (ORCPT ); Fri, 4 Jun 2010 06:34:40 -0400 Received: from vaebh106.NOE.Nokia.com (vaebh106.europe.nokia.com [10.160.244.32]) by mgw-mx06.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id o54AYQHM023157; Fri, 4 Jun 2010 13:34:37 +0300 Received: from esebh102.NOE.Nokia.com ([172.21.138.183]) by vaebh106.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.4675); Fri, 4 Jun 2010 13:34:25 +0300 Received: from mgw-sa01.ext.nokia.com ([147.243.1.47]) by esebh102.NOE.Nokia.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675); Fri, 4 Jun 2010 13:34:25 +0300 Received: from localhost.localdomain (masi.nmp.nokia.com [172.22.211.19]) by mgw-sa01.ext.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id o54AYO2e010713; Fri, 4 Jun 2010 13:34:24 +0300 From: "Matti J. Aaltonen" To: linux-media@vger.kernel.org, hverkuil@xs4all.nl, eduardo.valentin@nokia.com Cc: "Matti J. Aaltonen" Subject: [PATCH v4 1/5] V4L2: Add seek spacing and FM RX class. Date: Fri, 4 Jun 2010 13:34:19 +0300 Message-Id: <1275647663-20650-2-git-send-email-matti.j.aaltonen@nokia.com> X-Mailer: git-send-email 1.6.1.3 In-Reply-To: <1275647663-20650-1-git-send-email-matti.j.aaltonen@nokia.com> References: <1275647663-20650-1-git-send-email-matti.j.aaltonen@nokia.com> X-OriginalArrivalTime: 04 Jun 2010 10:34:25.0261 (UTC) FILETIME=[80B561D0:01CB03D1] X-Nokia-AV: Clean Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Add spacing field to v4l2_hw_freq_seek and also add FM RX class to control classes. Signed-off-by: Matti J. Aaltonen --- include/linux/videodev2.h | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h index 418dacf..95675cd 100644 --- a/include/linux/videodev2.h +++ b/include/linux/videodev2.h @@ -935,6 +935,7 @@ struct v4l2_ext_controls { #define V4L2_CTRL_CLASS_MPEG 0x00990000 /* MPEG-compression controls */ #define V4L2_CTRL_CLASS_CAMERA 0x009a0000 /* Camera class controls */ #define V4L2_CTRL_CLASS_FM_TX 0x009b0000 /* FM Modulator control class */ +#define V4L2_CTRL_CLASS_FM_RX 0x009c0000 /* FM Tuner control class */ #define V4L2_CTRL_ID_MASK (0x0fffffff) #define V4L2_CTRL_ID2CLASS(id) ((id) & 0x0fff0000UL) @@ -1313,6 +1314,17 @@ enum v4l2_preemphasis { #define V4L2_CID_TUNE_POWER_LEVEL (V4L2_CID_FM_TX_CLASS_BASE + 113) #define V4L2_CID_TUNE_ANTENNA_CAPACITOR (V4L2_CID_FM_TX_CLASS_BASE + 114) +/* FM Tuner class control IDs */ +#define V4L2_CID_FM_RX_CLASS_BASE (V4L2_CTRL_CLASS_FM_RX | 0x900) +#define V4L2_CID_FM_RX_CLASS (V4L2_CTRL_CLASS_FM_RX | 1) + +#define V4L2_CID_FM_RX_BAND (V4L2_CID_FM_TX_CLASS_BASE + 1) +enum v4l2_fm_rx_band { + V4L2_FM_BAND_OTHER = 0, + V4L2_FM_BAND_JAPAN = 1, + V4L2_FM_BAND_OIRT = 2 +}; + /* * T U N I N G */ @@ -1377,7 +1389,8 @@ struct v4l2_hw_freq_seek { enum v4l2_tuner_type type; __u32 seek_upward; __u32 wrap_around; - __u32 reserved[8]; + __u32 spacing; + __u32 reserved[7]; }; /*