From patchwork Tue Aug 7 02:46:56 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Devin Heitmueller X-Patchwork-Id: 13655 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1SyZqc-00075N-EZ for patchwork@linuxtv.org; Tue, 07 Aug 2012 04:48:42 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-3) with esmtp for id 1SyZqb-0000Ym-Fx; Tue, 07 Aug 2012 04:48:42 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932588Ab2HGCsj (ORCPT ); Mon, 6 Aug 2012 22:48:39 -0400 Received: from mail-vc0-f174.google.com ([209.85.220.174]:32810 "EHLO mail-vc0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932486Ab2HGCrw (ORCPT ); Mon, 6 Aug 2012 22:47:52 -0400 Received: by mail-vc0-f174.google.com with SMTP id fk26so3432645vcb.19 for ; Mon, 06 Aug 2012 19:47:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=VaVeJhifnVlFdAxmMLSpylRDnrrxqUBt8OLnoycS810=; b=BylwrL85z3Zr1XaqOw2DiEojTNVDs79HhjNQ66FWB6X15Wf3RuF875uW3YVSrTpmVK xwA27UCT5Uix6BTg4mmLpxyC78/AZ7mpewgv/FqHL8rwNB/eOa3v/I7786YgGjXD8epX zwK5RL3WURAwkW3/iSHCzBHyCf7wySZo2juuVKBHHzjb46fKsgl+OewjC/5EZ8Qcanqa Dml7k6hCdbPo3BMklDNfdb9b/rwQvCoJETyWlN5Bdn1kNfAP/metnDbq8AYhC5zbm6ri BTJGtBz5xIecpBZNgYBtN9KztEJsm3+7XZP3VHMJ8am4l5YeqNn3PPgyL2/m7capi3Wt Mg6g== Received: by 10.220.240.5 with SMTP id ky5mr9645868vcb.57.1344307671766; Mon, 06 Aug 2012 19:47:51 -0700 (PDT) Received: from localhost.localdomain (pool-108-54-72-165.nycmny.fios.verizon.net. [108.54.72.165]) by mx.google.com with ESMTPS id e9sm17555638vdf.21.2012.08.06.19.47.50 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 06 Aug 2012 19:47:51 -0700 (PDT) From: Devin Heitmueller To: linux-media@vger.kernel.org Cc: Devin Heitmueller Subject: [PATCH 06/24] xc5000: add support for showing the SNR and gain in the debug output Date: Mon, 6 Aug 2012 22:46:56 -0400 Message-Id: <1344307634-11673-7-git-send-email-dheitmueller@kernellabs.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1344307634-11673-1-git-send-email-dheitmueller@kernellabs.com> References: <1344307634-11673-1-git-send-email-dheitmueller@kernellabs.com> X-Gm-Message-State: ALoCoQmIoC0cFCZS2ltXM2B8yVrApC5eVsFwbcdq23R513H00rfz7LZBFTBTTq8RPsLAU7bMv2fo Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2012.8.7.23319 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_2000_2999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DATE_TZ_NA 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __SANE_MSGID 0, __STOCK_PHRASE_7 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' When debugging is enabled, also show the analog SNR and the total gain status values. Signed-off-by: Devin Heitmueller --- drivers/media/common/tuners/xc5000.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/drivers/media/common/tuners/xc5000.c b/drivers/media/common/tuners/xc5000.c index c41f2b9..f660e33 100644 --- a/drivers/media/common/tuners/xc5000.c +++ b/drivers/media/common/tuners/xc5000.c @@ -111,6 +111,7 @@ struct xc5000_priv { #define XREG_PRODUCT_ID 0x08 #define XREG_BUSY 0x09 #define XREG_BUILD 0x0D +#define XREG_TOTALGAIN 0x0F /* Basic firmware description. This will remain with @@ -539,6 +540,16 @@ static int xc_get_quality(struct xc5000_priv *priv, u16 *quality) return xc5000_readreg(priv, XREG_QUALITY, quality); } +static int xc_get_analogsnr(struct xc5000_priv *priv, u16 *snr) +{ + return xc5000_readreg(priv, XREG_SNR, snr); +} + +static int xc_get_totalgain(struct xc5000_priv *priv, u16 *totalgain) +{ + return xc5000_readreg(priv, XREG_TOTALGAIN, totalgain); +} + static u16 WaitForLock(struct xc5000_priv *priv) { u16 lockState = 0; @@ -650,6 +661,8 @@ static void xc_debug_dump(struct xc5000_priv *priv) u32 hsync_freq_hz = 0; u16 frame_lines; u16 quality; + u16 snr; + u16 totalgain; u8 hw_majorversion = 0, hw_minorversion = 0; u8 fw_majorversion = 0, fw_minorversion = 0; u16 fw_buildversion = 0; @@ -685,6 +698,13 @@ static void xc_debug_dump(struct xc5000_priv *priv) xc_get_quality(priv, &quality); dprintk(1, "*** Quality (0:<8dB, 7:>56dB) = %d\n", quality & 0x07); + + xc_get_analogsnr(priv, &snr); + dprintk(1, "*** Unweighted analog SNR = %d dB\n", snr & 0x3f); + + xc_get_totalgain(priv, &totalgain); + dprintk(1, "*** Total gain = %d.%d dB\n", totalgain / 256, + (totalgain % 256) * 100 / 256); } static int xc5000_set_params(struct dvb_frontend *fe)