Skip to content

sys/ztimer/kconfig: enable xtimer compat only with timer backend#17307

Merged
fjmolinas merged 1 commit intoRIOT-OS:masterfrom
leandrolanzieri:pr/sys/ztimer/kconfig/fix_compat_deps
Dec 2, 2021
Merged

sys/ztimer/kconfig: enable xtimer compat only with timer backend#17307
fjmolinas merged 1 commit intoRIOT-OS:masterfrom
leandrolanzieri:pr/sys/ztimer/kconfig/fix_compat_deps

Conversation

@leandrolanzieri
Copy link
Copy Markdown
Contributor

@leandrolanzieri leandrolanzieri commented Dec 1, 2021

Contribution description

While testing #17235 I came across a discrepancy between when Makefile.dep enables xtimer compatibility modules and when Kconfig does it. Kconfig would enable compatibility whenever xtimer and ztimer are active, but Makefile.dep checks in addition that the timer peripheral backend is enabled. This PR adds this condition to the Kconfig choice. To avoid a loop on the selection of MODULE_ZTIMER_PERIPH_TIMER, this also moves its selection from MODULE_ZTIMER_USEC to the visible symbol ZTIMER_USEC.

Testing procedure

  • Green CI
  • Check that the behaviour matches the one in Makefile.dep.

Issues/PRs references

#17235

@leandrolanzieri leandrolanzieri added the Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors) label Dec 1, 2021
@leandrolanzieri leandrolanzieri added this to the Release 2022.01 milestone Dec 1, 2021
@github-actions github-actions bot added Area: arduino API Area: Arduino wrapper API Area: boards Area: Board ports Area: drivers Area: Device drivers Area: Kconfig Area: Kconfig integration Area: pkg Area: External package ports Area: sys Area: System Area: timers Area: timer subsystems labels Dec 1, 2021
@leandrolanzieri leandrolanzieri mentioned this pull request Dec 1, 2021
Merged
@benpicco benpicco requested a review from kaspar030 December 1, 2021 14:04
fjmolinas
fjmolinas approved these changes Dec 2, 2021
View reviewed changes
Copy link
Copy Markdown
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

@fjmolinas fjmolinas added the CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR label Dec 2, 2021
@fjmolinas fjmolinas enabled auto-merge December 2, 2021 07:14
@leandrolanzieri
Copy link
Copy Markdown
Contributor Author

leandrolanzieri commented Dec 2, 2021

#17317 is merged, it needs probably an update

@leandrolanzieri leandrolanzieri force-pushed the pr/sys/ztimer/kconfig/fix_compat_deps branch from b9a0b78 to 004da59 Compare December 2, 2021 08:35
@leandrolanzieri
Copy link
Copy Markdown
Contributor Author

leandrolanzieri commented Dec 2, 2021

There, updated the select of the benchmark module

@leandrolanzieri
sys/ztimer/kconfig: enable xtimer compat only with timer backend
004da59 
This also moves the selection of MODULE_ZTIMER_PERIPH_TIMER from
MODULE_ZTIMER_USEC to the visible symbol ZTIMER_USEC.
@fjmolinas
Copy link
Copy Markdown
Contributor

fjmolinas commented Dec 2, 2021

ACK still stands

@fjmolinas fjmolinas enabled auto-merge December 2, 2021 09:08
@leandrolanzieri leandrolanzieri mentioned this pull request Dec 2, 2021
Merged
@fjmolinas fjmolinas merged commit 662aba4 into RIOT-OS:master Dec 2, 2021
@leandrolanzieri leandrolanzieri deleted the pr/sys/ztimer/kconfig/fix_compat_deps branch December 2, 2021 13:55
@leandrolanzieri
Copy link
Copy Markdown
Contributor Author

leandrolanzieri commented Dec 2, 2021

Thanks for reviewing!

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

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

@cgundogan cgundogan Awaiting requested review from cgundogan

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

@kaspar030 kaspar030 Awaiting requested review from kaspar030

Assignees

No one assigned

Labels

Area: arduino API Area: Arduino wrapper API Area: boards Area: Board ports Area: drivers Area: Device drivers Area: Kconfig Area: Kconfig integration Area: pkg Area: External package ports 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: bug The issue reports a bug / The PR fixes a bug (including spelling errors)

Projects

None yet

Milestone

Release 2022.01

Development

Successfully merging this pull request may close these issues.

2 participants

@leandrolanzieri @fjmolinas