Palacios Public Git Repository

To checkout Palacios execute

  git clone http://v3vee.org/palacios/palacios.web/palacios.git
This will give you the master branch. You probably want the devel branch or one of the release branches. To switch to the devel branch, simply execute
  cd palacios
  git checkout --track -b devel origin/devel
The other branches are similar.


added copyright tags
[palacios.git] / palacios / src / geekos / main.c
index ba1b4d6..d112e22 100644 (file)
@@ -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.40 $
+ * 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".
 #include <geekos/pci.h>
 
 
+#include <geekos/net.h>
+
 
 #define SPEAKER_PORT 0x61
 
 
+
+
 void Spin()
 {
   // hack - competing thread
@@ -217,6 +222,9 @@ void Main(struct Boot_Info* bootInfo)
 
   Init_Stubs();
 
+  Init_Network();
+
+
   //  Init_IDE();
 
   // Print("Done; stalling\n");
@@ -261,6 +269,7 @@ void Main(struct Boot_Info* bootInfo)
   }
 #endif
 
+
   {
     RunVMM(bootInfo);
   }