diff options
| author | hathach <[email protected]> | 2026-07-14 13:40:45 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2026-07-14 13:40:45 +0700 |
| commit | a686c70631812fe2b29d48e9c05e73e01581d944 (patch) | |
| tree | dd99d71f509f1b8a9afc52703a223d9d58d0955d /src | |
| parent | e02f93158cc602ba6f20945a187172abf2546718 (diff) | |
| parent | ac595bc5cf64949332347a2b9d901de507a744a6 (diff) | |
Merge remote-tracking branch 'origin/master' into usbtest
# Conflicts:
# .claude/skills/hil/SKILL.md
# test/hil/hil_test.py
Diffstat (limited to 'src')
| -rw-r--r-- | src/portable/nordic/nrf5x/dcd_nrf5x.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/portable/nordic/nrf5x/dcd_nrf5x.c b/src/portable/nordic/nrf5x/dcd_nrf5x.c index 4c5ed012d..5170e0645 100644 --- a/src/portable/nordic/nrf5x/dcd_nrf5x.c +++ b/src/portable/nordic/nrf5x/dcd_nrf5x.c @@ -855,6 +855,10 @@ static bool hfclk_running(void) { #if CFG_TUD_NRF_NRFX_VERSION == 1 return nrf_clock_hf_is_running(NRF_CLOCK_HFCLK_HIGH_ACCURACY); + #elif CFG_TUD_NRF_NRFX_VERSION == 2 + // nrfx 2.0.0 (MDK 8.29.0) has no nrf_clock_is_running(); it arrived in 2.1.0. + // nrf_clock_hf_is_running() is present in all of 2.0.0-2.11.0 (deprecated from 2.1.0). + return nrf_clock_hf_is_running(NRF_CLOCK, NRF_CLOCK_HFCLK_HIGH_ACCURACY); #else return nrf_clock_is_running(NRF_CLOCK, NRF_CLOCK_DOMAIN_HFCLK, NULL); #endif |