diff options
Diffstat (limited to 'components/drivers/include')
| -rw-r--r-- | components/drivers/include/drivers/usb_common.h | 38 | ||||
| -rw-r--r-- | components/drivers/include/drivers/usb_device.h | 23 |
2 files changed, 30 insertions, 31 deletions
diff --git a/components/drivers/include/drivers/usb_common.h b/components/drivers/include/drivers/usb_common.h index 503d3edbae..495cc17787 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,26 +320,14 @@ 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; +#define MIN(a, b) (a < b ? a : b) +#define MAX(a, b) (a > b ? a : b) -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; +/* + * 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 @@ -363,12 +351,6 @@ typedef struct ustorage_csw* ustorage_csw_t; #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) - #pragma pack() #ifdef __cplusplus diff --git a/components/drivers/include/drivers/usb_device.h b/components/drivers/include/drivers/usb_device.h index b969eb6864..e4b623ab00 100644 --- a/components/drivers/include/drivers/usb_device.h +++ b/components/drivers/include/drivers/usb_device.h @@ -19,10 +19,19 @@ #include <rtthread.h> #include "usb_common.h" -#define CONTROL_SEND_STATUS 0x00 -#define CONTROL_RECEIVE_STATUS 0x01 +/* Vendor ID */ +#ifdef USB_VENDOR_ID +#define USB_VENDOR_ID _VENDOR_ID +#else +#define _VENDOR_ID 0x0EFF +#endif +/* Product ID */ +#ifdef USB_PRODUCT_ID +#define USB_PRODUCT_ID _PRODUCT_ID +#else +#define _PRODUCT_ID 0x0001 +#endif -#define USB_VENDOR_ID 0x0483 /* Vendor ID */ #define USB_BCD_DEVICE 0x0200 /* USB Specification Release Number in Binary-Coded Decimal */ #define USB_BCD_VERSION 0x0200 /* USB 2.0 */ @@ -42,6 +51,7 @@ struct udcd_ops rt_err_t (*ep_stop)(struct uendpoint* ep); rt_err_t (*ep_read)(struct uendpoint* ep, void *buffer, rt_size_t size); rt_size_t (*ep_write)(struct uendpoint* ep, void *buffer, rt_size_t size); + rt_err_t (*send_status)(void); }; struct udcd @@ -264,4 +274,11 @@ rt_inline rt_size_t dcd_ep_write(udcd_t dcd, uep_t ep, void *buffer, return dcd->ops->ep_write(ep, buffer, size); } +rt_inline rt_err_t dcd_send_status(udcd_t dcd) +{ + RT_ASSERT(dcd != RT_NULL); + + return dcd->ops->send_status(); +} + #endif |
