V4L/DVB (6844): tuner: remove struct tuner from tuner-driver.h
struct tuner holds state for tuner-core, only -- move it into tuner-core.c Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
parent
790ba18ec7
commit
f7f427e4cc
|
@ -33,6 +33,27 @@
|
||||||
|
|
||||||
#define PREFIX t->i2c->driver->driver.name
|
#define PREFIX t->i2c->driver->driver.name
|
||||||
|
|
||||||
|
struct tuner {
|
||||||
|
/* device */
|
||||||
|
struct dvb_frontend fe;
|
||||||
|
struct i2c_client *i2c;
|
||||||
|
struct list_head list;
|
||||||
|
unsigned int using_v4l2:1;
|
||||||
|
|
||||||
|
/* keep track of the current settings */
|
||||||
|
v4l2_std_id std;
|
||||||
|
unsigned int tv_freq;
|
||||||
|
unsigned int radio_freq;
|
||||||
|
unsigned int audmode;
|
||||||
|
|
||||||
|
unsigned int mode;
|
||||||
|
unsigned int mode_mask; /* Combination of allowable modes */
|
||||||
|
|
||||||
|
unsigned int type; /* chip type id */
|
||||||
|
unsigned int config;
|
||||||
|
int (*tuner_callback) (void *dev, int command, int arg);
|
||||||
|
};
|
||||||
|
|
||||||
/* standard i2c insmod options */
|
/* standard i2c insmod options */
|
||||||
static unsigned short normal_i2c[] = {
|
static unsigned short normal_i2c[] = {
|
||||||
#if defined(CONFIG_TUNER_TEA5761) || (defined(CONFIG_TUNER_TEA5761_MODULE) && defined(MODULE))
|
#if defined(CONFIG_TUNER_TEA5761) || (defined(CONFIG_TUNER_TEA5761_MODULE) && defined(MODULE))
|
||||||
|
|
|
@ -50,27 +50,4 @@ struct analog_tuner_ops {
|
||||||
int (*set_config)(struct dvb_frontend *fe, void *priv_cfg);
|
int (*set_config)(struct dvb_frontend *fe, void *priv_cfg);
|
||||||
};
|
};
|
||||||
|
|
||||||
struct tuner {
|
|
||||||
/* device */
|
|
||||||
struct i2c_client *i2c;
|
|
||||||
struct list_head list; /* list of tuners */
|
|
||||||
|
|
||||||
unsigned int type; /* chip type */
|
|
||||||
|
|
||||||
unsigned int mode;
|
|
||||||
unsigned int mode_mask; /* Combination of allowable modes */
|
|
||||||
|
|
||||||
unsigned int tv_freq; /* keep track of the current settings */
|
|
||||||
unsigned int radio_freq;
|
|
||||||
unsigned int audmode;
|
|
||||||
v4l2_std_id std;
|
|
||||||
|
|
||||||
int using_v4l2;
|
|
||||||
|
|
||||||
struct dvb_frontend fe;
|
|
||||||
|
|
||||||
unsigned int config;
|
|
||||||
int (*tuner_callback) (void *dev, int command,int arg);
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif /* __TUNER_DRIVER_H__ */
|
#endif /* __TUNER_DRIVER_H__ */
|
||||||
|
|
Loading…
Reference in a new issue