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

update endpoint number usage and fix busid check

Browse Source 
Signed-off-by: Zhihong Chen <zhihong.chen@hpmicro.com>
This commit is contained in:
Zhihong Chen
2024-02-19 18:14:46 +08:00
committed by sakumisu
parent e0551b3e7b
commit 4803a6826b
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cherryusb_config_template.h
View File

@@ -33,6 +33,8 @@
/* ================= USB Device Stack Configuration ================ */
#define CONFIG_USBDEV_MAX_BUS 1 // for now, bus num must be 1 except hpm ip
/* Ep0 max transfer buffer, specially for receiving data from ep0 out */
#define CONFIG_USBDEV_REQUEST_BUFFER_LEN 256
@@ -146,9 +148,9 @@
/* ================ USB Device Port Configuration ================*/
#define CONFIG_USBDEV_MAX_BUS 1 // for now, bus num must be 1 except hpm ip
#define CONFIG_USBDEV_EP_NUM 4
#ifndef CONFIG_USBDEV_EP_NUM
#define CONFIG_USBDEV_EP_NUM 8
#endif
/* ================ USB Host Port Configuration ==================*/

9
core/usbd_core.c
View File

@@ -18,9 +18,6 @@
#define INTF_DESC_bInterfaceNumber 2 /** Interface number offset */
#define INTF_DESC_bAlternateSetting 3 /** Alternate setting offset */
#define USB_EP_OUT_NUM 16
#define USB_EP_IN_NUM 16
struct usbd_tx_rx_msg {
uint8_t ep;
uint32_t nbytes;
@@ -59,8 +56,8 @@ USB_NOCACHE_RAM_SECTION struct usbd_core_priv {
struct usbd_interface *intf[8];
uint8_t intf_offset;
struct usbd_tx_rx_msg tx_msg[USB_EP_IN_NUM];
struct usbd_tx_rx_msg rx_msg[USB_EP_OUT_NUM];
struct usbd_tx_rx_msg tx_msg[CONFIG_USBDEV_EP_NUM];
struct usbd_tx_rx_msg rx_msg[CONFIG_USBDEV_EP_NUM];
void (*event_handler)(uint8_t busid, uint8_t event);
} g_usbd_core[CONFIG_USBDEV_MAX_BUS];
@@ -1206,7 +1203,7 @@ int usbd_initialize(uint8_t busid, uint32_t reg_base, void (*event_handler)(uint
int ret;
struct usbd_bus *bus;
if (busid > CONFIG_USBDEV_MAX_BUS) {
if (busid >= CONFIG_USBDEV_MAX_BUS) {
USB_LOG_ERR("bus overflow\r\n");
while (1) {
}

2
core/usbh_core.c
View File

@@ -668,7 +668,7 @@ int usbh_initialize(uint8_t busid, uint32_t reg_base)
{
struct usbh_bus *bus;
if (busid > CONFIG_USBHOST_MAX_BUS) {
if (busid >= CONFIG_USBHOST_MAX_BUS) {
USB_LOG_ERR("bus overflow\r\n");
while (1) {
}