[media] vp7045-fe: convert set_fontend to use DVBv5 parameters
authorMauro Carvalho Chehab <mchehab@redhat.com>
Mon, 26 Dec 2011 19:00:42 +0000 (16:00 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Sat, 31 Dec 2011 11:57:16 +0000 (09:57 -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/dvb-usb/vp7045-fe.c

index f8b5d8c86d7b5434d254ab7254ad8a24b949e409..ecbd62384a68da19da60eb9b1841782b7a30d404 100644 (file)
@@ -103,9 +103,9 @@ static int vp7045_fe_get_tune_settings(struct dvb_frontend* fe, struct dvb_front
        return 0;
 }
 
-static int vp7045_fe_set_frontend(struct dvb_frontend* fe,
-                                 struct dvb_frontend_parameters *fep)
+static int vp7045_fe_set_frontend(struct dvb_frontend *fe)
 {
+       struct dtv_frontend_properties *fep = &fe->dtv_property_cache;
        struct vp7045_fe_state *state = fe->demodulator_priv;
        u8 buf[5];
        u32 freq = fep->frequency / 1000;
@@ -115,25 +115,24 @@ static int vp7045_fe_set_frontend(struct dvb_frontend* fe,
        buf[2] =  freq        & 0xff;
        buf[3] = 0;
 
-       switch (fep->u.ofdm.bandwidth) {
-               case BANDWIDTH_8_MHZ: buf[4] = 8; break;
-               case BANDWIDTH_7_MHZ: buf[4] = 7; break;
-               case BANDWIDTH_6_MHZ: buf[4] = 6; break;
-               case BANDWIDTH_AUTO: return -EOPNOTSUPP;
-               default:
-                       return -EINVAL;
+       switch (fep->bandwidth_hz) {
+       case 8000000:
+               buf[4] = 8;
+               break;
+       case 7000000:
+               buf[4] = 7;
+               break;
+       case 6000000:
+               buf[4] = 6;
+               break;
+       default:
+               return -EINVAL;
        }
 
        vp7045_usb_op(state->d,LOCK_TUNER_COMMAND,buf,5,NULL,0,200);
        return 0;
 }
 
-static int vp7045_fe_get_frontend(struct dvb_frontend* fe,
-                                 struct dvb_frontend_parameters *fep)
-{
-       return 0;
-}
-
 static void vp7045_fe_release(struct dvb_frontend* fe)
 {
        struct vp7045_fe_state *state = fe->demodulator_priv;
@@ -159,6 +158,7 @@ error:
 
 
 static struct dvb_frontend_ops vp7045_fe_ops = {
+       .delsys = { SYS_DVBT },
        .info = {
                .name                   = "Twinhan VP7045/46 USB DVB-T",
                .type                   = FE_OFDM,
@@ -180,8 +180,7 @@ static struct dvb_frontend_ops vp7045_fe_ops = {
        .init = vp7045_fe_init,
        .sleep = vp7045_fe_sleep,
 
-       .set_frontend_legacy = vp7045_fe_set_frontend,
-       .get_frontend_legacy = vp7045_fe_get_frontend,
+       .set_frontend = vp7045_fe_set_frontend,
        .get_tune_settings = vp7045_fe_get_tune_settings,
 
        .read_status = vp7045_fe_read_status,