aboutsummaryrefslogtreecommitdiffstats
path: root/libmaple
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
commit55323faebe0abb6b8900fc7b1344d383abe08a9d (patch)
treeb245b2dc9177a4605f7157109b49e7e1b2590131 /libmaple
parentf3bcdd18d8f0b64cd8f17410b480b49315791544 (diff)
downloadlibrambutan-55323faebe0abb6b8900fc7b1344d383abe08a9d.tar.gz
librambutan-55323faebe0abb6b8900fc7b1344d383abe08a9d.zip
systick_timer_millis is volatile, not IO-mapped.
Diffstat (limited to 'libmaple')
-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();