aboutsummaryrefslogtreecommitdiffstats
path: root/libmaple/systick.h
diff options
context:
space:
mode:
authorPerry Hung <iperry@gmail.com>2011-04-19 22:03:42 -0400
committerPerry Hung <iperry@gmail.com>2011-05-12 04:07:33 -0400
commit1c476012cdc88228ffc38723a36b652fa5c8831d (patch)
treed85121a565ddcf974e97ae714a092572304c96c4 /libmaple/systick.h
parentb687ae251329b073a5ab2d757797f0db5e0d7e0b (diff)
downloadlibrambutan-1c476012cdc88228ffc38723a36b652fa5c8831d.tar.gz
librambutan-1c476012cdc88228ffc38723a36b652fa5c8831d.zip
i2c: Various fixes, extensions, documentation.
-Fix clock calculations for fast-mode support -Add I2C_REMAP option to remap i2c1 (untested) -Add I2C_BUS_RESET option to reset bus on initialization -Add optional timeout parameter -Doxygen comments -Various cleanup 10-bit slave addressing is untested until I have a device that speaks such.
Diffstat (limited to 'libmaple/systick.h')
-rw-r--r--libmaple/systick.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/libmaple/systick.h b/libmaple/systick.h
index 35b4cb9..9d6d3b9 100644
--- a/libmaple/systick.h
+++ b/libmaple/systick.h
@@ -73,7 +73,11 @@ typedef struct systick_reg_map {
#define SYSTICK_CVR_TENMS 0xFFFFFF
/** System elapsed time, in milliseconds */
-extern volatile uint32 systick_timer_millis;
+extern volatile uint32 systick_uptime_millis;
+
+static inline uint32 systick_uptime(void) {
+ return systick_uptime_millis;
+}
void systick_init(uint32 reload_val);
void systick_disable();