]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
[media] tda8083: convert set_fontend to use DVBv5 parameters
authorMauro Carvalho Chehab <mchehab@redhat.com>
Mon, 26 Dec 2011 18:07:36 +0000 (15:07 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Sat, 31 Dec 2011 11:48:47 +0000 (09:48 -0200)
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: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/dvb/frontends/tda8083.c

index 7ff2946f39b20cd488ca6b3536a3769ec520bbdb..0f9841c07c3fcca9dcc67cc53a98f92e12366409 100644 (file)
@@ -315,8 +315,9 @@ static int tda8083_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
        return 0;
 }
 
-static int tda8083_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)
+static int tda8083_set_frontend(struct dvb_frontend *fe)
 {
+       struct dtv_frontend_properties *p = &fe->dtv_property_cache;
        struct tda8083_state* state = fe->demodulator_priv;
 
        if (fe->ops.tuner_ops.set_params) {
@@ -325,8 +326,8 @@ static int tda8083_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
        }
 
        tda8083_set_inversion (state, p->inversion);
-       tda8083_set_fec (state, p->u.qpsk.fec_inner);
-       tda8083_set_symbolrate (state, p->u.qpsk.symbol_rate);
+       tda8083_set_fec(state, p->fec_inner);
+       tda8083_set_symbolrate(state, p->symbol_rate);
 
        tda8083_writereg (state, 0x00, 0x3c);
        tda8083_writereg (state, 0x00, 0x04);
@@ -334,7 +335,7 @@ static int tda8083_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
        return 0;
 }
 
-static int tda8083_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)
+static int tda8083_get_frontend(struct dvb_frontend *fe, struct dtv_frontend_properties *p)
 {
        struct tda8083_state* state = fe->demodulator_priv;
 
@@ -342,8 +343,8 @@ static int tda8083_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
        /*p->frequency = ???;*/
        p->inversion = (tda8083_readreg (state, 0x0e) & 0x80) ?
                        INVERSION_ON : INVERSION_OFF;
-       p->u.qpsk.fec_inner = tda8083_get_fec (state);
-       /*p->u.qpsk.symbol_rate = tda8083_get_symbolrate (state);*/
+       p->fec_inner = tda8083_get_fec(state);
+       /*p->symbol_rate = tda8083_get_symbolrate (state);*/
 
        return 0;
 }
@@ -438,7 +439,7 @@ error:
 }
 
 static struct dvb_frontend_ops tda8083_ops = {
-
+       .delsys = { SYS_DVBS },
        .info = {
                .name                   = "Philips TDA8083 DVB-S",
                .type                   = FE_QPSK,
@@ -461,8 +462,8 @@ static struct dvb_frontend_ops tda8083_ops = {
        .init = tda8083_init,
        .sleep = tda8083_sleep,
 
-       .set_frontend_legacy = tda8083_set_frontend,
-       .get_frontend_legacy = tda8083_get_frontend,
+       .set_frontend = tda8083_set_frontend,
+       .get_frontend = tda8083_get_frontend,
 
        .read_status = tda8083_read_status,
        .read_signal_strength = tda8083_read_signal_strength,