andy/tinyUSB
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

refactor dcd API, drop edpt_hdl_t in favor of endpoint address for easy port

Browse Source
This commit is contained in:
hathach
2018-03-11 15:20:27 +07:00
parent fd250b92cb
commit cfdc7999f6
7 changed files with 70 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tinyusb/device/usbd.c
View File

@@ -138,7 +138,7 @@ typedef struct ATTR_ALIGNED(4)
tusb_control_request_t setup_received;
struct { // USBD_EVENTID_XFER_DONE
edpt_hdl_t edpt_hdl;
uint8_t edpt_addr;
uint32_t xferred_byte;
}xfer_done;
};
@@ -252,7 +252,7 @@ static tusb_error_t usbd_body_subtask(void)
{
if ( usbd_class_drivers[class_code].xfer_cb )
{
usbd_class_drivers[class_code].xfer_cb( event.xfer_done.edpt_hdl, (tusb_event_t) event.sub_event_id, event.xfer_done.xferred_byte);
usbd_class_drivers[class_code].xfer_cb( event.port, event.xfer_done.edpt_addr, (tusb_event_t) event.sub_event_id, event.xfer_done.xferred_byte);
}
}
}else if (USBD_EVENTID_SOF == event.event_id)
@@ -498,9 +498,9 @@ void tusb_dcd_setup_received(uint8_t port, uint8_t const* p_request)
osal_queue_send(usbd_queue_hdl, &task_event);
}
void tusb_dcd_xfer_complete(edpt_hdl_t edpt_hdl, uint32_t xferred_bytes, bool succeeded)
void tusb_dcd_xfer_complete(uint8_t port, uint8_t edpt_addr, uint32_t xferred_bytes, bool succeeded)
{
if (edpt_hdl.index == 0 )
if (edpt_addr == 0 )
{
// Control Transfer
osal_semaphore_post( usbd_control_xfer_sem_hdl );
@@ -508,13 +508,13 @@ void tusb_dcd_xfer_complete(edpt_hdl_t edpt_hdl, uint32_t xferred_bytes, bool su
{
usbd_task_event_t task_event =
{
.port = edpt_hdl.port,
.port = port,
.event_id = USBD_EVENTID_XFER_DONE,
.sub_event_id = succeeded ? TUSB_EVENT_XFER_COMPLETE : TUSB_EVENT_XFER_ERROR
};
task_event.xfer_done.edpt_addr = edpt_addr;
task_event.xfer_done.xferred_byte = xferred_bytes;
task_event.xfer_done.edpt_hdl = edpt_hdl;
osal_queue_send(usbd_queue_hdl, &task_event);
}