patch-2.4.8 linux/drivers/usb/storage/usb.h

• Lines: 46
• Date: Fri Aug 10 18:16:46 2001
• Orig file: v2.4.7/linux/drivers/usb/storage/usb.h
• Orig date: Tue Aug 7 12:51:28 2001

diff -u --recursive --new-file v2.4.7/linux/drivers/usb/storage/usb.h linux/drivers/usb/storage/usb.h
@@ -1,7 +1,7 @@
 /* Driver for USB Mass Storage compliant devices
  * Main Header File
  *
- * $Id: usb.h,v 1.12 2000/12/05 03:33:49 mdharm Exp $
+ * $Id: usb.h,v 1.18 2001/07/30 00:27:59 mdharm Exp $
  *
  * Current development and maintenance by:
  *   (c) 1999, 2000 Matthew Dharm (mdharm-usb@one-eyed-alien.net)
@@ -47,6 +47,7 @@
 #include <linux/usb.h>
 #include <linux/blk.h>
 #include <linux/smp_lock.h>
+#include <linux/completion.h>
 #include "scsi.h"
 #include "hosts.h"
 
@@ -94,11 +95,12 @@
 
 /* Flag definitions */
 #define US_FL_SINGLE_LUN      0x00000001 /* allow access to only LUN 0	    */
-#define US_FL_MODE_XLATE      0x00000002 /* translate _6 to _10 comands for
+#define US_FL_MODE_XLATE      0x00000002 /* translate _6 to _10 commands for
 						    Win/MacOS compatibility */
 #define US_FL_START_STOP      0x00000004 /* ignore START_STOP commands	    */
 #define US_FL_IGNORE_SER      0x00000010 /* Ignore the serial number given  */
 #define US_FL_SCM_MULT_TARG   0x00000020 /* supports multiple targets */
+#define US_FL_FIX_INQUIRY     0x00000040 /* INQUIRY response needs fixing */
 
 #define USB_STOR_STRING_LEN 32
 
@@ -165,11 +167,11 @@
 	struct semaphore	current_urb_sem; /* to protect irq_urb	 */
 	struct urb		*current_urb;	 /* non-int USB requests */
 
-	/* the waitqueue for sleeping the control thread */
-	wait_queue_head_t	wqh;		 /* to sleep thread on   */
+	/* the semaphore for sleeping the control thread */
+	struct semaphore	sema;		 /* to sleep thread on   */
 
 	/* mutual exclusion structures */
-	struct semaphore	notify;		 /* thread begin/end	    */
+	struct completion	notify;		 /* thread begin/end	    */
 	struct semaphore	queue_exclusion; /* to protect data structs */
 	struct us_unusual_dev   *unusual_dev;	 /* If unusual device       */
 	void			*extra;		 /* Any extra data          */