Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen...

[linux-2.6-omap-h63xx.git] / drivers / media / dvb / dvb-core / dvb_frontend.h

diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.h b/drivers/media/dvb/dvb-core/dvb_frontend.h
index 50dc5568efaadc8e356c95083dd9cc73a9955b7e..aa4133f0bd1911d093b4e386aba4ab0c965f6ba8 100644 (file)
--- 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_demod_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;
@@ -148,7 +168,7 @@ struct dvb_frontend_ops {
        int (*ts_bus_ctrl)(struct dvb_frontend* fe, int acquire);
 
        struct dvb_tuner_ops tuner_ops;
-       struct analog_tuner_ops *analog_demod_ops;
+       struct analog_demod_ops analog_ops;
 };
 
 #define MAX_EVENT 8