From d84fde4e5493b1409adb2892fd4ac7cb4aadf303 Mon Sep 17 00:00:00 2001
From: heyuanjie87 <sc943313837@gmail.com>
Date: Wed, 9 Jan 2013 18:56:14 +0800
Subject: [PATCH] revert the define

---
 .../drivers/include/drivers/usb_common.h      | 28 +++++++++++++++++++
 .../drivers/usb/usbdevice/class/mstorage.h    | 25 -----------------
 2 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/components/drivers/include/drivers/usb_common.h b/components/drivers/include/drivers/usb_common.h
index 16b332744a..495cc17787 100644
--- a/components/drivers/include/drivers/usb_common.h
+++ b/components/drivers/include/drivers/usb_common.h
@@ -323,6 +323,34 @@ typedef struct ureqest* ureq_t;
 #define MIN(a, b) (a < b ? a : b)
 #define MAX(a, b) (a > b ? a : b)
 
+/* 
+ * the define related to mass storage
+ */
+#define USBREQ_GET_MAX_LUN              0xfe
+#define USBREQ_MASS_STORAGE_RESET       0xff
+
+#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
+
 #pragma pack()
 
 #ifdef __cplusplus
diff --git a/components/drivers/usb/usbdevice/class/mstorage.h b/components/drivers/usb/usbdevice/class/mstorage.h
index 556e3aa77e..eb8e81a68f 100644
--- a/components/drivers/usb/usbdevice/class/mstorage.h
+++ b/components/drivers/usb/usbdevice/class/mstorage.h
@@ -18,31 +18,6 @@
 
 #include <rtthread.h>
 
-#define USBREQ_GET_MAX_LUN              0xfe
-#define USBREQ_MASS_STORAGE_RESET       0xff
-
-#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
-
 #pragma pack(1)
 
 struct ustorage_cbw