yemai/CherryUSB
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update usb test mode

Browse Source 
Signed-off-by: Zhihong Chen <zhihong.chen@hpmicro.com>
This commit is contained in:
Zhihong Chen
2024-03-11 16:32:32 +08:00
committed by sakumisu
parent 2e862f3864
commit bba4b46fa4
2 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
common/usb_dc.h
View File

@@ -178,6 +178,15 @@ void usbd_event_ep_in_complete_handler(uint8_t busid, uint8_t ep, uint32_t nbyte
*/
void usbd_event_ep_out_complete_handler(uint8_t busid, uint8_t ep, uint32_t nbytes);
#ifdef CONFIG_USBDEV_TEST_MODE
/**
* @brief Usb execute test mode
* @param[in] busid device busid
* @param[in] test_mode usb test mode
*/
void usbd_execute_test_mode(uint8_t busid, uint8_t test_mode);
#endif
#ifdef __cplusplus
}
#endif

24
core/usbd_core.c
View File

@@ -51,7 +51,7 @@ USB_NOCACHE_RAM_SECTION struct usbd_core_priv {
uint8_t configuration;
uint8_t speed;
#ifdef CONFIG_USBDEV_TEST_MODE
bool test_mode;
bool test_req;
#endif
struct usbd_interface *intf[8];
uint8_t intf_offset;
@@ -498,8 +498,7 @@ static bool usbd_std_device_req_handler(uint8_t busid, struct usb_setup_packet *
}
} else if (value == USB_FEATURE_TEST_MODE) {
#ifdef CONFIG_USBDEV_TEST_MODE
g_usbd_core[busid].test_mode = true;
usbd_execute_test_mode(busid, setup);
g_usbd_core[busid].test_req = true;
#endif
}
*len = 0;
@@ -973,10 +972,6 @@ void usbd_event_reset_handler(uint8_t busid)
{
usbd_set_address(busid, 0);
g_usbd_core[busid].configuration = 0;
#ifdef CONFIG_USBDEV_TEST_MODE
g_usbd_core[busid].test_mode = false;
#endif
struct usb_endpoint_descriptor ep0;
ep0.bLength = 7;
@@ -1027,13 +1022,7 @@ void usbd_event_ep0_setup_complete_handler(uint8_t busid, uint8_t *psetup)
usbd_ep_set_stall(busid, USB_CONTROL_IN_EP0);
return;
}
#ifdef CONFIG_USBDEV_TEST_MODE
/* send status in test mode, so do not execute downward, just return */
if (g_usbd_core[busid].test_mode) {
g_usbd_core[busid].test_mode = false;
return;
}
#endif
/* Send smallest of requested and offered length */
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) {
@@ -1082,6 +1071,13 @@ void usbd_event_ep0_in_complete_handler(uint8_t busid, uint8_t ep, uint32_t nbyt
/* if all data has sent completely, start reading out status */
usbd_ep_start_read(busid, USB_CONTROL_OUT_EP0, NULL, 0);
}
#ifdef CONFIG_USBDEV_TEST_MODE
if (g_usbd_core[busid].test_req) {
usbd_execute_test_mode(busid, HI_BYTE(setup->wIndex));
g_usbd_core[busid].test_req = false;
}
#endif
}
}
}