VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / drivers / usb / media / pwc-uncompress.h

diff --git a/drivers/usb/media/pwc-uncompress.h b/drivers/usb/media/pwc-uncompress.h
index f9a4372..c3db3de 100644 (file)
--- a/drivers/usb/media/pwc-uncompress.h
+++ b/drivers/usb/media/pwc-uncompress.h
@@ -24,9 +24,15 @@
 #define PWC_UNCOMPRESS_H
 
 #include <linux/config.h>
+#include <linux/linkage.h>
 #include <linux/list.h>
 
-#include "pwc.h"
+#include "pwc-ioctl.h"
+
+/* from pwc-dec.h */
+#define PWCX_FLAG_PLANAR        0x0001
+/* */
+
 
 #ifdef __cplusplus
 extern "C" {
@@ -42,10 +48,11 @@ struct pwc_decompressor
        int  type;              /* type of camera (645, 680, etc) */
        int  table_size;        /* memory needed */
 
-       void (* init)(int release, void *buffer, void *table);  /* Initialization routine; should be called after each set_video_mode */
+       void (* init)(int type, int release, void *buffer, void *table);        /* Initialization routine; should be called after each set_video_mode */
        void (* exit)(void);    /* Cleanup routine */
-       void (* decompress)(struct pwc_coord *image, struct pwc_coord *view, struct pwc_coord *offset,
-                            void *src, void *dst, int planar,
+       void (* decompress)(struct pwc_coord *image, struct pwc_coord *view,
+                           struct pwc_coord *offset,
+                            void *src, void *dst, int flags,
                            void *table, int bandlength);
        void (* lock)(void);    /* make sure module cannot be unloaded */
        void (* unlock)(void);  /* release lock on module */