aboutsummaryrefslogtreecommitdiffstats
path: root/wirish
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 /wirish
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 'wirish')
-rw-r--r--wirish/wirish_time.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/wirish/wirish_time.h b/wirish/wirish_time.h
index d5349e3..e326ea7 100644
--- a/wirish/wirish_time.h
+++ b/wirish/wirish_time.h
@@ -43,7 +43,7 @@
* @see micros()
*/
static inline uint32 millis(void) {
- return systick_timer_millis;
+ return systick_uptime();
}
/**