summaryrefslogtreecommitdiffstats
path: root/tmk_core/common/mbed/timer.c
diff options
context:
space:
mode:
authorWilliam Chang <william@factual.com>2019-11-20 22:17:07 -0800
committerWilliam Chang <william@factual.com>2019-11-20 22:17:07 -0800
commite7f4d56592b3975c38af329e77b4efd9108495e8 (patch)
tree0a416bccbf70bfdbdb9ffcdb3bf136b47378c014 /tmk_core/common/mbed/timer.c
parent71493b2f9bbd5f3d18373c518fa14ccafcbf48fc (diff)
parent8416a94ad27b3ff058576f09f35f0704a8b39ff3 (diff)
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'tmk_core/common/mbed/timer.c')
-rw-r--r--tmk_core/common/mbed/timer.c32
1 files changed, 7 insertions, 25 deletions
diff --git a/tmk_core/common/mbed/timer.c b/tmk_core/common/mbed/timer.c
index c357ceb786..7e4070af29 100644
--- a/tmk_core/common/mbed/timer.c
+++ b/tmk_core/common/mbed/timer.c
@@ -5,37 +5,19 @@
volatile uint32_t timer_count = 0;
/* Timer interrupt handler */
-void SysTick_Handler(void) {
- timer_count++;
-}
+void SysTick_Handler(void) { timer_count++; }
-void timer_init(void)
-{
+void timer_init(void) {
timer_count = 0;
SysTick_Config(SystemCoreClock / 1000); /* 1ms tick */
}
-void timer_clear(void)
-{
- timer_count = 0;
-}
+void timer_clear(void) { timer_count = 0; }
-uint16_t timer_read(void)
-{
- return (uint16_t)(timer_count & 0xFFFF);
-}
+uint16_t timer_read(void) { return (uint16_t)(timer_count & 0xFFFF); }
-uint32_t timer_read32(void)
-{
- return timer_count;
-}
+uint32_t timer_read32(void) { return timer_count; }
-uint16_t timer_elapsed(uint16_t last)
-{
- return TIMER_DIFF_16(timer_read(), last);
-}
+uint16_t timer_elapsed(uint16_t last) { return TIMER_DIFF_16(timer_read(), last); }
-uint32_t timer_elapsed32(uint32_t last)
-{
- return TIMER_DIFF_32(timer_read32(), last);
-}
+uint32_t timer_elapsed32(uint32_t last) { return TIMER_DIFF_32(timer_read32(), last); }