From patchwork Sun Oct 26 11:46:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akihiro TSUKADA X-Patchwork-Id: 26575 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1XiMIQ-00019m-Uj; Sun, 26 Oct 2014 12:47:42 +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-7) with esmtp id 1XiMIO-0004eo-38; Sun, 26 Oct 2014 12:47:42 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751610AbaJZLrg (ORCPT + 1 other); Sun, 26 Oct 2014 07:47:36 -0400 Received: from mail-pd0-f179.google.com ([209.85.192.179]:43648 "EHLO mail-pd0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751596AbaJZLrf (ORCPT ); Sun, 26 Oct 2014 07:47:35 -0400 Received: by mail-pd0-f179.google.com with SMTP id g10so3961331pdj.38 for ; Sun, 26 Oct 2014 04:47:35 -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:in-reply-to:references; bh=3S26mKluRPGFELAqsOgHSt/JfQ48sYQQOBbUD9q68b4=; b=NJqgCESMyvJem4U3ALruVl3WWGNIoy24CQvO7nSP6I08GlJJah0lwEJhdSrtXJVHNZ 3hLufnO73ARPejOaU/Ei52UaRSxS+XAH7BJik5EsNjjNKCMk3fWAOn+rytRviZIMDkFL AtRidmVqr3+gJtKyX2AosHQbUucsB/6Sm8ypuhFNmtksFqtT8CFLUjDYFTdwiQw/gYcz GiqLGSK73dUJHHlV+bMmpVK7y1SNP+00QYlI+bzkDb8Pz0M+xhWPqkMLGfrZIa/qvQ3V dkWpmNBm6sZm0P+soSYah1K5jP6CfxCQ88j1R/njLdutKF+KBThFKcTODE0Yn8W7hWbB iwIg== X-Received: by 10.70.100.199 with SMTP id fa7mr17108886pdb.114.1414324055261; Sun, 26 Oct 2014 04:47:35 -0700 (PDT) Received: from seabird.localdomain.localdomain (softbank219203027033.bbtec.net. [219.203.27.33]) by mx.google.com with ESMTPSA id dp4sm8203581pbc.21.2014.10.26.04.47.32 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 26 Oct 2014 04:47:34 -0700 (PDT) From: tskd08@gmail.com To: linux-media@vger.kernel.org Cc: m.chehab@samsung.com, Akihiro Tsukada Subject: [PATCH v2 6/7] v4l-utils/libdvbv5: don't discard config-supplied parameters Date: Sun, 26 Oct 2014 20:46:22 +0900 Message-Id: <1414323983-15996-7-git-send-email-tskd08@gmail.com> X-Mailer: git-send-email 2.1.2 In-Reply-To: <1414323983-15996-1-git-send-email-tskd08@gmail.com> References: <1414323983-15996-1-git-send-email-tskd08@gmail.com> 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.113620 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_1500_1599 0, BODY_SIZE_2000_LESS 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, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __PHISH_SPEAR_STRUCTURE_1 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' From: Akihiro Tsukada When an user enabled the option to update parameters with PSI, the parameters that were supplied from config file and not mandatory to the delivery system were discarded. --- lib/libdvbv5/dvb-fe.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/lib/libdvbv5/dvb-fe.c b/lib/libdvbv5/dvb-fe.c index 05f7d03..52af4e4 100644 --- a/lib/libdvbv5/dvb-fe.c +++ b/lib/libdvbv5/dvb-fe.c @@ -575,6 +575,7 @@ int dvb_fe_get_parms(struct dvb_v5_fe_parms *p) int i, n = 0; const unsigned int *sys_props; struct dtv_properties prop; + struct dtv_property fe_prop[DTV_MAX_COMMAND]; struct dvb_frontend_parameters v3_parms; uint32_t bw; @@ -583,19 +584,14 @@ int dvb_fe_get_parms(struct dvb_v5_fe_parms *p) return EINVAL; while (sys_props[n]) { - parms->dvb_prop[n].cmd = sys_props[n]; + fe_prop[n].cmd = sys_props[n]; n++; } - parms->dvb_prop[n].cmd = DTV_DELIVERY_SYSTEM; - parms->dvb_prop[n].u.data = parms->p.current_sys; + fe_prop[n].cmd = DTV_DELIVERY_SYSTEM; + fe_prop[n].u.data = parms->p.current_sys; n++; - /* Keep it ready for set */ - parms->dvb_prop[n].cmd = DTV_TUNE; - parms->n_props = n; - - struct dtv_property fe_prop[DTV_MAX_COMMAND]; - n = dvb_copy_fe_props(parms->dvb_prop, n, fe_prop); + n = dvb_copy_fe_props(fe_prop, n, fe_prop); prop.props = fe_prop; prop.num = n;