Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

sys/ztimer/xtimer_compat: fix bug introduced in #17690 #17705

Merged
merged 2 commits into from
Feb 25, 2022
Merged

sys/ztimer/xtimer_compat: fix bug introduced in #17690 #17705

merged 2 commits into from
Feb 25, 2022

Conversation

kfessel
Copy link
Contributor

@kfessel kfessel commented Feb 25, 2022 •
edited
Loading

Contribution description

while working on #17693 a bug in #17690 was detected

xtimer_usleep(x) -which redirects to ztimer_sleep(ZTIMER_USEC,x) needs no clock in xtimer_tsleep64()

also adds missing

    dummy XTIMER_BACKOFF
    xtimer_init
    xtimer_is_set
    xtimer_rmutex_lock_timeout

Testing procedure

build xtimer_test using ztimer/xtimer_compat

either by include of ztimer/xtimer_compat.h and adding ztimer_usec to USEMODULE

or adding

ztimer_xtimer_compat to USEMODULE

Issues/PRs references

while working on #17693 a bug in #17690 was detected

@github-actions github-actions bot added Area: sys Area: System Area: timers Area: timer subsystems labels Feb 25, 2022
@kfessel kfessel added CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors) labels Feb 25, 2022
fjmolinas
fjmolinas reviewed Feb 25, 2022
View reviewed changes
Copy link
Contributor

@fjmolinas fjmolinas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

YOu can squash right away

sys/include/ztimer/xtimer_compat.h Outdated Show resolved Hide resolved
@kfessel
sys/ztimer/xtimer_comapt: add missing define and functions
08442db 
- dummy XTIMER_BACKOFF
- xtimer_init
- xtimer_is_set
- xtimer_rmutex_lock_timeout
@kfessel
Copy link
Contributor Author

kfessel commented Feb 25, 2022

image

@kfessel kfessel added the CI: skip compile test If set, CI server will run only non-compile jobs, but no compile jobs or their dependent jobs label Feb 25, 2022
fjmolinas
fjmolinas approved these changes Feb 25, 2022
View reviewed changes
Copy link
Contributor

@fjmolinas fjmolinas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK!

@kfessel kfessel merged commit f3d935e into RIOT-OS:master Feb 25, 2022
@OlegHahm OlegHahm added this to the Release 2022.04 milestone Apr 25, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fjmolinas fjmolinas fjmolinas 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

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 CI: skip compile test If set, CI server will run only non-compile jobs, but no compile jobs or their dependent jobs Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors)
Projects
None yet
Milestone
Release 2022.04
Development

Successfully merging this pull request may close these issues.
3 participants
@kfessel @fjmolinas @OlegHahm