diff options
| author | hathach <[email protected]> | 2018-03-05 13:25:24 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2018-03-05 13:25:24 +0700 |
| commit | 84bce659b81db2c0ce079dd00818070048d1b1bc (patch) | |
| tree | b152e6d9415ee7014be261e598423efbe6914435 /tinyusb/class | |
| parent | 185b240f033fc692e3dfe1593895a9c28ee41c7b (diff) | |
reame SUBTASK_EXIT to SUBTASK_RETURN
Diffstat (limited to 'tinyusb/class')
| -rw-r--r-- | tinyusb/class/cdc_rndis_host.c | 12 | ||||
| -rw-r--r-- | tinyusb/class/hid_host.c | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/tinyusb/class/cdc_rndis_host.c b/tinyusb/class/cdc_rndis_host.c index 75184b39d..ccadeaeb3 100644 --- a/tinyusb/class/cdc_rndis_host.c +++ b/tinyusb/class/cdc_rndis_host.c @@ -179,7 +179,7 @@ tusb_error_t rndish_open_subtask(uint8_t dev_addr, cdch_data_t *p_cdc) msg_payload), error ); - if ( TUSB_ERROR_NONE != error ) SUBTASK_EXIT(error); + if ( TUSB_ERROR_NONE != error ) SUBTASK_RETURN(error); // TODO currently not support multiple data packets per xfer rndis_msg_initialize_cmplt_t * const p_init_cmpt = (rndis_msg_initialize_cmplt_t *) msg_payload; @@ -197,7 +197,7 @@ tusb_error_t rndish_open_subtask(uint8_t dev_addr, cdch_data_t *p_cdc) msg_payload), error ); - if ( TUSB_ERROR_NONE != error ) SUBTASK_EXIT(error); + if ( TUSB_ERROR_NONE != error ) SUBTASK_RETURN(error); rndis_msg_query_cmplt_t * const p_query_cmpt = (rndis_msg_query_cmplt_t *) msg_payload; SUBTASK_ASSERT(p_query_cmpt->type == RNDIS_MSG_QUERY_CMPLT && p_query_cmpt->status == RNDIS_STATUS_SUCCESS); @@ -214,7 +214,7 @@ tusb_error_t rndish_open_subtask(uint8_t dev_addr, cdch_data_t *p_cdc) msg_payload), error ); - if ( TUSB_ERROR_NONE != error ) SUBTASK_EXIT(error); + if ( TUSB_ERROR_NONE != error ) SUBTASK_RETURN(error); rndis_msg_set_cmplt_t * const p_set_cmpt = (rndis_msg_set_cmplt_t *) msg_payload; SUBTASK_ASSERT(p_set_cmpt->type == RNDIS_MSG_SET_CMPLT && p_set_cmpt->status == RNDIS_STATUS_SUCCESS); @@ -250,12 +250,12 @@ static tusb_error_t send_message_get_response_subtask( uint8_t dev_addr, cdch_da mess_length, p_mess), error ); - if ( TUSB_ERROR_NONE != error ) SUBTASK_EXIT(error); + if ( TUSB_ERROR_NONE != error ) SUBTASK_RETURN(error); //------------- waiting for Response Available notification -------------// (void) hcd_pipe_xfer(p_cdc->pipe_notification, msg_notification[dev_addr-1], 8, true); osal_semaphore_wait(rndish_data[dev_addr-1].sem_notification_hdl, OSAL_TIMEOUT_NORMAL, &error); - if ( TUSB_ERROR_NONE != error ) SUBTASK_EXIT(error); + if ( TUSB_ERROR_NONE != error ) SUBTASK_RETURN(error); SUBTASK_ASSERT(msg_notification[dev_addr-1][0] == 1); //------------- Get RNDIS Message Initialize Complete -------------// @@ -265,7 +265,7 @@ static tusb_error_t send_message_get_response_subtask( uint8_t dev_addr, cdch_da RNDIS_MSG_PAYLOAD_MAX, p_response), error ); - if ( TUSB_ERROR_NONE != error ) SUBTASK_EXIT(error); + if ( TUSB_ERROR_NONE != error ) SUBTASK_RETURN(error); OSAL_SUBTASK_END } diff --git a/tinyusb/class/hid_host.c b/tinyusb/class/hid_host.c index 0f39a0487..46b1383f7 100644 --- a/tinyusb/class/hid_host.c +++ b/tinyusb/class/hid_host.c @@ -239,11 +239,11 @@ tusb_error_t hidh_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t con #endif
{
- SUBTASK_EXIT(TUSB_ERROR_HIDH_NOT_SUPPORTED_PROTOCOL); // exit & restart task
+ SUBTASK_RETURN(TUSB_ERROR_HIDH_NOT_SUPPORTED_PROTOCOL); // exit & restart task
}
}else
{
- SUBTASK_EXIT(TUSB_ERROR_HIDH_NOT_SUPPORTED_SUBCLASS); // exit & restart task
+ SUBTASK_RETURN(TUSB_ERROR_HIDH_NOT_SUPPORTED_SUBCLASS); // exit & restart task
}
*p_length = sizeof(tusb_descriptor_interface_t) + sizeof(tusb_hid_descriptor_hid_t) + sizeof(tusb_descriptor_endpoint_t);
|