diff options
| author | hathach <[email protected]> | 2018-03-11 20:20:59 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2018-03-11 20:20:59 +0700 |
| commit | 26d81c3ea16809bfed6fd9e93e9b2d93696c6264 (patch) | |
| tree | fe17973b51a21af4be7ef4e30132fe871d1ac3c1 /tinyusb/class/cdc | |
| parent | ca13d59682e6a9327528dde230e6725c48fb305b (diff) | |
rename TUSB_DIR_OUT, TUSB_DIR_IN
Diffstat (limited to 'tinyusb/class/cdc')
| -rw-r--r-- | tinyusb/class/cdc/cdc_device.c | 2 | ||||
| -rw-r--r-- | tinyusb/class/cdc/cdc_host.c | 2 | ||||
| -rw-r--r-- | tinyusb/class/cdc/cdc_rndis_host.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/tinyusb/class/cdc/cdc_device.c b/tinyusb/class/cdc/cdc_device.c index 739dce054..113782ab9 100644 --- a/tinyusb/class/cdc/cdc_device.c +++ b/tinyusb/class/cdc/cdc_device.c @@ -179,7 +179,7 @@ tusb_error_t cdcd_open(uint8_t port, tusb_descriptor_interface_t const * p_inter TU_ASSERT( tusb_dcd_edpt_open(port, p_endpoint), TUSB_ERROR_DCD_OPEN_PIPE_FAILED);
- if ( p_endpoint->bEndpointAddress & TUSB_DIR_DEV_TO_HOST_MASK )
+ if ( p_endpoint->bEndpointAddress & TUSB_DIR_IN_MASK )
{
p_cdc->edpt_addr[CDC_PIPE_DATA_IN] = p_endpoint->bEndpointAddress;
}else
diff --git a/tinyusb/class/cdc/cdc_host.c b/tinyusb/class/cdc/cdc_host.c index ddacdb1f3..c4aac4f5e 100644 --- a/tinyusb/class/cdc/cdc_host.c +++ b/tinyusb/class/cdc/cdc_host.c @@ -202,7 +202,7 @@ tusb_error_t cdch_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t con ASSERT_INT(TUSB_DESC_TYPE_ENDPOINT, p_endpoint->bDescriptorType, TUSB_ERROR_USBH_DESCRIPTOR_CORRUPTED);
ASSERT_INT(TUSB_XFER_BULK, p_endpoint->bmAttributes.xfer, TUSB_ERROR_USBH_DESCRIPTOR_CORRUPTED);
- pipe_handle_t * p_pipe_hdl = ( p_endpoint->bEndpointAddress & TUSB_DIR_DEV_TO_HOST_MASK ) ?
+ pipe_handle_t * p_pipe_hdl = ( p_endpoint->bEndpointAddress & TUSB_DIR_IN_MASK ) ?
&p_cdc->pipe_in : &p_cdc->pipe_out;
(*p_pipe_hdl) = hcd_pipe_open(dev_addr, p_endpoint, TUSB_CLASS_CDC);
diff --git a/tinyusb/class/cdc/cdc_rndis_host.c b/tinyusb/class/cdc/cdc_rndis_host.c index ccadeaeb3..82b34d394 100644 --- a/tinyusb/class/cdc/cdc_rndis_host.c +++ b/tinyusb/class/cdc/cdc_rndis_host.c @@ -245,7 +245,7 @@ static tusb_error_t send_message_get_response_subtask( uint8_t dev_addr, cdch_da //------------- Send RNDIS Control Message -------------// OSAL_SUBTASK_INVOKED_AND_WAIT( - usbh_control_xfer_subtask( dev_addr, bm_request_type(TUSB_DIR_HOST_TO_DEV, TUSB_REQUEST_TYPE_CLASS, TUSB_REQUEST_RECIPIENT_INTERFACE), + usbh_control_xfer_subtask( dev_addr, bm_request_type(TUSB_DIR_OUT, TUSB_REQUEST_TYPE_CLASS, TUSB_REQUEST_RECIPIENT_INTERFACE), CDC_REQUEST_SEND_ENCAPSULATED_COMMAND, 0, p_cdc->interface_number, mess_length, p_mess), error @@ -260,7 +260,7 @@ static tusb_error_t send_message_get_response_subtask( uint8_t dev_addr, cdch_da //------------- Get RNDIS Message Initialize Complete -------------// OSAL_SUBTASK_INVOKED_AND_WAIT( - usbh_control_xfer_subtask( dev_addr, bm_request_type(TUSB_DIR_DEV_TO_HOST, TUSB_REQUEST_TYPE_CLASS, TUSB_REQUEST_RECIPIENT_INTERFACE), + usbh_control_xfer_subtask( dev_addr, bm_request_type(TUSB_DIR_IN, TUSB_REQUEST_TYPE_CLASS, TUSB_REQUEST_RECIPIENT_INTERFACE), CDC_REQUEST_GET_ENCAPSULATED_RESPONSE, 0, p_cdc->interface_number, RNDIS_MSG_PAYLOAD_MAX, p_response), error |