Skip to content

[cherryusb][fsdev] add N32H4x USBFS device support - #11764

Open
OnlyoutzZ wants to merge 3 commits into
RT-Thread:masterfrom
OnlyoutzZ:master
Open

[cherryusb][fsdev] add N32H4x USBFS device support#11764
OnlyoutzZ wants to merge 3 commits into
RT-Thread:masterfrom
OnlyoutzZ:master

Conversation

@OnlyoutzZ

@OnlyoutzZ OnlyoutzZ commented Aug 28, 2026

Copy link
Copy Markdown
Contributor

摘要

为 cherryusb fsdev 端口添加 N32H4x（N32H47x_48x / N32H49x）USBFS 全速设备支持。N32H4x 使用与 STM32 相同的 Synopsys USBFS 内核，但寄存器/位域重新排布，本 PR 通过寄存器重映射使 fsdev 端口直接适配，无需改动公共驱动逻辑。

主要变更

  • usb_fsdev_reg.h：新增 N32H4X_FSDEV 保护的寄存器/位域重映射（32 位 EP 寄存器、CTRL/STS 布局、无 BCDR），usb_dc_fsdev.c 的 PCD_* 宏在 N32H4x 上自动解析为正确布局
  • usb_dc_fsdev.c：N32H4x 上电时序（清 PD → 等待模拟基准电压稳定 → 清 FRST）、EP_ID 从 STS[11:8] 提取、DP 上拉改走 CTRL.PU
  • usb_glue_nation.c（新增）：N32H47x_48x/N32H49x 芯片级初始化——由 SystemCoreClock 实时推导 48 MHz USB 时钟分频、DM/DP GPIO（AF10，__WEAK 可覆盖）、NVIC 配置与 USB_FS_LP_IRQHandler 分发
  • Kconfig/SConscript：新增 RT_CHERRYUSB_DEVICE_FSDEV_NATION 配置选项
  • README.md：补充 N32H4x 支持列表

测试

  • N32H487ZGL7-EVB（N32H488）、N32H497ZGL7-EVB（N32H49X）上验证 USB HID 键盘枚举与收发正常

@github-actions

github-actions Bot commented Aug 28, 2026 •
edited
Loading

Copy link
Copy Markdown

📌 Code Review Assignment

🏷️ Tag: components

Reviewers: @Maihuanyi

Changed Files (Click to expand)
  • components/drivers/usb/cherryusb/Kconfig
  • components/drivers/usb/cherryusb/SConscript
  • components/drivers/usb/cherryusb/port/fsdev/README.md
  • components/drivers/usb/cherryusb/port/fsdev/usb_dc_fsdev.c
  • components/drivers/usb/cherryusb/port/fsdev/usb_fsdev_reg.h
  • components/drivers/usb/cherryusb/port/fsdev/usb_glue_nation.c

📊 Current Review Status (Last Updated: 2026-09-11 19:07 CST)

📝 Review Instructions

  1. 维护者可以通过单击此处来刷新审查状态: 🔄 刷新状态
    Maintainers can refresh the review status by clicking here: 🔄 Refresh Status

  2. 确认审核通过后评论 LGTM/lgtm
    Comment LGTM/lgtm after confirming approval

  3. PR合并前需至少一位维护者确认
    PR must be confirmed by at least one maintainer before merging

ℹ️ 刷新CI状态操作需要具备仓库写入权限。
ℹ️ Refresh CI status operation requires repository Write permission.

@github-actions

github-actions Bot commented Aug 28, 2026

Copy link
Copy Markdown

👋 感谢您对 RT-Thread 的贡献！Thank you for your contribution to RT-Thread!

为确保代码符合 RT-Thread 的编码规范，请在你的仓库中执行以下步骤运行代码格式化工作流（如果格式化CI运行失败）。
To ensure your code complies with RT-Thread's coding style, please run the code formatting workflow by following the steps below (If the formatting of CI fails to run).

🛠 操作步骤 | Steps

  1. 前往 Actions 页面 | Go to the Actions page
    点击进入工作流 → | Click to open workflow →

  2. 点击 Run workflow | Click Run workflow

  • Use workflow from 保持默认分支（通常为 master）
    Keep the default branch (usually master) in Use workflow from
  • 在 branch 输入框填写 PR 分支 master
    Enter PR branch master in the branch field
  • 设置需排除的文件/目录（目录请以"/"结尾）
    Set files/directories to exclude (directories should end with "/")
  1. 等待工作流完成 | Wait for the workflow to complete
    格式化后的代码将作为独立提交推送至你的分支。
    The formatting changes will be pushed to your branch as a separate commit.

完成后，提交将自动更新至 master 分支，关联的 Pull Request 也会同步更新。
Once completed, commits will be pushed to the master branch automatically, and the related Pull Request will be updated.

如有问题欢迎联系我们，再次感谢您的贡献！💐
If you have any questions, feel free to reach out. Thanks again for your contribution!

@github-actions

github-actions Bot commented Aug 28, 2026 •
edited
Loading

Copy link
Copy Markdown

MemBrowse Memory Report

k230

  • SRAM: .eh_frame +40 B, .text +64 B (+0.0%, 1,128,507 B / 268,300,288 B, total: 0% used)

qemu-virt64-aarch64

  • Code: .eh_frame +32 B, .text +64 B (+0.0%, 1,077,220 B)

simulator

@OnlyoutzZ OnlyoutzZ mentioned this pull request Sep 11, 2026
Open
7 tasks
@OnlyoutzZ
[cherryusb][fsdev] Guard the USB_DBG_LOG check with defined()
d55007e 
usb_dc_fsdev.c rejects building with USB_DBG_LOG enabled:

    #if (CONFIG_USB_DBG_LEVEL >= USB_DBG_LOG)
    #error "fsdev cannot enable USB_DBG_LOG"
    #endif

The static analysis job runs cppcheck with only "-I include -I
thread/components/finsh", so usbd_core.h cannot be resolved and neither
macro is defined.  Undefined identifiers evaluate to 0 in a #if, making
the test "0 >= 0" true, so the #error fires and the job fails with
preprocessorErrorDirective.

Add defined() guards so the comparison is only evaluated once both macros
are actually defined.  Real builds are unaffected: usb_log.h always
provides USB_DBG_LOG and a default CONFIG_USB_DBG_LEVEL before this point.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

component: drivers/usb component: drivers Component

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@OnlyoutzZ