Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1

[linux-2.6.git] / drivers / media / video / bt8xx / bttvp.h

diff --git a/drivers/media/video/bttvp.h b/drivers/media/video/bt8xx/bttvp.h
similarity index 96%
rename from drivers/media/video/bttvp.h
rename to drivers/media/video/bt8xx/bttvp.h
index 9cb72f1..347080c 100644 (file)
--- a/drivers/media/video/bttvp.h
+++ b/drivers/media/video/bt8xx/bttvp.h
@@ -33,6 +33,7 @@
 #include <linux/i2c.h>
 #include <linux/i2c-algo-bit.h>
 #include <linux/videodev.h>
+#include <media/v4l2-common.h>
 #include <linux/pci.h>
 #include <linux/input.h>
 #include <linux/mutex.h>
@@ -41,7 +42,6 @@
 
 #include <linux/device.h>
 #include <media/video-buf.h>
-#include <media/audiochip.h>
 #include <media/tuner.h>
 #include <media/tveeprom.h>
 #include <media/ir-common.h>
@@ -190,7 +190,8 @@ int bttv_buffer_activate_video(struct bttv *btv,
                               struct bttv_buffer_set *set);
 int bttv_buffer_activate_vbi(struct bttv *btv,
                             struct bttv_buffer *vbi);
-void bttv_dma_free(struct bttv *btv, struct bttv_buffer *buf);
+void bttv_dma_free(struct videobuf_queue *q, struct bttv *btv,
+                  struct bttv_buffer *buf);
 
 /* overlay handling */
 int bttv_overlay_risc(struct bttv *btv, struct bttv_overlay *ov,
@@ -214,7 +215,6 @@ extern struct videobuf_queue_ops bttv_vbi_qops;
 extern struct bus_type bttv_sub_bus_type;
 int bttv_sub_add_device(struct bttv_core *core, char *name);
 int bttv_sub_del_devices(struct bttv_core *core);
-void bttv_gpio_irq(struct bttv_core *core);
 
 
 /* ---------------------------------------------------------- */
@@ -298,6 +298,8 @@ struct bttv {
        int                        i2c_state, i2c_rc;
        int                        i2c_done;
        wait_queue_head_t          i2c_queue;
+       struct i2c_client         *i2c_msp34xx_client;
+       struct i2c_client         *i2c_tvaudio_client;
 
        /* video4linux (1) */
        struct video_device *video_dev;
@@ -320,6 +322,7 @@ struct bttv {
        /* video state */
        unsigned int input;
        unsigned int audio;
+       unsigned int mute;
        unsigned long freq;
        int tvnorm,hue,contrast,bright,saturation;
        struct v4l2_framebuffer fbuf;
@@ -357,7 +360,7 @@ struct bttv {
        int mbox_csel;
 
        /* risc memory management data
-          - must aquire s_lock before changing these
+          - must acquire s_lock before changing these
           - only the irq handler is supported to touch top + bottom + vcurr */
        struct btcx_riscmem     main;
        struct bttv_buffer      *screen;    /* overlay             */
@@ -381,6 +384,9 @@ struct bttv {
 
        unsigned int users;
        struct bttv_fh init;
+
+       /* used to make dvb-bt8xx autoloadable */
+       struct work_struct request_module_wk;
 };
 
 /* our devices */