kingkevin
/
esp32-s2_dfu
1
0
Fork 0
Code Issues Releases Activity

rename funciton trailing _subtask to _st

This commit is contained in:
hathach 2018-03-22 16:28:40 +07:00
parent 90ba1e67d9
commit e2739bb785
9 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tinyusb/class/cdc/cdc_device.c
View File

@ -214,7 +214,7 @@ void cdcd_close(uint8_t port)
fifo_clear(&_tx_ff); 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 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) 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 ); (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) 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 ); (uint8_t*) &cdcd_line_coding[port], min16_of(sizeof(cdc_line_coding_t), p_request->wLength)), err );
// TODO notify application on xfer complete // TODO notify application on xfer complete
} }

2
tinyusb/class/cdc/cdc_device.h
View File

@ -91,7 +91,7 @@ void tud_cdc_rx_cb(uint8_t port);
void cdcd_init(void); 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_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); 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); void cdcd_close(uint8_t port);

8
tinyusb/class/hid/hid_device.c
View File

@ -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; uint8_t subclass_idx;
for(subclass_idx=0; subclass_idx<HIDD_NUMBER_OF_SUBCLASS; 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 // copy to allow report descriptor not to be in USBRAM
memcpy(m_hid_buffer, p_hid->p_report_desc, p_hid->report_length); 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 }else
{ {
usbd_control_stall(port); 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); &p_buffer, p_request->wLength);
STASK_ASSERT( p_buffer != NULL && actual_length > 0 ); 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) ) 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) // return TUSB_ERROR_DCD_CONTROL_REQUEST_NOT_SUPPORT; // TODO test STALL control out endpoint (with mouse+keyboard)
// wValue = Report Type | Report ID // 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); STASK_ASSERT_STATUS(err);
p_driver->set_report_cb(port, u16_high_u8(p_request->wValue), m_hid_buffer, p_request->wLength); p_driver->set_report_cb(port, u16_high_u8(p_request->wValue), m_hid_buffer, p_request->wLength);

2
tinyusb/class/hid/hid_device.h
View File

@ -202,7 +202,7 @@ void tud_hid_mouse_set_report_cb(uint8_t port, hid_request_report_type_t report_
void hidd_init(void); 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_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); 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); void hidd_close(uint8_t port);

4
tinyusb/class/msc/msc_device.c
View File

@ -122,7 +122,7 @@ tusb_error_t mscd_open(uint8_t port, tusb_descriptor_interface_t const * p_inter
return TUSB_ERROR_NONE; 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 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 // 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; 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 }else
{ {
usbd_control_stall(port); // stall unsupported request usbd_control_stall(port); // stall unsupported request

2
tinyusb/class/msc/msc_device.h
View File

@ -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); 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_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); 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); void mscd_close(uint8_t port);

26
tinyusb/device/usbd.c
View File

@ -62,7 +62,7 @@ static usbd_class_driver_t const usbd_class_drivers[] =
{ {
.init = hidd_init, .init = hidd_init,
.open = hidd_open, .open = hidd_open,
.control_request_subtask = hidd_control_request_subtask, .control_request_st = hidd_control_request_st,
.xfer_cb = hidd_xfer_cb, .xfer_cb = hidd_xfer_cb,
// .routine = NULL, // .routine = NULL,
.sof = NULL, .sof = NULL,
@ -75,7 +75,7 @@ static usbd_class_driver_t const usbd_class_drivers[] =
{ {
.init = mscd_init, .init = mscd_init,
.open = mscd_open, .open = mscd_open,
.control_request_subtask = mscd_control_request_subtask, .control_request_st = mscd_control_request_st,
.xfer_cb = mscd_xfer_cb, .xfer_cb = mscd_xfer_cb,
// .routine = NULL, // .routine = NULL,
.sof = NULL, .sof = NULL,
@ -88,7 +88,7 @@ static usbd_class_driver_t const usbd_class_drivers[] =
{ {
.init = cdcd_init, .init = cdcd_init,
.open = cdcd_open, .open = cdcd_open,
.control_request_subtask = cdcd_control_request_subtask, .control_request_st = cdcd_control_request_st,
.xfer_cb = cdcd_xfer_cb, .xfer_cb = cdcd_xfer_cb,
// .routine = NULL, // .routine = NULL,
.sof = cdcd_sof, .sof = cdcd_sof,
@ -172,8 +172,8 @@ static osal_queue_t usbd_queue_hdl;
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
// IMPLEMENTATION // IMPLEMENTATION
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
static tusb_error_t proc_control_request_stask(uint8_t port, tusb_control_request_t const * const p_request); static tusb_error_t proc_control_request_st(uint8_t port, tusb_control_request_t const * const p_request);
static tusb_error_t usbd_main_stask(void); static tusb_error_t usbd_main_stk(void);
tusb_error_t usbd_init (void) tusb_error_t usbd_init (void)
{ {
@ -217,11 +217,11 @@ void usbd_task( void* param)
(void) param; (void) param;
OSAL_TASK_BEGIN OSAL_TASK_BEGIN
usbd_main_stask(); usbd_main_stk();
OSAL_TASK_END OSAL_TASK_END
} }
static tusb_error_t usbd_main_stask(void) static tusb_error_t usbd_main_stk(void)
{ {
static usbd_task_event_t event; static usbd_task_event_t event;
@ -255,7 +255,7 @@ static tusb_error_t usbd_main_stask(void)
if ( USBD_EVENTID_SETUP_RECEIVED == event.event_id ) if ( USBD_EVENTID_SETUP_RECEIVED == event.event_id )
{ {
STASK_INVOKE( proc_control_request_stask(event.port, &event.setup_received), error ); STASK_INVOKE( proc_control_request_st(event.port, &event.setup_received), error );
}else if (USBD_EVENTID_XFER_DONE == event.event_id) }else if (USBD_EVENTID_XFER_DONE == event.event_id)
{ {
// Call class handling function, Class that endpoint not belong to should check and return // Call class handling function, Class that endpoint not belong to should check and return
@ -287,7 +287,7 @@ static tusb_error_t usbd_main_stask(void)
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
// CONTROL REQUEST // CONTROL REQUEST
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
tusb_error_t usbd_control_xfer_stask(uint8_t port, tusb_dir_t dir, uint8_t * buffer, uint16_t length) tusb_error_t usbd_control_xfer_st(uint8_t port, tusb_dir_t dir, uint8_t * buffer, uint16_t length)
{ {
OSAL_SUBTASK_BEGIN OSAL_SUBTASK_BEGIN
@ -310,7 +310,7 @@ tusb_error_t usbd_control_xfer_stask(uint8_t port, tusb_dir_t dir, uint8_t * buf
OSAL_SUBTASK_END OSAL_SUBTASK_END
} }
static tusb_error_t proc_control_request_stask(uint8_t port, tusb_control_request_t const * const p_request) static tusb_error_t proc_control_request_st(uint8_t port, tusb_control_request_t const * const p_request)
{ {
OSAL_SUBTASK_BEGIN OSAL_SUBTASK_BEGIN
@ -328,7 +328,7 @@ static tusb_error_t proc_control_request_stask(uint8_t port, tusb_control_reques
if ( len ) if ( len )
{ {
STASK_INVOKE( usbd_control_xfer_stask(port, p_request->bmRequestType_bit.direction, (uint8_t*) buffer, len ), error ); STASK_INVOKE( usbd_control_xfer_st(port, p_request->bmRequestType_bit.direction, (uint8_t*) buffer, len ), error );
}else }else
{ {
usbd_control_stall(port); // stall unsupported descriptor usbd_control_stall(port); // stall unsupported descriptor
@ -363,9 +363,9 @@ static tusb_error_t proc_control_request_stask(uint8_t port, tusb_control_reques
// TODO [Custom] TUSB_CLASS_DIAGNOSTIC, vendor etc ... // TODO [Custom] TUSB_CLASS_DIAGNOSTIC, vendor etc ...
if ( (class_code > 0) && (class_code < USBD_CLASS_DRIVER_COUNT) && if ( (class_code > 0) && (class_code < USBD_CLASS_DRIVER_COUNT) &&
usbd_class_drivers[class_code].control_request_subtask ) usbd_class_drivers[class_code].control_request_st )
{ {
STASK_INVOKE( usbd_class_drivers[class_code].control_request_subtask(port, p_request), error ); STASK_INVOKE( usbd_class_drivers[class_code].control_request_st(port, p_request), error );
}else }else
{ {
usbd_control_stall(port); // Stall unsupported request usbd_control_stall(port); // Stall unsupported request

2
tinyusb/device/usbd.h
View File

@ -79,7 +79,7 @@ extern tusbd_descriptor_pointer_t tusbd_descriptor_pointers;
typedef struct { typedef struct {
void (* init) (void); void (* init) (void);
tusb_error_t (* open)(uint8_t port, tusb_descriptor_interface_t const * desc_intf, uint16_t* p_length); tusb_error_t (* open)(uint8_t port, tusb_descriptor_interface_t const * desc_intf, uint16_t* p_length);
tusb_error_t (* control_request_subtask) (uint8_t port, tusb_control_request_t const *); tusb_error_t (* control_request_st) (uint8_t port, tusb_control_request_t const *);
tusb_error_t (* xfer_cb) (uint8_t port, uint8_t ep_addr, tusb_event_t, uint32_t); tusb_error_t (* xfer_cb) (uint8_t port, uint8_t ep_addr, tusb_event_t, uint32_t);
// void (* routine)(void); // void (* routine)(void);
void (* sof)(uint8_t port); void (* sof)(uint8_t port);

2
tinyusb/device/usbd_pvt.h
View File

@ -50,7 +50,7 @@ tusb_error_t usbd_init(void);
void usbd_task( void* param); void usbd_task( void* param);
// Carry out Data and Status stage of control transfer // Carry out Data and Status stage of control transfer
tusb_error_t usbd_control_xfer_stask(uint8_t port, tusb_dir_t dir, uint8_t * buffer, uint16_t length); tusb_error_t usbd_control_xfer_st(uint8_t port, tusb_dir_t dir, uint8_t * buffer, uint16_t length);
// Return Status of control transfer // Return Status of control transfer
// Note dir is value of direction bit in setup packet (aka DATA stage direction) // Note dir is value of direction bit in setup packet (aka DATA stage direction)