korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-16 00:34:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

V4L/DVB (6844): tuner: remove struct tuner from tuner-driver.h

Browse Source 
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:
Michael Krufky 2007-12-16 22:02:26 -03:00 committed by Mauro Carvalho Chehab
parent 790ba18ec7
commit f7f427e4cc
2 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/media/video/tuner-core.c
View File

@ -33,6 +33,27 @@
#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 */
static unsigned short normal_i2c[] = {
#if defined(CONFIG_TUNER_TEA5761) || (defined(CONFIG_TUNER_TEA5761_MODULE) && defined(MODULE))

23
drivers/media/video/tuner-driver.h
View File

@ -50,27 +50,4 @@ struct analog_tuner_ops {
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__ */