malhuda/msm-4.14
1
0
Fork 0
mirror of https://github.com/rd-stuffs/msm-4.14.git synced 2025-02-20 11:45:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[media] DVB: dvb_frontend: add parameters_out

Browse Source 
- Holds the parameters detected by the demod.
- Updated on every call to get_frontend, either through ioctl or when
  a frontend event occurs.
- Reset to input parameters after every call to set_frontend, tune or
  search/track.

Signed-off-by: Andreas Oberritter <obi@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Andreas Oberritter 2011-05-08 20:03:40 -03:00 committed by Mauro Carvalho Chehab
parent 5072771932
commit a5959dbea3
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/media/dvb/dvb-core/dvb_frontend.c
View File

@ -106,6 +106,7 @@ struct dvb_frontend_private {
/* thread/frontend values */ /* thread/frontend values */
struct dvb_device *dvbdev; struct dvb_device *dvbdev;
struct dvb_frontend_parameters parameters_in; struct dvb_frontend_parameters parameters_in;
struct dvb_frontend_parameters parameters_out;
struct dvb_fe_events events; struct dvb_fe_events events;
struct semaphore sem; struct semaphore sem;
struct list_head list_head; struct list_head list_head;
@ -160,12 +161,11 @@ static void dvb_frontend_add_event(struct dvb_frontend *fe, fe_status_t status)
e = &events->events[events->eventw]; e = &events->events[events->eventw];
memcpy (&e->parameters, &fepriv->parameters_in,
sizeof (struct dvb_frontend_parameters));
if (status & FE_HAS_LOCK) if (status & FE_HAS_LOCK)
if (fe->ops.get_frontend) if (fe->ops.get_frontend)
fe->ops.get_frontend(fe, &e->parameters); fe->ops.get_frontend(fe, &fepriv->parameters_out);
e->parameters = fepriv->parameters_out;
events->eventw = wp; events->eventw = wp;
@ -353,6 +353,7 @@ static int dvb_frontend_swzigzag_autotune(struct dvb_frontend *fe, int check_wra
fepriv->parameters_in.inversion = fepriv->inversion; fepriv->parameters_in.inversion = fepriv->inversion;
if (fe->ops.set_frontend) if (fe->ops.set_frontend)
fe_set_err = fe->ops.set_frontend(fe, &fepriv->parameters_in); fe_set_err = fe->ops.set_frontend(fe, &fepriv->parameters_in);
fepriv->parameters_out = fepriv->parameters_in;
if (fe_set_err < 0) { if (fe_set_err < 0) {
fepriv->state = FESTATE_ERROR; fepriv->state = FESTATE_ERROR;
return fe_set_err; return fe_set_err;
@ -384,6 +385,7 @@ static void dvb_frontend_swzigzag(struct dvb_frontend *fe)
if (fe->ops.set_frontend) if (fe->ops.set_frontend)
retval = fe->ops.set_frontend(fe, retval = fe->ops.set_frontend(fe,
&fepriv->parameters_in); &fepriv->parameters_in);
fepriv->parameters_out = fepriv->parameters_in;
if (retval < 0) if (retval < 0)
fepriv->state = FESTATE_ERROR; fepriv->state = FESTATE_ERROR;
else else
@ -600,6 +602,8 @@ restart:
if (fe->ops.tune) if (fe->ops.tune)
fe->ops.tune(fe, params, fepriv->tune_mode_flags, &fepriv->delay, &s); fe->ops.tune(fe, params, fepriv->tune_mode_flags, &fepriv->delay, &s);
if (params)
fepriv->parameters_out = *params;
if (s != fepriv->status && !(fepriv->tune_mode_flags & FE_TUNE_MODE_ONESHOT)) { if (s != fepriv->status && !(fepriv->tune_mode_flags & FE_TUNE_MODE_ONESHOT)) {
dprintk("%s: state changed, adding current state\n", __func__); dprintk("%s: state changed, adding current state\n", __func__);
@ -639,6 +643,7 @@ restart:
fepriv->algo_status |= DVBFE_ALGO_SEARCH_AGAIN; fepriv->algo_status |= DVBFE_ALGO_SEARCH_AGAIN;
fepriv->delay = HZ / 2; fepriv->delay = HZ / 2;
} }
fepriv->parameters_out = fepriv->parameters_in;
fe->ops.read_status(fe, &s); fe->ops.read_status(fe, &s);
if (s != fepriv->status) { if (s != fepriv->status) {
dvb_frontend_add_event(fe, s); /* update event list */ dvb_frontend_add_event(fe, s); /* update event list */
@ -1880,8 +1885,8 @@ static int dvb_frontend_ioctl_legacy(struct file *file,
case FE_GET_FRONTEND: case FE_GET_FRONTEND:
if (fe->ops.get_frontend) { if (fe->ops.get_frontend) {
memcpy (parg, &fepriv->parameters_in, sizeof (struct dvb_frontend_parameters)); err = fe->ops.get_frontend(fe, &fepriv->parameters_out);
err = fe->ops.get_frontend(fe, (struct dvb_frontend_parameters*) parg); memcpy(parg, &fepriv->parameters_out, sizeof(struct dvb_frontend_parameters));
} }
break; break;