From 17a227ca90ff05f0929cff339cee30d69878c149 Mon Sep 17 00:00:00 2001 From: hathach Date: Wed, 21 Mar 2018 20:42:23 +0700 Subject: osal subtask rename --- tinyusb/class/cdc/cdc_device.c | 4 ++-- tinyusb/class/cdc/cdc_rndis_host.c | 10 +++++----- tinyusb/class/hid/hid_host.c | 4 ++-- tinyusb/class/msc/msc_device.c | 2 +- tinyusb/class/msc/msc_host.c | 6 +++--- 5 files changed, 13 insertions(+), 13 deletions(-) (limited to 'tinyusb/class') 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), diff --git a/tinyusb/class/hid/hid_host.c b/tinyusb/class/hid/hid_host.c index e3bdc6137..710a00424 100644 --- a/tinyusb/class/hid/hid_host.c +++ b/tinyusb/class/hid/hid_host.c @@ -198,7 +198,7 @@ tusb_error_t hidh_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t con OSAL_SUBTASK_BEGIN //------------- SET IDLE (0) request -------------// - 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), HID_REQUEST_CONTROL_SET_IDLE, 0, p_interface_desc->bInterfaceNumber, 0, NULL ), @@ -210,7 +210,7 @@ tusb_error_t hidh_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t con //------------- Get Report Descriptor TODO HID parser -------------// if ( p_desc_hid->bNumDescriptors ) { - OSAL_SUBTASK_INVOKED( + SUBTASK_INVOKE( usbh_control_xfer_subtask( dev_addr, bm_request_type(TUSB_DIR_IN, TUSB_REQ_TYPE_STANDARD, TUSB_REQ_RCPT_INTERFACE), TUSB_REQ_GET_DESCRIPTOR, (p_desc_hid->bReportType << 8), 0, p_desc_hid->wReportLength, report_descriptor ), diff --git a/tinyusb/class/msc/msc_device.c b/tinyusb/class/msc/msc_device.c index e16129204..3244e3c86 100644 --- a/tinyusb/class/msc/msc_device.c +++ b/tinyusb/class/msc/msc_device.c @@ -139,7 +139,7 @@ tusb_error_t mscd_control_request_subtask(uint8_t port, tusb_control_request_t c { // Note: lpc11/13u need xfer data's address to be aligned 64 -> make use of scsi_data instead of using max_lun directly p_msc->scsi_data[0] = p_msc->max_lun; - OSAL_SUBTASK_INVOKED( usbd_control_xfer_substak(port, TUSB_DIR_IN, p_msc->scsi_data, 1), err); + SUBTASK_INVOKE( usbd_control_xfer_substak(port, TUSB_DIR_IN, p_msc->scsi_data, 1), err); }else { SUBTASK_RETURN(TUSB_ERROR_DCD_CONTROL_REQUEST_NOT_SUPPORT); diff --git a/tinyusb/class/msc/msc_host.c b/tinyusb/class/msc/msc_host.c index 61cd8796d..6e8562307 100644 --- a/tinyusb/class/msc/msc_host.c +++ b/tinyusb/class/msc/msc_host.c @@ -327,7 +327,7 @@ tusb_error_t msch_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t con //------------- Get Max Lun -------------// - 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), MSC_REQUEST_GET_MAX_LUN, 0, msch_data[dev_addr-1].interface_number, 1, msch_buffer ), @@ -339,7 +339,7 @@ tusb_error_t msch_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t con #if 0 //------------- Reset -------------// - 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), MSC_REQUEST_RESET, 0, msch_data[dev_addr-1].interface_number, 0, NULL ), @@ -365,7 +365,7 @@ tusb_error_t msch_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t con // Read Capacity --> Stalled --> Clear Stall --> Request Sense --> Read Capacity (2) to work if ( hcd_pipe_is_stalled(msch_data[dev_addr-1].bulk_in) ) { // clear stall TODO abstract clear stall function - OSAL_SUBTASK_INVOKED( + SUBTASK_INVOKE( usbh_control_xfer_subtask( dev_addr, bm_request_type(TUSB_DIR_OUT, TUSB_REQ_TYPE_STANDARD, TUSB_REQ_RCPT_ENDPOINT), TUSB_REQ_CLEAR_FEATURE, 0, hcd_pipe_get_endpoint_addr(msch_data[dev_addr-1].bulk_in), 0, NULL ), -- cgit v1.3.1