From patchwork Mon Aug 8 14:54:36 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Oberritter X-Patchwork-Id: 1045462 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p78EsoTU018914 for ; Mon, 8 Aug 2011 14:54:50 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752679Ab1HHOys (ORCPT ); Mon, 8 Aug 2011 10:54:48 -0400 Received: from mail.dream-property.net ([82.149.226.172]:39128 "EHLO mail.dream-property.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751392Ab1HHOyr (ORCPT ); Mon, 8 Aug 2011 10:54:47 -0400 Received: from localhost (localhost [127.0.0.1]) by mail.dream-property.net (Postfix) with ESMTP id BCA0A3152C0C; Mon, 8 Aug 2011 16:54:46 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail.dream-property.net Received: from mail.dream-property.net ([127.0.0.1]) by localhost (mail.dream-property.net [127.0.0.1]) (amavisd-new, port 10024) with LMTP id xsnRxA1LIa95; Mon, 8 Aug 2011 16:54:39 +0200 (CEST) Received: from pepe.dream-property.nete (dreamboxupdate.com [82.149.226.174]) by mail.dream-property.net (Postfix) with SMTP id C51643153570; Mon, 8 Aug 2011 16:54:38 +0200 (CEST) Received: by pepe.dream-property.nete (sSMTP sendmail emulation); Mon, 08 Aug 2011 14:54:38 +0000 From: Andreas Oberritter To: linux-media@vger.kernel.org Cc: user.vdr@gmail.com, alannisota@gmail.com Subject: [PATCH 2/3] DVB: dvb_frontend: Fix compatibility criteria for satellite receivers Date: Mon, 8 Aug 2011 14:54:36 +0000 Message-Id: <1312815277-9502-2-git-send-email-obi@linuxtv.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1312815277-9502-1-git-send-email-obi@linuxtv.org> References: <1312815277-9502-1-git-send-email-obi@linuxtv.org> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Mon, 08 Aug 2011 14:54:50 +0000 (UTC) - When converting satellite receiver parameters from S2API to legacy, identify a satellite receiver by its 'delivery_system' instead of 'modulation', which may overlap between different delivery systems. Signed-off-by: Andreas Oberritter --- drivers/media/dvb/dvb-core/dvb_frontend.c | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c index d02c32e..d218fe2 100644 --- a/drivers/media/dvb/dvb-core/dvb_frontend.c +++ b/drivers/media/dvb/dvb-core/dvb_frontend.c @@ -1132,16 +1132,13 @@ static void dtv_property_adv_params_sync(struct dvb_frontend *fe) p->frequency = c->frequency; p->inversion = c->inversion; - switch(c->modulation) { - case PSK_8: - case APSK_16: - case APSK_32: - case QPSK: + if (c->delivery_system == SYS_DSS || + c->delivery_system == SYS_DVBS || + c->delivery_system == SYS_DVBS2 || + c->delivery_system == SYS_ISDBS || + c->delivery_system == SYS_TURBO) { p->u.qpsk.symbol_rate = c->symbol_rate; p->u.qpsk.fec_inner = c->fec_inner; - break; - default: - break; } /* Fake out a generic DVB-T request so we pass validation in the ioctl */