summaryrefslogtreecommitdiff
path: root/drivers/media/dvb/firewire/firedtv-fe.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/dvb/firewire/firedtv-fe.c')
-rw-r--r--drivers/media/dvb/firewire/firedtv-fe.c17
1 files changed, 11 insertions, 6 deletions
diff --git a/drivers/media/dvb/firewire/firedtv-fe.c b/drivers/media/dvb/firewire/firedtv-fe.c
index 1eb5ad3a5dfa..e1705a903f5c 100644
--- a/drivers/media/dvb/firewire/firedtv-fe.c
+++ b/drivers/media/dvb/firewire/firedtv-fe.c
@@ -141,16 +141,16 @@ static int fdtv_read_uncorrected_blocks(struct dvb_frontend *fe, u32 *ucblocks)
return -EOPNOTSUPP;
}
-static int fdtv_set_frontend(struct dvb_frontend *fe,
- struct dvb_frontend_parameters *params)
+static int fdtv_set_frontend(struct dvb_frontend *fe)
{
+ struct dtv_frontend_properties *p = &fe->dtv_property_cache;
struct firedtv *fdtv = fe->sec_priv;
- return avc_tuner_dsd(fdtv, params);
+ return avc_tuner_dsd(fdtv, p);
}
static int fdtv_get_frontend(struct dvb_frontend *fe,
- struct dvb_frontend_parameters *params)
+ struct dtv_frontend_properties *params)
{
return -EOPNOTSUPP;
}
@@ -173,8 +173,8 @@ void fdtv_frontend_init(struct firedtv *fdtv, const char *name)
ops->init = fdtv_dvb_init;
ops->sleep = fdtv_sleep;
- ops->set_frontend_legacy = fdtv_set_frontend;
- ops->get_frontend_legacy = fdtv_get_frontend;
+ ops->set_frontend = fdtv_set_frontend;
+ ops->get_frontend = fdtv_get_frontend;
ops->get_property = fdtv_get_property;
ops->set_property = fdtv_set_property;
@@ -192,6 +192,7 @@ void fdtv_frontend_init(struct firedtv *fdtv, const char *name)
switch (fdtv->type) {
case FIREDTV_DVB_S:
+ ops->delsys[0] = SYS_DVBS;
fi->type = FE_QPSK;
fi->frequency_min = 950000;
@@ -211,6 +212,8 @@ void fdtv_frontend_init(struct firedtv *fdtv, const char *name)
break;
case FIREDTV_DVB_S2:
+ ops->delsys[0] = SYS_DVBS;
+ ops->delsys[1] = SYS_DVBS;
fi->type = FE_QPSK;
fi->frequency_min = 950000;
@@ -231,6 +234,7 @@ void fdtv_frontend_init(struct firedtv *fdtv, const char *name)
break;
case FIREDTV_DVB_C:
+ ops->delsys[0] = SYS_DVBC_ANNEX_A;
fi->type = FE_QAM;
fi->frequency_min = 47000000;
@@ -249,6 +253,7 @@ void fdtv_frontend_init(struct firedtv *fdtv, const char *name)
break;
case FIREDTV_DVB_T:
+ ops->delsys[0] = SYS_DVBT;
fi->type = FE_OFDM;
fi->frequency_min = 49000000;