Skip to content

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

Merged
kfessel merged 2 commits intoRIOT-OS:masterfrom
kfessel:p-fix-ztimer-compat
Feb 25, 2022
Merged

sys/ztimer/xtimer_compat: fix bug introduced in #17690#17705
kfessel merged 2 commits intoRIOT-OS:masterfrom
kfessel:p-fix-ztimer-compat

Conversation

@kfessel
Copy link
Contributor

@kfessel kfessel commented Feb 25, 2022

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
@kfessel kfessel force-pushed the p-fix-ztimer-compat branch from 49748ef to 6075fb8 Compare February 25, 2022 12:52
@kfessel kfessel requested a review from fjmolinas February 25, 2022 13:00
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

- dummy XTIMER_BACKOFF
- xtimer_init
- xtimer_is_set
- xtimer_rmutex_lock_timeout
@kfessel kfessel force-pushed the p-fix-ztimer-compat branch from 6075fb8 to 08442db Compare February 25, 2022 15:32
@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
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 enabled auto-merge February 25, 2022 18:05
@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

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

Development

Successfully merging this pull request may close these issues.

3 participants