From 1d33d4e07247107af6e8a14467852ed56734924c Mon Sep 17 00:00:00 2001 From: hathach Date: Thu, 29 Mar 2018 13:11:36 +0700 Subject: assert clean up --- tinyusb/host/hub.c | 12 ++++++------ tinyusb/host/usbh.c | 32 ++++++++++++++++---------------- 2 files changed, 22 insertions(+), 22 deletions(-) (limited to 'tinyusb/host') diff --git a/tinyusb/host/hub.c b/tinyusb/host/hub.c index 7bcd009e8..9b4f03634 100644 --- a/tinyusb/host/hub.c +++ b/tinyusb/host/hub.c @@ -83,7 +83,7 @@ tusb_error_t hub_port_clear_feature_subtask(uint8_t hub_addr, uint8_t hub_port, 0, NULL ), error ); - STASK_ASSERT_STATUS( error ); + STASK_ASSERT_ERR( error ); //------------- Get Port Status to check if feature is cleared -------------// STASK_INVOKE( @@ -92,7 +92,7 @@ tusb_error_t hub_port_clear_feature_subtask(uint8_t hub_addr, uint8_t hub_port, 4, hub_enum_buffer ), error ); - STASK_ASSERT_STATUS( error ); + STASK_ASSERT_ERR( error ); //------------- Check if feature is cleared -------------// hub_port_status_response_t * p_port_status; @@ -117,7 +117,7 @@ tusb_error_t hub_port_reset_subtask(uint8_t hub_addr, uint8_t hub_port) 0, NULL ), error ); - STASK_ASSERT_STATUS( error ); + STASK_ASSERT_ERR( error ); osal_task_delay(RESET_DELAY); // TODO Hub wait for Status Endpoint on Reset Change @@ -128,7 +128,7 @@ tusb_error_t hub_port_reset_subtask(uint8_t hub_addr, uint8_t hub_port) 4, hub_enum_buffer ), error ); - STASK_ASSERT_STATUS( error ); + STASK_ASSERT_ERR( error ); hub_port_status_response_t * p_port_status; p_port_status = (hub_port_status_response_t *) hub_enum_buffer; @@ -185,7 +185,7 @@ tusb_error_t hub_open_subtask(uint8_t dev_addr, tusb_desc_interface_t const *p_i sizeof(descriptor_hub_desc_t), hub_enum_buffer ), error ); - STASK_ASSERT_STATUS(error); + STASK_ASSERT_ERR(error); // only care about this field in hub descriptor hub_data[dev_addr-1].port_number = ((descriptor_hub_desc_t*) hub_enum_buffer)->bNbrPorts; @@ -203,7 +203,7 @@ tusb_error_t hub_open_subtask(uint8_t dev_addr, tusb_desc_interface_t const *p_i } //------------- Queue the initial Status endpoint transfer -------------// - STASK_ASSERT_STATUS ( hcd_pipe_xfer(hub_data[dev_addr-1].pipe_status, &hub_data[dev_addr-1].status_change, 1, true) ); + STASK_ASSERT_ERR ( hcd_pipe_xfer(hub_data[dev_addr-1].pipe_status, &hub_data[dev_addr-1].status_change, 1, true) ); OSAL_SUBTASK_END } diff --git a/tinyusb/host/usbh.c b/tinyusb/host/usbh.c index a491988c3..e0be32e3f 100644 --- a/tinyusb/host/usbh.c +++ b/tinyusb/host/usbh.c @@ -186,7 +186,7 @@ tusb_error_t usbh_control_xfer_subtask(uint8_t dev_addr, uint8_t bmRequestType, OSAL_SUBTASK_BEGIN osal_mutex_wait(usbh_devices[dev_addr].control.mutex_hdl, OSAL_TIMEOUT_NORMAL, &error); - STASK_ASSERT_STATUS_HDLR(error, osal_mutex_release(usbh_devices[dev_addr].control.mutex_hdl)); + STASK_ASSERT_ERR_HDLR(error, osal_mutex_release(usbh_devices[dev_addr].control.mutex_hdl)); usbh_devices[dev_addr].control.request = (tusb_control_request_t) { {.bmRequestType = bmRequestType}, @@ -206,7 +206,7 @@ tusb_error_t usbh_control_xfer_subtask(uint8_t dev_addr, uint8_t bmRequestType, if ( TUSB_ERROR_NONE == error ) osal_semaphore_wait(usbh_devices[dev_addr].control.sem_hdl, OSAL_TIMEOUT_NORMAL, &error); osal_mutex_release(usbh_devices[dev_addr].control.mutex_hdl); - STASK_ASSERT_STATUS(error); + STASK_ASSERT_ERR(error); if (TUSB_EVENT_XFER_STALLED == usbh_devices[dev_addr].control.pipe_status) STASK_RETURN(TUSB_ERROR_USBH_XFER_STALLED); if (TUSB_EVENT_XFER_ERROR == usbh_devices[dev_addr].control.pipe_status) STASK_RETURN(TUSB_ERROR_USBH_XFER_FAILED); @@ -374,7 +374,7 @@ tusb_error_t enumeration_body_subtask(void) OSAL_SUBTASK_BEGIN osal_queue_receive(enum_queue_hdl, &enum_entry, OSAL_TIMEOUT_WAIT_FOREVER, &error); - STASK_ASSERT_STATUS(error); + STASK_ASSERT_ERR(error); usbh_devices[0].core_id = enum_entry.core_id; // TODO refractor integrate to device_pool usbh_devices[0].hub_addr = enum_entry.hub_addr; @@ -412,8 +412,8 @@ tusb_error_t enumeration_body_subtask(void) 4, enum_data_buffer ), error ); -// STASK_ASSERT_STATUS( error ); - STASK_ASSERT_STATUS_HDLR(error, hub_status_pipe_queue( usbh_devices[0].hub_addr) ); // TODO hub refractor +// STASK_ASSERT_ERR( error ); + STASK_ASSERT_ERR_HDLR(error, hub_status_pipe_queue( usbh_devices[0].hub_addr) ); // TODO hub refractor // Acknowledge Port Connection Change STASK_INVOKE( hub_port_clear_feature_subtask(usbh_devices[0].hub_addr, usbh_devices[0].hub_port, HUB_FEATURE_PORT_CONNECTION_CHANGE), error ); @@ -433,8 +433,8 @@ tusb_error_t enumeration_body_subtask(void) else { // Connection Event STASK_INVOKE ( hub_port_reset_subtask(usbh_devices[0].hub_addr, usbh_devices[0].hub_port), error ); -// STASK_ASSERT_STATUS( error ); - STASK_ASSERT_STATUS_HDLR(error, hub_status_pipe_queue( usbh_devices[0].hub_addr) ); // TODO hub refractor +// STASK_ASSERT_ERR( error ); + STASK_ASSERT_ERR_HDLR(error, hub_status_pipe_queue( usbh_devices[0].hub_addr) ); // TODO hub refractor usbh_devices[0].speed = hub_port_get_speed(); @@ -444,7 +444,7 @@ tusb_error_t enumeration_body_subtask(void) } #endif - STASK_ASSERT_STATUS( usbh_pipe_control_open(0, 8) ); + STASK_ASSERT_ERR( usbh_pipe_control_open(0, 8) ); usbh_devices[0].state = TUSB_DEVICE_STATE_ADDRESSED; //------------- Get first 8 bytes of device descriptor to get Control Endpoint Size -------------// @@ -458,14 +458,14 @@ tusb_error_t enumeration_body_subtask(void) //------------- Reset device again before Set Address -------------// if (usbh_devices[0].hub_addr == 0) { // connected directly to roothub - STASK_ASSERT_STATUS(error); // TODO some slow device is observed to fail the very fist controller xfer, can try more times + STASK_ASSERT_ERR(error); // TODO some slow device is observed to fail the very fist controller xfer, can try more times hcd_port_reset( usbh_devices[0].core_id ); // reset port after 8 byte descriptor osal_task_delay(RESET_DELAY); } #if TUSB_CFG_HOST_HUB else { // connected via a hub - STASK_ASSERT_STATUS_HDLR(error, hub_status_pipe_queue( usbh_devices[0].hub_addr) ); // TODO hub refractor + STASK_ASSERT_ERR_HDLR(error, hub_status_pipe_queue( usbh_devices[0].hub_addr) ); // TODO hub refractor STASK_INVOKE ( hub_port_reset_subtask(usbh_devices[0].hub_addr, usbh_devices[0].hub_port), error ); if ( TUSB_ERROR_NONE == error ) @@ -487,7 +487,7 @@ tusb_error_t enumeration_body_subtask(void) 0, NULL ), error ); - STASK_ASSERT_STATUS(error); + STASK_ASSERT_ERR(error); //------------- update port info & close control pipe of addr0 -------------// usbh_devices[new_addr].core_id = usbh_devices[0].core_id; @@ -500,7 +500,7 @@ tusb_error_t enumeration_body_subtask(void) usbh_devices[0].state = TUSB_DEVICE_STATE_UNPLUG; // open control pipe for new address - STASK_ASSERT_STATUS ( usbh_pipe_control_open(new_addr, ((tusb_desc_device_t*) enum_data_buffer)->bMaxPacketSize0 ) ); + STASK_ASSERT_ERR ( usbh_pipe_control_open(new_addr, ((tusb_desc_device_t*) enum_data_buffer)->bMaxPacketSize0 ) ); //------------- Get full device descriptor -------------// STASK_INVOKE( @@ -509,7 +509,7 @@ tusb_error_t enumeration_body_subtask(void) 18, enum_data_buffer ), error ); - STASK_ASSERT_STATUS(error); + STASK_ASSERT_ERR(error); // update device info TODO alignment issue usbh_devices[new_addr].vendor_id = ((tusb_desc_device_t*) enum_data_buffer)->idVendor; @@ -526,7 +526,7 @@ tusb_error_t enumeration_body_subtask(void) 9, enum_data_buffer ), error ); - STASK_ASSERT_STATUS(error); + STASK_ASSERT_ERR(error); STASK_ASSERT_HDLR( TUSB_CFG_HOST_ENUM_BUFFER_SIZE >= ((tusb_desc_configuration_t*)enum_data_buffer)->wTotalLength, tuh_device_mount_failed_cb(TUSB_ERROR_USBH_MOUNT_CONFIG_DESC_TOO_LONG, NULL) ); @@ -537,7 +537,7 @@ tusb_error_t enumeration_body_subtask(void) TUSB_CFG_HOST_ENUM_BUFFER_SIZE, enum_data_buffer ), error ); - STASK_ASSERT_STATUS(error); + STASK_ASSERT_ERR(error); // update configuration info usbh_devices[new_addr].interface_count = ((tusb_desc_configuration_t*) enum_data_buffer)->bNumInterfaces; @@ -549,7 +549,7 @@ tusb_error_t enumeration_body_subtask(void) 0, NULL ), error ); - STASK_ASSERT_STATUS(error); + STASK_ASSERT_ERR(error); usbh_devices[new_addr].state = TUSB_DEVICE_STATE_CONFIGURED; -- cgit v1.3.1