projects
/
pintos-anon
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make userspace actually work.
[pintos-anon]
/
src
/
devices
/
timer.c
diff --git
a/src/devices/timer.c
b/src/devices/timer.c
index 4adca8989cf1192612a0c009d187f999c2d5e25a..4b8dd2a47865b8828b9a6f326d4a7f03d970e222 100644
(file)
--- a/
src/devices/timer.c
+++ b/
src/devices/timer.c
@@
-3,6
+3,10
@@
#include "interrupt.h"
#include "io.h"
#include "interrupt.h"
#include "io.h"
+#if TIMER_FREQ < 19
+#error 8254 timer requires TIMER_FREQ >= 19
+#endif
+
static volatile uint64_t ticks;
static void
static volatile uint64_t ticks;
static void
@@
-26,7
+30,7
@@
timer_init (void)
outb (0x40, count & 0xff);
outb (0x40, count >> 8);
outb (0x40, count & 0xff);
outb (0x40, count >> 8);
- intr_register (0x20, 0, IF_OFF, irq20_timer);
+ intr_register (0x20, 0, IF_OFF, irq20_timer
, "8254 Timer"
);
}
uint64_t
}
uint64_t