X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fgeekos%2Fmain.c;h=a498a90cbae3261fa31f5ca9f8763c8fb6bcdf00;hb=d6aaf17a9c98eeaa093a35fb61c4b4bb59b31c07;hp=1624aa90ecf6fefb907a08e3e51efdee0073a9d1;hpb=1cf6b8a334fd683681665c177d33ad6c452ad366;p=palacios-OLD.git

diff --git a/palacios/src/geekos/main.c b/palacios/src/geekos/main.c
index 1624aa9..a498a90 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.32 $
+ * $Revision: 1.36 $
  * 
  * 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>
+
 
 
 
@@ -171,15 +173,14 @@ int AllocateAndMapPagesForRange(uint_t start, uint_t length, pte_t template_pte)
  */
 void Main(struct Boot_Info* bootInfo)
 {
-  struct Kernel_Thread * key_thread;
-  struct Kernel_Thread * spkr_thread;
 
-  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 +192,7 @@ void Main(struct Boot_Info* bootInfo)
   Init_Keyboard();
   Init_VM(bootInfo);
   Init_Paging();
+  Init_Stubs();
 
   //  Init_IDE();
 
@@ -207,20 +209,25 @@ void Main(struct Boot_Info* bootInfo)
   */
 #endif
 
-#if 1
+#if 0
+  {
+
+  struct Kernel_Thread * key_thread;
+  struct Kernel_Thread * spkr_thread;
+
+  ulong_t doIBuzz = 0;
+
   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
 
   {