iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[media] cinergyT2-fe: convert set_fontend to use DVBv5 parameters

Browse Source 
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>
This commit is contained in:
Mauro Carvalho Chehab 2011-12-26 15:41:01 -03:00
parent f9e54512fd
commit 7830bbaff9
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/media/dvb/dvb-usb/cinergyT2-fe.c
View File

@ -40,9 +40,8 @@
* We replace errornous fields by default TPS fields (the ones with value 0). * We replace errornous fields by default TPS fields (the ones with value 0).
*/ */
static uint16_t compute_tps(struct dvb_frontend_parameters *p) static uint16_t compute_tps(struct dtv_frontend_properties *op)
{ {
struct dvb_ofdm_parameters *op = &p->u.ofdm;
uint16_t tps = 0; uint16_t tps = 0;
switch (op->code_rate_HP) { switch (op->code_rate_HP) {
@ -83,7 +82,7 @@ static uint16_t compute_tps(struct dvb_frontend_parameters *p)
/* tps |= (0 << 4) */; /* tps |= (0 << 4) */;
} }
switch (op->constellation) { switch (op->modulation) {
case QAM_16: case QAM_16:
tps |= (1 << 13); tps |= (1 << 13);
break; break;
@ -119,7 +118,7 @@ static uint16_t compute_tps(struct dvb_frontend_parameters *p)
/* tps |= (0 << 2) */; /* tps |= (0 << 2) */;
} }
switch (op->hierarchy_information) { switch (op->hierarchy) {
case HIERARCHY_1: case HIERARCHY_1:
tps |= (1 << 10); tps |= (1 << 10);
break; break;
@ -263,9 +262,9 @@ static int cinergyt2_fe_get_tune_settings(struct dvb_frontend *fe,
return 0; return 0;
} }
static int cinergyt2_fe_set_frontend(struct dvb_frontend *fe, static int cinergyt2_fe_set_frontend(struct dvb_frontend *fe)
struct dvb_frontend_parameters *fep)
{ {
struct dtv_frontend_properties *fep = &fe->dtv_property_cache;
struct cinergyt2_fe_state *state = fe->demodulator_priv; struct cinergyt2_fe_state *state = fe->demodulator_priv;
struct dvbt_set_parameters_msg param; struct dvbt_set_parameters_msg param;
char result[2]; char result[2];
@ -274,9 +273,20 @@ static int cinergyt2_fe_set_frontend(struct dvb_frontend *fe,
param.cmd = CINERGYT2_EP1_SET_TUNER_PARAMETERS; param.cmd = CINERGYT2_EP1_SET_TUNER_PARAMETERS;
param.tps = cpu_to_le16(compute_tps(fep)); param.tps = cpu_to_le16(compute_tps(fep));
param.freq = cpu_to_le32(fep->frequency / 1000); param.freq = cpu_to_le32(fep->frequency / 1000);
param.bandwidth = 8 - fep->u.ofdm.bandwidth - BANDWIDTH_8_MHZ;
param.flags = 0; param.flags = 0;
switch (fep->bandwidth_hz) {
case 8000000:
param.bandwidth = 0;
break;
case 7000000:
param.bandwidth = 1;
break;
case 6000000:
param.bandwidth = 2;
break;
}
err = dvb_usb_generic_rw(state->d, err = dvb_usb_generic_rw(state->d,
(char *)&param, sizeof(param), (char *)&param, sizeof(param),
result, sizeof(result), 0); result, sizeof(result), 0);
@ -287,7 +297,7 @@ static int cinergyt2_fe_set_frontend(struct dvb_frontend *fe,
} }
static int cinergyt2_fe_get_frontend(struct dvb_frontend *fe, static int cinergyt2_fe_get_frontend(struct dvb_frontend *fe,
struct dvb_frontend_parameters *fep) struct dtv_frontend_properties *fep)
{ {
return 0; return 0;
} }
@ -316,6 +326,7 @@ struct dvb_frontend *cinergyt2_fe_attach(struct dvb_usb_device *d)
static struct dvb_frontend_ops cinergyt2_fe_ops = { static struct dvb_frontend_ops cinergyt2_fe_ops = {
.delsys = { SYS_DVBT },
.info = { .info = {
.name = DRIVER_NAME, .name = DRIVER_NAME,
.type = FE_OFDM, .type = FE_OFDM,
@ -340,8 +351,8 @@ static struct dvb_frontend_ops cinergyt2_fe_ops = {
.init = cinergyt2_fe_init, .init = cinergyt2_fe_init,
.sleep = cinergyt2_fe_sleep, .sleep = cinergyt2_fe_sleep,
.set_frontend_legacy = cinergyt2_fe_set_frontend, .set_frontend = cinergyt2_fe_set_frontend,
.get_frontend_legacy = cinergyt2_fe_get_frontend, .get_frontend = cinergyt2_fe_get_frontend,
.get_tune_settings = cinergyt2_fe_get_tune_settings, .get_tune_settings = cinergyt2_fe_get_tune_settings,
.read_status = cinergyt2_fe_read_status, .read_status = cinergyt2_fe_read_status,