summaryrefslogtreecommitdiff
path: root/tinyusb/class
diff options
context:
space:
mode:
authorhathach <[email protected]>2018-03-28 13:54:28 +0700
committerhathach <[email protected]>2018-03-28 13:54:28 +0700
commit47c125d0257fb8f053870b33bded1f422ff81847 (patch)
tree58a235b28e0926cf90d4bccdb22c4a0d83bdfdcc /tinyusb/class
parent4deb4da6cba0a5d9415279e63d9427e992c75028 (diff)
more dcd clean up
Diffstat (limited to 'tinyusb/class')
-rw-r--r--tinyusb/class/cdc/cdc_device.c4
-rw-r--r--tinyusb/class/hid/hid_device.c8
-rw-r--r--tinyusb/class/msc/msc_device.c4
3 files changed, 8 insertions, 8 deletions
diff --git a/tinyusb/class/cdc/cdc_device.c b/tinyusb/class/cdc/cdc_device.c
index 300eb0efa..072e79404 100644
--- a/tinyusb/class/cdc/cdc_device.c
+++ b/tinyusb/class/cdc/cdc_device.c
@@ -258,11 +258,11 @@ tusb_error_t cdcd_control_request_st(uint8_t rhport, tusb_control_request_t cons
p_cdc->connected = false;
}
- usbd_control_status(rhport, p_request->bmRequestType_bit.direction);
+ dcd_control_status(rhport, p_request->bmRequestType_bit.direction);
}
else
{
- usbd_control_stall(rhport); // stall unsupported request
+ dcd_control_stall(rhport); // stall unsupported request
}
OSAL_SUBTASK_END
diff --git a/tinyusb/class/hid/hid_device.c b/tinyusb/class/hid/hid_device.c
index 789f1cf29..8bad4cbbe 100644
--- a/tinyusb/class/hid/hid_device.c
+++ b/tinyusb/class/hid/hid_device.c
@@ -212,7 +212,7 @@ tusb_error_t hidd_control_request_st(uint8_t rhport, tusb_control_request_t cons
STASK_INVOKE( usbd_control_xfer_st(rhport, p_request->bmRequestType_bit.direction, m_hid_buffer, p_hid->report_length), err );
}else
{
- usbd_control_stall(rhport);
+ dcd_control_stall(rhport);
}
}
//------------- Class Specific Request -------------//
@@ -241,17 +241,17 @@ tusb_error_t hidd_control_request_st(uint8_t rhport, tusb_control_request_t cons
else if (HID_REQUEST_CONTROL_SET_IDLE == p_request->bRequest)
{
// uint8_t idle_rate = u16_high_u8(p_request->wValue);
- usbd_control_status(rhport, p_request->bmRequestType_bit.direction);
+ dcd_control_status(rhport, p_request->bmRequestType_bit.direction);
}else
{
// HID_REQUEST_CONTROL_GET_IDLE:
// HID_REQUEST_CONTROL_GET_PROTOCOL:
// HID_REQUEST_CONTROL_SET_PROTOCOL:
- usbd_control_stall(rhport);
+ dcd_control_stall(rhport);
}
}else
{
- usbd_control_stall(rhport);
+ dcd_control_stall(rhport);
}
OSAL_SUBTASK_END
diff --git a/tinyusb/class/msc/msc_device.c b/tinyusb/class/msc/msc_device.c
index 23184a2f1..b5a29ad91 100644
--- a/tinyusb/class/msc/msc_device.c
+++ b/tinyusb/class/msc/msc_device.c
@@ -147,7 +147,7 @@ tusb_error_t mscd_control_request_st(uint8_t rhport, tusb_control_request_t cons
if(MSC_REQUEST_RESET == p_request->bRequest)
{
- usbd_control_status(rhport, p_request->bmRequestType_bit.direction);
+ dcd_control_status(rhport, p_request->bmRequestType_bit.direction);
}
else if (MSC_REQUEST_GET_MAX_LUN == p_request->bRequest)
{
@@ -156,7 +156,7 @@ tusb_error_t mscd_control_request_st(uint8_t rhport, tusb_control_request_t cons
STASK_INVOKE( usbd_control_xfer_st(rhport, p_request->bmRequestType_bit.direction, p_msc->scsi_data, 1), err);
}else
{
- usbd_control_stall(rhport); // stall unsupported request
+ dcd_control_stall(rhport); // stall unsupported request
}
OSAL_SUBTASK_END