From 1c476012cdc88228ffc38723a36b652fa5c8831d Mon Sep 17 00:00:00 2001
From: Perry Hung <iperry@gmail.com>
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.
---
 wirish/wirish_time.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'wirish')

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();
 }
 
 /**
-- 
cgit v1.2.3