diff options
| author | Alex Ong <the.onga@gmail.com> | 2019-01-26 01:36:28 +0100 |
|---|---|---|
| committer | Alex Ong <the.onga@gmail.com> | 2019-01-26 01:36:28 +0100 |
| commit | d977daa8dc9136746425f9e1414e1f93cb161877 (patch) | |
| tree | 209ab8082580e5fdf37f1a8b7c1169250b7548c0 /tmk_core/common/arm_atsam/timer.c | |
| parent | 47c91fc7f75ae0a477e55b687aa0fc30da0a283c (diff) | |
| parent | 0306e487e2cd6a77ad840d0a441b478747b7ccd0 (diff) | |
| download | qmk_firmware-d977daa8dc9136746425f9e1414e1f93cb161877.tar.gz qmk_firmware-d977daa8dc9136746425f9e1414e1f93cb161877.tar.xz | |
Merge branch 'master' of https://github.com/qmk/qmk_firmware
Diffstat (limited to 'tmk_core/common/arm_atsam/timer.c')
| -rw-r--r-- | tmk_core/common/arm_atsam/timer.c | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/tmk_core/common/arm_atsam/timer.c b/tmk_core/common/arm_atsam/timer.c index bcfe5002c..6c3905e30 100644 --- a/tmk_core/common/arm_atsam/timer.c +++ b/tmk_core/common/arm_atsam/timer.c @@ -9,7 +9,7 @@ void set_time(uint64_t tset) void timer_init(void) { - ms_clk = 0; + timer_clear(); } uint16_t timer_read(void) @@ -37,23 +37,7 @@ uint32_t timer_elapsed32(uint32_t tlast) return TIMER_DIFF_32(timer_read32(), tlast); } -uint32_t timer_elapsed64(uint32_t tlast) -{ - uint64_t tnow = timer_read64(); - return (tnow >= tlast ? tnow - tlast : UINT64_MAX - tlast + tnow); -} - void timer_clear(void) { - ms_clk = 0; -} - -void wait_ms(uint64_t msec) -{ - CLK_delay_ms(msec); -} - -void wait_us(uint16_t usec) -{ - CLK_delay_us(usec); + set_time(0); } |