diff options
| author | Perry Hung <iperry@gmail.com> | 2011-04-19 22:03:42 -0400 |
|---|---|---|
| committer | Perry Hung <iperry@gmail.com> | 2011-05-12 04:07:33 -0400 |
| commit | 1c476012cdc88228ffc38723a36b652fa5c8831d (patch) | |
| tree | d85121a565ddcf974e97ae714a092572304c96c4 /libmaple/systick.c | |
| parent | b687ae251329b073a5ab2d757797f0db5e0d7e0b (diff) | |
| download | librambutan-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.c')
| -rw-r--r-- | libmaple/systick.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmaple/systick.c b/libmaple/systick.c index c04f4f3..7582436 100644 --- a/libmaple/systick.c +++ b/libmaple/systick.c @@ -28,7 +28,7 @@ #include "systick.h" -volatile uint32 systick_timer_millis; +volatile uint32 systick_uptime_millis; /** * @brief Initialize and enable SysTick. @@ -67,5 +67,5 @@ void systick_enable() { */ void __exc_systick(void) { - systick_timer_millis++; + systick_uptime_millis++; } |