build fixes

diff --git a/geekos/build/Makefile b/geekos/build/Makefile
index d41af2e..eafa4b3 100644 (file)
--- a/geekos/build/Makefile
+++ b/geekos/build/Makefile
@@ -51,10 +51,6 @@ VPATH := $(PROJECT_ROOT)/src
 
 
 
-#
-#TCPSTACK, uIP is used currently
-#
-TCPSTACK=UIP
 
 #
 #TCPSTACK, uIP is used currently
@@ -287,6 +283,10 @@ net/%.o : net/%.c
 all : $(ALL_TARGETS)
 
 
+force_lwip:
+       (cd ../src/lwip/build; make clean; make)
+
+
 #geekos/vmx_lowlevel.o: $(PROJECT_ROOT)/src/geekos/vmx_lowlevel.asm
 #      $(NASM) -O99 \
 #      -f elf \
@@ -340,7 +340,7 @@ geekos/kernel.bin : geekos/kernel.exe
        $(PAD) $@ 512
 
 # The kernel executable and symbol map.
-geekos/kernel.exe : $(KERNEL_OBJS) $(COMMON_C_OBJS) $(TCPSTACK_OBJS)
+geekos/kernel.exe : $(KERNEL_OBJS) $(COMMON_C_OBJS) force_lwip $(TCPSTACK_OBJS) 
        $(TARGET_LD) -o geekos/kernel.exe -Ttext $(KERNEL_BASE_ADDR) -e $(KERNEL_ENTRY) \
                $(V3_LD_FLAGS) \
                $(KERNEL_OBJS) $(COMMON_C_OBJS) $(TCPSTACK_OBJS) $(V3_LIBS) -b binary ./palacios/vm_kernel

diff --git a/geekos/build/lwip/.ignore b/geekos/build/lwip/.ignore
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/geekos/include/geekos/socket.h b/geekos/include/geekos/socket.h
index 35273cb..3d31d0d 100644 (file)
--- a/geekos/include/geekos/socket.h
+++ b/geekos/include/geekos/socket.h
@@ -21,9 +21,11 @@
 #define GEEKOS_SOCKET_H
 
 #include <geekos/ring_buffer.h>
-#include <uip/uip.h>
 #include <geekos/kthread.h>
 
+#ifdef UIP
+#include <uip/uip.h>
+
 
 typedef enum {WAITING, CLOSED, LISTEN, ESTABLISHED} sock_state_t;
 
@@ -48,5 +50,6 @@ int send(int sockfd, void * buf, uint_t len);
 
 void set_ip_addr(uchar_t addr[4]);
 
+#endif // UIP
 
 #endif

diff --git a/geekos/src/lwip/arch/sys_arch.c b/geekos/src/lwip/arch/sys_arch.c
index e390d98..52746db 100644 (file)
--- a/geekos/src/lwip/arch/sys_arch.c
+++ b/geekos/src/lwip/arch/sys_arch.c
@@ -51,7 +51,7 @@
 
 #include <string.h>
 
-#include <palacios/vmm.h>
+//#include <palacios/vmm.h>
 #include <geekos/synch.h>
 #include <geekos/kthread.h>
 #include <geekos/debug.h>