|
@@ -973,31 +973,6 @@ static enum dvbfe_algo stv0900_frontend_algo(struct dvb_frontend *fe)
|
|
|
return DVBFE_ALGO_CUSTOM;
|
|
|
}
|
|
|
|
|
|
-static int stb0900_set_property(struct dvb_frontend *fe,
|
|
|
- struct dtv_property *tvp)
|
|
|
-{
|
|
|
- dprintk("%s(..)\n", __func__);
|
|
|
-
|
|
|
- return 0;
|
|
|
-}
|
|
|
-
|
|
|
-static int stb0900_get_property(struct dvb_frontend *fe,
|
|
|
- struct dtv_property *tvp)
|
|
|
-{
|
|
|
- dprintk("%s(..)\n", __func__);
|
|
|
- switch (tvp->cmd) {
|
|
|
- case DTV_ENUM_DELSYS:
|
|
|
- tvp->u.buffer.data[0] = SYS_DSS;
|
|
|
- tvp->u.buffer.data[1] = SYS_DVBS;
|
|
|
- tvp->u.buffer.data[2] = SYS_DVBS2;
|
|
|
- tvp->u.buffer.len = 3;
|
|
|
- break;
|
|
|
- default:
|
|
|
- break;
|
|
|
- }
|
|
|
- return 0;
|
|
|
-}
|
|
|
-
|
|
|
void stv0900_start_search(struct stv0900_internal *intp,
|
|
|
enum fe_stv0900_demod_num demod)
|
|
|
{
|
|
@@ -1876,7 +1851,7 @@ static int stv0900_sleep(struct dvb_frontend *fe)
|
|
|
}
|
|
|
|
|
|
static int stv0900_get_frontend(struct dvb_frontend *fe,
|
|
|
- struct dvb_frontend_parameters *p)
|
|
|
+ struct dtv_frontend_properties *p)
|
|
|
{
|
|
|
struct stv0900_state *state = fe->demodulator_priv;
|
|
|
struct stv0900_internal *intp = state->internal;
|
|
@@ -1884,12 +1859,12 @@ static int stv0900_get_frontend(struct dvb_frontend *fe,
|
|
|
struct stv0900_signal_info p_result = intp->result[demod];
|
|
|
|
|
|
p->frequency = p_result.locked ? p_result.frequency : 0;
|
|
|
- p->u.qpsk.symbol_rate = p_result.locked ? p_result.symbol_rate : 0;
|
|
|
+ p->symbol_rate = p_result.locked ? p_result.symbol_rate : 0;
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
static struct dvb_frontend_ops stv0900_ops = {
|
|
|
-
|
|
|
+ .delsys = { SYS_DVBS, SYS_DVBS2, SYS_DSS },
|
|
|
.info = {
|
|
|
.name = "STV0900 frontend",
|
|
|
.type = FE_QPSK,
|
|
@@ -1908,7 +1883,7 @@ static struct dvb_frontend_ops stv0900_ops = {
|
|
|
},
|
|
|
.release = stv0900_release,
|
|
|
.init = stv0900_init,
|
|
|
- .get_frontend_legacy = stv0900_get_frontend,
|
|
|
+ .get_frontend = stv0900_get_frontend,
|
|
|
.sleep = stv0900_sleep,
|
|
|
.get_frontend_algo = stv0900_frontend_algo,
|
|
|
.i2c_gate_ctrl = stv0900_i2c_gate_ctrl,
|
|
@@ -1916,8 +1891,6 @@ static struct dvb_frontend_ops stv0900_ops = {
|
|
|
.diseqc_send_burst = stv0900_send_burst,
|
|
|
.diseqc_recv_slave_reply = stv0900_recv_slave_reply,
|
|
|
.set_tone = stv0900_set_tone,
|
|
|
- .set_property = stb0900_set_property,
|
|
|
- .get_property = stb0900_get_property,
|
|
|
.search = stv0900_search,
|
|
|
.track = stv0900_track,
|
|
|
.read_status = stv0900_read_status,
|