From 62f6889f929002e32865650a92a083698424cd49 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679>
Date: Sat, 15 Sep 2012 22:22:40 +0000
Subject: [PATCH] ENC28J60 does not have a MAC address

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@5160 7fd9a85b-ad96-42d3-883c-3090e2eb8679
---
 apps/include/netutils/resolv.h                | 23 ++++++++++++-------
 nuttx/configs/fire-stm32v2/nsh/defconfig      |  4 ++--
 .../configs/olimex-strp711/nettest/defconfig  | 12 ++++++----
 nuttx/net/uip/uip_lock.c                      |  1 +
 4 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/apps/include/netutils/resolv.h b/apps/include/netutils/resolv.h
index 81798558c7..bf71e3b6e8 100644
--- a/apps/include/netutils/resolv.h
+++ b/apps/include/netutils/resolv.h
@@ -3,8 +3,13 @@
  * DNS resolver code header file.
  * Author Adam Dunkels <adam@dunkels.com>
  *
- * Copyright (c) 2002-2003, Adam Dunkels.
- * All rights reserved.
+ *   Copyright (C) 2007-2009, 2011-2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *
+ * Inspired by/based on uIP logic by Adam Dunkels:
+ *
+ *   Copyright (c) 2002-2003, Adam Dunkels.
+ *   All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -41,6 +46,8 @@
 
 #include <nuttx/net/uip/uipopt.h>
 
+#include <netinet/in.h>
+
 /****************************************************************************
  * Public Function Prototypes
  ****************************************************************************/
@@ -58,13 +65,13 @@ extern "C" {
 EXTERN int resolv_init(void);
 
 #ifdef CONFIG_NET_IPv6
-EXTERN void resolv_conf(const struct in6_addr *dnsserver);
-EXTERN void resolv_getserver(const struct in_addr *dnsserver);
-EXTERN int  resolv_query(const char *name, struct sockaddr_in6 *addr);
+EXTERN void resolv_conf(FAR const struct in6_addr *dnsserver);
+EXTERN void resolv_getserver(FAR const struct in_addr *dnsserver);
+EXTERN int  resolv_query(FAR const char *name, FAR struct sockaddr_in6 *addr);
 #else
-EXTERN void resolv_conf(const struct in_addr *dnsserver);
-EXTERN void resolv_getserver(struct in_addr *dnsserver);
-EXTERN int  resolv_query(const char *name, struct sockaddr_in *addr);
+EXTERN void resolv_conf(FAR const struct in_addr *dnsserver);
+EXTERN void resolv_getserver(FAR struct in_addr *dnsserver);
+EXTERN int  resolv_query(FAR const char *name, FAR struct sockaddr_in *addr);
 #endif
 
 #undef EXTERN
diff --git a/nuttx/configs/fire-stm32v2/nsh/defconfig b/nuttx/configs/fire-stm32v2/nsh/defconfig
index 86fe9b4576..fd51878010 100644
--- a/nuttx/configs/fire-stm32v2/nsh/defconfig
+++ b/nuttx/configs/fire-stm32v2/nsh/defconfig
@@ -260,7 +260,7 @@ CONFIG_SDCLONE_DISABLE=y
 CONFIG_SCHED_WORKQUEUE=y
 CONFIG_SCHED_WORKPRIORITY=192
 CONFIG_SCHED_WORKPERIOD=50000
-CONFIG_SCHED_WORKSTACKSIZE=2048
+CONFIG_SCHED_WORKSTACKSIZE=1024
 CONFIG_SIG_SIGWORK=4
 # CONFIG_SCHED_LPWORK is not set
 CONFIG_SCHED_WAITPID=y
@@ -957,7 +957,7 @@ CONFIG_NSH_IOBUFFER_SIZE=512
 CONFIG_NSH_IPADDR=0x0a000002
 CONFIG_NSH_DRIPADDR=0x0a000001
 CONFIG_NSH_NETMASK=0xffffff00
-# CONFIG_NSH_NOMAC is not set
+CONFIG_NSH_NOMAC=y
 
 #
 # System NSH Add-Ons
diff --git a/nuttx/configs/olimex-strp711/nettest/defconfig b/nuttx/configs/olimex-strp711/nettest/defconfig
index f69d3f8cb4..e8455ab941 100755
--- a/nuttx/configs/olimex-strp711/nettest/defconfig
+++ b/nuttx/configs/olimex-strp711/nettest/defconfig
@@ -223,8 +223,8 @@ CONFIG_NUNGET_CHARS=2
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_MQ_MAXMSGSIZE=32
 CONFIG_MAX_WDOGPARMS=2
-CONFIG_PREALLOC_WDOGS=4
-CONFIG_PREALLOC_TIMERS=4
+CONFIG_PREALLOC_WDOGS=16
+CONFIG_PREALLOC_TIMERS=8
 
 #
 # Filesystem configuration
@@ -235,6 +235,7 @@ CONFIG_FS_ROMFS=n
 #
 # ENC28J60 configuration
 #
+CONFIG_NETDEVICES=y
 CONFIG_ENC28J60=y
 #CONFIG_ENC28J60_SPIMODE
 CONFIG_ENC28J60_FREQUENCY=20000000
@@ -252,10 +253,11 @@ CONFIG_MMCSD_READONLY=n
 # TCP/IP and UDP support via uIP
 #
 CONFIG_NET=y
+CONFIG_NET_NOINTS=y
 CONFIG_NET_IPv6=n
-CONFIG_NSOCKET_DESCRIPTORS=8
+CONFIG_NSOCKET_DESCRIPTORS=16
 CONFIG_NET_SOCKOPTS=y
-CONFIG_NET_BUFSIZE=420
+CONFIG_NET_BUFSIZE=562
 CONFIG_NET_TCP=y
 CONFIG_NET_TCP_CONNS=8
 CONFIG_NET_NTCP_READAHEAD_BUFFERS=8
@@ -365,7 +367,7 @@ CONFIG_NSH_TELNET=n
 CONFIG_NSH_ARCHINIT=n
 CONFIG_NSH_IOBUFFER_SIZE=512
 CONFIG_NSH_DHCPC=n
-CONFIG_NSH_NOMAC=n
+CONFIG_NSH_NOMAC=y
 CONFIG_NSH_IPADDR=0x0a000002
 CONFIG_NSH_DRIPADDR=0x0a000001
 CONFIG_NSH_NETMASK=0xffffff00
diff --git a/nuttx/net/uip/uip_lock.c b/nuttx/net/uip/uip_lock.c
index 0e770cef79..5abcda2698 100644
--- a/nuttx/net/uip/uip_lock.c
+++ b/nuttx/net/uip/uip_lock.c
@@ -39,6 +39,7 @@
 
 #include <nuttx/config.h>
 
+#include <unistd.h>
 #include <semaphore.h>
 #include <assert.h>
 #include <errno.h>