aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarti Bolivar <mbolivar@leaflabs.com>2011-05-04 13:20:20 -0400
committerMarti Bolivar <mbolivar@leaflabs.com>2011-05-04 13:31:53 -0400
commit43b3ba82e692345883e168c57fde1e08d39c7064 (patch)
treedd9194dd51d4482ebff71378bb7acc431bcdbcef
parente7d5f4c167f063ca186bfa30f3ca72b1ca1a11aa (diff)
systick_timer_millis is volatile, not IO-mapped.
-rw-r--r--libmaple/systick.c2
-rw-r--r--libmaple/systick.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/libmaple/systick.c b/libmaple/systick.c
index 103893e..c04f4f3 100644
--- a/libmaple/systick.c
+++ b/libmaple/systick.c
@@ -28,7 +28,7 @@
#include "systick.h"
-__io uint32 systick_timer_millis;
+volatile uint32 systick_timer_millis;
/**
* @brief Initialize and enable SysTick.
diff --git a/libmaple/systick.h b/libmaple/systick.h
index 4654c5f..35b4cb9 100644
--- a/libmaple/systick.h
+++ b/libmaple/systick.h
@@ -73,7 +73,7 @@ typedef struct systick_reg_map {
#define SYSTICK_CVR_TENMS 0xFFFFFF
/** System elapsed time, in milliseconds */
-extern __io uint32 systick_timer_millis;
+extern volatile uint32 systick_timer_millis;
void systick_init(uint32 reload_val);
void systick_disable();