summaryrefslogtreecommitdiff
path: root/main.c
diff options
context:
space:
mode:
authorkaashoek <kaashoek>2006-07-05 20:00:14 +0000
committerkaashoek <kaashoek>2006-07-05 20:00:14 +0000
commitb22d898297a2496ba4cfd31d445769fbebc0a46d (patch)
tree99a08718f78c6836be1a245650e48c9f20333fb9 /main.c
parent8b4e2a08febc8b957b44732dbc7da831479a0005 (diff)
downloadxv6-labs-b22d898297a2496ba4cfd31d445769fbebc0a46d.tar.gz
xv6-labs-b22d898297a2496ba4cfd31d445769fbebc0a46d.tar.bz2
xv6-labs-b22d898297a2496ba4cfd31d445769fbebc0a46d.zip
timer interrupts
disk interrupts (assuming bochs has a bug)
Diffstat (limited to 'main.c')
-rw-r--r--main.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/main.c b/main.c
index 4c2a2f9..296d00f 100644
--- a/main.c
+++ b/main.c
@@ -36,7 +36,7 @@ main()
cprintf("\nxV6\n\n");
- pic_init(); // initialize PIC---not clear why
+ pic_init(); // initialize PIC
mp_init(); // multiprocessor
kinit(); // physical memory allocator
tvinit(); // trap vectors
@@ -59,12 +59,14 @@ main()
p->ppid = 0;
setupsegs(p);
+ write_eflags(read_eflags() | FL_IF);
+
// turn on interrupts on boot processor
lapic_timerinit();
lapic_enableintr();
- write_eflags(read_eflags() | FL_IF);
#if 0
+ ide_init();
ide_read(0, buf, 1);
cprintf("sec0.0 %x\n", buf[0] & 0xff);
#endif