Skip to content

Commit

Permalink
[media] DVB: allow to read back of detected parameters through S2API
Browse files Browse the repository at this point in the history
Signed-off-by: Andreas Oberritter <obi@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Andreas Oberritter authored and Mauro Carvalho Chehab committed May 20, 2011
1 parent a5959db commit bbe880b
Showing 1 changed file with 15 additions and 4 deletions.
19 changes: 15 additions & 4 deletions drivers/media/dvb/dvb-core/dvb_frontend.c
Original file line number Diff line number Diff line change
Expand Up @@ -1023,10 +1023,9 @@ static int is_legacy_delivery_system(fe_delivery_system_t s)
* it's being used for the legacy or new API, reducing code and complexity.
*/
static void dtv_property_cache_sync(struct dvb_frontend *fe,
struct dvb_frontend_parameters *p)
struct dtv_frontend_properties *c,
const struct dvb_frontend_parameters *p)
{
struct dtv_frontend_properties *c = &fe->dtv_property_cache;

c->frequency = p->frequency;
c->inversion = p->inversion;

Expand Down Expand Up @@ -1200,8 +1199,20 @@ static int dtv_property_process_get(struct dvb_frontend *fe,
struct file *file)
{
const struct dtv_frontend_properties *c = &fe->dtv_property_cache;
struct dvb_frontend_private *fepriv = fe->frontend_priv;
struct dtv_frontend_properties cdetected;
int r;

/*
* If the driver implements a get_frontend function, then convert
* detected parameters to S2API properties.
*/
if (fe->ops.get_frontend) {
cdetected = *c;
dtv_property_cache_sync(fe, &cdetected, &fepriv->parameters_out);
c = &cdetected;
}

switch(tvp->cmd) {
case DTV_FREQUENCY:
tvp->u.data = c->frequency;
Expand Down Expand Up @@ -1812,7 +1823,7 @@ static int dvb_frontend_ioctl_legacy(struct file *file,

memcpy (&fepriv->parameters_in, parg,
sizeof (struct dvb_frontend_parameters));
dtv_property_cache_sync(fe, &fepriv->parameters_in);
dtv_property_cache_sync(fe, c, &fepriv->parameters_in);
}

memset(&fetunesettings, 0, sizeof(struct dvb_frontend_tune_settings));
Expand Down

0 comments on commit bbe880b

Please sign in to comment.