Add a network test configuration for the STM3240G-EVAL

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4169 42af7a65-404d-4744-a932-0658087f49c3

7 files changed, 34 insertions, 12 deletions

diff --git a/apps/ChangeLog.txt b/apps/ChangeLog.txt
index 1038bea56..e71b99a2e 100755
--- a/apps/ChangeLog.txt
+++ b/apps/ChangeLog.txt
@@ -136,5 +136,9 @@
 
 6.13 2012-xx-xx Gregory Nutt <gnutt@nuttx.org>
 
-* apps/netutils/dhcpd/dhcpd.c: Fix several problems using host order address
-  where network addresses expected (and vice versa).
+	* apps/examples/dhcpd: May now be built as an NSH built-in application
+	  by setting CONFIG_NSH_BUILTIN_APPS.
+	* apps/netutils/dhcpd/dhcpd.c: Fix several problems using host order address
+	  where network addresses expected (and vice versa).
+	* apps/examples/nettest: May now be built as an NSH built-in application
+	  by setting CONFIG_NSH_BUILTIN_APPS.
diff --git a/apps/examples/Makefile b/apps/examples/Makefile
index 11925f91f..6989803ae 100644
--- a/apps/examples/Makefile
+++ b/apps/examples/Makefile
@@ -2,7 +2,7 @@
 # apps/examples/Makefile
 #
 #   Copyright (C) 2011 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+#   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -46,12 +46,18 @@ SUBDIRS = buttons dhcpd ftpc hello helloxx hidkbd igmp lcdrw mm mount \
 
 CNTXTDIRS = 
 
+ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
+CNTXTDIRS +=  dhcpd
+endif
 ifeq ($(CONFIG_EXAMPLES_HELLOXX_BUILTIN),y)
 CNTXTDIRS +=  helloxx
 endif
 ifeq ($(CONFIG_EXAMPLES_LCDRW_BUILTIN),y)
 CNTXTDIRS +=  lcdrw
 endif
+ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
+CNTXTDIRS +=  nettest
+endif
 ifeq ($(CONFIG_EXAMPLES_NX_BUILTIN),y)
 CNTXTDIRS +=  nx
 endif
diff --git a/apps/examples/nettest/Makefile b/apps/examples/nettest/Makefile
index e9489a6be..7ae5d4aff 100644
--- a/apps/examples/nettest/Makefile
+++ b/apps/examples/nettest/Makefile
@@ -2,7 +2,7 @@
 # examples/nettest/Makefile
 #
 #   Copyright (C) 2007-2008, 2010-2011 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+#   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -78,6 +78,12 @@ HOST_BIN	= host
 
 ROOTDEPPATH	= --dep-path .
 
+# NET test built-in application info
+
+APPNAME		= nettest
+PRIORITY	= SCHED_PRIORITY_DEFAULT
+STACKSIZE	= 2048
+
 # Common build
 
 VPATH		= 
@@ -107,7 +113,13 @@ $(HOST_BIN): $(HOST_OBJS)
 .built:	$(TARG_BIN) $(HOST_BIN)
 	@touch .built
 
-context:
+.context:
+ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
+	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
+	@touch $@
+endif
+
+context: .context
 
 .depend: Makefile $(TARG_SRCS)
 	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(TARG_SRCS) >Make.dep
diff --git a/apps/examples/nettest/host.c b/apps/examples/nettest/host.c
index 8b0bffd7d..25cb85455 100644
--- a/apps/examples/nettest/host.c
+++ b/apps/examples/nettest/host.c
@@ -1,8 +1,8 @@
 /****************************************************************************
  * examples/nettest/host.c
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2007, 2011 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/apps/examples/nettest/nettest.c b/apps/examples/nettest/nettest.c
index a6b3cda14..8ce44e54a 100644
--- a/apps/examples/nettest/nettest.c
+++ b/apps/examples/nettest/nettest.c
@@ -2,7 +2,7 @@
  * examples/nettest/nettest.c
  *
  *   Copyright (C) 2007, 2009-2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/apps/examples/nettest/nettest_client.c b/apps/examples/nettest/nettest_client.c
index 516898cde..23036d581 100644
--- a/apps/examples/nettest/nettest_client.c
+++ b/apps/examples/nettest/nettest_client.c
@@ -1,8 +1,8 @@
 /****************************************************************************
  * examples/nettest/nettest-client.c
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2007, 2011 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/apps/examples/nettest/nettest_server.c b/apps/examples/nettest/nettest_server.c
index 6d9ccaeba..3b153d8c6 100644
--- a/apps/examples/nettest/nettest_server.c
+++ b/apps/examples/nettest/nettest_server.c
@@ -1,8 +1,8 @@
 /****************************************************************************
  * examples/nettest/nettest-server.c
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2007, 2011 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions