summaryrefslogtreecommitdiff
path: root/main.c
diff options
context:
space:
mode:
authorkaashoek <kaashoek>2006-07-10 13:08:37 +0000
committerkaashoek <kaashoek>2006-07-10 13:08:37 +0000
commit72ea69fbdfb6db6111cf3e1f5ef540e4a87ec29c (patch)
treec81f52d3ce2aae08e96072e35402875c5a8e4160 /main.c
parent7837c71b32fc716101a859302e0349061416bd6e (diff)
downloadxv6-labs-72ea69fbdfb6db6111cf3e1f5ef540e4a87ec29c.tar.gz
xv6-labs-72ea69fbdfb6db6111cf3e1f5ef540e4a87ec29c.tar.bz2
xv6-labs-72ea69fbdfb6db6111cf3e1f5ef540e4a87ec29c.zip
read the disk using interrupts
Diffstat (limited to 'main.c')
-rw-r--r--main.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/main.c b/main.c
index a075def..563f216 100644
--- a/main.c
+++ b/main.c
@@ -60,12 +60,14 @@ main()
p->ppid = 0;
setupsegs(p);
- // become interruptable
- write_eflags(read_eflags() | FL_IF);
-
// turn on timer and enable interrupts on the local APIC
lapic_timerinit();
lapic_enableintr();
+ // init disk device
+ ide_init();
+
+ // become interruptable
+ write_eflags(read_eflags() | FL_IF);
p = newproc();
// load_icode(p, _binary_usertests_start, (unsigned) _binary_usertests_size);