1 files changed, 23 insertions, 7 deletions

diff --git a/drivers/media/video/gspca/gspca.h b/drivers/media/video/gspca/gspca.h
index 59c7941da999..02c696a22be0 100644
--- a/drivers/media/video/gspca/gspca.h
+++ b/drivers/media/video/gspca/gspca.h
@@ -48,26 +48,27 @@ extern int gspca_debug;
 
 /* used to list framerates supported by a camera mode (resolution) */
 struct framerates {
-        int *rates;
+        const u8 *rates;
         int nrates;
 };
 
 /* device information - set at probe time */
 struct cam {
-        int bulk_size;          /* buffer size when image transfer by bulk */
         const struct v4l2_pix_format *cam_mode; /* size nmodes */
-        char nmodes;
         const struct framerates *mode_framerates; /* must have size nmode,
                                                    * just like cam_mode */
-        __u8 bulk_nurbs;        /* number of URBs in bulk mode
+        u32 bulk_size;          /* buffer size when image transfer by bulk */
+        u32 input_flags;        /* value for ENUM_INPUT status flags */
+        u8 nmodes;              /* size of cam_mode */
+        u8 no_urb_create;       /* don't create transfer URBs */
+        u8 bulk_nurbs;          /* number of URBs in bulk mode
                                  * - cannot be > MAX_NURBS
                                  * - when 0 and bulk_size != 0 means
                                  *   1 URB and submit done by subdriver */
         u8 bulk;                /* image transfer by 0:isoc / 1:bulk */
         u8 npkt;                /* number of packets in an ISOC message
                                  * 0 is the default value: 32 packets */
-        u32 input_flags;        /* value for ENUM_INPUT status flags */
-        char reverse_alts;      /* Alt settings are in high to low order */
+        u8 reverse_alts;        /* Alt settings are in high to low order */
 };
 
 struct gspca_dev;
@@ -90,6 +91,9 @@ typedef int (*cam_qmnu_op) (struct gspca_dev *,
 typedef void (*cam_pkt_op) (struct gspca_dev *gspca_dev,
                                 u8 *data,
                                 int len);
+typedef int (*cam_int_pkt_op) (struct gspca_dev *gspca_dev,
+                                u8 *data,
+                                int len);
 
 struct ctrl {
         struct v4l2_queryctrl qctrl;
@@ -125,6 +129,12 @@ struct sd_desc {
         cam_reg_op get_register;
 #endif
         cam_ident_op get_chip_ident;
+#ifdef CONFIG_INPUT
+        cam_int_pkt_op int_pkt_scan;
+        /* other_input makes the gspca core create gspca_dev->input even when
+           int_pkt_scan is NULL, for cams with non interrupt driven buttons */
+        u8 other_input;
+#endif
 };
 
 /* packet types when moving from iso buf to frame buf */
@@ -147,6 +157,10 @@ struct gspca_dev {
         struct module *module;          /* subdriver handling the device */
         struct usb_device *dev;
         struct file *capt_file;         /* file doing video capture */
+#ifdef CONFIG_INPUT
+        struct input_dev *input_dev;
+        char phys[64];                  /* physical device path */
+#endif
 
         struct cam cam;                         /* device information */
         const struct sd_desc *sd_desc;          /* subdriver description */
@@ -156,6 +170,9 @@ struct gspca_dev {
 #define USB_BUF_SZ 64
         __u8 *usb_buf;                          /* buffer for USB exchanges */
         struct urb *urb[MAX_NURBS];
+#ifdef CONFIG_INPUT
+        struct urb *int_urb;
+#endif
 
         __u8 *frbuf;                            /* buffer for nframes */
         struct gspca_frame frame[GSPCA_MAX_FRAMES];
@@ -187,7 +204,6 @@ struct gspca_dev {
         char users;                     /* number of opens */
         char present;                   /* device connected */
         char nbufread;                  /* number of buffers for read() */
-        char nurbs;                     /* number of allocated URBs */
         char memory;                    /* memory type (V4L2_MEMORY_xxx) */
         __u8 iface;                     /* USB interface number */
         __u8 alt;                       /* USB alternate setting */