patch-2.3.29 linux/drivers/usb/cpia.h

Next file: linux/drivers/usb/dc2xx.c
Previous file: linux/drivers/usb/cpia.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.28/linux/drivers/usb/cpia.h linux/drivers/usb/cpia.h
@@ -159,11 +159,14 @@
 	int hdrwidth;		/* Width the frame actually is */
 	int hdrheight;		/* Height */
 
-	int grabstate;		/* State of grabbing */
+	volatile int grabstate;	/* State of grabbing */
 	int scanstate;		/* State of scanning */
 
 	int curline;		/* Line of frame we're working on */
 
+	long scanlength;	/* uncompressed, raw data length of frame */
+	long bytes_read;	/* amount of scanlength that has been read from *data */
+
 	wait_queue_head_t wq;	/* Processes waiting */
 };
 
@@ -176,6 +179,9 @@
 	/* Device structure */
 	struct usb_device *dev;
 
+	struct semaphore lock;
+	int user;		/* user count for exclusive use */
+
 	int streaming;		/* Are we streaming Isochronous? */
 	int grabbing;		/* Are we grabbing? */
 
@@ -195,4 +201,3 @@
 };
 
 #endif
-

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)