summaryrefslogtreecommitdiff
path: root/tinyusb/class/hid
diff options
context:
space:
mode:
authorhathach <[email protected]>2018-03-11 21:05:27 +0700
committerhathach <[email protected]>2018-03-11 21:06:32 +0700
commitd71334c34822c1e7b5b4ecfdcc44c8c3c3843d61 (patch)
tree7919ae09945b0ab3fe09c40651ab837f56b1bef4 /tinyusb/class/hid
parent26d81c3ea16809bfed6fd9e93e9b2d93696c6264 (diff)
tusb_type rename
Diffstat (limited to 'tinyusb/class/hid')
-rw-r--r--tinyusb/class/hid/hid_device.c4
-rw-r--r--tinyusb/class/hid/hid_host.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/tinyusb/class/hid/hid_device.c b/tinyusb/class/hid/hid_device.c
index a49f88b32..5d0e136fe 100644
--- a/tinyusb/class/hid/hid_device.c
+++ b/tinyusb/class/hid/hid_device.c
@@ -190,7 +190,7 @@ tusb_error_t hidd_control_request_subtask(uint8_t port, tusb_control_request_t c
hidd_interface_t* const p_hid = p_driver->p_interface;
//------------- STD Request -------------//
- if (p_request->bmRequestType_bit.type == TUSB_REQUEST_TYPE_STANDARD)
+ if (p_request->bmRequestType_bit.type == TUSB_REQ_TYPE_STANDARD)
{
uint8_t const desc_type = u16_high_u8(p_request->wValue);
uint8_t const desc_index = u16_low_u8 (p_request->wValue);
@@ -205,7 +205,7 @@ tusb_error_t hidd_control_request_subtask(uint8_t port, tusb_control_request_t c
tusb_dcd_control_xfer(port, TUSB_DIR_IN, m_hid_buffer, p_hid->report_length, false);
}
//------------- Class Specific Request -------------//
- else if (p_request->bmRequestType_bit.type == TUSB_REQUEST_TYPE_CLASS)
+ else if (p_request->bmRequestType_bit.type == TUSB_REQ_TYPE_CLASS)
{
OSAL_SUBTASK_BEGIN
diff --git a/tinyusb/class/hid/hid_host.c b/tinyusb/class/hid/hid_host.c
index 227b45461..c7548f54f 100644
--- a/tinyusb/class/hid/hid_host.c
+++ b/tinyusb/class/hid/hid_host.c
@@ -199,7 +199,7 @@ tusb_error_t hidh_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t con
//------------- SET IDLE (0) request -------------//
OSAL_SUBTASK_INVOKED_AND_WAIT(
- usbh_control_xfer_subtask( dev_addr, bm_request_type(TUSB_DIR_OUT, TUSB_REQUEST_TYPE_CLASS, TUSB_REQUEST_RECIPIENT_INTERFACE),
+ 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 ),
error
@@ -211,7 +211,7 @@ tusb_error_t hidh_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t con
if ( p_desc_hid->bNumDescriptors )
{
OSAL_SUBTASK_INVOKED_AND_WAIT(
- usbh_control_xfer_subtask( dev_addr, bm_request_type(TUSB_DIR_IN, TUSB_REQUEST_TYPE_STANDARD, TUSB_REQUEST_RECIPIENT_INTERFACE),
+ 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,
p_desc_hid->wReportLength, report_descriptor ),
error