From 7b2929303eeaf90f18f1404e896f869b62166ac4 Mon Sep 17 00:00:00 2001 From: heyuanjie87 Date: Fri, 11 Jan 2013 00:02:21 +0800 Subject: [PATCH] revert some define to usb_common.h --- .../drivers/include/drivers/usb_common.h | 21 +++++++++++++++++++ .../drivers/usb/usbdevice/class/mstorage.h | 21 ------------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/components/drivers/include/drivers/usb_common.h b/components/drivers/include/drivers/usb_common.h index 495cc17787..5881e11dc6 100644 --- a/components/drivers/include/drivers/usb_common.h +++ b/components/drivers/include/drivers/usb_common.h @@ -351,6 +351,27 @@ typedef struct ureqest* ureq_t; #define CSW_SIGNATURE 0x53425355 #define CBW_TAG_VALUE 0x12345678 +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; + #pragma pack() #ifdef __cplusplus diff --git a/components/drivers/usb/usbdevice/class/mstorage.h b/components/drivers/usb/usbdevice/class/mstorage.h index eb8e81a68f..951cbdfef8 100644 --- a/components/drivers/usb/usbdevice/class/mstorage.h +++ b/components/drivers/usb/usbdevice/class/mstorage.h @@ -20,27 +20,6 @@ #pragma pack(1) -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; - struct umass_descriptor { struct uinterface_descriptor intf_desc; -- GitLab