git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
USB: ftdi_sio: add Basic Micro ATOM Nano USB2Serial PID
[pandora-kernel.git]
/
drivers
/
usb
/
storage
/
usb.h
diff --git
a/drivers/usb/storage/usb.h
b/drivers/usb/storage/usb.h
index
89d3bff
..
75f70f0
100644
(file)
--- a/
drivers/usb/storage/usb.h
+++ b/
drivers/usb/storage/usb.h
@@
-47,6
+47,7
@@
#include <linux/blkdev.h>
#include <linux/completion.h>
#include <linux/mutex.h>
#include <linux/blkdev.h>
#include <linux/completion.h>
#include <linux/mutex.h>
+#include <linux/workqueue.h>
#include <scsi/scsi_host.h>
struct us_data;
#include <scsi/scsi_host.h>
struct us_data;
@@
-72,7
+73,9
@@
struct us_unusual_dev {
#define US_FLIDX_DISCONNECTING 3 /* disconnect in progress */
#define US_FLIDX_RESETTING 4 /* device reset in progress */
#define US_FLIDX_TIMED_OUT 5 /* SCSI midlayer timed out */
#define US_FLIDX_DISCONNECTING 3 /* disconnect in progress */
#define US_FLIDX_RESETTING 4 /* device reset in progress */
#define US_FLIDX_TIMED_OUT 5 /* SCSI midlayer timed out */
-#define US_FLIDX_DONT_SCAN 6 /* don't scan (disconnect) */
+#define US_FLIDX_SCAN_PENDING 6 /* scanning not yet done */
+#define US_FLIDX_REDO_READ10 7 /* redo READ(10) command */
+#define US_FLIDX_READ10_WORKED 8 /* previous READ(10) succeeded */
#define USB_STOR_STRING_LEN 32
#define USB_STOR_STRING_LEN 32
@@
-145,8
+148,8
@@
struct us_data {
/* mutual exclusion and synchronization structures */
struct completion cmnd_ready; /* to sleep thread on */
struct completion notify; /* thread begin/end */
/* mutual exclusion and synchronization structures */
struct completion cmnd_ready; /* to sleep thread on */
struct completion notify; /* thread begin/end */
- wait_queue_head_t delay_wait; /* wait during
scan, reset
*/
- struct
completion scanning_done; /* wait for scan thread
*/
+ wait_queue_head_t delay_wait; /* wait during
reset
*/
+ struct
delayed_work scan_dwork; /* for async scanning
*/
/* subdriver information */
void *extra; /* Any extra data */
/* subdriver information */
void *extra; /* Any extra data */