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

diff --git a/palacios/src/geekos/main.c b/palacios/src/geekos/main.c
index de46041..d112e22 100644
--- a/palacios/src/geekos/main.c
+++ b/palacios/src/geekos/main.c
@@ -3,7 +3,8 @@
  * 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.35 $
+ * Copyright (c) 2008, Jack Lange <jarusl@cs.northwestern.edu>
+ * $Revision: 1.47 $
  * 
  * This is free software.  You are permitted to use,
  * redistribute, and modify it as specified in the file "COPYING".
@@ -36,13 +37,25 @@
 
 #include <geekos/vmm_stubs.h>
 
+#include <geekos/pci.h>
 
 
+#include <geekos/net.h>
+
 
 #define SPEAKER_PORT 0x61
 
 
 
+
+void Spin()
+{
+  // hack - competing thread
+  while (1) {};
+
+}
+
+
 void Buzz(unsigned delay, unsigned num)
 {
   volatile int x;
@@ -173,18 +186,27 @@ 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);
+  //Out_Byte(0x1234,5);
+  //Out_Byte(0x1234,5);
 
   Init_BSS();
   Init_Screen();
 
   Init_Serial();
+
+  /*  {
+    extern char BSS_START, BSS_END;
+
+    SerialPrint("BSS 0x%x->0x%x\n", &BSS_START, &BSS_END);
+
+    }*/
+
+
+  // SerialPrint("Guest Mem Dump at 0x%x\n", 0x100000);
+  //SerialMemDump((unsigned char *)(0x100000), 261 * 1024);
+
   Init_Mem(bootInfo);
   Init_CRC32();
   Init_TSS();
@@ -195,8 +217,14 @@ void Main(struct Boot_Info* bootInfo)
   Init_Keyboard();
   Init_VM(bootInfo);
   Init_Paging();
+  
+  //Init_PCI();
+
   Init_Stubs();
 
+  Init_Network();
+
+
   //  Init_IDE();
 
   // Print("Done; stalling\n");
@@ -212,7 +240,22 @@ void Main(struct Boot_Info* bootInfo)
   */
 #endif
 
+
 #if 1
+  struct Kernel_Thread *spin_thread;
+
+  spin_thread=Start_Kernel_Thread(Spin,0,PRIORITY_NORMAL,false);
+
+#endif
+
+#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);
   /*
@@ -223,15 +266,17 @@ void Main(struct Boot_Info* bootInfo)
   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(bootInfo);
   }
 
 
-  
+  SerialPrint("RunVMM returned, spinning\n");
+  while (1) {} 
 
 
   TODO("Write a Virtual Machine Monitor");