X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fgeekos%2Fmain.c;h=de460418d934f0a2301d4a8bf8844261e283a1c4;hb=624a05de781c51ed5d34a6db2583f884918a9594;hp=ab7dd1fa2258064da46141f30dd9aa32a6bd3e2f;hpb=a109eb919a162bd7de58d62020801bc2e633be50;p=palacios.git

diff --git a/palacios/src/geekos/main.c b/palacios/src/geekos/main.c
index ab7dd1f..de46041 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.31 $
+ * $Revision: 1.35 $
  * 
  * This is free software.  You are permitted to use,
  * redistribute, and modify it as specified in the file "COPYING".
@@ -34,6 +34,8 @@
 #include <geekos/vm.h>
 #include <geekos/gdt.h>
 
+#include <geekos/vmm_stubs.h>
+
 
 
 
@@ -176,10 +178,12 @@ void Main(struct Boot_Info* bootInfo)
 
   ulong_t doIBuzz = 0;
 
+  Out_Byte(0x1234,5);
+  Out_Byte(0x1234,5);
+
   Init_BSS();
   Init_Screen();
 
-
   Init_Serial();
   Init_Mem(bootInfo);
   Init_CRC32();
@@ -191,6 +195,7 @@ void Main(struct Boot_Info* bootInfo)
   Init_Keyboard();
   Init_VM(bootInfo);
   Init_Paging();
+  Init_Stubs();
 
   //  Init_IDE();
 
@@ -198,7 +203,7 @@ void Main(struct Boot_Info* bootInfo)
 
 
   
-#if 1
+#if 0
   SerialPrint("Dumping VM kernel Code (first 128 bytes @ 0x%x)\n", 0x100000);
   SerialMemDump((unsigned char *)0x100000, 256);
   /*
@@ -207,24 +212,22 @@ void Main(struct Boot_Info* bootInfo)
   */
 #endif
 
-#if 0
-  SerialPrint("Dumping BIOS code f0000-fffff\n\n");
-  SerialMemDump((unsigned char *)0xf0000, 65536);
+#if 1
+  SerialPrint("Dumping BIOS code ffff0-fffff\n\n");
+  SerialMemDump((unsigned char *)0x10fff0, 16);
   /*
     SerialPrint("Dumping kernel Code (first 512 bytes @ 0x%x)\n",KERNEL_START);
     SerialMemDump((unsigned char *)VM_KERNEL_START, 512);
   */
-#endif
 
-#if 1
-  SerialPrintLevel(1000,"Launching Noisemaker and keyboard listener threads\n");
+  SerialPrint("Noisemaker and keyboard listener threads\n");
   key_thread = Start_Kernel_Thread(Keyboard_Listener, (ulong_t)&doIBuzz, PRIORITY_NORMAL, false);
   spkr_thread = Start_Kernel_Thread(Buzzer, (ulong_t)&doIBuzz, PRIORITY_NORMAL, false);
 
 #endif
 
   {
-    RunVMM();
+    RunVMM(bootInfo);
   }