From d6dc1aa2e9e206922106a29a4fb83f1237c52246 Mon Sep 17 00:00:00 2001 From: hathach Date: Wed, 21 Mar 2018 15:31:58 +0700 Subject: rename TUSB_REQUEST to simply TUSB_REQ_ --- tinyusb/class/hid/hid_device.c | 2 +- tinyusb/class/hid/hid_host.c | 2 +- tinyusb/class/msc/msc_host.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'tinyusb/class') diff --git a/tinyusb/class/hid/hid_device.c b/tinyusb/class/hid/hid_device.c index fd6da979f..69f0778aa 100644 --- a/tinyusb/class/hid/hid_device.c +++ b/tinyusb/class/hid/hid_device.c @@ -197,7 +197,7 @@ tusb_error_t hidd_control_request_subtask(uint8_t port, tusb_control_request_t c (void) desc_index; - ASSERT ( p_request->bRequest == TUSB_REQUEST_GET_DESCRIPTOR && desc_type == HID_DESC_TYPE_REPORT, + ASSERT ( p_request->bRequest == TUSB_REQ_GET_DESCRIPTOR && desc_type == HID_DESC_TYPE_REPORT, TUSB_ERROR_DCD_CONTROL_REQUEST_NOT_SUPPORT); ASSERT ( p_hid->report_length <= HIDD_BUFFER_SIZE, TUSB_ERROR_NOT_ENOUGH_MEMORY); diff --git a/tinyusb/class/hid/hid_host.c b/tinyusb/class/hid/hid_host.c index c1751814c..e3bdc6137 100644 --- a/tinyusb/class/hid/hid_host.c +++ b/tinyusb/class/hid/hid_host.c @@ -212,7 +212,7 @@ tusb_error_t hidh_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t con { OSAL_SUBTASK_INVOKED( usbh_control_xfer_subtask( dev_addr, bm_request_type(TUSB_DIR_IN, TUSB_REQ_TYPE_STANDARD, TUSB_REQ_RCPT_INTERFACE), - TUSB_REQUEST_GET_DESCRIPTOR, (p_desc_hid->bReportType << 8), 0, + TUSB_REQ_GET_DESCRIPTOR, (p_desc_hid->bReportType << 8), 0, p_desc_hid->wReportLength, report_descriptor ), error ); diff --git a/tinyusb/class/msc/msc_host.c b/tinyusb/class/msc/msc_host.c index 01e6f58c7..61cd8796d 100644 --- a/tinyusb/class/msc/msc_host.c +++ b/tinyusb/class/msc/msc_host.c @@ -367,7 +367,7 @@ tusb_error_t msch_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t con { // clear stall TODO abstract clear stall function OSAL_SUBTASK_INVOKED( usbh_control_xfer_subtask( dev_addr, bm_request_type(TUSB_DIR_OUT, TUSB_REQ_TYPE_STANDARD, TUSB_REQ_RCPT_ENDPOINT), - TUSB_REQUEST_CLEAR_FEATURE, 0, hcd_pipe_get_endpoint_addr(msch_data[dev_addr-1].bulk_in), + TUSB_REQ_CLEAR_FEATURE, 0, hcd_pipe_get_endpoint_addr(msch_data[dev_addr-1].bulk_in), 0, NULL ), error ); -- cgit v1.3.1