Skip to content

sys/ztimer64/xtimer_compat: also provide fallback options when ztimer64 is used#21958

Merged
miri64 merged 3 commits intoRIOT-OS:masterfrom
benpicco:xtimer64-compat
Feb 10, 2026
Merged

sys/ztimer64/xtimer_compat: also provide fallback options when ztimer64 is used#21958
miri64 merged 3 commits intoRIOT-OS:masterfrom
benpicco:xtimer64-compat

Conversation

@benpicco
Copy link
Copy Markdown
Contributor

@benpicco benpicco commented Dec 16, 2025

Contribution description

Turns out we also have to provide those fallback implementations in ztimer64/xtimer_compat.h for when ztimer64 is used.

Take the opportunity to re-order the ztimer/xtimer_compat.h so it better aligns with ztimer64/xtimer_compat.h.

Testing procedure

Issues/PRs references

follow-up to #20494

@benpicco benpicco requested a review from maribu December 16, 2025 10:50
@github-actions github-actions bot added Area: timers Area: timer subsystems Area: sys Area: System labels Dec 16, 2025
@benpicco benpicco changed the title Xtimer64 compat sys/ztimer64/xtimer_compat: also provide fallback options when ztimer64 is used Dec 16, 2025
@benpicco benpicco added the CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR label Dec 16, 2025
@crasbe crasbe added the Type: enhancement The issue suggests enhanceable parts / The PR enhances parts of the codebase / documentation label Dec 16, 2025
@riot-ci
Copy link
Copy Markdown

riot-ci commented Dec 16, 2025 •
edited
Loading

Murdock results

✔️ PASSED

968b476 sys/xtimer_compat: add xtimer_now_msec()

Success Failures Total Runtime
11005 0 11005 12m:06s

Artifacts

@benpicco benpicco force-pushed the xtimer64-compat branch 4 times, most recently from d6095d0 to 11efdbe Compare December 16, 2025 13:08
@benpicco benpicco mentioned this pull request Dec 16, 2025
Open
@benpicco benpicco requested a review from fabian18 December 17, 2025 12:03
@benpicco benpicco mentioned this pull request Dec 17, 2025
Merged
@benpicco benpicco requested a review from crasbe December 19, 2025 16:56
kfessel
kfessel reviewed Jan 9, 2026
View reviewed changes
kfessel
kfessel reviewed Jan 29, 2026
View reviewed changes
@kfessel
Copy link
Copy Markdown
Contributor

kfessel commented Feb 3, 2026

look good conflict aside

seems like master like nanosleep should be removed

@crasbe crasbe added the State: needs rebase State: The codebase was changed since the creation of the PR, making a rebase necessary label Feb 3, 2026
@benpicco benpicco removed the State: needs rebase State: The codebase was changed since the creation of the PR, making a rebase necessary label Feb 5, 2026
@kfessel
Copy link
Copy Markdown
Contributor

kfessel commented Feb 6, 2026 •
edited
Loading

Building application "tests_thread_flags" for "atmega256rfr2-xpro" with CPU "atmega256rfr2".

In file included from ../../../sys/include/xtimer.h:66:0,
from main.c:21:
../../../sys/include/ztimer/xtimer_compat.h:430:20: error: redefinition of ‘xtimer_tsleep32’
static inline void xtimer_tsleep32(xtimer_ticks32_t ticks)
^
../../../sys/include/ztimer/xtimer_compat.h:207:20: note: previous definition of ‘xtimer_tsleep32’ was here
static inline void xtimer_tsleep32(xtimer_ticks32_t ticks)
^
../../../sys/include/ztimer/xtimer_compat.h:435:20: error: redefinition of ‘xtimer_tsleep64’
static inline void xtimer_tsleep64(xtimer_ticks64_t ticks)
^
../../../sys/include/ztimer/xtimer_compat.h:212:20: note: previous definition of ‘xtimer_tsleep64’ was here
static inline void xtimer_tsleep64(xtimer_ticks64_t ticks)
^
make[1]: *** [/tmp/dwq.0.8080580257392148/4e36b2fece8a9a57b8daeff151ab7f33/Makefile.base:157: /tmp/dwq.0.8

@benpicco
Copy link
Copy Markdown
Contributor Author

benpicco commented Feb 9, 2026

Whoops, copy & paste (instead of cut & paste) error it seems.

@benpicco benpicco added this pull request to the merge queue Feb 9, 2026
@miri64 miri64 removed this pull request from the merge queue due to a manual request Feb 9, 2026
@miri64
Copy link
Copy Markdown
Member

miri64 commented Feb 9, 2026

Shunting in favor of the release note PR

@miri64 miri64 added this pull request to the merge queue Feb 9, 2026
Merged via the queue into RIOT-OS:master with commit 77cbf21 Feb 10, 2026
25 of 26 checks passed
@benpicco benpicco deleted the xtimer64-compat branch February 10, 2026 10:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kfessel kfessel kfessel approved these changes

@kaspar030 kaspar030 Awaiting requested review from kaspar030 kaspar030 is a code owner

@bergzand bergzand Awaiting requested review from bergzand bergzand is a code owner

@maribu maribu Awaiting requested review from maribu

@fabian18 fabian18 Awaiting requested review from fabian18

@crasbe crasbe Awaiting requested review from crasbe

Assignees

No one assigned

Labels

Area: sys Area: System Area: timers Area: timer subsystems CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Type: enhancement The issue suggests enhanceable parts / The PR enhances parts of the codebase / documentation

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@benpicco @riot-ci @kfessel @miri64 @crasbe