Browse Source

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>
Michael Krufky 17 years ago
parent
commit
807ffe8df2
2 changed files with 22 additions and 24 deletions
  1. 22 2
      drivers/media/dvb/dvb-core/dvb_frontend.h
  2. 0 22
      drivers/media/video/tuner-driver.h

+ 22 - 2
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;

+ 0 - 22
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__ */