Skip to content

Conversation

jnohlgard
Copy link
Member

@jnohlgard jnohlgard commented Jul 5, 2016

Various clean ups in the xtimer implementation to prepare for some functional enhancements.

  • Two commits are taken from @kaspar030's sys: make xtimer isr-safe #5428, with one two fixups added by me for fixing some minor left overs in the configuration.
  • The xtimer.h header was getting a bit long and unwieldy so I decided to split it into one API declaration header and one implementation header for defining the inline functions.
  • The _lltimer functions are available from the xtimer.h header so they have to be prefixed in order to keep the namespace conventions. There is still an underscore prefix used to indicate that these functions are meant to be private and should not be called from user applications.
  • Renamed XTIMER -> XTIMER_DEV to make the macro less generic and more describing.
  • Renamed the type timer_callback_t -> xtimer_callback_t
  • Delete an old test xtimer_shift_on_compare which has no use any more.

@jnohlgard jnohlgard added CI: needs squashing Commits in this PR need to be squashed; If set, CI systems will mark this PR as unmergable Type: cleanup The issue proposes a clean-up / The PR cleans-up parts of the codebase / documentation TimerTaskForce Area: timers Area: timer subsystems labels Jul 5, 2016
@jnohlgard jnohlgard added this to the Release 2016.07 milestone Jul 5, 2016
@jnohlgard jnohlgard force-pushed the pr/xtimer-cleanups branch from f4bf15f to 1fafd56 Compare July 5, 2016 21:16
@kaspar030
Copy link
Contributor

Thanks, works for me and overdue! (Will make rebasing hard for me, though...)

ACK.

@kaspar030
Copy link
Contributor

(pls squash)

@jnohlgard jnohlgard force-pushed the pr/xtimer-cleanups branch from 1cdc1c4 to e4c9840 Compare July 6, 2016 09:20
@jnohlgard jnohlgard added CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR and removed CI: needs squashing Commits in this PR need to be squashed; If set, CI systems will mark this PR as unmergable labels Jul 6, 2016
@jnohlgard
Copy link
Member Author

@kaspar030 is the current commit list OK or should I squash further?

@jnohlgard jnohlgard force-pushed the pr/xtimer-cleanups branch from f7bb20e to 053a366 Compare July 6, 2016 11:22
@jnohlgard
Copy link
Member Author

Added a missing closing brace in implementation.h for extern "C" { when building C++, immediately squashed.

@jnohlgard jnohlgard force-pushed the pr/xtimer-cleanups branch from 053a366 to fe161d6 Compare July 6, 2016 16:16
@jnohlgard
Copy link
Member Author

rebased after #5610 was merged

@jnohlgard jnohlgard force-pushed the pr/xtimer-cleanups branch from c1806dc to 3468282 Compare July 6, 2016 19:10
@jnohlgard jnohlgard force-pushed the pr/xtimer-cleanups branch from 3468282 to da8cd11 Compare July 6, 2016 20:23
@jnohlgard
Copy link
Member Author

Murdock is finally happy! @kaspar030 ACK holds?

@kaspar030
Copy link
Contributor

Yes!

@kaspar030 kaspar030 merged commit 1c6c447 into RIOT-OS:master Jul 7, 2016
@jnohlgard jnohlgard deleted the pr/xtimer-cleanups branch July 7, 2016 08:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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: cleanup The issue proposes a clean-up / The PR cleans-up parts of the codebase / documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants