Signed-off-by: Mauro Carvalho Chehab <mche...@redhat.com>
---
drivers/media/dvb/frontends/tda10023.c | 45 +++++++++++++++++++++++++++----
1 files changed, 39 insertions(+), 6 deletions(-)
diff --git a/drivers/media/dvb/frontends/tda10023.c
b/drivers/media/dvb/frontends/tda10023.c
index dccc74b..f5f0e73 100644
--- a/drivers/media/dvb/frontends/tda10023.c
+++ b/drivers/media/dvb/frontends/tda10023.c
@@ -301,8 +301,11 @@ static int tda10023_init (struct dvb_frontend *fe)
static int tda10023_set_parameters (struct dvb_frontend *fe,
struct dvb_frontend_parameters *p)
{
+ struct dtv_frontend_properties *c = &fe->dtv_property_cache;
+ u32 delsys = c->delivery_system;
+ unsigned qam = c->modulation;
+ bool is_annex_c;
struct tda10023_state* state = fe->demodulator_priv;
-
struct qam_params {
u8 qam, lockthr, mseth, aref, agcrefnyq, eragnyq_thd;
} static const qam_params[] = {
@@ -315,7 +318,16 @@ static int tda10023_set_parameters (struct dvb_frontend
*fe,
[QAM_256] = { (4<<2), 0x26, 0x23, 0x6c, 0x5c, 0x3c },
};
- unsigned qam = p->u.qam.modulation;
+ switch (delsys) {
+ case SYS_DVBC_ANNEX_A:
+ is_annex_c = false;
+ break;
+ case SYS_DVBC_ANNEX_C:
+ is_annex_c = true;
+ break;
+ default:
+ return -EINVAL;
+ }
if (qam >= ARRAY_SIZE(qam_params))
return -EINVAL;
@@ -325,21 +337,42 @@ static int tda10023_set_parameters (struct dvb_frontend
*fe,
if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0);
}
- tda10023_set_symbolrate (state, p->u.qam.symbol_rate);
+ tda10023_set_symbolrate (state, c->symbol_rate);
tda10023_writereg (state, 0x05, qam_params[qam].lockthr);
tda10023_writereg (state, 0x08, qam_params[qam].mseth);
tda10023_writereg (state, 0x09, qam_params[qam].aref);
tda10023_writereg (state, 0xb4, qam_params[qam].agcrefnyq);
tda10023_writereg (state, 0xb6, qam_params[qam].eragnyq_thd);
-// tda10023_writereg (state, 0x04, (p->inversion?0x12:0x32));
-// tda10023_writebit (state, 0x04, 0x60, (p->inversion?0:0x20));
+// tda10023_writereg (state, 0x04, (c->inversion?0x12:0x32));
+// tda10023_writebit (state, 0x04, 0x60, (c->inversion?0:0x20));
tda10023_writebit (state, 0x04, 0x40, 0x40);
+
+ if (is_annex_c)
+ tda10023_writebit (state, 0x3d, 0xfc, 0x03);
+ else
+ tda10023_writebit (state, 0x3d, 0xfc, 0x02);
+
tda10023_setup_reg0 (state, qam_params[qam].qam);
return 0;
}
+static int tda10023_get_property(struct dvb_frontend *fe,
+ struct dtv_property *p)
+{
+ switch (p->cmd) {
+ case DTV_ENUM_DELSYS:
+ p->u.buffer.data[0] = SYS_DVBC_ANNEX_A;
+ p->u.buffer.data[1] = SYS_DVBC_ANNEX_C;
+ p->u.buffer.len = 2;
+ break;
+ default:
+ break;
+ }
+ return 0;
+}
+
static int tda10023_read_status(struct dvb_frontend* fe, fe_status_t* status)
{
struct tda10023_state* state = fe->demodulator_priv;
@@ -559,7 +592,7 @@ static struct dvb_frontend_ops tda10023_ops = {
.set_frontend = tda10023_set_parameters,
.get_frontend = tda10023_get_frontend,
-
+ .get_property = tda10023_get_property,
.read_status = tda10023_read_status,
.read_ber = tda10023_read_ber,
.read_signal_strength = tda10023_read_signal_strength,
--
1.7.8
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
