From: Peter Dinda <pdinda@northwestern.edu>
Date: Fri, 8 Feb 2008 22:24:52 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: JACK-WORKING-STATIC-GEEKOS~12
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=b6c7009abd8e269d9860eb21f4aaba385ed78276

*** empty log message ***
---

diff --git a/palacios/build/Makefile b/palacios/build/Makefile
index 2d329d2..541221d 100644
--- a/palacios/build/Makefile
+++ b/palacios/build/Makefile
@@ -1,6 +1,6 @@
 # Makefile for GeekOS kernel, userspace, and tools
 # Copyright (c) 2004,2005 David H. Hovemeyer <daveho@cs.umd.edu>
-# $Revision: 1.3 $
+# $Revision: 1.4 $
 
 # This is free software.  You are permitted to use,
 # redistribute, and modify it as specified in the file "COPYING".
@@ -90,6 +90,7 @@ ALL_TARGETS := fd.img  rombios vgabios vmxassist
 
 # Kernel source files
 KERNEL_C_SRCS := idt.c int.c trap.c irq.c io.c \
+        blockdev.c ide.c \
 	keyboard.c screen.c timer.c \
 	mem.c crc32.c \
 	gdt.c tss.c segment.c \
diff --git a/palacios/src/geekos/main.c b/palacios/src/geekos/main.c
index 2da73ac..71e5644 100644
--- a/palacios/src/geekos/main.c
+++ b/palacios/src/geekos/main.c
@@ -3,7 +3,7 @@
  * Copyright (c) 2001,2003,2004 David H. Hovemeyer <daveho@cs.umd.edu>
  * Copyright (c) 2003, Jeffrey K. Hollingsworth <hollings@cs.umd.edu>
  * Copyright (c) 2004, Iulian Neamtiu <neamtiu@cs.umd.edu>
- * $Revision: 1.1 $
+ * $Revision: 1.2 $
  * 
  * This is free software.  You are permitted to use,
  * redistribute, and modify it as specified in the file "COPYING".
@@ -25,6 +25,8 @@
 #include <geekos/reboot.h>
 #include <geekos/mem.h>
 #include <geekos/paging.h>
+#include <geekos/ide.h>
+
 #include <geekos/vmx.h>
 #include <geekos/vmcs.h>
 
@@ -295,9 +297,12 @@ void Main(struct Boot_Info* bootInfo)
   Init_Keyboard();
   Init_VM(bootInfo);
   Init_Paging();
-  
 
+  Init_IDE();
 
+  Print("Done; stalling\n");
+
+  while(1);