aboutsummaryrefslogtreecommitdiffstats
path: root/core/time.h
diff options
context:
space:
mode:
authorPerry Hung <iperry@alum.mit.edu>2010-03-31 21:29:29 -0400
committerPerry Hung <iperry@alum.mit.edu>2010-03-31 21:29:29 -0400
commit25c7ba0ed78aea0a368bc178dd720a845dd515ac (patch)
tree86be2502247dc0dd831191ae219a62875daad97c /core/time.h
parent4e51e057bb5a8d6b3475d2202af8a2a2caf9ba7b (diff)
downloadlibrambutan-25c7ba0ed78aea0a368bc178dd720a845dd515ac.tar.gz
librambutan-25c7ba0ed78aea0a368bc178dd720a845dd515ac.zip
Removed inttypes.h
Removed inttypes.h from libmaple. Will have another pass through to use the standard libmaple types, but will come in another commit.
Diffstat (limited to 'core/time.h')
-rw-r--r--core/time.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/time.h b/core/time.h
index 68b3901..377762c 100644
--- a/core/time.h
+++ b/core/time.h
@@ -30,16 +30,16 @@
extern "C"{
#endif
/* Returns time since boot in milliseconds */
-uint32_t millis(void);
+uint32 millis(void);
/* Time in microseconds since boot */
-uint32_t micros(void);
+uint32 micros(void);
/* Delay for ms milliseconds */
void delay(unsigned long ms);
/* Delay for us microseconds */
-void delayMicroseconds(uint32_t us);
+void delayMicroseconds(uint32 us);
#if 0
static inline void delay_us(uint32 us) {