diff options
author | Michael Krufky <mkrufky@linuxtv.org> | 2007-08-25 18:08:45 -0400 |
---|---|---|
committer | Michael Krufky <mkrufky@linuxtv.org> | 2007-08-25 18:08:45 -0400 |
commit | b9cd19d4eca8dac90da1724311b50a428d88487e (patch) | |
tree | 0bfd7b86a0448293e4d270dcdd3fce42ceb9f7b1 /linux/drivers/media/video/tda8290.h | |
parent | 803132a3c8c06956bc3fc589693fb390dcf23368 (diff) | |
download | mediapointer-dvb-s2-b9cd19d4eca8dac90da1724311b50a428d88487e.tar.gz mediapointer-dvb-s2-b9cd19d4eca8dac90da1724311b50a428d88487e.tar.bz2 |
Move all tda8275/8275a tuning code from tda8290 module into tda827x module
From: Michael Krufky <mkrufky@linuxtv.org>
Add analog tuning support to tda827x dvb_frontend tuner module.
Convert tda8290 module back to native tuner interface.
The tda8290 analog demodulator will be handled the same way as tda9887.
The tuner.ko module (tuner-core) will pass commands to tda8290 via the
tuner_operations interface. tda8290 will communicate with tda827x via
the dvb_frontend interface, while passing a pointer to a private data
structure.
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Reviewed-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
linux/drivers/media/Kconfig | 1
linux/drivers/media/dvb/frontends/tda827x.c | 307 ++++++++++++++-
linux/drivers/media/dvb/frontends/tda827x.h | 10
linux/drivers/media/video/tda8290.c | 566 +++++-----------------------
linux/drivers/media/video/tda8290.h | 30 -
linux/drivers/media/video/tuner-core.c | 16
6 files changed, 424 insertions(+), 506 deletions(-)
Diffstat (limited to 'linux/drivers/media/video/tda8290.h')
-rw-r--r-- | linux/drivers/media/video/tda8290.h | 30 |
1 files changed, 9 insertions, 21 deletions
diff --git a/linux/drivers/media/video/tda8290.h b/linux/drivers/media/video/tda8290.h index 107b24b05..9b63e62b3 100644 --- a/linux/drivers/media/video/tda8290.h +++ b/linux/drivers/media/video/tda8290.h @@ -18,36 +18,24 @@ #define __TDA8290_H__ #include <linux/i2c.h> -#include "dvb_frontend.h" - -struct tda8290_config -{ - unsigned int *lna_cfg; - int (*tuner_callback) (void *dev, int command,int arg); -}; +#include "tuner-driver.h" #if defined(CONFIG_TUNER_TDA8290) || (defined(CONFIG_TUNER_TDA8290_MODULE) && defined(MODULE)) -extern int tda8290_probe(struct i2c_adapter* i2c_adap, u8 i2c_addr); +extern int tda8290_probe(struct tuner *t); -extern struct dvb_frontend *tda8290_attach(struct dvb_frontend *fe, - struct i2c_adapter* i2c_adap, - u8 i2c_addr, - struct tda8290_config *cfg); +extern int tda8290_attach(struct tuner *t); #else -static inline int tda8290_probe(struct i2c_adapter* i2c_adap, u8 i2c_addr) +static inline int tda8290_probe(struct tuner *t) { - printk(KERN_INFO "%s: not probed - driver disabled by Kconfig\n", - __FUNCTION__); + printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__); return -EINVAL; } -static inline struct dvb_frontend *tda8290_attach(struct dvb_frontend *fe, - struct i2c_adapter* i2c_adap, - u8 i2c_addr, - struct tda8290_config *cfg) +static inline int tda8290_attach(struct tuner *t) { - printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__); - return NULL; + printk(KERN_INFO "%s: not probed - driver disabled by Kconfig\n", + __FUNCTION__); + return -EINVAL; } #endif |