aboutsummaryrefslogtreecommitdiffstats
path: root/wirish/wirish_time.h
diff options
context:
space:
mode:
Diffstat (limited to 'wirish/wirish_time.h')
-rw-r--r--wirish/wirish_time.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/wirish/wirish_time.h b/wirish/wirish_time.h
index c37da87..ab225e8 100644
--- a/wirish/wirish_time.h
+++ b/wirish/wirish_time.h
@@ -32,9 +32,9 @@
#ifndef _TIME_H_
#define _TIME_H_
-#include "libmaple.h"
-#include "nvic.h"
+#include "libmaple_types.h"
#include "systick.h"
+
#include "boards.h"
#define US_PER_MS 1000
@@ -64,7 +64,7 @@ static inline uint32 micros(void) {
} while (ms != millis());
/* SYSTICK_RELOAD_VAL is 1 less than the number of cycles it
- actually takes to complete a SysTick reload */
+ * actually takes to complete a SysTick reload */
res = (ms * US_PER_MS) +
(SYSTICK_RELOAD_VAL + 1 - cycle_cnt) / CYCLES_PER_MICROSECOND;