diff --git a/examples/obsolete/device/src/cdc_device_app.c b/examples/obsolete/device/src/cdc_device_app.c index 1d77511c..406ab2a4 100644 --- a/examples/obsolete/device/src/cdc_device_app.c +++ b/examples/obsolete/device/src/cdc_device_app.c @@ -51,7 +51,6 @@ enum { SERIAL_BUFFER_SIZE = 64 }; //--------------------------------------------------------------------+ // MACRO CONSTANT TYPEDEF //--------------------------------------------------------------------+ -static osal_semaphore_t sem_hdl; //--------------------------------------------------------------------+ // INTERNAL OBJECT & FUNCTION DECLARATION diff --git a/examples/obsolete/device/src/tusb_descriptors.c b/examples/obsolete/device/src/tusb_descriptors.c index 82d9d1fb..14c6e488 100644 --- a/examples/obsolete/device/src/tusb_descriptors.c +++ b/examples/obsolete/device/src/tusb_descriptors.c @@ -138,7 +138,7 @@ uint8_t const desc_mouse_report[] = { tusb_descriptor_device_t const desc_device = { .bLength = sizeof(tusb_descriptor_device_t), - .bDescriptorType = TUSB_DESC_TYPE_DEVICE, + .bDescriptorType = TUSB_DESC_DEVICE, .bcdUSB = 0x0200, #if TUSB_CFG_DEVICE_CDC // Use Interface Association Descriptor (IAD) for CDC @@ -173,7 +173,7 @@ app_descriptor_configuration_t const desc_configuration = .configuration = { .bLength = sizeof(tusb_descriptor_configuration_t), - .bDescriptorType = TUSB_DESC_TYPE_CONFIGURATION, + .bDescriptorType = TUSB_DESC_CONFIGURATION, .wTotalLength = sizeof(app_descriptor_configuration_t), .bNumInterfaces = TOTAL_INTEFACES, @@ -189,7 +189,7 @@ app_descriptor_configuration_t const desc_configuration = .cdc_iad = { .bLength = sizeof(tusb_descriptor_interface_association_t), - .bDescriptorType = TUSB_DESC_TYPE_INTERFACE_ASSOCIATION, + .bDescriptorType = TUSB_DESC_INTERFACE_ASSOCIATION, .bFirstInterface = INTERFACE_NO_CDC, .bInterfaceCount = 2, @@ -204,7 +204,7 @@ app_descriptor_configuration_t const desc_configuration = .cdc_comm_interface = { .bLength = sizeof(tusb_descriptor_interface_t), - .bDescriptorType = TUSB_DESC_TYPE_INTERFACE, + .bDescriptorType = TUSB_DESC_INTERFACE, .bInterfaceNumber = INTERFACE_NO_CDC, .bAlternateSetting = 0, .bNumEndpoints = 1, @@ -217,7 +217,7 @@ app_descriptor_configuration_t const desc_configuration = .cdc_header = { .bLength = sizeof(cdc_desc_func_header_t), - .bDescriptorType = TUSB_DESC_TYPE_INTERFACE_CLASS_SPECIFIC, + .bDescriptorType = TUSB_DESC_CLASS_SPECIFIC, .bDescriptorSubType = CDC_FUNC_DESC_HEADER, .bcdCDC = 0x0120 }, @@ -225,7 +225,7 @@ app_descriptor_configuration_t const desc_configuration = .cdc_call = { .bLength = sizeof(cdc_desc_func_call_management_t), - .bDescriptorType = TUSB_DESC_TYPE_INTERFACE_CLASS_SPECIFIC, + .bDescriptorType = TUSB_DESC_CLASS_SPECIFIC, .bDescriptorSubType = CDC_FUNC_DESC_CALL_MANAGEMENT, .bmCapabilities = { 0 }, .bDataInterface = INTERFACE_NO_CDC+1, @@ -234,7 +234,7 @@ app_descriptor_configuration_t const desc_configuration = .cdc_acm = { .bLength = sizeof(cdc_desc_func_abstract_control_management_t), - .bDescriptorType = TUSB_DESC_TYPE_INTERFACE_CLASS_SPECIFIC, + .bDescriptorType = TUSB_DESC_CLASS_SPECIFIC, .bDescriptorSubType = CDC_FUNC_DESC_ABSTRACT_CONTROL_MANAGEMENT, .bmCapabilities = { // 0x02 .support_line_request = 1, @@ -244,7 +244,7 @@ app_descriptor_configuration_t const desc_configuration = .cdc_union = { .bLength = sizeof(cdc_desc_func_union_t), // plus number of - .bDescriptorType = TUSB_DESC_TYPE_INTERFACE_CLASS_SPECIFIC, + .bDescriptorType = TUSB_DESC_CLASS_SPECIFIC, .bDescriptorSubType = CDC_FUNC_DESC_UNION, .bControlInterface = INTERFACE_NO_CDC, .bSubordinateInterface = INTERFACE_NO_CDC+1, @@ -253,7 +253,7 @@ app_descriptor_configuration_t const desc_configuration = .cdc_endpoint_notification = { .bLength = sizeof(tusb_descriptor_endpoint_t), - .bDescriptorType = TUSB_DESC_TYPE_ENDPOINT, + .bDescriptorType = TUSB_DESC_ENDPOINT, .bEndpointAddress = CDC_EDPT_NOTIFICATION_ADDR, .bmAttributes = { .xfer = TUSB_XFER_INTERRUPT }, .wMaxPacketSize = { .size = 0x08 }, @@ -264,7 +264,7 @@ app_descriptor_configuration_t const desc_configuration = .cdc_data_interface = { .bLength = sizeof(tusb_descriptor_interface_t), - .bDescriptorType = TUSB_DESC_TYPE_INTERFACE, + .bDescriptorType = TUSB_DESC_INTERFACE, .bInterfaceNumber = INTERFACE_NO_CDC+1, .bAlternateSetting = 0x00, .bNumEndpoints = 2, @@ -277,7 +277,7 @@ app_descriptor_configuration_t const desc_configuration = .cdc_endpoint_out = { .bLength = sizeof(tusb_descriptor_endpoint_t), - .bDescriptorType = TUSB_DESC_TYPE_ENDPOINT, + .bDescriptorType = TUSB_DESC_ENDPOINT, .bEndpointAddress = CDC_EDPT_DATA_OUT_ADDR, .bmAttributes = { .xfer = TUSB_XFER_BULK }, .wMaxPacketSize = { .size = CDC_EDPT_DATA_PACKETSIZE }, @@ -287,7 +287,7 @@ app_descriptor_configuration_t const desc_configuration = .cdc_endpoint_in = { .bLength = sizeof(tusb_descriptor_endpoint_t), - .bDescriptorType = TUSB_DESC_TYPE_ENDPOINT, + .bDescriptorType = TUSB_DESC_ENDPOINT, .bEndpointAddress = CDC_EDPT_DATA_IN_ADDR, .bmAttributes = { .xfer = TUSB_XFER_BULK }, .wMaxPacketSize = { .size = CDC_EDPT_DATA_PACKETSIZE }, @@ -300,7 +300,7 @@ app_descriptor_configuration_t const desc_configuration = .keyboard_interface = { .bLength = sizeof(tusb_descriptor_interface_t), - .bDescriptorType = TUSB_DESC_TYPE_INTERFACE, + .bDescriptorType = TUSB_DESC_INTERFACE, .bInterfaceNumber = INTERFACE_NO_HID_KEYBOARD, .bAlternateSetting = 0x00, .bNumEndpoints = 1, @@ -324,7 +324,7 @@ app_descriptor_configuration_t const desc_configuration = .keyboard_endpoint = { .bLength = sizeof(tusb_descriptor_endpoint_t), - .bDescriptorType = TUSB_DESC_TYPE_ENDPOINT, + .bDescriptorType = TUSB_DESC_ENDPOINT, .bEndpointAddress = HID_KEYBOARD_EDPT_ADDR, .bmAttributes = { .xfer = TUSB_XFER_INTERRUPT }, .wMaxPacketSize = { .size = HID_KEYBOARD_EDPT_PACKETSIZE }, @@ -337,7 +337,7 @@ app_descriptor_configuration_t const desc_configuration = .mouse_interface = { .bLength = sizeof(tusb_descriptor_interface_t), - .bDescriptorType = TUSB_DESC_TYPE_INTERFACE, + .bDescriptorType = TUSB_DESC_INTERFACE, .bInterfaceNumber = INTERFACE_NO_HID_MOUSE, .bAlternateSetting = 0x00, .bNumEndpoints = 1, @@ -361,7 +361,7 @@ app_descriptor_configuration_t const desc_configuration = .mouse_endpoint = { .bLength = sizeof(tusb_descriptor_endpoint_t), - .bDescriptorType = TUSB_DESC_TYPE_ENDPOINT, + .bDescriptorType = TUSB_DESC_ENDPOINT, .bEndpointAddress = HID_MOUSE_EDPT_ADDR, // TODO .bmAttributes = { .xfer = TUSB_XFER_INTERRUPT }, .wMaxPacketSize = { .size = HID_MOUSE_EDPT_PACKETSIZE }, @@ -374,7 +374,7 @@ app_descriptor_configuration_t const desc_configuration = .msc_interface = { .bLength = sizeof(tusb_descriptor_interface_t), - .bDescriptorType = TUSB_DESC_TYPE_INTERFACE, + .bDescriptorType = TUSB_DESC_INTERFACE, .bInterfaceNumber = INTERFACE_NO_MSC, .bAlternateSetting = 0x00, .bNumEndpoints = 2, @@ -387,7 +387,7 @@ app_descriptor_configuration_t const desc_configuration = .msc_endpoint_in = { .bLength = sizeof(tusb_descriptor_endpoint_t), - .bDescriptorType = TUSB_DESC_TYPE_ENDPOINT, + .bDescriptorType = TUSB_DESC_ENDPOINT, .bEndpointAddress = MSC_EDPT_IN_ADDR, .bmAttributes = { .xfer = TUSB_XFER_BULK }, .wMaxPacketSize = { .size = MSC_EDPT_PACKETSIZE }, @@ -397,7 +397,7 @@ app_descriptor_configuration_t const desc_configuration = .msc_endpoint_out = { .bLength = sizeof(tusb_descriptor_endpoint_t), - .bDescriptorType = TUSB_DESC_TYPE_ENDPOINT, + .bDescriptorType = TUSB_DESC_ENDPOINT, .bEndpointAddress = MSC_EDPT_OUT_ADDR, .bmAttributes = { .xfer = TUSB_XFER_BULK }, .wMaxPacketSize = { .size = MSC_EDPT_PACKETSIZE }, @@ -416,42 +416,42 @@ app_descriptor_configuration_t const desc_configuration = uint16_t const * const string_descriptor_arr [] = { [0] = (uint16_t []) { // supported language - ENDIAN_BE16_FROM( STRING_LEN_UNICODE(1), TUSB_DESC_TYPE_STRING ), + ENDIAN_BE16_FROM( STRING_LEN_UNICODE(1), TUSB_DESC_STRING ), 0x0409 // English }, [1] = (uint16_t []) { // manufacturer - ENDIAN_BE16_FROM( STRING_LEN_UNICODE(11), TUSB_DESC_TYPE_STRING), + ENDIAN_BE16_FROM( STRING_LEN_UNICODE(11), TUSB_DESC_STRING), 't', 'i', 'n', 'y', 'u', 's', 'b', '.', 'o', 'r', 'g' // len = 11 }, [2] = (uint16_t []) { // product - ENDIAN_BE16_FROM( STRING_LEN_UNICODE(14), TUSB_DESC_TYPE_STRING), + ENDIAN_BE16_FROM( STRING_LEN_UNICODE(14), TUSB_DESC_STRING), 't', 'i', 'n', 'y', 'u', 's', 'b', ' ', 'd', 'e', 'v', 'i', 'c', 'e' // len = 14 }, [3] = (uint16_t []) { // serials - ENDIAN_BE16_FROM( STRING_LEN_UNICODE(4), TUSB_DESC_TYPE_STRING), + ENDIAN_BE16_FROM( STRING_LEN_UNICODE(4), TUSB_DESC_STRING), '1', '2', '3', '4' // len = 4 }, [4] = (uint16_t []) { // CDC Interface - ENDIAN_BE16_FROM( STRING_LEN_UNICODE(3), TUSB_DESC_TYPE_STRING), + ENDIAN_BE16_FROM( STRING_LEN_UNICODE(3), TUSB_DESC_STRING), 'c', 'd', 'c' // len = 3 }, [5] = (uint16_t []) { // Keyboard Interface - ENDIAN_BE16_FROM( STRING_LEN_UNICODE(5), TUSB_DESC_TYPE_STRING), + ENDIAN_BE16_FROM( STRING_LEN_UNICODE(5), TUSB_DESC_STRING), 'm', 'o', 'u', 's', 'e' // len = 5 }, [6] = (uint16_t []) { // Keyboard Interface - ENDIAN_BE16_FROM( STRING_LEN_UNICODE(8), TUSB_DESC_TYPE_STRING), + ENDIAN_BE16_FROM( STRING_LEN_UNICODE(8), TUSB_DESC_STRING), 'k', 'e', 'y', 'b', 'o', 'a', 'r', 'd' // len = 8 }, [7] = (uint16_t []) { // MSC Interface - ENDIAN_BE16_FROM( STRING_LEN_UNICODE(3), TUSB_DESC_TYPE_STRING), + ENDIAN_BE16_FROM( STRING_LEN_UNICODE(3), TUSB_DESC_STRING), 'm', 's', 'c' // len = 3 } }; diff --git a/tinyusb/class/cdc/cdc_device.c b/tinyusb/class/cdc/cdc_device.c index 46635f96..e604f149 100644 --- a/tinyusb/class/cdc/cdc_device.c +++ b/tinyusb/class/cdc/cdc_device.c @@ -142,7 +142,7 @@ tusb_error_t cdcd_open(uint8_t port, tusb_descriptor_interface_t const * p_inter //------------- Communication Interface -------------// (*p_length) = sizeof(tusb_descriptor_interface_t); - while( TUSB_DESC_TYPE_INTERFACE_CLASS_SPECIFIC == p_desc[DESCRIPTOR_OFFSET_TYPE] ) + while( TUSB_DESC_CLASS_SPECIFIC == p_desc[DESCRIPTOR_OFFSET_TYPE] ) { // Communication Functional Descriptors if ( CDC_FUNC_DESC_ABSTRACT_CONTROL_MANAGEMENT == cdc_functional_desc_typeof(p_desc) ) { // save ACM bmCapabilities @@ -153,7 +153,7 @@ tusb_error_t cdcd_open(uint8_t port, tusb_descriptor_interface_t const * p_inter p_desc = descriptor_next(p_desc); } - if ( TUSB_DESC_TYPE_ENDPOINT == p_desc[DESCRIPTOR_OFFSET_TYPE]) + if ( TUSB_DESC_ENDPOINT == p_desc[DESCRIPTOR_OFFSET_TYPE]) { // notification endpoint if any TU_ASSERT( tusb_dcd_edpt_open(port, (tusb_descriptor_endpoint_t const *) p_desc), TUSB_ERROR_DCD_OPEN_PIPE_FAILED); @@ -164,7 +164,7 @@ tusb_error_t cdcd_open(uint8_t port, tusb_descriptor_interface_t const * p_inter } //------------- Data Interface (if any) -------------// - if ( (TUSB_DESC_TYPE_INTERFACE == p_desc[DESCRIPTOR_OFFSET_TYPE]) && + if ( (TUSB_DESC_INTERFACE == p_desc[DESCRIPTOR_OFFSET_TYPE]) && (TUSB_CLASS_CDC_DATA == ((tusb_descriptor_interface_t const *) p_desc)->bInterfaceClass) ) { (*p_length) += p_desc[DESCRIPTOR_OFFSET_LENGTH]; @@ -174,7 +174,7 @@ tusb_error_t cdcd_open(uint8_t port, tusb_descriptor_interface_t const * p_inter for(uint32_t i=0; i<2; i++) { tusb_descriptor_endpoint_t const *p_endpoint = (tusb_descriptor_endpoint_t const *) p_desc; - TU_ASSERT(TUSB_DESC_TYPE_ENDPOINT == p_endpoint->bDescriptorType, TUSB_ERROR_DESCRIPTOR_CORRUPTED); + TU_ASSERT(TUSB_DESC_ENDPOINT == p_endpoint->bDescriptorType, TUSB_ERROR_DESCRIPTOR_CORRUPTED); TU_ASSERT(TUSB_XFER_BULK == p_endpoint->bmAttributes.xfer, TUSB_ERROR_DESCRIPTOR_CORRUPTED); TU_ASSERT( tusb_dcd_edpt_open(port, p_endpoint), TUSB_ERROR_DCD_OPEN_PIPE_FAILED); diff --git a/tinyusb/class/cdc/cdc_host.c b/tinyusb/class/cdc/cdc_host.c index c4aac4f5..fc1f8fba 100644 --- a/tinyusb/class/cdc/cdc_host.c +++ b/tinyusb/class/cdc/cdc_host.c @@ -167,7 +167,7 @@ tusb_error_t cdch_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t con //------------- Communication Interface -------------// (*p_length) = sizeof(tusb_descriptor_interface_t); - while( TUSB_DESC_TYPE_INTERFACE_CLASS_SPECIFIC == p_desc[DESCRIPTOR_OFFSET_TYPE] ) + while( TUSB_DESC_CLASS_SPECIFIC == p_desc[DESCRIPTOR_OFFSET_TYPE] ) { // Communication Functional Descriptors if ( CDC_FUNC_DESC_ABSTRACT_CONTROL_MANAGEMENT == cdc_functional_desc_typeof(p_desc) ) { // save ACM bmCapabilities @@ -178,7 +178,7 @@ tusb_error_t cdch_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t con p_desc = descriptor_next(p_desc); } - if ( TUSB_DESC_TYPE_ENDPOINT == p_desc[DESCRIPTOR_OFFSET_TYPE]) + if ( TUSB_DESC_ENDPOINT == p_desc[DESCRIPTOR_OFFSET_TYPE]) { // notification endpoint if any p_cdc->pipe_notification = hcd_pipe_open(dev_addr, (tusb_descriptor_endpoint_t const *) p_desc, TUSB_CLASS_CDC); @@ -189,7 +189,7 @@ tusb_error_t cdch_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t con } //------------- Data Interface (if any) -------------// - if ( (TUSB_DESC_TYPE_INTERFACE == p_desc[DESCRIPTOR_OFFSET_TYPE]) && + if ( (TUSB_DESC_INTERFACE == p_desc[DESCRIPTOR_OFFSET_TYPE]) && (TUSB_CLASS_CDC_DATA == ((tusb_descriptor_interface_t const *) p_desc)->bInterfaceClass) ) { (*p_length) += p_desc[DESCRIPTOR_OFFSET_LENGTH]; @@ -199,7 +199,7 @@ tusb_error_t cdch_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t con for(uint32_t i=0; i<2; i++) { tusb_descriptor_endpoint_t const *p_endpoint = (tusb_descriptor_endpoint_t const *) p_desc; - ASSERT_INT(TUSB_DESC_TYPE_ENDPOINT, p_endpoint->bDescriptorType, TUSB_ERROR_USBH_DESCRIPTOR_CORRUPTED); + ASSERT_INT(TUSB_DESC_ENDPOINT, p_endpoint->bDescriptorType, TUSB_ERROR_USBH_DESCRIPTOR_CORRUPTED); ASSERT_INT(TUSB_XFER_BULK, p_endpoint->bmAttributes.xfer, TUSB_ERROR_USBH_DESCRIPTOR_CORRUPTED); pipe_handle_t * p_pipe_hdl = ( p_endpoint->bEndpointAddress & TUSB_DIR_IN_MASK ) ? diff --git a/tinyusb/class/custom_class_host.c b/tinyusb/class/custom_class_host.c index ce9c5d01..be660d9d 100644 --- a/tinyusb/class/custom_class_host.c +++ b/tinyusb/class/custom_class_host.c @@ -117,7 +117,7 @@ tusb_error_t cush_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t con for(uint32_t i=0; i<2; i++) { tusb_descriptor_endpoint_t const *p_endpoint = (tusb_descriptor_endpoint_t const *) p_desc; - ASSERT_INT(TUSB_DESC_TYPE_ENDPOINT, p_endpoint->bDescriptorType, TUSB_ERROR_INVALID_PARA); + ASSERT_INT(TUSB_DESC_ENDPOINT, p_endpoint->bDescriptorType, TUSB_ERROR_INVALID_PARA); pipe_handle_t * p_pipe_hdl = ( p_endpoint->bEndpointAddress & TUSB_DIR_IN_MASK ) ? &custom_interface[dev_addr-1].pipe_in : &custom_interface[dev_addr-1].pipe_out; diff --git a/tinyusb/class/hid/hid_device.c b/tinyusb/class/hid/hid_device.c index 5d0e136f..2c8e7f8f 100644 --- a/tinyusb/class/hid/hid_device.c +++ b/tinyusb/class/hid/hid_device.c @@ -266,7 +266,7 @@ tusb_error_t hidd_open(uint8_t port, tusb_descriptor_interface_t const * p_inter //------------- Endpoint Descriptor -------------// p_desc += p_desc[DESCRIPTOR_OFFSET_LENGTH]; tusb_descriptor_endpoint_t const *p_desc_endpoint = (tusb_descriptor_endpoint_t const *) p_desc; - ASSERT_INT(TUSB_DESC_TYPE_ENDPOINT, p_desc_endpoint->bDescriptorType, TUSB_ERROR_HIDD_DESCRIPTOR_INTERFACE); + ASSERT_INT(TUSB_DESC_ENDPOINT, p_desc_endpoint->bDescriptorType, TUSB_ERROR_HIDD_DESCRIPTOR_INTERFACE); if (p_interface_desc->bInterfaceSubClass == HID_SUBCLASS_BOOT) { diff --git a/tinyusb/class/hid/hid_host.c b/tinyusb/class/hid/hid_host.c index c7548f54..a86dfa37 100644 --- a/tinyusb/class/hid/hid_host.c +++ b/tinyusb/class/hid/hid_host.c @@ -193,7 +193,7 @@ tusb_error_t hidh_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t con //------------- Endpoint Descriptor -------------// p_desc += p_desc[DESCRIPTOR_OFFSET_LENGTH]; tusb_descriptor_endpoint_t const * p_endpoint_desc = (tusb_descriptor_endpoint_t const *) p_desc; - ASSERT_INT(TUSB_DESC_TYPE_ENDPOINT, p_endpoint_desc->bDescriptorType, TUSB_ERROR_INVALID_PARA); + ASSERT_INT(TUSB_DESC_ENDPOINT, p_endpoint_desc->bDescriptorType, TUSB_ERROR_INVALID_PARA); OSAL_SUBTASK_BEGIN diff --git a/tinyusb/class/msc/msc_device.c b/tinyusb/class/msc/msc_device.c index 700fc74c..cec56826 100644 --- a/tinyusb/class/msc/msc_device.c +++ b/tinyusb/class/msc/msc_device.c @@ -95,7 +95,7 @@ tusb_error_t mscd_open(uint8_t port, tusb_descriptor_interface_t const * p_inter tusb_descriptor_endpoint_t const *p_endpoint = (tusb_descriptor_endpoint_t const *) descriptor_next( (uint8_t const*) p_interface_desc ); for(uint32_t i=0; i<2; i++) { - TU_ASSERT(TUSB_DESC_TYPE_ENDPOINT == p_endpoint->bDescriptorType && + TU_ASSERT(TUSB_DESC_ENDPOINT == p_endpoint->bDescriptorType && TUSB_XFER_BULK == p_endpoint->bmAttributes.xfer, TUSB_ERROR_DESCRIPTOR_CORRUPTED); TU_ASSERT( tusb_dcd_edpt_open(port, p_endpoint), TUSB_ERROR_DCD_FAILED ); diff --git a/tinyusb/class/msc/msc_host.c b/tinyusb/class/msc/msc_host.c index aceb2119..b1e8e84c 100644 --- a/tinyusb/class/msc/msc_host.c +++ b/tinyusb/class/msc/msc_host.c @@ -310,7 +310,7 @@ tusb_error_t msch_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t con for(uint32_t i=0; i<2; i++) { - SUBTASK_ASSERT(TUSB_DESC_TYPE_ENDPOINT == p_endpoint->bDescriptorType); + SUBTASK_ASSERT(TUSB_DESC_ENDPOINT == p_endpoint->bDescriptorType); SUBTASK_ASSERT(TUSB_XFER_BULK == p_endpoint->bmAttributes.xfer); pipe_handle_t * p_pipe_hdl = ( p_endpoint->bEndpointAddress & TUSB_DIR_IN_MASK ) ? diff --git a/tinyusb/common/tusb_types.h b/tinyusb/common/tusb_types.h index 56fdb56d..876c0d9e 100644 --- a/tinyusb/common/tusb_types.h +++ b/tinyusb/common/tusb_types.h @@ -76,18 +76,18 @@ typedef enum /// USB Descriptor Types (section 9.4 table 9-5) typedef enum { - TUSB_DESC_TYPE_DEVICE = 0x01 , - TUSB_DESC_TYPE_CONFIGURATION = 0x02 , - TUSB_DESC_TYPE_STRING = 0x03 , - TUSB_DESC_TYPE_INTERFACE = 0x04 , - TUSB_DESC_TYPE_ENDPOINT = 0x05 , - TUSB_DESC_TYPE_DEVICE_QUALIFIER = 0x06 , - TUSB_DESC_TYPE_OTHER_SPEED_CONFIGURATION = 0x07 , - TUSB_DESC_TYPE_INTERFACE_POWER = 0x08 , - TUSB_DESC_TYPE_OTG = 0x09 , - TUSB_DESC_TYPE_DEBUG = 0x0A , - TUSB_DESC_TYPE_INTERFACE_ASSOCIATION = 0x0B , - TUSB_DESC_TYPE_INTERFACE_CLASS_SPECIFIC = 0x24 + TUSB_DESC_DEVICE = 0x01 , + TUSB_DESC_CONFIGURATION = 0x02 , + TUSB_DESC_STRING = 0x03 , + TUSB_DESC_INTERFACE = 0x04 , + TUSB_DESC_ENDPOINT = 0x05 , + TUSB_DESC_DEVICE_QUALIFIER = 0x06 , + TUSB_DESC_OTHER_SPEED_CONFIG = 0x07 , + TUSB_DESC_INTERFACE_POWER = 0x08 , + TUSB_DESC_OTG = 0x09 , + TUSB_DESC_DEBUG = 0x0A , + TUSB_DESC_INTERFACE_ASSOCIATION = 0x0B , + TUSB_DESC_CLASS_SPECIFIC = 0x24 }tusb_std_descriptor_type_t; typedef enum diff --git a/tinyusb/device/usbd.c b/tinyusb/device/usbd.c index 53a527fd..cb5e651f 100644 --- a/tinyusb/device/usbd.c +++ b/tinyusb/device/usbd.c @@ -368,12 +368,12 @@ static tusb_error_t usbd_set_configure_received(uint8_t port, uint8_t config_num while( p_desc < p_desc_config + config_total_length ) { - if ( TUSB_DESC_TYPE_INTERFACE_ASSOCIATION == p_desc[DESCRIPTOR_OFFSET_TYPE]) + if ( TUSB_DESC_INTERFACE_ASSOCIATION == p_desc[DESCRIPTOR_OFFSET_TYPE]) { p_desc += p_desc[DESCRIPTOR_OFFSET_LENGTH]; // ignore Interface Association }else { - ASSERT( TUSB_DESC_TYPE_INTERFACE == p_desc[DESCRIPTOR_OFFSET_TYPE], TUSB_ERROR_NOT_SUPPORTED_YET ); + ASSERT( TUSB_DESC_INTERFACE == p_desc[DESCRIPTOR_OFFSET_TYPE], TUSB_ERROR_NOT_SUPPORTED_YET ); uint8_t class_index; tusb_descriptor_interface_t* p_desc_interface = (tusb_descriptor_interface_t*) p_desc; @@ -408,17 +408,17 @@ static tusb_error_t get_descriptor(uint8_t port, tusb_control_request_t const * switch(desc_type) { - case TUSB_DESC_TYPE_DEVICE: + case TUSB_DESC_DEVICE: p_data = tusbd_descriptor_pointers.p_device; (*p_length) = sizeof(tusb_descriptor_device_t); break; - case TUSB_DESC_TYPE_CONFIGURATION: + case TUSB_DESC_CONFIGURATION: p_data = tusbd_descriptor_pointers.p_configuration; (*p_length) = ((tusb_descriptor_configuration_t*)tusbd_descriptor_pointers.p_configuration)->wTotalLength; break; - case TUSB_DESC_TYPE_STRING: + case TUSB_DESC_STRING: if ( !(desc_index < 100) ) return TUSB_ERROR_DCD_CONTROL_REQUEST_NOT_SUPPORT; // windows sometimes ask for string at index 238 !!! p_data = tusbd_descriptor_pointers.p_string_arr[desc_index]; diff --git a/tinyusb/host/hub.c b/tinyusb/host/hub.c index 44786729..a5ae7ca5 100644 --- a/tinyusb/host/hub.c +++ b/tinyusb/host/hub.c @@ -169,7 +169,7 @@ tusb_error_t hub_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t cons tusb_descriptor_endpoint_t const *p_endpoint; p_endpoint = (tusb_descriptor_endpoint_t const *) descriptor_next( (uint8_t const*) p_interface_desc ); - SUBTASK_ASSERT(TUSB_DESC_TYPE_ENDPOINT == p_endpoint->bDescriptorType); + SUBTASK_ASSERT(TUSB_DESC_ENDPOINT == p_endpoint->bDescriptorType); SUBTASK_ASSERT(TUSB_XFER_INTERRUPT == p_endpoint->bmAttributes.xfer); hub_data[dev_addr-1].pipe_status = hcd_pipe_open(dev_addr, p_endpoint, TUSB_CLASS_HUB); diff --git a/tinyusb/host/usbh.c b/tinyusb/host/usbh.c index b8f030cb..3650610d 100644 --- a/tinyusb/host/usbh.c +++ b/tinyusb/host/usbh.c @@ -450,7 +450,7 @@ tusb_error_t enumeration_body_subtask(void) //------------- Get first 8 bytes of device descriptor to get Control Endpoint Size -------------// OSAL_SUBTASK_INVOKED_AND_WAIT( usbh_control_xfer_subtask( 0, bm_request_type(TUSB_DIR_IN, TUSB_REQ_TYPE_STANDARD, TUSB_REQ_RCPT_DEVICE), - TUSB_REQUEST_GET_DESCRIPTOR, (TUSB_DESC_TYPE_DEVICE << 8), 0, + TUSB_REQUEST_GET_DESCRIPTOR, (TUSB_DESC_DEVICE << 8), 0, 8, enum_data_buffer ), error ); @@ -505,7 +505,7 @@ tusb_error_t enumeration_body_subtask(void) //------------- Get full device descriptor -------------// OSAL_SUBTASK_INVOKED_AND_WAIT( usbh_control_xfer_subtask( new_addr, bm_request_type(TUSB_DIR_IN, TUSB_REQ_TYPE_STANDARD, TUSB_REQ_RCPT_DEVICE), - TUSB_REQUEST_GET_DESCRIPTOR, (TUSB_DESC_TYPE_DEVICE << 8), 0, + TUSB_REQUEST_GET_DESCRIPTOR, (TUSB_DESC_DEVICE << 8), 0, 18, enum_data_buffer ), error ); @@ -522,7 +522,7 @@ tusb_error_t enumeration_body_subtask(void) //------------- Get 9 bytes of configuration descriptor -------------// OSAL_SUBTASK_INVOKED_AND_WAIT( usbh_control_xfer_subtask( new_addr, bm_request_type(TUSB_DIR_IN, TUSB_REQ_TYPE_STANDARD, TUSB_REQ_RCPT_DEVICE), - TUSB_REQUEST_GET_DESCRIPTOR, (TUSB_DESC_TYPE_CONFIGURATION << 8) | (configure_selected - 1), 0, + TUSB_REQUEST_GET_DESCRIPTOR, (TUSB_DESC_CONFIGURATION << 8) | (configure_selected - 1), 0, 9, enum_data_buffer ), error ); @@ -533,7 +533,7 @@ tusb_error_t enumeration_body_subtask(void) //------------- Get full configuration descriptor -------------// OSAL_SUBTASK_INVOKED_AND_WAIT( usbh_control_xfer_subtask( new_addr, bm_request_type(TUSB_DIR_IN, TUSB_REQ_TYPE_STANDARD, TUSB_REQ_RCPT_DEVICE), - TUSB_REQUEST_GET_DESCRIPTOR, (TUSB_DESC_TYPE_CONFIGURATION << 8) | (configure_selected - 1), 0, + TUSB_REQUEST_GET_DESCRIPTOR, (TUSB_DESC_CONFIGURATION << 8) | (configure_selected - 1), 0, TUSB_CFG_HOST_ENUM_BUFFER_SIZE, enum_data_buffer ), error ); @@ -562,7 +562,7 @@ tusb_error_t enumeration_body_subtask(void) while( p_desc < enum_data_buffer + ((tusb_descriptor_configuration_t*)enum_data_buffer)->wTotalLength ) { // skip until we see interface descriptor - if ( TUSB_DESC_TYPE_INTERFACE != p_desc[DESCRIPTOR_OFFSET_TYPE] ) + if ( TUSB_DESC_INTERFACE != p_desc[DESCRIPTOR_OFFSET_TYPE] ) { p_desc += p_desc[DESCRIPTOR_OFFSET_LENGTH]; // skip the descriptor, increase by the descriptor's length }else