[media] Remove Annex A/C selection via roll-off factor
Instead of using a roll-off factor, change DRX-K & friends to select
the bandwidth filter and the Nyquist half roll-off via delivery system.
This provides a cleaner support for Annex A/C switch.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
diff --git a/drivers/media/dvb/frontends/drxk_hard.c b/drivers/media/dvb/frontends/drxk_hard.c
index 038e470..a2c8196 100644
--- a/drivers/media/dvb/frontends/drxk_hard.c
+++ b/drivers/media/dvb/frontends/drxk_hard.c
@@ -6215,6 +6215,7 @@
struct dvb_frontend_parameters *p)
{
struct drxk_state *state = fe->demodulator_priv;
+ u32 delsys = fe->dtv_property_cache.delivery_system;
u32 IF;
dprintk(1, "\n");
@@ -6225,11 +6226,15 @@
return -EINVAL;
}
- if (fe->ops.info.type == FE_QAM) {
- if (fe->dtv_property_cache.rolloff == ROLLOFF_13)
- state->m_itut_annex_c = true;
- else
- state->m_itut_annex_c = false;
+ switch (delsys) {
+ case SYS_DVBC_ANNEX_A:
+ state->m_itut_annex_c = false;
+ break;
+ case SYS_DVBC_ANNEX_C:
+ state->m_itut_annex_c = true;
+ break;
+ default:
+ return -EINVAL;
}
if (fe->ops.i2c_gate_ctrl)