X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdevices%2Ftimer.h;h=cd3d6bbfeb8d94046224d2676326705247f4a710;hb=2e7e4557b7f84a1377d38c1b4db544251bcec317;hp=59f7c9a57835dc6fbc523b47c4cdd3d086119a17;hpb=34a1a2cf11500505e74ae5796e88de0d8de00958;p=pintos-anon

diff --git a/src/devices/timer.h b/src/devices/timer.h
index 59f7c9a..cd3d6bb 100644
--- a/src/devices/timer.h
+++ b/src/devices/timer.h
@@ -8,14 +8,21 @@
 #define TIMER_FREQ 100
 
 void timer_init (void);
+void timer_calibrate (void);
+
 int64_t timer_ticks (void);
 int64_t timer_elapsed (int64_t);
 
+/* Sleep and yield the CPU to other threads. */
 void timer_sleep (int64_t ticks);
+void timer_msleep (int64_t milliseconds);
+void timer_usleep (int64_t microseconds);
+void timer_nsleep (int64_t nanoseconds);
 
-int64_t timer_ms2ticks (int64_t ms);
-int64_t timer_us2ticks (int64_t us);
-int64_t timer_ns2ticks (int64_t ns);
+/* Busy waits. */
+void timer_mdelay (int64_t milliseconds);
+void timer_udelay (int64_t microseconds);
+void timer_ndelay (int64_t nanoseconds);
 
 void timer_print_stats (void);