Mirrors_Framework/rt-thread
1
0
Fork 0
mirror of https://github.com/RT-Thread/rt-thread.git synced 2026-09-22 11:30:01 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

add USB composite and mass storage class features in USB device stack

Browse Source 
git-svn-id: https://rt-thread.googlecode.com/svn/trunk@2447 bbd45198-f89e-11dd-88c7-29a3b14d5316
This commit is contained in:
qiuyiuestc@gmail.com
2012-11-25 00:02:10 +00:00
parent 1b2d954105
commit 60c27fc4b5
8 changed files with 726 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/drivers/include/drivers/usb_common.h
+8 -3
View File
@@ -51,6 +51,7 @@ extern "C" {
#define USB_DESC_TYPE_ENDPOINT 0x05
#define USB_DESC_TYPE_DEVICEQUALIFIER 0x06
#define USB_DESC_TYPE_OTHERSPEED 0x07
#define USB_DESC_TYPE_IAD 0x0b
#define USB_DESC_TYPE_HID 0x21
#define USB_DESC_TYPE_REPORT 0x22
#define USB_DESC_TYPE_PHYSICAL 0x23
@@ -58,6 +59,7 @@ extern "C" {
#define USB_DESC_LENGTH_DEVICE 0x12
#define USB_DESC_LENGTH_CONFIG 0x9
#define USB_DESC_LENGTH_IAD 0x8
#define USB_DESC_LENGTH_STRING 0x4
#define USB_DESC_LENGTH_INTERFACE 0x9
#define USB_DESC_LENGTH_ENDPOINT 0x7
@@ -244,7 +246,7 @@ struct uconfig_descriptor
rt_uint8_t iConfiguration;
rt_uint8_t bmAttributes;
rt_uint8_t MaxPower;
rt_uint8_t data[128];
rt_uint8_t data[256];
};
typedef struct uconfig_descriptor* ucfg_desc_t;
@@ -263,7 +265,7 @@ struct uinterface_descriptor
typedef struct uinterface_descriptor* uintf_desc_t;
/* Interface Association Descriptor (IAD) */
struct uassco_descriptor
struct uiad_descriptor
{
rt_uint8_t bLength;
rt_uint8_t bDescriptorType;
@@ -274,7 +276,7 @@ struct uassco_descriptor
rt_uint8_t bFunctionProtocol;
rt_uint8_t iFunction;
};
typedef struct uassco_descriptor* uassco_desc_t;
typedef struct uiad_descriptor* uiad_desc_t;
struct uendpoint_descriptor
{
@@ -364,6 +366,9 @@ typedef struct ustorage_csw* ustorage_csw_t;
#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
components/drivers/include/drivers/usb_device.h
+9 -2
View File
@@ -92,7 +92,9 @@ struct uclass
struct udevice* device;
udev_desc_t dev_desc;
struct uassco_descriptor* assco;
#ifdef RT_USB_DEVICE_COMPOSITE
uiad_desc_t iad_desc;
#endif
rt_list_t intf_list;
};
typedef struct uclass* uclass_t;
@@ -157,6 +159,7 @@ uep_t rt_usbd_endpoint_create(uep_desc_t ep_desc,
ualtsetting_t rt_usbd_altsetting_create(uintf_desc_t intf_desc, rt_size_t desc_size);
rt_err_t rt_usbd_core_init(void);
rt_err_t rt_usbd_post_event(struct udev_msg* msg, rt_size_t size);
rt_err_t rt_usbd_free_device(udevice_t device);
rt_err_t rt_usbd_device_set_controller(udevice_t device, udcd_t dcd);
rt_err_t rt_usbd_device_set_descriptor(udevice_t device, udev_desc_t dev_desc);
@@ -173,9 +176,13 @@ uconfig_t rt_usbd_find_config(udevice_t device, rt_uint8_t value);
uintf_t rt_usbd_find_interface(udevice_t device, rt_uint8_t value);
uep_t rt_usbd_find_endpoint(udevice_t device, rt_uint8_t ep_addr);
uclass_t rt_usbd_class_mass_create(udevice_t device);
uclass_t rt_usbd_class_mstorage_create(udevice_t device);
uclass_t rt_usbd_class_cdc_create(udevice_t device);
#ifdef RT_USB_DEVICE_COMPOSITE
rt_err_t rt_usbd_class_set_iad(uclass_t cls, uiad_desc_t iad_desc);
#endif
rt_inline rt_err_t dcd_set_address(udcd_t dcd, rt_uint8_t value)
{
RT_ASSERT(dcd != RT_NULL);