From 130d9b1ceb8b5edd8cf7f33adcd3591bdecc2452 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Sun, 1 Jan 2012 16:11:10 -0300 Subject: [PATCH] --- yaml --- r: 285598 b: refs/heads/master c: 26c924febc2a840fc232bfb3771df39810f5d362 h: refs/heads/master v: v3 --- [refs] | 2 +- .../drivers/media/dvb/dvb-core/dvb_frontend.c | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 8eadcc34c8f2..aca0fc288f22 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 641269f9583c5c3535dff9c66de13a8216f791a5 +refs/heads/master: 26c924febc2a840fc232bfb3771df39810f5d362 diff --git a/trunk/drivers/media/dvb/dvb-core/dvb_frontend.c b/trunk/drivers/media/dvb/dvb-core/dvb_frontend.c index d030cd3de643..b72b87ecc3e3 100644 --- a/trunk/drivers/media/dvb/dvb-core/dvb_frontend.c +++ b/trunk/drivers/media/dvb/dvb-core/dvb_frontend.c @@ -873,17 +873,22 @@ static int dvb_frontend_clear_cache(struct dvb_frontend *fe) memset(c, 0, sizeof(struct dtv_frontend_properties)); c->state = DTV_CLEAR; - c->delivery_system = SYS_UNDEFINED; - c->inversion = INVERSION_AUTO; - c->fec_inner = FEC_AUTO; + + c->delivery_system = fe->ops.delsys[0]; + c->transmission_mode = TRANSMISSION_MODE_AUTO; - c->bandwidth_hz = BANDWIDTH_AUTO; + c->bandwidth_hz = 0; /* AUTO */ c->guard_interval = GUARD_INTERVAL_AUTO; c->hierarchy = HIERARCHY_AUTO; - c->symbol_rate = QAM_AUTO; + c->symbol_rate = 0; c->code_rate_HP = FEC_AUTO; c->code_rate_LP = FEC_AUTO; + c->fec_inner = FEC_AUTO; c->rolloff = ROLLOFF_AUTO; + c->voltage = SEC_VOLTAGE_OFF; + c->modulation = QAM_AUTO; + c->sectone = SEC_TONE_OFF; + c->pilot = PILOT_AUTO; c->isdbt_partial_reception = -1; c->isdbt_sb_mode = -1; @@ -898,6 +903,9 @@ static int dvb_frontend_clear_cache(struct dvb_frontend *fe) c->layer[i].segment_count = -1; } + c->isdbs_ts_id = 0; + c->dvbt2_plp_id = 0; + return 0; }