diff options
| author | Michael Krufky <mkrufky@linuxtv.org> | 2007-12-21 08:55:43 +0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-26 00:04:10 +0300 |
| commit | 807ffe8df23e1977d4e702697a08047f346eb974 (patch) | |
| tree | fe7cb050ddddc64fc98b0248030cf1d6a8abc8d4 | |
| parent | b624aa86cd92b32d66653609e4896f54c0d6111d (diff) | |
| download | linux-807ffe8df23e1977d4e702697a08047f346eb974.tar.xz | |
V4L/DVB (6879): move struct analog_tuner_ops into dvb_frontend.h
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>
| -rw-r--r-- | drivers/media/dvb/dvb-core/dvb_frontend.h | 24 | ||||
| -rw-r--r-- | drivers/media/video/tuner-driver.h | 22 |
2 files changed, 22 insertions, 24 deletions
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.h b/drivers/media/dvb/dvb-core/dvb_frontend.h index 50dc5568efaa..417802f83f7e 100644 --- a/drivers/media/dvb/dvb-core/dvb_frontend.h +++ b/drivers/media/dvb/dvb-core/dvb_frontend.h @@ -62,8 +62,6 @@ struct dvb_tuner_info { u32 bandwidth_step; }; -struct analog_tuner_ops; - struct analog_parameters { unsigned int frequency; unsigned int mode; @@ -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; diff --git a/drivers/media/video/tuner-driver.h b/drivers/media/video/tuner-driver.h index 999ad7715a01..79efecc93340 100644 --- a/drivers/media/video/tuner-driver.h +++ b/drivers/media/video/tuner-driver.h @@ -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__ */ |