From b22d898297a2496ba4cfd31d445769fbebc0a46d Mon Sep 17 00:00:00 2001
From: kaashoek
Date: Wed, 5 Jul 2006 20:00:14 +0000
Subject: timer interrupts disk interrupts (assuming bochs has a bug)

---
 main.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'main.c')

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
-- 
cgit v1.2.3