Commit 15115c17 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

[media] siano: 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 e11eb288
...@@ -50,7 +50,7 @@ struct smsdvb_client_t { ...@@ -50,7 +50,7 @@ struct smsdvb_client_t {
struct completion tune_done; struct completion tune_done;
/* todo: save freq/band instead whole struct */ /* todo: save freq/band instead whole struct */
struct dvb_frontend_parameters fe_params; struct dtv_frontend_properties fe_params;
struct SMSHOSTLIB_STATISTICS_DVB_S sms_stat_dvb; struct SMSHOSTLIB_STATISTICS_DVB_S sms_stat_dvb;
int event_fe_state; int event_fe_state;
...@@ -591,8 +591,7 @@ static int smsdvb_get_tune_settings(struct dvb_frontend *fe, ...@@ -591,8 +591,7 @@ static int smsdvb_get_tune_settings(struct dvb_frontend *fe,
return 0; return 0;
} }
static int smsdvb_dvbt_set_frontend(struct dvb_frontend *fe, static int smsdvb_dvbt_set_frontend(struct dvb_frontend *fe)
struct dvb_frontend_parameters *p)
{ {
struct dtv_frontend_properties *c = &fe->dtv_property_cache; struct dtv_frontend_properties *c = &fe->dtv_property_cache;
struct smsdvb_client_t *client = struct smsdvb_client_t *client =
...@@ -658,8 +657,7 @@ static int smsdvb_dvbt_set_frontend(struct dvb_frontend *fe, ...@@ -658,8 +657,7 @@ static int smsdvb_dvbt_set_frontend(struct dvb_frontend *fe,
&client->tune_done); &client->tune_done);
} }
static int smsdvb_isdbt_set_frontend(struct dvb_frontend *fe, static int smsdvb_isdbt_set_frontend(struct dvb_frontend *fe)
struct dvb_frontend_parameters *p)
{ {
struct dtv_frontend_properties *c = &fe->dtv_property_cache; struct dtv_frontend_properties *c = &fe->dtv_property_cache;
struct smsdvb_client_t *client = struct smsdvb_client_t *client =
...@@ -723,8 +721,7 @@ static int smsdvb_isdbt_set_frontend(struct dvb_frontend *fe, ...@@ -723,8 +721,7 @@ static int smsdvb_isdbt_set_frontend(struct dvb_frontend *fe,
&client->tune_done); &client->tune_done);
} }
static int smsdvb_set_frontend(struct dvb_frontend *fe, static int smsdvb_set_frontend(struct dvb_frontend *fe)
struct dvb_frontend_parameters *fep)
{ {
struct smsdvb_client_t *client = struct smsdvb_client_t *client =
container_of(fe, struct smsdvb_client_t, frontend); container_of(fe, struct smsdvb_client_t, frontend);
...@@ -733,17 +730,17 @@ static int smsdvb_set_frontend(struct dvb_frontend *fe, ...@@ -733,17 +730,17 @@ static int smsdvb_set_frontend(struct dvb_frontend *fe,
switch (smscore_get_device_mode(coredev)) { switch (smscore_get_device_mode(coredev)) {
case DEVICE_MODE_DVBT: case DEVICE_MODE_DVBT:
case DEVICE_MODE_DVBT_BDA: case DEVICE_MODE_DVBT_BDA:
return smsdvb_dvbt_set_frontend(fe, fep); return smsdvb_dvbt_set_frontend(fe);
case DEVICE_MODE_ISDBT: case DEVICE_MODE_ISDBT:
case DEVICE_MODE_ISDBT_BDA: case DEVICE_MODE_ISDBT_BDA:
return smsdvb_isdbt_set_frontend(fe, fep); return smsdvb_isdbt_set_frontend(fe);
default: default:
return -EINVAL; return -EINVAL;
} }
} }
static int smsdvb_get_frontend(struct dvb_frontend *fe, static int smsdvb_get_frontend(struct dvb_frontend *fe,
struct dvb_frontend_parameters *fep) struct dtv_frontend_properties *fep)
{ {
struct smsdvb_client_t *client = struct smsdvb_client_t *client =
container_of(fe, struct smsdvb_client_t, frontend); container_of(fe, struct smsdvb_client_t, frontend);
...@@ -752,7 +749,7 @@ static int smsdvb_get_frontend(struct dvb_frontend *fe, ...@@ -752,7 +749,7 @@ static int smsdvb_get_frontend(struct dvb_frontend *fe,
/* todo: */ /* todo: */
memcpy(fep, &client->fe_params, memcpy(fep, &client->fe_params,
sizeof(struct dvb_frontend_parameters)); sizeof(struct dtv_frontend_properties));
return 0; return 0;
} }
...@@ -805,8 +802,8 @@ static struct dvb_frontend_ops smsdvb_fe_ops = { ...@@ -805,8 +802,8 @@ static struct dvb_frontend_ops smsdvb_fe_ops = {
.release = smsdvb_release, .release = smsdvb_release,
.set_frontend_legacy = smsdvb_set_frontend, .set_frontend = smsdvb_set_frontend,
.get_frontend_legacy = smsdvb_get_frontend, .get_frontend = smsdvb_get_frontend,
.get_tune_settings = smsdvb_get_tune_settings, .get_tune_settings = smsdvb_get_tune_settings,
.read_status = smsdvb_read_status, .read_status = smsdvb_read_status,
...@@ -873,6 +870,17 @@ static int smsdvb_hotplug(struct smscore_device_t *coredev, ...@@ -873,6 +870,17 @@ static int smsdvb_hotplug(struct smscore_device_t *coredev,
memcpy(&client->frontend.ops, &smsdvb_fe_ops, memcpy(&client->frontend.ops, &smsdvb_fe_ops,
sizeof(struct dvb_frontend_ops)); sizeof(struct dvb_frontend_ops));
switch (smscore_get_device_mode(coredev)) {
case DEVICE_MODE_DVBT:
case DEVICE_MODE_DVBT_BDA:
smsdvb_fe_ops.delsys[0] = SYS_DVBT;
break;
case DEVICE_MODE_ISDBT:
case DEVICE_MODE_ISDBT_BDA:
smsdvb_fe_ops.delsys[0] = SYS_ISDBT;
break;
}
rc = dvb_register_frontend(&client->adapter, &client->frontend); rc = dvb_register_frontend(&client->adapter, &client->frontend);
if (rc < 0) { if (rc < 0) {
sms_err("frontend registration failed %d", rc); sms_err("frontend registration failed %d", rc);
......
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