diff --git a/components/drivers/include/drivers/usb_common.h b/components/drivers/include/drivers/usb_common.h index 920a85e61b1ab22bef7a4cb4f2c825f433b85d5d..1c3dd1ec491697c567237daccdd39a103c051d4a 100644 --- a/components/drivers/include/drivers/usb_common.h +++ b/components/drivers/include/drivers/usb_common.h @@ -390,24 +390,6 @@ struct usb_os_header_comp_id_descriptor }; typedef struct usb_os_header_comp_id_descriptor * usb_os_header_desc_t; -struct usb_os_function_comp_id_descriptor -{ - rt_list_t list; - rt_uint8_t bFirstInterfaceNumber; - rt_uint8_t reserved1; - rt_uint8_t compatibleID[8]; - rt_uint8_t subCompatibleID[8]; - rt_uint8_t reserved2[6]; -}; -typedef struct usb_os_function_comp_id_descriptor * usb_os_func_comp_id_desc_t; - -struct usb_os_comp_id_descriptor -{ - struct usb_os_header_comp_id_descriptor head_desc; - rt_list_t func_desc; -}; -typedef struct usb_os_comp_id_descriptor * usb_os_comp_id_desc_t; - struct usb_os_property_header { rt_uint32_t dwLength; @@ -557,6 +539,24 @@ typedef struct ustorage_csw* ustorage_csw_t; #pragma pack() +struct usb_os_comp_id_descriptor +{ + struct usb_os_header_comp_id_descriptor head_desc; + rt_list_t func_desc; +}; +typedef struct usb_os_comp_id_descriptor * usb_os_comp_id_desc_t; + +struct usb_os_function_comp_id_descriptor +{ + rt_list_t list; + rt_uint8_t bFirstInterfaceNumber; + rt_uint8_t reserved1; + rt_uint8_t compatibleID[8]; + rt_uint8_t subCompatibleID[8]; + rt_uint8_t reserved2[6]; +}; +typedef struct usb_os_function_comp_id_descriptor * usb_os_func_comp_id_desc_t; + /* * USB device event loop thread configurations */