diff options
Diffstat (limited to 'tinyusb/class')
| -rw-r--r-- | tinyusb/class/cdc/cdc_device.c | 6 | ||||
| -rw-r--r-- | tinyusb/class/cdc/cdc_device.h | 2 | ||||
| -rw-r--r-- | tinyusb/class/hid/hid_device.c | 8 | ||||
| -rw-r--r-- | tinyusb/class/hid/hid_device.h | 2 | ||||
| -rw-r--r-- | tinyusb/class/msc/msc_device.c | 4 | ||||
| -rw-r--r-- | tinyusb/class/msc/msc_device.h | 2 |
6 files changed, 12 insertions, 12 deletions
diff --git a/tinyusb/class/cdc/cdc_device.c b/tinyusb/class/cdc/cdc_device.c index c027e6ffb..29f9f588b 100644 --- a/tinyusb/class/cdc/cdc_device.c +++ b/tinyusb/class/cdc/cdc_device.c @@ -214,7 +214,7 @@ void cdcd_close(uint8_t port) fifo_clear(&_tx_ff);
}
-tusb_error_t cdcd_control_request_subtask(uint8_t port, tusb_control_request_t const * p_request)
+tusb_error_t cdcd_control_request_st(uint8_t port, tusb_control_request_t const * p_request)
{
OSAL_SUBTASK_BEGIN
@@ -225,12 +225,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)
{
- STASK_INVOKE( usbd_control_xfer_stask(port, (tusb_dir_t) p_request->bmRequestType_bit.direction,
+ STASK_INVOKE( usbd_control_xfer_st(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)
{
- STASK_INVOKE( usbd_control_xfer_stask(port, (tusb_dir_t) p_request->bmRequestType_bit.direction,
+ STASK_INVOKE( usbd_control_xfer_st(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_device.h b/tinyusb/class/cdc/cdc_device.h index 44768d1a2..96cc1e868 100644 --- a/tinyusb/class/cdc/cdc_device.h +++ b/tinyusb/class/cdc/cdc_device.h @@ -91,7 +91,7 @@ void tud_cdc_rx_cb(uint8_t port); void cdcd_init(void);
tusb_error_t cdcd_open(uint8_t port, tusb_descriptor_interface_t const * p_interface_desc, uint16_t *p_length);
-tusb_error_t cdcd_control_request_subtask(uint8_t port, tusb_control_request_t const * p_request);
+tusb_error_t cdcd_control_request_st(uint8_t port, tusb_control_request_t const * p_request);
tusb_error_t cdcd_xfer_cb(uint8_t port, uint8_t edpt_addr, tusb_event_t event, uint32_t xferred_bytes);
void cdcd_close(uint8_t port);
diff --git a/tinyusb/class/hid/hid_device.c b/tinyusb/class/hid/hid_device.c index dfb239650..c142feb13 100644 --- a/tinyusb/class/hid/hid_device.c +++ b/tinyusb/class/hid/hid_device.c @@ -176,7 +176,7 @@ void hidd_close(uint8_t port) }
}
-tusb_error_t hidd_control_request_subtask(uint8_t port, tusb_control_request_t const * p_request)
+tusb_error_t hidd_control_request_st(uint8_t port, tusb_control_request_t const * p_request)
{
uint8_t subclass_idx;
for(subclass_idx=0; subclass_idx<HIDD_NUMBER_OF_SUBCLASS; subclass_idx++)
@@ -209,7 +209,7 @@ tusb_error_t hidd_control_request_subtask(uint8_t port, tusb_control_request_t c // copy to allow report descriptor not to be in USBRAM
memcpy(m_hid_buffer, p_hid->p_report_desc, p_hid->report_length);
- STASK_INVOKE( usbd_control_xfer_stask(port, p_request->bmRequestType_bit.direction, m_hid_buffer, p_hid->report_length), err );
+ STASK_INVOKE( usbd_control_xfer_st(port, p_request->bmRequestType_bit.direction, m_hid_buffer, p_hid->report_length), err );
}else
{
usbd_control_stall(port);
@@ -227,13 +227,13 @@ tusb_error_t hidd_control_request_subtask(uint8_t port, tusb_control_request_t c &p_buffer, p_request->wLength);
STASK_ASSERT( p_buffer != NULL && actual_length > 0 );
- STASK_INVOKE( usbd_control_xfer_stask(port, p_request->bmRequestType_bit.direction, p_buffer, actual_length), err );
+ STASK_INVOKE( usbd_control_xfer_st(port, p_request->bmRequestType_bit.direction, p_buffer, actual_length), err );
}
else if ( (HID_REQUEST_CONTROL_SET_REPORT == p_request->bRequest) && (p_driver->set_report_cb != NULL) )
{
// return TUSB_ERROR_DCD_CONTROL_REQUEST_NOT_SUPPORT; // TODO test STALL control out endpoint (with mouse+keyboard)
// wValue = Report Type | Report ID
- STASK_INVOKE( usbd_control_xfer_stask(port, p_request->bmRequestType_bit.direction, m_hid_buffer, p_request->wLength), err );
+ STASK_INVOKE( usbd_control_xfer_st(port, p_request->bmRequestType_bit.direction, m_hid_buffer, p_request->wLength), err );
STASK_ASSERT_STATUS(err);
p_driver->set_report_cb(port, u16_high_u8(p_request->wValue), m_hid_buffer, p_request->wLength);
diff --git a/tinyusb/class/hid/hid_device.h b/tinyusb/class/hid/hid_device.h index 83ed2e8b5..78274d492 100644 --- a/tinyusb/class/hid/hid_device.h +++ b/tinyusb/class/hid/hid_device.h @@ -202,7 +202,7 @@ void tud_hid_mouse_set_report_cb(uint8_t port, hid_request_report_type_t report_ void hidd_init(void);
tusb_error_t hidd_open(uint8_t port, tusb_descriptor_interface_t const * p_interface_desc, uint16_t *p_length);
-tusb_error_t hidd_control_request_subtask(uint8_t port, tusb_control_request_t const * p_request);
+tusb_error_t hidd_control_request_st(uint8_t port, tusb_control_request_t const * p_request);
tusb_error_t hidd_xfer_cb(uint8_t port, uint8_t edpt_addr, tusb_event_t event, uint32_t xferred_bytes);
void hidd_close(uint8_t port);
diff --git a/tinyusb/class/msc/msc_device.c b/tinyusb/class/msc/msc_device.c index e3abeb9a3..a2b67121d 100644 --- a/tinyusb/class/msc/msc_device.c +++ b/tinyusb/class/msc/msc_device.c @@ -122,7 +122,7 @@ tusb_error_t mscd_open(uint8_t port, tusb_descriptor_interface_t const * p_inter return TUSB_ERROR_NONE;
}
-tusb_error_t mscd_control_request_subtask(uint8_t port, tusb_control_request_t const * p_request)
+tusb_error_t mscd_control_request_st(uint8_t port, tusb_control_request_t const * p_request)
{
OSAL_SUBTASK_BEGIN
@@ -140,7 +140,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;
- STASK_INVOKE( usbd_control_xfer_stask(port, p_request->bmRequestType_bit.direction, p_msc->scsi_data, 1), err);
+ STASK_INVOKE( usbd_control_xfer_st(port, p_request->bmRequestType_bit.direction, p_msc->scsi_data, 1), err);
}else
{
usbd_control_stall(port); // stall unsupported request
diff --git a/tinyusb/class/msc/msc_device.h b/tinyusb/class/msc/msc_device.h index 98c041849..cf8362250 100644 --- a/tinyusb/class/msc/msc_device.h +++ b/tinyusb/class/msc/msc_device.h @@ -123,7 +123,7 @@ msc_csw_status_t tud_msc_scsi_cb (uint8_t port, uint8_t lun, uint8_t scsi_cmd[16 void mscd_init(void);
tusb_error_t mscd_open(uint8_t port, tusb_descriptor_interface_t const * p_interface_desc, uint16_t *p_length);
-tusb_error_t mscd_control_request_subtask(uint8_t port, tusb_control_request_t const * p_request);
+tusb_error_t mscd_control_request_st(uint8_t port, tusb_control_request_t const * p_request);
tusb_error_t mscd_xfer_cb(uint8_t port, uint8_t edpt_addr, tusb_event_t event, uint32_t xferred_bytes);
void mscd_close(uint8_t port);
|