fixed a ton of compile errors

[palacios.git] / palacios / src / geekos / main.c

diff --git a/palacios/src/geekos/main.c b/palacios/src/geekos/main.c
index f634c96..5e1d714 100644 (file)
--- 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.44 $
+ * $Revision: 1.46 $
  * 
  * This is free software.  You are permitted to use,
  * redistribute, and modify it as specified in the file "COPYING".
@@ -38,11 +38,14 @@
 
 #include <geekos/pci.h>
 
+#if 0
 #include <geekos/ne2k.h>
 #include <uip/uip.h>
 #include <uip/uip_arp.h>
+#endif
 
-#include <geekos/ring_buffer.h>
+#include <geekos/socket.h>
+//#include <geekos/ring_buffer.h>
 
 #define SPEAKER_PORT 0x61
 #define TEST_NE2K 0
@@ -246,8 +249,28 @@ void Main(struct Boot_Info* bootInfo)
 
   Init_Stubs();
 
+#if 0
+  {
+    init_network();
+    uchar_t local_addr[4];
+    uchar_t remote_addr[4];
+
+    local_addr[0] = 10;
+    local_addr[1] = 0;
+    local_addr[2] = 2;
+    local_addr[3] = 21;
 
-#if TEST_NE2K
+    set_ip_addr(local_addr);
+
+    remote_addr[0] = 10;
+    remote_addr[1] = 0;
+    remote_addr[2] = 2;
+    remote_addr[3] = 20;
+
+
+    connect(remote_addr, 4301);
+  }
+#elif 0
   Init_Ne2k(&Packet_Received);
   uip_init();
   uip_arp_init();
@@ -323,11 +346,10 @@ void Main(struct Boot_Info* bootInfo)
   }
 #endif
 
-#if !TEST_NE2K
+
   {
     RunVMM(bootInfo);
   }
-#endif
 
 
   SerialPrint("RunVMM returned, spinning\n");