diff options
| author | hathach <[email protected]> | 2018-03-21 20:42:23 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2018-03-21 20:42:23 +0700 |
| commit | 17a227ca90ff05f0929cff339cee30d69878c149 (patch) | |
| tree | a638611c5372384b90dbe624a6cb66ccf531cc51 /tinyusb/class/cdc | |
| parent | 047bc5eeb1d37ef6fb2d569179848ee4bf56beb7 (diff) | |
osal subtask rename
Diffstat (limited to 'tinyusb/class/cdc')
| -rw-r--r-- | tinyusb/class/cdc/cdc_device.c | 4 | ||||
| -rw-r--r-- | tinyusb/class/cdc/cdc_rndis_host.c | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/tinyusb/class/cdc/cdc_device.c b/tinyusb/class/cdc/cdc_device.c index f39075885..ebb3e8ead 100644 --- a/tinyusb/class/cdc/cdc_device.c +++ b/tinyusb/class/cdc/cdc_device.c @@ -221,12 +221,12 @@ tusb_error_t cdcd_control_request_subtask(uint8_t port, tusb_control_request_t c if (CDC_REQUEST_GET_LINE_CODING == p_request->bRequest)
{
- OSAL_SUBTASK_INVOKED( usbd_control_xfer_substak(port, (tusb_dir_t) p_request->bmRequestType_bit.direction,
+ SUBTASK_INVOKE( usbd_control_xfer_substak(port, (tusb_dir_t) p_request->bmRequestType_bit.direction,
(uint8_t*) &cdcd_line_coding[port], min16_of(sizeof(cdc_line_coding_t), p_request->wLength)), err );
}
else if (CDC_REQUEST_SET_LINE_CODING == p_request->bRequest)
{
- OSAL_SUBTASK_INVOKED( usbd_control_xfer_substak(port, (tusb_dir_t) p_request->bmRequestType_bit.direction,
+ SUBTASK_INVOKE( usbd_control_xfer_substak(port, (tusb_dir_t) p_request->bmRequestType_bit.direction,
(uint8_t*) &cdcd_line_coding[port], min16_of(sizeof(cdc_line_coding_t), p_request->wLength)), err );
// TODO notify application on xfer complete
}
diff --git a/tinyusb/class/cdc/cdc_rndis_host.c b/tinyusb/class/cdc/cdc_rndis_host.c index bcf40c242..7910e63a3 100644 --- a/tinyusb/class/cdc/cdc_rndis_host.c +++ b/tinyusb/class/cdc/cdc_rndis_host.c @@ -173,7 +173,7 @@ tusb_error_t rndish_open_subtask(uint8_t dev_addr, cdch_data_t *p_cdc) //------------- Message Initialize -------------// memcpy(msg_payload, &msg_init, sizeof(rndis_msg_initialize_t)); - OSAL_SUBTASK_INVOKED( + SUBTASK_INVOKE( send_message_get_response_subtask( dev_addr, p_cdc, msg_payload, sizeof(rndis_msg_initialize_t), msg_payload), @@ -191,7 +191,7 @@ tusb_error_t rndish_open_subtask(uint8_t dev_addr, cdch_data_t *p_cdc) memcpy(msg_payload, &msg_query_permanent_addr, sizeof(rndis_msg_query_t)); memclr_(msg_payload + sizeof(rndis_msg_query_t), 6); // 6 bytes for MAC address - OSAL_SUBTASK_INVOKED( + SUBTASK_INVOKE( send_message_get_response_subtask( dev_addr, p_cdc, msg_payload, sizeof(rndis_msg_query_t) + 6, msg_payload), @@ -208,7 +208,7 @@ tusb_error_t rndish_open_subtask(uint8_t dev_addr, cdch_data_t *p_cdc) memclr_(msg_payload + sizeof(rndis_msg_set_t), 4); // 4 bytes for filter flags ((rndis_msg_set_t*) msg_payload)->oid_buffer[0] = (RNDIS_PACKET_TYPE_DIRECTED | RNDIS_PACKET_TYPE_MULTICAST | RNDIS_PACKET_TYPE_BROADCAST); - OSAL_SUBTASK_INVOKED( + SUBTASK_INVOKE( send_message_get_response_subtask( dev_addr, p_cdc, msg_payload, sizeof(rndis_msg_set_t) + 4, msg_payload), @@ -244,7 +244,7 @@ static tusb_error_t send_message_get_response_subtask( uint8_t dev_addr, cdch_da OSAL_SUBTASK_BEGIN //------------- Send RNDIS Control Message -------------// - OSAL_SUBTASK_INVOKED( + SUBTASK_INVOKE( usbh_control_xfer_subtask( dev_addr, bm_request_type(TUSB_DIR_OUT, TUSB_REQ_TYPE_CLASS, TUSB_REQ_RCPT_INTERFACE), CDC_REQUEST_SEND_ENCAPSULATED_COMMAND, 0, p_cdc->interface_number, mess_length, p_mess), @@ -259,7 +259,7 @@ static tusb_error_t send_message_get_response_subtask( uint8_t dev_addr, cdch_da SUBTASK_ASSERT(msg_notification[dev_addr-1][0] == 1); //------------- Get RNDIS Message Initialize Complete -------------// - OSAL_SUBTASK_INVOKED( + SUBTASK_INVOKE( usbh_control_xfer_subtask( dev_addr, bm_request_type(TUSB_DIR_IN, TUSB_REQ_TYPE_CLASS, TUSB_REQ_RCPT_INTERFACE), CDC_REQUEST_GET_ENCAPSULATED_RESPONSE, 0, p_cdc->interface_number, RNDIS_MSG_PAYLOAD_MAX, p_response), |