From 2fa8fdd94cd6e3566de4bacaba1e05898891a08a Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Mon, 24 Mar 2014 09:30:41 -0600
Subject: [PATCH] =?UTF-8?q?apps/examples/igmp:=20=20Fill=20out=20empty=20K?=
 =?UTF-8?q?config=20file;=20can=20now=20be=20built=20as=20an=20NSH=20built?=
 =?UTF-8?q?in=20function.=20=20From=20Manuel=20St=FChn?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ChangeLog.txt          |  8 +++++---
 examples/igmp/Kconfig  | 17 +++++++++++++++++
 examples/igmp/Makefile | 11 +++++++++++
 3 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index b92b147b1..328919363 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -861,6 +861,8 @@
 
 7.2 2014-xx-xx Gregory Nutt <gnutt@nuttx.org>
 
-	* Fix NuttShell version number display in welcome message.  version.h
-	  was not being included (2014-3-23).
-
+	* apps/nshlib/nsh_parse.c: Fix NuttShell version number display in
+	  welcome message.  version.h was not being included (2014-3-23).
+	* apps/examples/igmp:  Fill out Kconfig file; update makefile so
+	  that the IGMP example can be used as an NSH built-in application.
+	  From Manuel Stühn (2014-3-24).
diff --git a/examples/igmp/Kconfig b/examples/igmp/Kconfig
index d94121376..d2122d4d2 100644
--- a/examples/igmp/Kconfig
+++ b/examples/igmp/Kconfig
@@ -10,4 +10,21 @@ config EXAMPLES_IGMP
 		Enable the IGMP example
 
 if EXAMPLES_IGMP
+
+  config EXAMPLES_IGMP_IPADDR
+    hex "Target IP address"
+    default 0xc0a80a10
+
+  config EXAMPLES_IGMP_DRIPADDR
+    hex "Default Router IP address (Gateway)"
+    default 0xc0a80aFA
+
+  config EXAMPLES_IGMP_GRPADDR
+    hex "Group address"
+    default 0xE0000181
+
+  config EXAMPLES_IGMP_NETMASK
+    hex "Network Mask"
+    default 0xffffff00
+
 endif
diff --git a/examples/igmp/Makefile b/examples/igmp/Makefile
index 3715e1d34..8cfe69558 100644
--- a/examples/igmp/Makefile
+++ b/examples/igmp/Makefile
@@ -37,6 +37,10 @@
 -include $(TOPDIR)/Make.defs
 include $(APPDIR)/Make.defs
 
+APPNAME		= igmp
+PRIORITY	= SCHED_PRIORITY_DEFAULT
+STACKSIZE	= 1024
+
 # IGMP Networking Example
 
 ASRCS		=
@@ -77,7 +81,14 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call ARCHIVE, $(BIN), $(OBJS))
 	@touch .built
 
+ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
+$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
+	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
+
+context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat
+else
 context:
+endif
 
 .depend: Makefile $(SRCS)
 	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep