Really make it safe to call printf() from any context.

[pintos-anon] / src / devices / timer.h

diff --git a/src/devices/timer.h b/src/devices/timer.h
index ba736d2a28d6d7e23c9ce41d4da06006f2877554..db76f6d3456345f9380dfdf880f314210cbe4b81 100644 (file)
--- a/src/devices/timer.h
+++ b/src/devices/timer.h
@@ -1,16 +1,20 @@
 #ifndef DEVICES_TIMER_H
 #define DEVICES_TIMER_H
 
+#include <round.h>
 #include <stdint.h>
 
+/* Number of timer interrupts per second. */
 #define TIMER_FREQ 100
 
 void timer_init (void);
 int64_t timer_ticks (void);
 int64_t timer_elapsed (int64_t);
 
-void timer_msleep (int64_t ms);
-void timer_usleep (int64_t us);
-void timer_nsleep (int64_t ns);
+void timer_sleep (int64_t ticks);
+
+int64_t timer_ms2ticks (int64_t ms);
+int64_t timer_us2ticks (int64_t us);
+int64_t timer_ns2ticks (int64_t ns);
 
 #endif /* devices/timer.h */