This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / media / dvb / ttpci / av7110.h

diff --git a/drivers/media/dvb/ttpci/av7110.h b/drivers/media/dvb/ttpci/av7110.h
index f25a825..c9485ee 100644 (file)
--- a/drivers/media/dvb/ttpci/av7110.h
+++ b/drivers/media/dvb/ttpci/av7110.h
@@ -4,12 +4,13 @@
 #include <linux/interrupt.h>
 #include <linux/socket.h>
 #include <linux/netdevice.h>
-#include <linux/i2c.h>
 
 #ifdef CONFIG_DEVFS_FS
 #include <linux/devfs_fs_kernel.h>
 #endif
 
+#include <media/saa7146_vv.h>
+
 #include <linux/dvb/video.h>
 #include <linux/dvb/audio.h>
 #include <linux/dvb/dmx.h>
@@ -24,25 +25,7 @@
 #include "dvb_filter.h"
 #include "dvb_net.h"
 #include "dvb_ringbuffer.h"
-#include "dvb_frontend.h"
-#include "ves1820.h"
-#include "ves1x93.h"
-#include "stv0299.h"
-#include "tda8083.h"
-#include "sp8870.h"
-#include "stv0297.h"
-
-#include <media/saa7146_vv.h>
-
 
-#define ANALOG_TUNER_VES1820 1
-#define ANALOG_TUNER_STV0297 2
-#define ANALOG_TUNER_VBI     0x100
-
-extern int av7110_debug;
-
-#define dprintk(level,args...) \
-           do { if ((av7110_debug & level)) { printk("dvb-ttpci: %s(): ", __FUNCTION__); printk(args); } } while (0)
 
 #define MAXFILT 32
 
@@ -77,17 +60,16 @@ struct av7110 {
         struct dvb_device       dvb_dev;
         struct dvb_net               dvb_net;
 
-       struct video_device     *v4l_dev;
-       struct video_device     *vbi_dev;
+       struct video_device     v4l_dev;
+       struct video_device     vbi_dev;
 
         struct saa7146_dev     *dev;
 
-       struct i2c_adapter      i2c_adap;
-
+       struct dvb_i2c_bus      *i2c_bus;       
        char                    *card_name;
 
        /* support for analog module of dvb-c */
-       int                     analog_tuner_flags;
+       int                     has_analog_tuner;
        int                     current_input;
        u32                     current_freq;
                                
@@ -127,8 +109,8 @@ struct av7110 {
 
         spinlock_t              debilock;
         struct semaphore        dcomlock;
-       volatile int            debitype;
-       volatile int            debilen;
+        int                     debitype;
+        int                     debilen;
 
 
         /* Recording and playback flags */
@@ -145,7 +127,7 @@ struct av7110 {
 
         int                     osdwin;      /* currently active window */
         u16                     osdbpp[8];
-       struct semaphore        osd_sema;
+
 
         /* CA */
 
@@ -205,7 +187,6 @@ struct av7110 {
         struct dvb_ringbuffer    ci_rbuffer;
         struct dvb_ringbuffer    ci_wbuffer;
 
-       struct audio_mixer      mixer;
 
         struct dvb_adapter       *dvb_adapter;
         struct dvb_device        *video_dev;
@@ -229,18 +210,6 @@ struct av7110 {
 
        unsigned char *bin_root;
        unsigned long size_root;
-
-       struct dvb_frontend* fe;
-       fe_status_t fe_status;
-       int (*fe_init)(struct dvb_frontend* fe);
-       int (*fe_read_status)(struct dvb_frontend* fe, fe_status_t* status);
-       int (*fe_diseqc_reset_overload)(struct dvb_frontend* fe);
-       int (*fe_diseqc_send_master_cmd)(struct dvb_frontend* fe, struct dvb_diseqc_master_cmd* cmd);
-       int (*fe_diseqc_send_burst)(struct dvb_frontend* fe, fe_sec_mini_cmd_t minicmd);
-       int (*fe_set_tone)(struct dvb_frontend* fe, fe_sec_tone_mode_t tone);
-       int (*fe_set_voltage)(struct dvb_frontend* fe, fe_sec_voltage_t voltage);
-       int (*fe_dishnetwork_send_legacy_command)(struct dvb_frontend* fe, unsigned int cmd);
-       int (*fe_set_frontend)(struct dvb_frontend* fe, struct dvb_frontend_parameters* params);
 };