Skip to content

sb_glue_nation.c中添加N32H49X和N32H7XX系列MCU的USBHS支持和修复cherryusb库中AC5下编译报错误和警告 #11522

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
OnlyoutzZ wants to merge 5 commits into
base: master
Choose a base branch
from
Open

sb_glue_nation.c中添加N32H49X和N32H7XX系列MCU的USBHS支持和修复cherryusb库中AC5下编译报错误和警告 #11522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
05b61c4
更新国民技术BSP架构，添加N32H7xx系列BSP
OnlyoutzZ Jan 28, 2026
9b5609d
Merge branch 'RT-Thread:master' into master
OnlyoutzZ Apr 1, 2026
8739d36
Merge branch 'RT-Thread:master' into master
OnlyoutzZ Jun 26, 2026
b22d05a
1、usb_glue_nation.c中添加N32H49X和N32H7XX系列MCU的USBHS支持
OnlyoutzZ Jun 26, 2026
d7ae6e9
style: format code with clang-format [skip ci]
Jun 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion components/drivers/usb/cherryusb/class/hid/usbd_hid.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,4 +122,4 @@ __WEAK void usbd_hid_set_protocol(uint8_t busid, uint8_t intf, uint8_t protocol)
(void)busid;
(void)intf;
(void)protocol;
}
}
2 changes: 1 addition & 1 deletion components/drivers/usb/cherryusb/common/usb_hc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ struct usbh_urb {
uint32_t start_frame;
usbh_complete_callback_t complete;
void *arg;
#if defined(__ICCARM__) || defined(__ICCRISCV__) || defined(__ICCRX__)
#if defined(__ICCARM__) || defined(__ICCRISCV__) || defined(__ICCRX__) || defined(__CC_ARM)
struct usbh_iso_frame_packet *iso_packet;
#else
struct usbh_iso_frame_packet iso_packet[0];
Expand Down
2 changes: 1 addition & 1 deletion components/drivers/usb/cherryusb/common/usb_version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
#define CHERRYUSB_VERSION 0x010601
#define CHERRYUSB_VERSION_STR "v1.6.1"

#endif
#endif
2 changes: 1 addition & 1 deletion components/drivers/usb/cherryusb/osal/usb_osal_rtthread.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,4 +226,4 @@ void *usb_osal_malloc(size_t size)
void usb_osal_free(void *ptr)
{
rt_free(ptr);
}
}
74 changes: 37 additions & 37 deletions components/drivers/usb/cherryusb/port/dwc2/usb_dwc2_param.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,41 +217,41 @@ struct dwc2_hw_params {
uint32_t snpsid;
uint32_t dev_ep_dirs;

unsigned op_mode : 3;
unsigned arch : 2;
unsigned enable_dynamic_fifo : 1;
unsigned host_channels : 5;
unsigned hs_phy_type : 2;
unsigned fs_phy_type : 2;
unsigned num_dev_ep : 4;
unsigned nperio_tx_q_depth : 3;
unsigned host_perio_tx_q_depth : 3;
unsigned dev_token_q_depth : 5;

unsigned max_transfer_size : 26;
unsigned max_packet_count : 11;
unsigned i2c_enable : 1;
unsigned total_fifo_size : 16;
unsigned lpm_mode : 1;

unsigned en_multiple_tx_fifo : 1;
unsigned num_dev_in_eps : 4;
unsigned num_dev_perio_in_ep : 4;
unsigned dma_desc_enable : 1;
unsigned power_optimized : 1;
unsigned hibernation : 1;
unsigned utmi_phy_data_width : 2;
unsigned acg_enable : 1;
unsigned ipg_isoc_en : 1;
unsigned service_interval_mode : 1;
unsigned op_mode : 3;
unsigned arch : 2;
unsigned enable_dynamic_fifo : 1;
unsigned host_channels : 5;
unsigned hs_phy_type : 2;
unsigned fs_phy_type : 2;
unsigned num_dev_ep : 4;
unsigned nperio_tx_q_depth : 3;
unsigned host_perio_tx_q_depth : 3;
unsigned dev_token_q_depth : 5;

unsigned max_transfer_size : 26;
unsigned max_packet_count : 11;
unsigned i2c_enable : 1;
unsigned total_fifo_size : 16;
unsigned lpm_mode : 1;

unsigned en_multiple_tx_fifo : 1;
unsigned num_dev_in_eps : 4;
unsigned num_dev_perio_in_ep : 4;
unsigned dma_desc_enable : 1;
unsigned power_optimized : 1;
unsigned hibernation : 1;
unsigned utmi_phy_data_width : 2;
unsigned acg_enable : 1;
unsigned ipg_isoc_en : 1;
unsigned service_interval_mode : 1;
};

#define DWC2_PHY_TYPE_PARAM_FS 0
#define DWC2_PHY_TYPE_PARAM_UTMI 1
#define DWC2_PHY_TYPE_PARAM_ULPI 2
#define DWC2_PHY_TYPE_PARAM_FS 0
#define DWC2_PHY_TYPE_PARAM_UTMI 1
#define DWC2_PHY_TYPE_PARAM_ULPI 2

struct dwc2_user_params {
uint8_t phy_type;
uint8_t phy_type;
uint8_t phy_utmi_width;

bool device_dma_enable;
Expand All @@ -261,18 +261,18 @@ struct dwc2_user_params {
*/
uint16_t device_rx_fifo_size;
/* IN Endpoints Max packet Size / 4 */
uint16_t device_tx_fifo_size[MAX_EPS_CHANNELS];
uint16_t device_tx_fifo_size[MAX_EPS_CHANNELS];

bool host_dma_desc_enable;
/*
* (largest USB packet used / 4) + 1 for status information + 1 transfer complete +
* 1 location each for Bulk/Control endpoint for handling NAK/NYET scenario
*/
uint16_t host_rx_fifo_size;
uint16_t host_rx_fifo_size;
/* largest non-periodic USB packet used / 4 */
uint16_t host_nperio_tx_fifo_size;
uint16_t host_nperio_tx_fifo_size;
/* largest periodic USB packet used / 4 */
uint16_t host_perio_tx_fifo_size;
uint16_t host_perio_tx_fifo_size;

uint32_t device_gccfg;
uint32_t host_gccfg;
Expand All @@ -282,7 +282,7 @@ struct dwc2_user_params {
};

struct usb_dwc2_user_fifo_config {
/* (5 * number of control endpoints + 8) + ((largest USB packet used / 4) + 1 for
/* (5 * number of control endpoints + 8) + ((largest USB packet used / 4) + 1 for
* status information) + (2 * number of OUT endpoints) + 1 for Global NAK
*/
uint16_t device_rx_fifo_size;
Expand Down Expand Up @@ -364,4 +364,4 @@ static inline void dwc2_get_hwparams(uint32_t reg_base, struct dwc2_hw_params *h
void dwc2_get_user_params(uint32_t reg_base, struct dwc2_user_params *params);
void dwc2_get_user_fifo_config(uint32_t reg_base, struct usb_dwc2_user_fifo_config *config);

#endif
#endif
Loading