Commit 81931e94 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

[media] nxt200x: convert set_fontend to use DVBv5 parameters

Instead of using dvb_frontend_parameters struct, that were
designed for a subset of the supported standards, use the DVBv5
cache information.

Also, fill the supported delivery systems at dvb_frontend_ops
struct.
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 6714049e
...@@ -528,9 +528,9 @@ static int nxt2004_load_firmware (struct dvb_frontend* fe, const struct firmware ...@@ -528,9 +528,9 @@ static int nxt2004_load_firmware (struct dvb_frontend* fe, const struct firmware
return 0; return 0;
}; };
static int nxt200x_setup_frontend_parameters (struct dvb_frontend* fe, static int nxt200x_setup_frontend_parameters(struct dvb_frontend *fe)
struct dvb_frontend_parameters *p)
{ {
struct dtv_frontend_properties *p = &fe->dtv_property_cache;
struct nxt200x_state* state = fe->demodulator_priv; struct nxt200x_state* state = fe->demodulator_priv;
u8 buf[5]; u8 buf[5];
...@@ -546,7 +546,7 @@ static int nxt200x_setup_frontend_parameters (struct dvb_frontend* fe, ...@@ -546,7 +546,7 @@ static int nxt200x_setup_frontend_parameters (struct dvb_frontend* fe,
} }
/* set additional params */ /* set additional params */
switch (p->u.vsb.modulation) { switch (p->modulation) {
case QAM_64: case QAM_64:
case QAM_256: case QAM_256:
/* Set punctured clock for QAM */ /* Set punctured clock for QAM */
...@@ -576,7 +576,7 @@ static int nxt200x_setup_frontend_parameters (struct dvb_frontend* fe, ...@@ -576,7 +576,7 @@ static int nxt200x_setup_frontend_parameters (struct dvb_frontend* fe,
nxt200x_agc_reset(state); nxt200x_agc_reset(state);
/* set target power level */ /* set target power level */
switch (p->u.vsb.modulation) { switch (p->modulation) {
case QAM_64: case QAM_64:
case QAM_256: case QAM_256:
buf[0] = 0x74; buf[0] = 0x74;
...@@ -620,7 +620,7 @@ static int nxt200x_setup_frontend_parameters (struct dvb_frontend* fe, ...@@ -620,7 +620,7 @@ static int nxt200x_setup_frontend_parameters (struct dvb_frontend* fe,
} }
/* write sdmx input */ /* write sdmx input */
switch (p->u.vsb.modulation) { switch (p->modulation) {
case QAM_64: case QAM_64:
buf[0] = 0x68; buf[0] = 0x68;
break; break;
...@@ -714,7 +714,7 @@ static int nxt200x_setup_frontend_parameters (struct dvb_frontend* fe, ...@@ -714,7 +714,7 @@ static int nxt200x_setup_frontend_parameters (struct dvb_frontend* fe,
} }
/* write agc ucgp0 */ /* write agc ucgp0 */
switch (p->u.vsb.modulation) { switch (p->modulation) {
case QAM_64: case QAM_64:
buf[0] = 0x02; buf[0] = 0x02;
break; break;
...@@ -1203,7 +1203,7 @@ struct dvb_frontend* nxt200x_attach(const struct nxt200x_config* config, ...@@ -1203,7 +1203,7 @@ struct dvb_frontend* nxt200x_attach(const struct nxt200x_config* config,
} }
static struct dvb_frontend_ops nxt200x_ops = { static struct dvb_frontend_ops nxt200x_ops = {
.delsys = { SYS_ATSC, SYS_DVBC_ANNEX_B },
.info = { .info = {
.name = "Nextwave NXT200X VSB/QAM frontend", .name = "Nextwave NXT200X VSB/QAM frontend",
.type = FE_ATSC, .type = FE_ATSC,
...@@ -1220,7 +1220,7 @@ static struct dvb_frontend_ops nxt200x_ops = { ...@@ -1220,7 +1220,7 @@ static struct dvb_frontend_ops nxt200x_ops = {
.init = nxt200x_init, .init = nxt200x_init,
.sleep = nxt200x_sleep, .sleep = nxt200x_sleep,
.set_frontend_legacy = nxt200x_setup_frontend_parameters, .set_frontend = nxt200x_setup_frontend_parameters,
.get_tune_settings = nxt200x_get_tune_settings, .get_tune_settings = nxt200x_get_tune_settings,
.read_status = nxt200x_read_status, .read_status = nxt200x_read_status,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment