projects
/
pintos-anon
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Do console locking.
[pintos-anon]
/
src
/
devices
/
timer.h
diff --git
a/src/devices/timer.h
b/src/devices/timer.h
index 5807b0fb253d1dace47cd211990b0cc6d4dffe99..db76f6d3456345f9380dfdf880f314210cbe4b81 100644
(file)
--- a/
src/devices/timer.h
+++ b/
src/devices/timer.h
@@
-1,6
+1,7
@@
#ifndef DEVICES_TIMER_H
#define DEVICES_TIMER_H
#ifndef DEVICES_TIMER_H
#define DEVICES_TIMER_H
+#include <round.h>
#include <stdint.h>
/* Number of timer interrupts per second. */
#include <stdint.h>
/* Number of timer interrupts per second. */
@@
-10,8
+11,10
@@
void timer_init (void);
int64_t timer_ticks (void);
int64_t timer_elapsed (int64_t);
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 */
#endif /* devices/timer.h */