Skip to content

fix[STM32][I2C]: allow INT and DMA flags to coexist in hard i2c config#11330

Open
wdfk-prog wants to merge 1 commit intoRT-Thread:masterfrom
wdfk-prog:stm32_i2c_fix_bug
Open

fix[STM32][I2C]: allow INT and DMA flags to coexist in hard i2c config#11330
wdfk-prog wants to merge 1 commit intoRT-Thread:masterfrom
wdfk-prog:stm32_i2c_fix_bug

Conversation

@wdfk-prog
Copy link
Copy Markdown
Contributor

@wdfk-prog wdfk-prog commented Apr 14, 2026

拉取/合并请求描述:(PR description)

[

为什么提交这份PR (why to submit this PR)

当前 stm32_get_info() 中 I2C1、I2C3 和 I2C4 的 TX/RX 宏配置仍使用 INTDMA#elif 互斥分支。启用 BSP_I2C*_TX_USING_INTBSP_I2C*_RX_USING_INT 后,会屏蔽对应的 DMA 标志和 DMA 配置,导致一旦启用 INT 就无法继续使用 DMA。

你的解决方案是什么 (what is your solution)

将 I2C1、I2C3 和 I2C4 的 TX/RX 配置改为与 I2C2 一致的独立 #if 判断,分别累计 RT_DEVICE_FLAG_INT_*RT_DEVICE_FLAG_DMA_*,并在启用 DMA 时继续保留 dma_tx / dma_rx 配置。这样在同时打开 INT 和 DMA 宏时,运行时仍可按现有逻辑优先选择 DMA,在不满足 DMA 条件时回退到 IT 路径。

请提供验证的bsp和config (provide the config and bsp)

  • BSP:

    • 未提供,提交前建议补充本次验证所使用的 STM32 BSP 路径
  • .config:

    • CONFIG_BSP_USING_HARD_I2C
    • CONFIG_BSP_I2C_USING_IRQ
    • 对应 I2C 实例同时开启 BSP_I2C*_TX_USING_INTBSP_I2C*_TX_USING_DMA
    • 对应 I2C 实例同时开启 BSP_I2C*_RX_USING_INTBSP_I2C*_RX_USING_DMA
  • action:

    • 未提供,提交前建议补充 PR 分支对应 action 编译链接

]

当前拉取/合并请求的状态 Intent for your PR

必须选择一项 Choose one (Mandatory):

  • 本拉取/合并请求是一个草稿版本 This PR is for a code-review and is intended to get feedback
  • 本拉取/合并请求是一个成熟版本 This PR is mature, and ready to be integrated into the repo

代码质量 Code Quality:

我在这个拉取/合并请求中已经考虑了 As part of this pull request, I've considered the following:

  • 已经仔细查看过代码改动的对比 Already check the difference between PR and old code
  • 代码风格正确,包括缩进空格,命名及其他风格 Style guide is adhered to, including spacing, naming and other styles
  • 没有垃圾代码,代码尽量精简,不包含#if 0代码,不包含已经被注释了的代码 All redundant code is removed and cleaned up
  • 所有变更均有原因及合理的,并且不会影响到其他软件组件代码或BSP All modifications are justified and not affect other components or BSP
  • 对难懂代码均提供对应的注释 I've commented appropriately where code is tricky
  • 代码是高质量的 Code in this PR is of high quality
  • 已经使用formatting 等源码格式化工具确保格式符合RT-Thread代码规范 This PR complies with RT-Thread code specification
  • 如果是新增bsp, 已经添加ci检查到.github/ALL_BSP_COMPILE.json 详细请参考链接BSP自查

@github-actions
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

  • 设置需排除的文件/目录(目录请以"/"结尾)
    Set files/directories to exclude (directories should end with "/")
  • 将目标分支设置为 \ Set the target branch to:stm32_i2c_fix_bug
  • 设置PR number为 \ Set the PR number to:11330
  1. 等待工作流完成 | Wait for the workflow to complete
    格式化后的代码将自动推送至你的分支。
    The formatted code will be automatically pushed to your branch.

完成后,提交将自动更新至 stm32_i2c_fix_bug 分支,关联的 Pull Request 也会同步更新。
Once completed, commits will be pushed to the stm32_i2c_fix_bug 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
Copy link
Copy Markdown

📌 Code Review Assignment

🏷️ Tag: bsp_stm32

Reviewers: @Liang1795 @hamburger-os @wdfk-prog

Changed Files (Click to expand)
  • bsp/stm32/libraries/HAL_Drivers/drivers/drv_hard_i2c.c

📊 Current Review Status (Last Updated: 2026-04-14 15:47 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 added BSP: STM32 BSP related with ST/STM32 BSP labels Apr 14, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

BSP: STM32 BSP related with ST/STM32 BSP

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant