From 1c476012cdc88228ffc38723a36b652fa5c8831d Mon Sep 17 00:00:00 2001 From: Perry Hung Date: Tue, 19 Apr 2011 22:03:42 -0400 Subject: 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. --- libmaple/systick.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'libmaple/systick.h') 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(); -- cgit v1.2.3