aboutsummaryrefslogtreecommitdiffstats
path: root/demos/ARM7-AT91SAM7X-LWIP-GCC
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2009-10-12 17:55:00 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2009-10-12 17:55:00 +0000
commite1eef3b01547597ce8d84759c6fc7613243ccf9a (patch)
treed4113b2fc4b597ec4513305a01af3e0990f2eb01 /demos/ARM7-AT91SAM7X-LWIP-GCC
parent85786fabbfd94e480ff43a8979f074c1fd6292e1 (diff)
downloadChibiOS-e1eef3b01547597ce8d84759c6fc7613243ccf9a.tar.gz
ChibiOS-e1eef3b01547597ce8d84759c6fc7613243ccf9a.tar.bz2
ChibiOS-e1eef3b01547597ce8d84759c6fc7613243ccf9a.zip
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1219 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'demos/ARM7-AT91SAM7X-LWIP-GCC')
-rw-r--r--demos/ARM7-AT91SAM7X-LWIP-GCC/lwip/lwipthread.c17
-rw-r--r--demos/ARM7-AT91SAM7X-LWIP-GCC/lwipopts.h2
2 files changed, 4 insertions, 15 deletions
diff --git a/demos/ARM7-AT91SAM7X-LWIP-GCC/lwip/lwipthread.c b/demos/ARM7-AT91SAM7X-LWIP-GCC/lwip/lwipthread.c
index 6741630cb..c9752cb46 100644
--- a/demos/ARM7-AT91SAM7X-LWIP-GCC/lwip/lwipthread.c
+++ b/demos/ARM7-AT91SAM7X-LWIP-GCC/lwip/lwipthread.c
@@ -91,14 +91,6 @@ static void low_level_init(struct netif *netif) {
/* set MAC hardware address length */
netif->hwaddr_len = ETHARP_HWADDR_LEN;
- /* set MAC hardware address */
-/* netif->hwaddr[0] = 0xC2;
- netif->hwaddr[1] = 0xAF;
- netif->hwaddr[2] = 0x51;
- netif->hwaddr[3] = 0x03;
- netif->hwaddr[4] = 0xCF;
- netif->hwaddr[5] = 0x46;*/
-
/* maximum transfer unit */
netif->mtu = 1500;
@@ -107,7 +99,6 @@ static void low_level_init(struct netif *netif) {
netif->flags = NETIF_FLAG_BROADCAST | NETIF_FLAG_ETHARP | NETIF_FLAG_LINK_UP;
/* Do whatever else is needed to initialize interface. */
- macSetAddress(&ETH1, netif->hwaddr);
}
/*
@@ -241,12 +232,10 @@ msg_t lwip_thread(void *p) {
/* TCP/IP parameters, runtime or compile time.*/
if (p) {
struct lwipthread_opts *opts = p;
- if (opts->macaddress) {
- unsigned i;
+ unsigned i;
- for (i = 0; i < 6; i++)
- thisif.hwaddr[i] = opts->macaddress[i];
- }
+ for (i = 0; i < 6; i++)
+ thisif.hwaddr[i] = opts->macaddress[i];
ip.addr = opts->address;
gateway.addr = opts->gateway;
netmask.addr = opts->netmask;
diff --git a/demos/ARM7-AT91SAM7X-LWIP-GCC/lwipopts.h b/demos/ARM7-AT91SAM7X-LWIP-GCC/lwipopts.h
index 17c799866..298bc9585 100644
--- a/demos/ARM7-AT91SAM7X-LWIP-GCC/lwipopts.h
+++ b/demos/ARM7-AT91SAM7X-LWIP-GCC/lwipopts.h
@@ -271,7 +271,7 @@
* (requires NO_SYS==0)
*/
#ifndef MEMP_NUM_SYS_TIMEOUT
-#define MEMP_NUM_SYS_TIMEOUT 3
+#define MEMP_NUM_SYS_TIMEOUT (4 + LWIP_DHCP + LWIP_DNS)
#endif
/**