From 55bec7a933f4c4b1476b42550f795633965efeda Mon Sep 17 00:00:00 2001
From: stefan <stefan@315a16e6-25f9-4109-90ae-ca3045a26c18>
Date: Tue, 30 Nov 2010 05:52:23 +0000
Subject: [PATCH] - enable the DHCP support - optimize the memory alignments

git-svn-id: http://svn.lfbs.rwth-aachen.de/svn/scc/trunk/MetalSVM@295 315a16e6-25f9-4109-90ae-ca3045a26c18
---
 lwip/src/include/arch/cc.h  | 15 +++++++++------
 lwip/src/include/lwipopts.h | 32 ++++++++++++++++++--------------
 2 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/lwip/src/include/arch/cc.h b/lwip/src/include/arch/cc.h
index 4bd1070e..97c69292 100644
--- a/lwip/src/include/arch/cc.h
+++ b/lwip/src/include/arch/cc.h
@@ -42,12 +42,12 @@
 #endif /* BYTE_ORDER */
 
 /* Define generic types used in lwIP */
-typedef unsigned   char    u8_t;
-typedef signed     char    s8_t;
-typedef unsigned   short   u16_t;
-typedef signed     short   s16_t;
-typedef unsigned   int     u32_t;
-typedef signed     int     s32_t;
+typedef uint8_t		u8_t;
+typedef int8_t		s8_t;
+typedef uint16_t	u16_t;
+typedef int16_t		s16_t;
+typedef uint32_t	u32_t;
+typedef int32_t		s32_t;
 
 typedef size_t mem_ptr_t;
 
@@ -66,6 +66,9 @@ typedef size_t mem_ptr_t;
 #define PACK_STRUCT_BEGIN
 #define PACK_STRUCT_END
 
+#define MEM_ALIGNMENT 4
+#define ETH_PAD_SIZE  2
+
 /* prototypes for printf() and abort() */
 #include <metalsvm/stdio.h>
 #include <metalsvm/stdlib.h>
diff --git a/lwip/src/include/lwipopts.h b/lwip/src/include/lwipopts.h
index 5519e8a3..4bf6fcf0 100644
--- a/lwip/src/include/lwipopts.h
+++ b/lwip/src/include/lwipopts.h
@@ -3,8 +3,6 @@
 #ifndef __LWIPOPTS_H__
 #define __LWIPOPTS_H_
 
-#define MEM_ALIGNMENT		4
-
 /** 
  * NO_SYS==1: Provides VERY minimal functionality. Otherwise,
  * use lwIP facilities.
@@ -24,7 +22,12 @@
 /**
  * LWIP_DHCP==1: Enable DHCP module.
  */
-#define LWIP_DHCP 		0	
+#define LWIP_DHCP 		1
+
+/**
+ * DHCP_DOES_ARP_CHECK==1: Do an ARP check on the offered address.
+ */
+#define DHCP_DOES_ARP_CHECK	0
 
 /**
  * LWIP_TCP==1: Turn on TCP.
@@ -34,27 +37,28 @@
 /**
  * LWIP_BROADCAST_PING==1: respond to broadcast pings (default is unicast only)
  */
-#ifndef LWIP_BROADCAST_PING
 #define LWIP_BROADCAST_PING	1
-#endif
 
 /**
  * LWIP_MULTICAST_PING==1: respond to multicast pings (default is unicast only)
  */
-#ifndef LWIP_MULTICAST_PING
 #define LWIP_MULTICAST_PING	1
-#endif
+
+/**
+ * LWIP_HAVE_LOOPIF==1: Support loop interface (127.0.0.1) and loopif.c
+ */
+#define LWIP_HAVE_LOOPIF	1
 
 /* DEBUG options */
 #define LWIP_DEBUG		1
-#define DHCP_DEBUG		LWIP_DBG_ON
-#define ETHARP_DEBUG		LWIP_DBG_ON
-#define TCPIP_DEBUG		LWIP_DBG_ON
+#define DHCP_DEBUG		LWIP_DBG_OFF
+#define ETHARP_DEBUG		LWIP_DBG_OFF
+#define TCPIP_DEBUG		LWIP_DBG_OFF
 #define SYS_DEBUG		LWIP_DBG_ON
-#define RAW_DEBUG		LWIP_DBG_ON
-#define MEM_DEBUG		LWIP_DBG_ON
-#define IP_DEBUG		LWIP_DBG_ON
-#define INET_DEBUG		LWIP_DBG_ON
+#define RAW_DEBUG		LWIP_DBG_OFF
+#define MEM_DEBUG		LWIP_DBG_OFF
+#define IP_DEBUG		LWIP_DBG_OFF
+#define INET_DEBUG		LWIP_DBG_OFF
 #define NETIF_DEBUG		LWIP_DBG_ON
 
 #endif