From patchwork Fri Jul 13 23:11:07 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: CrazyCat X-Patchwork-Id: 1197201 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id A0E19DFFFD for ; Fri, 13 Jul 2012 23:17:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755898Ab2GMXRR (ORCPT ); Fri, 13 Jul 2012 19:17:17 -0400 Received: from forward2.mail.yandex.net ([77.88.46.7]:39336 "EHLO forward2.mail.yandex.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755625Ab2GMXRQ (ORCPT ); Fri, 13 Jul 2012 19:17:16 -0400 X-Greylist: delayed 366 seconds by postgrey-1.27 at vger.kernel.org; Fri, 13 Jul 2012 19:17:16 EDT Received: from web6d.yandex.ru (web6d.yandex.ru [77.88.47.184]) by forward2.mail.yandex.net (Yandex) with ESMTP id 020D012A375A for ; Sat, 14 Jul 2012 03:11:07 +0400 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1342221068; bh=iRRKOgszXiy08x1XyDQstenl1a8JaYd7417F65BD26U=; h=From:To:Subject:MIME-Version:Message-Id:Date: Content-Transfer-Encoding:Content-Type; b=kMjCFcek/EFDyeKDzsQcf5cipa1Helg8lw0ZvmmnJhkawisutIaKXOStCMVYVOnPj nHWMoH2vTW1v6bOK7KcZT6a4PGP6iq5bvyU731/YY06buRyjrvz0E7iT3Bjp+e0X7L NnQtIc0TpIqVg86fev7OtQRm40WV5raAbwd2JfAM= Received: from 127.0.0.1 (localhost.localdomain [127.0.0.1]) by web6d.yandex.ru (Yandex) with ESMTP id C0EBA23480BA; Sat, 14 Jul 2012 03:11:07 +0400 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1342221067; bh=iRRKOgszXiy08x1XyDQstenl1a8JaYd7417F65BD26U=; h=From:To:Subject:MIME-Version:Message-Id:Date: Content-Transfer-Encoding:Content-Type; b=aYNhN2W/+K3JTKCjS7I/ZBs02zDukkoTL/DPnXWUzKqN6qGkjrQG7/krUZiSHMFeB n0Qxy/bDPucsSfVeXl49++Afo5y4Vhz/kdg5yPFFR9gXf6i1FtpUB8jwxM64X4s5d8 qgjjD1tTaOfapgemurJiB5wZGB2vIXII7MMZD3Ow= Received: from globax.colo.dc.utel.ua (globax.colo.dc.utel.ua [213.186.114.24]) by web6d.yandex.ru with HTTP; Sat, 14 Jul 2012 03:11:07 +0400 From: CrazyCat To: linux-media@vger.kernel.org Subject: [PATCH]DVB-S2 multistream support MIME-Version: 1.0 Message-Id: <842721342221067@web6d.yandex.ru> Date: Sat, 14 Jul 2012 02:11:07 +0300 X-Mailer: Yamail [ http://yandex.ru ] 5.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Now present DTV_DVBT2_PLP_ID property for DVB-T2, so i add alias DTV_DVBS2_MIS_ID (same feature for advanced DVB-S2). Now DVB-S2 multistream filtration supported for current STV090x demod cut 3.0, so i implement support for stv090x demod driver. Additional fe-caps FE_CAN_MULTISTREAM also added. --- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/include/linux/dvb/frontend.h b/include/linux/dvb/frontend.h index f50d405..f625f8d 100644 --- a/include/linux/dvb/frontend.h +++ b/include/linux/dvb/frontend.h @@ -62,6 +62,7 @@ typedef enum fe_caps { FE_CAN_8VSB = 0x200000, FE_CAN_16VSB = 0x400000, FE_HAS_EXTENDED_CAPS = 0x800000, /* We need more bitspace for newer APIs, indicate this. */ + FE_CAN_MULTISTREAM = 0x4000000, /* frontend supports DVB-S2 multistream filtering */ FE_CAN_TURBO_FEC = 0x8000000, /* frontend supports "turbo fec modulation" */ FE_CAN_2G_MODULATION = 0x10000000, /* frontend supports "2nd generation modulation" (DVB-S2) */ FE_NEEDS_BENDING = 0x20000000, /* not supported anymore, don't use (frontend requires frequency bending) */ @@ -317,6 +318,7 @@ struct dvb_frontend_event { #define DTV_ISDBS_TS_ID 42 #define DTV_DVBT2_PLP_ID 43 +#define DTV_DVBS2_MIS_ID 43 #define DTV_ENUM_DELSYS 44 diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c index aebcdf2..83e51f9 100644 --- a/drivers/media/dvb/dvb-core/dvb_frontend.c +++ b/drivers/media/dvb/dvb-core/dvb_frontend.c @@ -947,7 +947,7 @@ static int dvb_frontend_clear_cache(struct dvb_frontend *fe) } c->isdbs_ts_id = 0; - c->dvbt2_plp_id = 0; + c->dvbt2_plp_id = -1; switch (c->delivery_system) { case SYS_DVBS: diff --git a/drivers/media/dvb/frontends/stv090x.c b/drivers/media/dvb/frontends/stv090x.c index ea86a56..eb6f1cf 100644 --- a/drivers/media/dvb/frontends/stv090x.c +++ b/drivers/media/dvb/frontends/stv090x.c @@ -3425,6 +3425,33 @@ err: return -1; } +static int stv090x_set_mis(struct stv090x_state *state, int mis) +{ + u32 reg; + + if (mis<0 || mis>255) { + dprintk(FE_DEBUG, 1, "Disable MIS filtering"); + reg = STV090x_READ_DEMOD(state, PDELCTRL1); + STV090x_SETFIELD_Px(reg, FILTER_EN_FIELD, 0x00); + if (STV090x_WRITE_DEMOD(state, PDELCTRL1, reg) < 0) + goto err; + } else { + dprintk(FE_DEBUG, 1, "Enable MIS filtering - %d", mis); + reg = STV090x_READ_DEMOD(state, PDELCTRL1); + STV090x_SETFIELD_Px(reg, FILTER_EN_FIELD, 0x01); + if (STV090x_WRITE_DEMOD(state, PDELCTRL1, reg) < 0) + goto err; + if (STV090x_WRITE_DEMOD(state, ISIENTRY, mis) < 0) + goto err; + if (STV090x_WRITE_DEMOD(state, ISIBITENA, 0xff) < 0) + goto err; + } + return 0; +err: + dprintk(FE_ERROR, 1, "I/O error"); + return -1; +} + static enum dvbfe_search stv090x_search(struct dvb_frontend *fe) { struct stv090x_state *state = fe->demodulator_priv; @@ -3433,6 +3460,8 @@ static enum dvbfe_search stv090x_search(struct dvb_frontend *fe) if (props->frequency == 0) return DVBFE_ALGO_SEARCH_INVALID; + stv090x_set_mis(state,props->dvbt2_plp_id); + state->delsys = props->delivery_system; state->frequency = props->frequency; state->srate = props->symbol_rate; @@ -3447,6 +3476,8 @@ static enum dvbfe_search stv090x_search(struct dvb_frontend *fe) state->search_range = 5000000; } + stv090x_set_mis(state,props->dvbt2_plp_id); + if (stv090x_algo(state) == STV090x_RANGEOK) { dprintk(FE_DEBUG, 1, "Search success!"); return DVBFE_ALGO_SEARCH_SUCCESS; @@ -4798,6 +4829,9 @@ struct dvb_frontend *stv090x_attach(const struct stv090x_config *config, } } + if (state->internal->dev_ver>=0x30) + state->frontend.ops.info.caps |= FE_CAN_MULTISTREAM; + /* workaround for stuck DiSEqC output */ if (config->diseqc_envelope_mode) stv090x_send_diseqc_burst(&state->frontend, SEC_MINI_A);