Skip to content

Commit

Permalink
V4L/DVB (6879): move struct analog_tuner_ops into dvb_frontend.h
Browse files Browse the repository at this point in the history
struct analog_tuner_ops no longer has any dependencies specific
to v4l2, so we can move this into dvb_frontend.h with the rest
of the tuning structures.

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
  • Loading branch information
Michael Krufky authored and Mauro Carvalho Chehab committed Jan 25, 2008
1 parent b624aa8 commit 807ffe8
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 24 deletions.
24 changes: 22 additions & 2 deletions drivers/media/dvb/dvb-core/dvb_frontend.h
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,6 @@ struct dvb_tuner_info {
u32 bandwidth_step;
};

struct analog_tuner_ops;

struct analog_parameters {
unsigned int frequency;
unsigned int mode;
Expand Down Expand Up @@ -103,6 +101,28 @@ struct dvb_tuner_ops {
int (*set_bandwidth)(struct dvb_frontend *fe, u32 bandwidth);
};

struct analog_demod_info {
char *name;
};

struct analog_tuner_ops {

struct analog_demod_info info;

void (*set_params)(struct dvb_frontend *fe,
struct analog_parameters *params);
int (*has_signal)(struct dvb_frontend *fe);
int (*is_stereo)(struct dvb_frontend *fe);
int (*get_afc)(struct dvb_frontend *fe);
void (*tuner_status)(struct dvb_frontend *fe);
void (*standby)(struct dvb_frontend *fe);
void (*release)(struct dvb_frontend *fe);
int (*i2c_gate_ctrl)(struct dvb_frontend *fe, int enable);

/** This is to allow setting tuner-specific configuration */
int (*set_config)(struct dvb_frontend *fe, void *priv_cfg);
};

struct dvb_frontend_ops {

struct dvb_frontend_info info;
Expand Down
22 changes: 0 additions & 22 deletions drivers/media/video/tuner-driver.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,26 +24,4 @@

#include "dvb_frontend.h"

struct analog_demod_info {
char *name;
};

struct analog_tuner_ops {

struct analog_demod_info info;

void (*set_params)(struct dvb_frontend *fe,
struct analog_parameters *params);
int (*has_signal)(struct dvb_frontend *fe);
int (*is_stereo)(struct dvb_frontend *fe);
int (*get_afc)(struct dvb_frontend *fe);
void (*tuner_status)(struct dvb_frontend *fe);
void (*standby)(struct dvb_frontend *fe);
void (*release)(struct dvb_frontend *fe);
int (*i2c_gate_ctrl)(struct dvb_frontend *fe, int enable);

/** This is to allow setting tuner-specific configuration */
int (*set_config)(struct dvb_frontend *fe, void *priv_cfg);
};

#endif /* __TUNER_DRIVER_H__ */

0 comments on commit 807ffe8

Please sign in to comment.