usb-storage: add new no_read_capacity_16 quirk

[pandora-kernel.git] / include / linux / usb_usual.h

diff --git a/include/linux/usb_usual.h b/include/linux/usb_usual.h
index a4b947e..71693d4 100644 (file)
--- a/include/linux/usb_usual.h
+++ b/include/linux/usb_usual.h
@@ -58,7 +58,11 @@
        US_FLAG(CAPACITY_OK,    0x00010000)                     \
                /* READ CAPACITY response is correct */         \
        US_FLAG(BAD_SENSE,      0x00020000)                     \
-               /* Bad Sense (never more than 18 bytes) */
+               /* Bad Sense (never more than 18 bytes) */      \
+       US_FLAG(NO_READ_DISC_INFO,      0x00040000)             \
+               /* cannot handle READ_DISC_INFO */              \
+       US_FLAG(NO_READ_CAPACITY_16,    0x00080000)             \
+               /* cannot handle READ_CAPACITY_16 */
 
 #define US_FLAG(name, value)   US_FL_##name = value ,
 enum { US_DO_ALL_FLAGS };
@@ -74,42 +78,7 @@ enum { US_DO_ALL_FLAGS };
 #define USB_US_TYPE(flags)             (((flags) >> 24) & 0xFF)
 #define USB_US_ORIG_FLAGS(flags)       ((flags) & 0x00FFFFFF)
 
-/*
- * This is probably not the best place to keep these constants, conceptually.
- * But it's the only header included into all places which need them.
- */
-
-/* Sub Classes */
-
-#define US_SC_RBC      0x01            /* Typically, flash devices */
-#define US_SC_8020     0x02            /* CD-ROM */
-#define US_SC_QIC      0x03            /* QIC-157 Tapes */
-#define US_SC_UFI      0x04            /* Floppy */
-#define US_SC_8070     0x05            /* Removable media */
-#define US_SC_SCSI     0x06            /* Transparent */
-#define US_SC_LOCKABLE 0x07            /* Password-protected */
-
-#define US_SC_ISD200    0xf0           /* ISD200 ATA */
-#define US_SC_CYP_ATACB 0xf1           /* Cypress ATACB */
-#define US_SC_DEVICE   0xff            /* Use device's value */
-
-/* Protocols */
-
-#define US_PR_CBI      0x00            /* Control/Bulk/Interrupt */
-#define US_PR_CB       0x01            /* Control/Bulk w/o interrupt */
-#define US_PR_BULK     0x50            /* bulk only */
-
-#define US_PR_USBAT    0x80            /* SCM-ATAPI bridge */
-#define US_PR_EUSB_SDDR09      0x81    /* SCM-SCSI bridge for SDDR-09 */
-#define US_PR_SDDR55   0x82            /* SDDR-55 (made up) */
-#define US_PR_DPCM_USB  0xf0           /* Combination CB/SDDR09 */
-#define US_PR_FREECOM   0xf1           /* Freecom */
-#define US_PR_DATAFAB   0xf2           /* Datafab chipsets */
-#define US_PR_JUMPSHOT  0xf3           /* Lexar Jumpshot */
-#define US_PR_ALAUDA    0xf4           /* Alauda chipsets */
-#define US_PR_KARMA     0xf5           /* Rio Karma */
-
-#define US_PR_DEVICE   0xff            /* Use device's value */
+#include <linux/usb/storage.h>
 
 /*
  */