From patchwork Sun Feb 9 06:05:52 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antti Palosaari X-Patchwork-Id: 3611711 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.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C3C8C9F38E for ; Sun, 9 Feb 2014 06:07:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CDB7D201B6 for ; Sun, 9 Feb 2014 06:06:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DB53E2018B for ; Sun, 9 Feb 2014 06:06:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751614AbaBIGGp (ORCPT ); Sun, 9 Feb 2014 01:06:45 -0500 Received: from mail.kapsi.fi ([217.30.184.167]:33298 "EHLO mail.kapsi.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751633AbaBIGGZ (ORCPT ); Sun, 9 Feb 2014 01:06:25 -0500 Received: from [82.128.187.60] (helo=localhost.localdomain) by mail.kapsi.fi with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1WCNX3-00036H-0A; Sun, 09 Feb 2014 08:06:21 +0200 From: Antti Palosaari To: linux-media@vger.kernel.org Cc: Mauro Carvalho Chehab , Hans Verkuil , Antti Palosaari Subject: [PATCH 3/5] v4l2-ctl: add tuner support for SDR tuners Date: Sun, 9 Feb 2014 08:05:52 +0200 Message-Id: <1391925954-25975-4-git-send-email-crope@iki.fi> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1391925954-25975-1-git-send-email-crope@iki.fi> References: <1391925954-25975-1-git-send-email-crope@iki.fi> X-SA-Exim-Connect-IP: 82.128.187.60 X-SA-Exim-Mail-From: crope@iki.fi X-SA-Exim-Scanned: No (on mail.kapsi.fi); SAEximRunCond expanded to false Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 Add initial SDR support for tuner related operations. Cc: Hans Verkuil Signed-off-by: Antti Palosaari Acked-by: Hans Verkuil --- utils/v4l2-ctl/v4l2-ctl-tuner.cpp | 53 +++++++++++++++++++++++++++++++-------- 1 file changed, 43 insertions(+), 10 deletions(-) diff --git a/utils/v4l2-ctl/v4l2-ctl-tuner.cpp b/utils/v4l2-ctl/v4l2-ctl-tuner.cpp index 16e1652..0fc2371 100644 --- a/utils/v4l2-ctl/v4l2-ctl-tuner.cpp +++ b/utils/v4l2-ctl/v4l2-ctl-tuner.cpp @@ -116,6 +116,8 @@ static std::string tcap2s(unsigned cap) if (cap & V4L2_TUNER_CAP_LOW) s += "62.5 Hz "; + else if (cap & V4L2_TUNER_CAP_1HZ) + s += "1 Hz "; else s += "62.5 kHz "; if (cap & V4L2_TUNER_CAP_NORM) @@ -264,12 +266,24 @@ void tuner_set(int fd) if (capabilities & V4L2_CAP_MODULATOR) { type = V4L2_TUNER_RADIO; modulator.index = tuner_index; - if (doioctl(fd, VIDIOC_G_MODULATOR, &modulator) == 0) - fac = (modulator.capability & V4L2_TUNER_CAP_LOW) ? 16000 : 16; + if (doioctl(fd, VIDIOC_G_MODULATOR, &modulator) == 0) { + if (modulator.capability & V4L2_TUNER_CAP_LOW) + fac = 16000; + else if (modulator.capability & V4L2_TUNER_CAP_1HZ) + fac = 1000000; + else + fac = 16; + } } else if (capabilities & V4L2_CAP_TUNER) { tuner.index = tuner_index; if (doioctl(fd, VIDIOC_G_TUNER, &tuner) == 0) { - fac = (tuner.capability & V4L2_TUNER_CAP_LOW) ? 16000 : 16; + if (tuner.capability & V4L2_TUNER_CAP_LOW) + fac = 16000; + else if (tuner.capability & V4L2_TUNER_CAP_1HZ) + fac = 1000000; + else + fac = 16; + type = tuner.type; } } @@ -310,6 +324,9 @@ void tuner_set(int fd) if (band.capability & V4L2_TUNER_CAP_LOW) printf("\tFrequency Range: %.3f MHz - %.3f MHz\n", band.rangelow / 16000.0, band.rangehigh / 16000.0); + else if (band.capability & V4L2_TUNER_CAP_1HZ) + printf("\tFrequency Range: %.6f MHz - %.6f MHz\n", + band.rangelow / 1000000.0, band.rangehigh / 1000000.0); else printf("\tFrequency Range: %.3f MHz - %.3f MHz\n", band.rangelow / 16.0, band.rangehigh / 16.0); @@ -345,13 +362,24 @@ void tuner_get(int fd) if (capabilities & V4L2_CAP_MODULATOR) { vf.type = V4L2_TUNER_RADIO; modulator.index = tuner_index; - if (doioctl(fd, VIDIOC_G_MODULATOR, &modulator) == 0) - fac = (modulator.capability & V4L2_TUNER_CAP_LOW) ? 16000 : 16; + if (doioctl(fd, VIDIOC_G_MODULATOR, &modulator) == 0) { + if (modulator.capability & V4L2_TUNER_CAP_LOW) + fac = 16000; + else if (modulator.capability & V4L2_TUNER_CAP_1HZ) + fac = 1000000; + else + fac = 16; + } } else { vf.type = V4L2_TUNER_ANALOG_TV; tuner.index = tuner_index; if (doioctl(fd, VIDIOC_G_TUNER, &tuner) == 0) { - fac = (tuner.capability & V4L2_TUNER_CAP_LOW) ? 16000 : 16; + if (tuner.capability & V4L2_TUNER_CAP_LOW) + fac = 16000; + else if (tuner.capability & V4L2_TUNER_CAP_1HZ) + fac = 1000000; + else + fac = 16; vf.type = tuner.type; } } @@ -373,13 +401,18 @@ void tuner_get(int fd) if (vt.capability & V4L2_TUNER_CAP_LOW) printf("\tFrequency range : %.3f MHz - %.3f MHz\n", vt.rangelow / 16000.0, vt.rangehigh / 16000.0); + else if (vt.capability & V4L2_TUNER_CAP_1HZ) + printf("\tFrequency range : %.6f MHz - %.6f MHz\n", + vt.rangelow / 1000000.0, vt.rangehigh / 1000000.0); else printf("\tFrequency range : %.3f MHz - %.3f MHz\n", vt.rangelow / 16.0, vt.rangehigh / 16.0); - printf("\tSignal strength/AFC : %d%%/%d\n", (int)((vt.signal / 655.35)+0.5), vt.afc); - printf("\tCurrent audio mode : %s\n", audmode2s(vt.audmode)); - printf("\tAvailable subchannels: %s\n", - rxsubchans2s(vt.rxsubchans).c_str()); + + if (vt.type != V4L2_TUNER_ADC && vt.type != V4L2_TUNER_RF) { + printf("\tSignal strength/AFC : %d%%/%d\n", (int)((vt.signal / 655.35)+0.5), vt.afc); + printf("\tCurrent audio mode : %s\n", audmode2s(vt.audmode)); + printf("\tAvailable subchannels: %s\n", rxsubchans2s(vt.rxsubchans).c_str()); + } } }