move the define related to Mass to mstorage.h

1 files changed, 3 insertions, 49 deletions

diff --git a/components/drivers/include/drivers/usb_common.h b/components/drivers/include/drivers/usb_common.h
index 503d3edbae..16b332744a 100644
--- a/components/drivers/include/drivers/usb_common.h
+++ b/components/drivers/include/drivers/usb_common.h
@@ -9,11 +9,11 @@
  *
  * Change Logs:
  * Date           Author       Notes
- * 2012-10-01     Yi Qiu      first version
+ * 2012-10-01     Yi Qiu       first version
  */
 
-#ifndef __RT_USB_COMMON_H__
-#define __RT_USB_COMMON_H__
+#ifndef __USB_COMMON_H__
+#define __USB_COMMON_H__
 
 #ifdef __cplusplus
 extern "C" {
@@ -320,52 +320,6 @@ struct ureqest
 };
 typedef struct ureqest* ureq_t;
 
-struct ustorage_cbw 
-{
-    rt_uint32_t signature;
-    rt_uint32_t tag;
-    rt_uint32_t xfer_len;
-    rt_uint8_t dflags;
-    rt_uint8_t lun;
-    rt_uint8_t cb_len;
-    rt_uint8_t cb[16];
-};
-typedef struct ustorage_cbw* ustorage_cbw_t;
-
-struct ustorage_csw 
-{
-    rt_uint32_t signature;
-    rt_uint32_t tag;
-    rt_uint32_t data_reside;
-    rt_uint8_t  status;
-};
-typedef struct ustorage_csw* ustorage_csw_t;
-
-#define SIZEOF_CSW                      0x0d
-#define SIZEOF_CBW                      0x1f
-
-#define CBWFLAGS_DIR_M                  0x80
-#define CBWFLAGS_DIR_IN                 0x80
-#define CBWFLAGS_DIR_OUT                0x00
-
-#define SCSI_TEST_UNIT_READY            0x00
-#define SCSI_REQUEST_SENSE              0x03
-#define SCSI_INQUIRY_CMD                0x12
-#define SCSI_ALLOW_MEDIUM_REMOVAL       0x1e
-#define SCSI_MODE_SENSE_6               0x1a
-#define SCSI_READ_CAPACITIES            0x23
-#define SCSI_READ_CAPACITY              0x25
-#define SCSI_READ_10                    0x28
-#define SCSI_WRITE_10                   0x2a
-#define SCSI_VERIFY_10                  0x2f
-
-#define CBW_SIGNATURE                   0x43425355
-#define CSW_SIGNATURE                   0x53425355
-#define CBW_TAG_VALUE                   0x12345678
-
-#define USBREQ_GET_MAX_LUN              0xfe
-#define USBREQ_MASS_STORAGE_RESET       0xff
-
 #define MIN(a, b) (a < b ? a : b)
 #define MAX(a, b) (a > b ? a : b)