sakumisu/CherryUSB
1
0
Fork 0
mirror of https://github.com/sakumisu/CherryUSB.git synced 2025-05-08 07:59:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(core/usbd_core): add ep0_next_state to record control transfer state

Browse Source 
Signed-off-by: sakumisu <1203593632@qq.com>
This commit is contained in:
sakumisu 2025-04-21 18:23:30 +08:00
parent dd8ec4bbcf
commit d10b88c1a1
2 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
core/usbd_core.c
View File

@ -64,6 +64,7 @@ USB_NOCACHE_RAM_SECTION struct usbd_core_priv {
/** Currently selected configuration */
uint8_t configuration;
uint8_t device_address;
uint8_t ep0_next_state;
bool self_powered;
bool remote_wakeup_support;
bool remote_wakeup_enabled;
@ -1118,6 +1119,7 @@ void usbd_event_reset_handler(uint8_t busid)
usbd_set_address(busid, 0);
g_usbd_core[busid].device_address = 0;
g_usbd_core[busid].configuration = 0;
g_usbd_core[busid].ep0_next_state = USBD_EP0_STATE_SETUP;
#ifdef CONFIG_USBDEV_ADVANCE_DESC
g_usbd_core[busid].speed = USB_SPEED_UNKNOWN;
#endif
@ -1162,12 +1164,14 @@ static void __usbd_event_ep0_setup_complete_handler(uint8_t busid, struct usb_se
/* handle class request when all the data is received */
if (setup->wLength && ((setup->bmRequestType & USB_REQUEST_DIR_MASK) == USB_REQUEST_DIR_OUT)) {
USB_LOG_DBG("Start reading %d bytes from ep0\r\n", setup->wLength);
g_usbd_core[busid].ep0_next_state = USBD_EP0_STATE_OUT_DATA;
usbd_ep_start_read(busid, USB_CONTROL_OUT_EP0, g_usbd_core[busid].ep0_data_buf, setup->wLength);
return;
}
/* Ask installed handler to process request */
if (!usbd_setup_request_handler(busid, setup, &buf, &g_usbd_core[busid].ep0_data_buf_len)) {
g_usbd_core[busid].ep0_next_state = USBD_EP0_STATE_SETUP;
usbd_ep_set_stall(busid, USB_CONTROL_IN_EP0);
return;
}
@ -1176,6 +1180,7 @@ static void __usbd_event_ep0_setup_complete_handler(uint8_t busid, struct usb_se
g_usbd_core[busid].ep0_data_buf_residue = MIN(g_usbd_core[busid].ep0_data_buf_len, setup->wLength);
if (g_usbd_core[busid].ep0_data_buf_residue > CONFIG_USBDEV_REQUEST_BUFFER_LEN) {
USB_LOG_ERR("Request buffer too small\r\n");
g_usbd_core[busid].ep0_next_state = USBD_EP0_STATE_SETUP;
usbd_ep_set_stall(busid, USB_CONTROL_IN_EP0);
return;
}
@ -1193,6 +1198,12 @@ static void __usbd_event_ep0_setup_complete_handler(uint8_t busid, struct usb_se
/* use memcpy(*data, xxx, len); has copied into ep0 buffer, we do nothing */
}
if (g_usbd_core[busid].ep0_data_buf_residue > 0) {
g_usbd_core[busid].ep0_next_state = USBD_EP0_STATE_IN_DATA;
} else {
g_usbd_core[busid].ep0_next_state = USBD_EP0_STATE_IN_STATUS;
}
/* Send data or status to host */
usbd_ep_start_write(busid, USB_CONTROL_IN_EP0, g_usbd_core[busid].ep0_data_buf, g_usbd_core[busid].ep0_data_buf_residue);
/*
@ -1247,7 +1258,13 @@ static void usbd_event_ep0_in_complete_handler(uint8_t busid, uint8_t ep, uint32
*/
if (setup->wLength && ((setup->bmRequestType & USB_REQUEST_DIR_MASK) == USB_REQUEST_DIR_IN)) {
/* if all data has sent completely, start reading out status */
g_usbd_core[busid].ep0_next_state = USBD_EP0_STATE_OUT_STATUS;
usbd_ep_start_read(busid, USB_CONTROL_OUT_EP0, NULL, 0);
return;
}
if (g_usbd_core[busid].ep0_next_state == USBD_EP0_STATE_IN_STATUS) {
g_usbd_core[busid].ep0_next_state = USBD_EP0_STATE_SETUP;
}
#ifdef CONFIG_USBDEV_TEST_MODE
@ -1280,10 +1297,12 @@ static void usbd_event_ep0_out_complete_handler(uint8_t busid, uint8_t ep, uint3
/* Received all, send data to handler */
g_usbd_core[busid].ep0_data_buf = g_usbd_core[busid].req_data;
if (!usbd_setup_request_handler(busid, setup, &g_usbd_core[busid].ep0_data_buf, &g_usbd_core[busid].ep0_data_buf_len)) {
g_usbd_core[busid].ep0_next_state = USBD_EP0_STATE_SETUP;
usbd_ep_set_stall(busid, USB_CONTROL_IN_EP0);
return;
}
g_usbd_core[busid].ep0_next_state = USBD_EP0_STATE_IN_STATUS;
/*Send status to host*/
usbd_ep_start_write(busid, USB_CONTROL_IN_EP0, NULL, 0);
#endif
@ -1292,6 +1311,7 @@ static void usbd_event_ep0_out_complete_handler(uint8_t busid, uint8_t ep, uint3
usbd_ep_start_read(busid, USB_CONTROL_OUT_EP0, g_usbd_core[busid].ep0_data_buf, g_usbd_core[busid].ep0_data_buf_residue);
}
} else {
g_usbd_core[busid].ep0_next_state = USBD_EP0_STATE_SETUP;
/* Read out status completely, do nothing */
USB_LOG_DBG("EP0 recv out status\r\n");
}
@ -1425,6 +1445,11 @@ int usbd_send_remote_wakeup(uint8_t busid)
}
}
uint8_t usbd_get_ep0_next_state(uint8_t busid)
{
return g_usbd_core[busid].ep0_next_state;
}
#ifdef CONFIG_USBDEV_EP0_THREAD
static void usbdev_ep0_thread(CONFIG_USB_OSAL_THREAD_SET_ARGV)
{
@ -1451,10 +1476,12 @@ static void usbdev_ep0_thread(CONFIG_USB_OSAL_THREAD_SET_ARGV)
/* Received all, send data to handler */
g_usbd_core[busid].ep0_data_buf = g_usbd_core[busid].req_data;
if (!usbd_setup_request_handler(busid, setup, &g_usbd_core[busid].ep0_data_buf, &g_usbd_core[busid].ep0_data_buf_len)) {
g_usbd_core[busid].ep0_next_state = USBD_EP0_STATE_SETUP;
usbd_ep_set_stall(busid, USB_CONTROL_IN_EP0);
continue;
}
g_usbd_core[busid].ep0_next_state = USBD_EP0_STATE_IN_STATUS;
/*Send status to host*/
usbd_ep_start_write(busid, USB_CONTROL_IN_EP0, NULL, 0);
break;

7
core/usbd_core.h
View File

@ -45,6 +45,12 @@ enum usbd_event_type {
USBD_EVENT_UNKNOWN
};
#define USBD_EP0_STATE_SETUP 0
#define USBD_EP0_STATE_IN_DATA 1
#define USBD_EP0_STATE_OUT_DATA 2
#define USBD_EP0_STATE_IN_STATUS 3
#define USBD_EP0_STATE_OUT_STATUS 4
typedef int (*usbd_request_handler)(uint8_t busid, struct usb_setup_packet *setup, uint8_t **data, uint32_t *len);
typedef void (*usbd_endpoint_callback)(uint8_t busid, uint8_t ep, uint32_t nbytes);
typedef void (*usbd_notify_handler)(uint8_t busid, uint8_t event, void *arg);
@ -105,6 +111,7 @@ uint8_t usbd_get_ep_mult(uint8_t busid, uint8_t ep);
bool usb_device_is_configured(uint8_t busid);
bool usb_device_is_suspend(uint8_t busid);
int usbd_send_remote_wakeup(uint8_t busid);
uint8_t usbd_get_ep0_next_state(uint8_t busid);
int usbd_initialize(uint8_t busid, uintptr_t reg_base, void (*event_handler)(uint8_t busid, uint8_t event));
int usbd_deinitialize(uint8_t busid);