summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/tuner-core.c
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@linuxtv.org>2007-12-16 22:02:26 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-01-25 19:03:56 -0200
commitf7f427e4cc6078e23078dcd7f321676e0b0f544c (patch)
tree61c68f36d39527be687d83d5e945e56465c1eec6 /drivers/media/video/tuner-core.c
parent790ba18ec7a5f15c854f52835b0e6f39de2369dd (diff)
downloadlinux-f7f427e4cc6078e23078dcd7f321676e0b0f544c.tar.gz
linux-f7f427e4cc6078e23078dcd7f321676e0b0f544c.tar.bz2
linux-f7f427e4cc6078e23078dcd7f321676e0b0f544c.zip
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>
Diffstat (limited to 'drivers/media/video/tuner-core.c')
-rw-r--r--drivers/media/video/tuner-core.c21
1 files changed, 21 insertions, 0 deletions
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index d51f3afa969d..f22c41bb97ef 100644
--- a/drivers/media/video/tuner-core.c
+++ b/drivers/media/video/tuner-core.c
@@ -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))