fix build with zephyr with latest nrfx v4#3376
Conversation
There was a problem hiding this comment.
Pull request overview
This PR fixes build compatibility with Zephyr RTOS when using the latest nrfx v4 by adding proper version detection and conditional compilation for Zephyr-specific configurations.
Key changes:
- Extended nrfx version detection to support v3 and v4 based on MDK version ranges
- Updated clock API calls to use the new nrf_clock_is_running() function for nrfx v2+
- Added Zephyr-specific conditional compilation to exclude UART initialization that conflicts with Zephyr's drivers
Reviewed changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
| src/portable/nordic/nrf5x/dcd_nrf5x.c | Added nrfx v3/v4 detection logic and updated clock API calls to use newer functions |
| hw/bsp/nrf/family.cmake | Added MDK header include path for Zephyr builds |
| hw/bsp/nrf/family.c | Wrapped UART initialization code with Zephyr guards to prevent conflicts |
| examples/device/cdc_msc/prj.conf | Removed UART0 configuration that conflicts with Zephyr's driver handling |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
You can also share your feedback on Copilot code review for a chance to win a $100 gift card. Take the survey.
| */ | ||
| #ifndef CFG_TUD_NRF_NRFX_VERSION | ||
| #define _MDK_VERSION (10000*MDK_MAJOR_VERSION + 100*MDK_MINOR_VERSION + MDK_MICRO_VERSION) | ||
| #define MDK_VERSION (10000 * MDK_MAJOR_VERSION + 100 * MDK_MINOR_VERSION + MDK_MICRO_VERSION) |
There was a problem hiding this comment.
[nitpick] The macro was renamed from _MDK_VERSION to MDK_VERSION, removing the leading underscore. This could potentially conflict with a macro defined by the MDK headers themselves. Consider using a project-specific prefix like TUSB_MDK_VERSION to avoid potential naming collisions with external libraries.
| nrf_clock_hfclk_t active_clk_src; | ||
| return nrf_clock_is_running(NRF_CLOCK, NRF_CLOCK_DOMAIN_HFCLK, &active_clk_src); |
There was a problem hiding this comment.
The variable active_clk_src is declared but its value is never used after the function call. Consider using NULL as the third parameter if the API supports it, or add a comment explaining why the output parameter is intentionally unused.
| nrf_clock_hfclk_t active_clk_src; | |
| return nrf_clock_is_running(NRF_CLOCK, NRF_CLOCK_DOMAIN_HFCLK, &active_clk_src); | |
| // Output parameter unused; pass NULL | |
| return nrf_clock_is_running(NRF_CLOCK, NRF_CLOCK_DOMAIN_HFCLK, NULL); |
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
| #if CFG_TUD_NRF_NRFX_VERSION == 1 | ||
| return nrf_clock_hf_is_running(NRF_CLOCK_HFCLK_HIGH_ACCURACY); | ||
| #else | ||
| return nrf_clock_hf_is_running(NRF_CLOCK, NRF_CLOCK_HFCLK_HIGH_ACCURACY); | ||
| #endif | ||
| #else | ||
| nrf_clock_hfclk_t active_clk_src; | ||
| return nrf_clock_is_running(NRF_CLOCK, NRF_CLOCK_DOMAIN_HFCLK, &active_clk_src); |
There was a problem hiding this comment.
When CFG_TUD_NRF_NRFX_VERSION resolves to 2 or 3 (MDK 8.44–8.53 per the version table), hfclk_running now calls nrf_clock_is_running(NRF_CLOCK, NRF_CLOCK_DOMAIN_HFCLK, …) for all versions greater than 1. That helper only exists in nrfx v4, while the v2/v3 HALs still expose nrf_clock_hf_is_running, so building against the common nrfx v2/v3 SDKs will fail to link. Please keep the old nrf_clock_hf_is_running path for versions below v4 and use nrf_clock_is_running only when CFG_TUD_NRF_NRFX_VERSION is 4.
Useful? React with 👍 / 👎.
hathach
force-pushed
the
fix-zephyr-build
branch
from
5e715ef to
03f1f36
Compare
hathach
force-pushed
the
fix-zephyr-build
branch
from
03f1f36 to
7d012b0
Compare
|
1 participant
No description provided.