From patchwork Sun Oct 26 12:10:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akihiro TSUKADA X-Patchwork-Id: 26579 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1XiMen-0002JI-AX; Sun, 26 Oct 2014 13:10:49 +0100 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.72/mailfrontend-5) with esmtp id 1XiMel-0001rY-7p; Sun, 26 Oct 2014 13:10:49 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751513AbaJZMKe (ORCPT + 1 other); Sun, 26 Oct 2014 08:10:34 -0400 Received: from mail-pd0-f173.google.com ([209.85.192.173]:39360 "EHLO mail-pd0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751397AbaJZMKe (ORCPT ); Sun, 26 Oct 2014 08:10:34 -0400 Received: by mail-pd0-f173.google.com with SMTP id v10so3988740pde.4 for ; Sun, 26 Oct 2014 05:10:33 -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; bh=oUyKnoRmjeAJNBmnC+sMiTDBswPFBLFg6ItUS+zDgmM=; b=vVEpbUAFzoy+BObUf4+fuYJoBe5s65sFP7MylN/FHPSi4GXDJa5XM0CLQ2kYuCizv+ ZXfB8JZnixSIzlocanbSZO9w0ry5Knjzo9KSvs/Bk5HWKz5dSENsoNb5WGP0CZYdoIh0 S3s1UCezse0jAKuDpGU6OItG4ZwV+xjAGfxt83bcs57axdv7WQ6bea2zeDVOvrTiiHC4 jV6/SH4hzz30BBDJEh4l9plh3D90YzSDbNEz8V3pQyCx6PwL6TyLZkUHcQzc4Kv//G5p 8tAi/W2U7ciS4vpPK8moRPzZ+ERkq/fbrkuRifrDsSGGtPKuM8bsxdb64NoQuQErd6Rn 3bBQ== X-Received: by 10.70.45.40 with SMTP id j8mr2937205pdm.130.1414325433765; Sun, 26 Oct 2014 05:10:33 -0700 (PDT) Received: from seabird.localdomain.localdomain (softbank219203027033.bbtec.net. [219.203.27.33]) by mx.google.com with ESMTPSA id dp4sm8244272pbc.21.2014.10.26.05.10.31 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 26 Oct 2014 05:10:32 -0700 (PDT) From: tskd08@gmail.com To: linux-media@vger.kernel.org Cc: m.chehab@samsung.com, Akihiro Tsukada Subject: [PATCH] dvb:tc90522: fix stats report Date: Sun, 26 Oct 2014 21:10:24 +0900 Message-Id: <1414325424-16706-1-git-send-email-tskd08@gmail.com> X-Mailer: git-send-email 2.1.2 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2014.10.26.120334 X-PMX-Spam: Gauge=IIIIIIIII, Probability=9%, Report=' FORGED_FROM_GMAIL 0.1, MULTIPLE_RCPTS 0.1, 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, DKIM_SIGNATURE 0, NO_REAL_NAME 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __FRAUD_BODY_WEBMAIL 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __FROM_GMAIL 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __PHISH_SPEAR_STRUCTURE_1 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __SUBJ_ALPHA_NEGATE 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' From: Akihiro Tsukada * report per-transponder symbolrate instead of per-TS one (moved to dvb-core) * add output TS-ID report, which might be useful if an user did not specify stream id or set a wrong one, and the demod chose the first TS_ID found. Signed-off-by: is also missing here. --- drivers/media/dvb-frontends/tc90522.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/drivers/media/dvb-frontends/tc90522.c b/drivers/media/dvb-frontends/tc90522.c index bca81ef..b35d65c 100644 --- a/drivers/media/dvb-frontends/tc90522.c +++ b/drivers/media/dvb-frontends/tc90522.c @@ -216,32 +216,30 @@ static int tc90522s_get_frontend(struct dvb_frontend *fe) c->delivery_system = SYS_ISDBS; layers = 0; - ret = reg_read(state, 0xe8, val, 3); + ret = reg_read(state, 0xe6, val, 5); if (ret == 0) { - int slots; u8 v; + c->stream_id = val[0] << 8 | val[1]; + /* high/single layer */ - v = (val[0] & 0x70) >> 4; + v = (val[2] & 0x70) >> 4; c->modulation = (v == 7) ? PSK_8 : QPSK; c->fec_inner = fec_conv_sat[v]; c->layer[0].fec = c->fec_inner; c->layer[0].modulation = c->modulation; - c->layer[0].segment_count = val[1] & 0x3f; /* slots */ + c->layer[0].segment_count = val[3] & 0x3f; /* slots */ /* low layer */ - v = (val[0] & 0x07); + v = (val[2] & 0x07); c->layer[1].fec = fec_conv_sat[v]; if (v == 0) /* no low layer */ c->layer[1].segment_count = 0; else - c->layer[1].segment_count = val[2] & 0x3f; /* slots */ + c->layer[1].segment_count = val[4] & 0x3f; /* slots */ /* actually, BPSK if v==1, but not defined in fe_modulation_t */ c->layer[1].modulation = QPSK; layers = (v > 0) ? 2 : 1; - - slots = c->layer[0].segment_count + c->layer[1].segment_count; - c->symbol_rate = 28860000 * slots / 48; } /* statistics */