Merge branch 'NuttX/master'

apps/ChangeLog.txt

@@ -305,3 +305,28 @@
 	  netutils/webserver/httpd_fsdata.c has been replaced with a dynamically
 	  built configuration located at apps/examples/uip (Contributed by
 	  Max Holtzberg).
+	* apps/netutils/webserver:  Several inenhancements from Kate including the
+	  ability to elide scripting and SERVER headers and the ability to map
+	  files into memory before transferring them.
+	* apps/netutils/webserver:  Add ability to map a URL to CGI function.
+	  Contributed by Kate.
+	* apps/nshlib/nsh_mntcmds.c: The changes of 6.21 introduced holes in the
+	  error handling:  Now the number of arguments to mount can be 0 or 4.
+	  Additional parameter checking is required to prevent mysterious errors
+	  (submiteed by Kate).
+	* apps/netutils/webserver/httpd_mmap.c:  Fix errors when the mmap()
+	  length is zero (submitted by Kate).
+	* apps/netutils/webserver/httpd_sendfile.c:  Add and option,
+	  CONFIG_NETUTILS_HTTPD_SENDFILE to transfer files using the NuttX
+	  sendfile() interface.
+	* apps/netutils/discover:  A UDP network discovery utility contributed
+	  by Max Holtzberg.
+	* apps/examples/discover:  A test example for the UDP network discovery
+	  utility (also contribed by Max Holtzberg).
+	* apps/examples/*/main.c:  Too many files called main.c.  Each renamed
+	  to something unique so that they will not collide in the archive.
+	* apps/netutils/xmlrpc: The Embeddable Lightweight XML-RPC Server
+	  discussed at http://www.drdobbs.com/web-development/\
+	  an-embeddable-lightweight-xml-rpc-server/184405364.  Contributed by
+	  Max Holtzberg.
+

apps/Make.defs

@@ -3,7 +3,7 @@
 # Common make definitions provided to all applications
 #
 #   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

apps/examples/Kconfig

@@ -3,115 +3,115 @@
 # see misc/tools/kconfig-language.txt.
 #
 
-menu "ADC example"
+menu "ADC Example"
 source "$APPSDIR/examples/adc/Kconfig"
 endmenu
 
-menu "Buttons example"
+menu "Buttons Example"
 source "$APPSDIR/examples/buttons/Kconfig"
 endmenu
 
-menu "CAN example"
+menu "CAN Example"
 source "$APPSDIR/examples/can/Kconfig"
 endmenu
 
-menu "USB CDC/ACM class driver example"
+menu "USB CDC/ACM Class Driver Example"
 source "$APPSDIR/examples/cdcacm/Kconfig"
 endmenu
 
-menu "USB composite class driver example"
+menu "USB composite Class Driver Example"
 source "$APPSDIR/examples/composite/Kconfig"
 endmenu
 
-menu "DHCP server example"
+menu "DHCP Server Example"
 source "$APPSDIR/examples/dhcpd/Kconfig"
 endmenu
 
-menu "FTP client example"
+menu "FTP Client Example"
 source "$APPSDIR/examples/ftpc/Kconfig"
 endmenu
 
-menu "FTP server example"
+menu "FTP Server Example"
 source "$APPSDIR/examples/ftpd/Kconfig"
 endmenu
 
-menu "\"Hello, World!\" example"
+menu "\"Hello, World!\" Example"
 source "$APPSDIR/examples/hello/Kconfig"
 endmenu
 
-menu "\"Hello, World!\" C++ example"
+menu "\"Hello, World!\" C++ Example"
 source "$APPSDIR/examples/helloxx/Kconfig"
 endmenu
 
-menu "USB HID keyboard example"
+menu "USB HID Keyboard Example"
 source "$APPSDIR/examples/hidkbd/Kconfig"
 endmenu
 
-menu "IGMP example"
+menu "IGMP Example"
 source "$APPSDIR/examples/igmp/Kconfig"
 endmenu
 
-menu "LCD read/write example"
+menu "LCD Read/Write Example"
 source "$APPSDIR/examples/lcdrw/Kconfig"
 endmenu
 
-menu "Memory management example"
+menu "Memory Management Example"
 source "$APPSDIR/examples/mm/Kconfig"
 endmenu
 
-menu "File system mount example"
+menu "File System Mount Example"
 source "$APPSDIR/examples/mount/Kconfig"
 endmenu
 
-menu "FreeModBus example"
+menu "FreeModBus Example"
 source "$APPSDIR/examples/modbus/Kconfig"
 endmenu
 
-menu "Network test example"
+menu "Network Test Example"
 source "$APPSDIR/examples/nettest/Kconfig"
 endmenu
 
-menu "NuttShell (NSH) example"
+menu "NuttShell (NSH) Example"
 source "$APPSDIR/examples/nsh/Kconfig"
 endmenu
 
-menu "NULL example"
+menu "NULL Example"
 source "$APPSDIR/examples/null/Kconfig"
 endmenu
 
-menu "NX graphics example"
+menu "NX Graphics Example"
 source "$APPSDIR/examples/nx/Kconfig"
 endmenu
 
-menu "NxConsole example"
+menu "NxConsole Example"
 source "$APPSDIR/examples/nxconsole/Kconfig"
 endmenu
 
-menu "NXFFS file system example"
+menu "NXFFS File System Example"
 source "$APPSDIR/examples/nxffs/Kconfig"
 endmenu
 
-menu "NXFLAT example"
+menu "NXFLAT Example"
 source "$APPSDIR/examples/nxflat/Kconfig"
 endmenu
 
-menu "NX graphics \"Hello, World!\" example"
+menu "NX Graphics \"Hello, World!\" Example"
 source "$APPSDIR/examples/nxhello/Kconfig"
 endmenu
 
-menu "NX graphics image example"
+menu "NX Graphics image Example"
 source "$APPSDIR/examples/nximage/Kconfig"
 endmenu
 
-menu "NX graphics lines example"
+menu "NX Graphics lines Example"
 source "$APPSDIR/examples/nxlines/Kconfig"
 endmenu
 
-menu "NX graphics text example"
+menu "NX Graphics Text Example"
 source "$APPSDIR/examples/nxtext/Kconfig"
 endmenu
 
-menu "OS test example"
+menu "OS Test Example"
 source "$APPSDIR/examples/ostest/Kconfig"
 endmenu
 
@@ -119,82 +119,90 @@ menu "Pascal \"Hello, World!\"example"
 source "$APPSDIR/examples/pashello/Kconfig"
 endmenu
 
-menu "Pipe example"
+menu "Pipe Example"
 source "$APPSDIR/examples/pipe/Kconfig"
 endmenu
 
-menu "Poll example"
+menu "Poll Example"
 source "$APPSDIR/examples/poll/Kconfig"
 endmenu
 
-menu "Pulse width modulation (PWM) example"
+menu "Pulse Width Modulation (PWM) Example"
 source "$APPSDIR/examples/pwm/Kconfig"
 endmenu
 
-menu "Quadrature encoder example"
+menu "Quadrature Encoder Example"
 source "$APPSDIR/examples/qencoder/Kconfig"
 endmenu
 
-menu "RGMP example"
+menu "RGMP Example"
 source "$APPSDIR/examples/rgmp/Kconfig"
 endmenu
 
-menu "ROMFS example"
+menu "ROMFS Example"
 source "$APPSDIR/examples/romfs/Kconfig"
 endmenu
 
-menu "sendmail example"
+menu "sendmail Example"
 source "$APPSDIR/examples/sendmail/Kconfig"
 endmenu
 
-menu "Serial loopback example"
+menu "Serial Loopback Example"
 source "$APPSDIR/examples/serloop/Kconfig"
 endmenu
 
-menu "Telnet daemon example"
+menu "Telnet Daemon Example"
 source "$APPSDIR/examples/telnetd/Kconfig"
 endmenu
 
-menu "THTTPD web server example"
+menu "THTTPD Web Server Example"
 source "$APPSDIR/examples/thttpd/Kconfig"
 endmenu
 
-menu "TIFF generation example"
+menu "TIFF Generation Example"
 source "$APPSDIR/examples/tiff/Kconfig"
 endmenu
 
-menu "Touchscreen example"
+menu "Touchscreen Example"
 source "$APPSDIR/examples/touchscreen/Kconfig"
 endmenu
 
-menu "UDP example"
+menu "UDP Example"
 source "$APPSDIR/examples/udp/Kconfig"
 endmenu
 
-menu "uIP web server example"
+menu "UDP Discovery Daemon Example"
+source "$APPSDIR/examples/discover/Kconfig"
+endmenu
+
+menu "uIP Web Server Example"
 source "$APPSDIR/examples/uip/Kconfig"
 endmenu
 
-menu "USB serial test example"
+menu "USB Serial Test Example"
 source "$APPSDIR/examples/usbserial/Kconfig"
 endmenu
 
-menu "USB mass storage class example"
+menu "USB Mass Storage Class Example"
 source "$APPSDIR/examples/usbstorage/Kconfig"
 endmenu
 
-menu "USB serial terminal example"
+menu "USB Serial Terminal Example"
 source "$APPSDIR/examples/usbterm/Kconfig"
 endmenu
 
-menu "Watchdog timer example"
+menu "Watchdog timer Example"
 source "$APPSDIR/examples/watchdog/Kconfig"
 endmenu
 
-menu "wget example"
+menu "wget Example"
 source "$APPSDIR/examples/wget/Kconfig"
 endmenu
 
-menu "WLAN example"
+menu "WLAN Example"
 source "$APPSDIR/examples/wlan/Kconfig"
 endmenu
+
+menu "XML RPC Example"
+source "$APPSDIR/examples/xmlrpc/Kconfig"
+endmenu

apps/examples/Make.defs

@@ -58,6 +58,10 @@ ifeq ($(CONFIG_EXAMPLES_DHCPD),y)
 CONFIGURED_APPS += examples/dhcpd
 endif
 
+ifeq ($(CONFIG_EXAMPLE_DISCOVER),y)
+CONFIGURED_APPS += examples/discover
+endif
+
 ifeq ($(CONFIG_EXAMPLES_FTPC),y)
 CONFIGURED_APPS += examples/ftpc
 endif
@@ -221,3 +225,7 @@ endif
 ifeq ($(CONFIG_EXAMPLES_WLAN),y)
 CONFIGURED_APPS += examples/wlan
 endif
+
+ifeq ($(CONFIG_EXAMPLES_XMLRPC),y)
+CONFIGURED_APPS += examples/xmlrpc
+endif

apps/examples/Makefile

@@ -37,11 +37,12 @@
 
 # Sub-directories
 
-SUBDIRS = adc buttons can cdcacm composite dhcpd ftpc ftpd hello helloxx \
+SUBDIRS  = adc buttons can cdcacm composite dhcpd discover ftpc ftpd hello
-	hidkbd igmp lcdrw mm modbus mount nettest nsh null nx nxconsole nxffs \
+SUBDIRS += helloxx hidkbd igmp lcdrw mm modbus mount nettest nsh null nx
-	nxflat nxhello nximage nxlines nxtext ostest pashello pipe poll pwm \
+SUBDIRS += nxconsole nxffs nxflat nxhello nximage nxlines nxtext ostest
-	qencoder rgmp romfs serloop telnetd thttpd tiff touchscreen udp uip \
+SUBDIRS += pashello pipe poll pwm qencoder rgmp romfs serloop telnetd
-	usbserial sendmail usbstorage usbterm watchdog wget wlan
+SUBDIRS += thttpd tiff touchscreen udp uip usbserial sendmail usbstorage
+SUBDIRS += usbterm watchdog wget wlan
 
 # Sub-directories that might need context setup.  Directories may need
 # context setup for a variety of reasons, but the most common is because
@@ -56,7 +57,8 @@ SUBDIRS = adc buttons can cdcacm composite dhcpd ftpc ftpd hello helloxx \
 CNTXTDIRS = pwm
 
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
-CNTXTDIRS += adc can cdcacm composite ftpd dhcpd modbus nettest qencoder telnetd watchdog
+CNTXTDIRS += adc can cdcacm composite discover ftpd dhcpd modbus nettest
+CNTXTDIRS += qencoder telnetd watchdog
 endif
 
 ifeq ($(CONFIG_EXAMPLES_HELLO_BUILTIN),y)

apps/examples/README.txt

@@ -275,6 +275,28 @@ examples/dhcpd
 
   CONFIGURED_APPS += uiplib
 
+examples/discover
+^^^^^^^^^^^^^^^^^
+
+  This example exercises netutils/discover utility.  This example initializes
+  and starts the UDP discover daemon. This daemon is useful for discovering
+  devices in local networks, especially with DHCP configured devices.  It
+  listens for UDP broadcasts which also can include a device class so that
+  groups of devices can be discovered. It is also possible to address all
+  classes with a kind of broadcast discover.
+
+  This example will automatically be built as an NSH built-in if
+  CONFIG_NSH_BUILTIN_APPS is selected.  Otherwise, it will be a standalone
+  program with entry point "discover_main".
+
+  NuttX configuration settings:
+
+    CONFIG_EXAMPLE_DISCOVER_DHCPC - DHCP Client
+    CONFIG_EXAMPLE_DISCOVER_NOMAC - Use canned MAC address
+    CONFIG_EXAMPLE_DISCOVER_IPADDR - Target IP address
+    CONFIG_EXAMPLE_DISCOVER_DRIPADDR - Router IP address
+    CONFIG_EXAMPLE_DISCOVER_NETMASK - Network Mask
+
 examples/ftpc
 ^^^^^^^^^^^^^
 
@@ -1111,7 +1133,7 @@ examples/rgmp
 
   See http://rgmp.sourceforge.net/wiki/index.php/Main_Page for further
 
-  At present, the RGMP example folder contains only an empty main.c file.
+  At present, the RGMP example folder contains only an empty rgmp_main.c file.
 
 examples/romfs
 ^^^^^^^^^^^^^^
@@ -1646,8 +1668,27 @@ examples/wget
   file in the configuration driver with instruction to build applications
   like:
 
-  CONFIGURED_APPS += uiplib
+    CONFIGURED_APPS += uiplib
-  CONFIGURED_APPS += resolv
+    CONFIGURED_APPS += resolv
-  CONFIGURED_APPS += webclient
+    CONFIGURED_APPS += webclient
 
+examples/xmlrpc
 
+  This example exercises the "Embeddable Lightweight XML-RPC Server" which
+  is discussed at:
+
+    http://www.drdobbs.com/web-development/an-embeddable-lightweight-xml-rpc-server/184405364
+
+  Configuration options:
+
+    CONFIG_EXAMPLES_XMLRPC_BUFFERSIZE - HTTP buffer size. Default 1024
+    CONFIG_EXAMPLES_XMLRPC_DHCPC - Use DHCP Client.  Default n. Ignored
+      if CONFIG_NSH_BUILTIN_APPS is selected.
+    CONFIG_EXAMPLES_XMLRPC_NOMAC - Use Canned MAC Address. Defaul n. Ignored
+      if CONFIG_NSH_BUILTIN_APPS is selected.
+    CONFIG_EXAMPLES_XMLRPC_IPADDR - Target IP address. Default 0x0a000002.
+      Ignored if CONFIG_NSH_BUILTIN_APPS is selected.
+    CONFIG_EXAMPLES_XMLRPC_DRIPADDR - Default Router IP address (Gateway).
+      Default 0x0a000001. Ignored if CONFIG_NSH_BUILTIN_APPS is selected.
+    CONFIG_EXAMPLES_XMLRPC_NETMASK - Network Mask.  Default 0xffffff00
+      Ignored if CONFIG_NSH_BUILTIN_APPS is selected.

apps/examples/buttons/Makefile

@@ -2,7 +2,7 @@
 # apps/examples/buttons/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
@@ -40,7 +40,7 @@ include $(APPDIR)/Make.defs
 # Hello, World! Example
 
 ASRCS		=
-CSRCS		= main.c
+CSRCS		= buttons_main.c
 
 AOBJS		= $(ASRCS:.S=$(OBJEXT))
 COBJS		= $(CSRCS:.c=$(OBJEXT))

apps/examples/buttons/buttons_main.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/buttons/main.c
+ * examples/buttons/buttons_main.c
  *
  *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>

apps/examples/can/can_main.c

@@ -2,7 +2,7 @@
  * examples/can/can_main.c
  *
  *   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

apps/examples/hello/Makefile

@@ -46,7 +46,7 @@ STACKSIZE	= 2048
 # Hello, World! Example
 
 ASRCS		=
-CSRCS		= main.c
+CSRCS		= hello_main.c
 
 AOBJS		= $(ASRCS:.S=$(OBJEXT))
 COBJS		= $(CSRCS:.c=$(OBJEXT))

apps/examples/hello/hello_main.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/hello/main.c
+ * examples/hello/hello_main.c
  *
  *   Copyright (C) 2008, 2011-2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>

apps/examples/helloxx/Makefile

@@ -2,7 +2,7 @@
 # apps/examples/helloxx/Makefile
 #
 #   Copyright (C) 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
@@ -41,7 +41,7 @@ include $(APPDIR)/Make.defs
 
 ASRCS		=
 CSRCS		=
-CXXSRCS		= main.cxx
+CXXSRCS		= helloxx_main.cxx
 
 AOBJS		= $(ASRCS:.S=$(OBJEXT))
 COBJS		= $(CSRCS:.c=$(OBJEXT))

apps/examples/helloxx/helloxx_main.cxx

@@ -1,5 +1,5 @@
 //***************************************************************************
-// examples/helloxx/main.cxx
+// examples/helloxx/helloxx_main.cxx
 //
 //   Copyright (C) 2009, 2011-2012 Gregory Nutt. All rights reserved.
 //   Author: Gregory Nutt <gnutt@nuttx.org>

apps/examples/lcdrw/lcdrw_main.c

@@ -1,253 +0,0 @@
-/****************************************************************************
- * examples/lcdrw/lcdrw_main.c
- *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name NuttX nor the names of its contributors may be
- *    used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- ****************************************************************************/
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <nuttx/lcd/lcd.h>
-#include <nuttx/nx/nxglib.h>
-
-/****************************************************************************
- * Definitions
- ****************************************************************************/
-/* Configuration ************************************************************/
-/* Most of the NX configuration settings are probbably *not* needed by this
- * example.  But, presumeably you are using NX too and so the checks might
- * be good for you.
- */
-
-#ifndef CONFIG_NX
-#  error "CONFIG_NX must be defined to use this test"
-#endif
-
-#ifndef CONFIG_NX_LCDDRIVER
-#  error "CONFIG_NX_LCDDRIVER must be defined to use this test"
-#endif
-
-#ifndef CONFIG_EXAMPLES_LCDRW_BPP
-#  define CONFIG_EXAMPLES_LCDRW_BPP 16
-#endif
-
-#if CONFIG_EXAMPLES_LCDRW_BPP != 16
-#  error "Currently only RGB565 is supported -- feel free to extend"
-#endif
-
-#ifdef CONFIG_NX_DISABLE_16BPP
-#  error "CONFIG_NX_DISABLE_16BPP disables 16-bit support"
-#endif
-
-#ifndef CONFIG_EXAMPLES_LDCRW_DEVNO
-#  define CONFIG_EXAMPLES_LDCRW_DEVNO 0
-#endif
-
-#ifndef CONFIG_EXAMPLES_LDCRW_XRES
-#  define CONFIG_EXAMPLES_LDCRW_XRES 240
-#endif
-
-#ifndef CONFIG_EXAMPLES_LDCRW_YRES
-#  define CONFIG_EXAMPLES_LDCRW_YRES 320
-#endif
-
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-struct lcdrw_instance_s
-{
-  /* LCD device handle and planeinfo */
-
-  FAR struct lcd_dev_s *dev;
-  struct lcd_planeinfo_s pinfo;
-};
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-/****************************************************************************
- * Name: lcdrw_initialize
- ****************************************************************************/
-
-static inline int lcdrw_initialize(FAR struct lcdrw_instance_s *inst)
-{
-  int ret;
-
-  /* Initialize the LCD device */
-
-  printf("screens_initialize: Initializing LCD\n");
-  ret = up_lcdinitialize();
-  if (ret < 0)
-    {
-      fprintf(stderr, "screens_initialize: up_lcdinitialize failed: %d\n", -ret);
-      return ret;
-    }
-
-  /* Get the device instance. */
-
-  printf("Get LCD instance\n");
-  inst->dev = up_lcdgetdev(CONFIG_EXAMPLES_LDCRW_DEVNO);
-  if (!inst->dev)
-    {
-      fprintf(stderr, "up_lcdgetdev failed, devno=%d\n", CONFIG_EXAMPLES_LDCRW_DEVNO);
-      return ret;
-    }
-
-  /* Turn the LCD on at 75% power.  This should not be necessary. */
-
-  (void)inst->dev->setpower(inst->dev, ((3*CONFIG_LCD_MAXPOWER + 3)/4));
-
-  /* Get the planeinfo structure */
-
-  ret = inst->dev->getplaneinfo(inst->dev, 0, &inst->pinfo);
-  if (ret < 0)
-    {
-      fprintf(stderr, "getplaneinfo failed: %d\n", ret);
-    }
-  return ret;
-}
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: lcdrw_main
- ****************************************************************************/
-
-int lcdrw_main(int argc, char *argv[])
-{
-  struct lcdrw_instance_s inst;
-  nxgl_coord_t row;
-  nxgl_coord_t col;
-  uint16_t value;
-  uint32_t offset;
-  FAR uint16_t *ptr;
-  int ret;
-
-  /* Initialize the LCD driver */
-
-  ret = lcdrw_initialize(&inst);
-  if (ret < 0)
-    {
-      exit(1);
-    }
-
-  /* Loop, writing all possible values to the LCD */
-
-  value = 0;
-  for (row = 0; row < CONFIG_EXAMPLES_LDCRW_YRES; row++)
-    {
-      /* Create a dummy row.  The important thing is to try all
-       * bit combinations in a predictable way.
-       */
-  
-       ptr = (FAR uint16_t*)inst.pinfo.buffer;
-       for (col = 0; col < CONFIG_EXAMPLES_LDCRW_XRES; col++)
-         {
-           *ptr++ = value++;
-         }
-
-      /* Write the row to the LCD */
-
-      ret = inst.pinfo.putrun(row, 0, inst.pinfo.buffer,
-                              CONFIG_EXAMPLES_LDCRW_XRES);
-      if (ret < 0)
-        {
-          fprintf(stderr, "putrun failed: %d\n", ret);
-          exit(1);
-        }
-    }
-
-  /* Print a header */
-
-  printf("       ");
-  for (col = 0; col < 15; col++)
-    {
-      printf("---%x ", col);
-    }
-  printf("---f\n");
-
-   /* Then read each line back from the LCD. */
-
-  offset = 0;
-  for (row = 0; row < CONFIG_EXAMPLES_LDCRW_YRES; row++)
-    {
-      /* Read the row */
- 
-      ret = inst.pinfo.getrun(row, 0, inst.pinfo.buffer,
-                              CONFIG_EXAMPLES_LDCRW_XRES);
-      if (ret < 0)
-        {
-          fprintf(stderr, "getrun failed: %d\n", ret);
-          exit(1);
-        }
-
-      /* Then dump the row to the display */
-
-      ptr = (FAR uint16_t*)inst.pinfo.buffer;
-      for (col = 0; col < CONFIG_EXAMPLES_LDCRW_XRES; col++)
-        {
-          if ((offset & 15) == 0)
-            {
-              printf("%06x ", offset);
-            }
-
-          value = *ptr++;
-          offset++;
-
-          if ((offset & 15) == 0)
-            {
-              printf("%04x\n", value);
-            }
-          else
-            {
-              printf("%04x ", value);
-            }
-        }
-    }
-  fflush(stdout);
-
-  return 0;
-}
-

apps/examples/mm/Makefile

@@ -2,7 +2,7 @@
 # apps/examples/mm/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

apps/examples/mm/mm_main.c

@@ -2,7 +2,7 @@
  * examples/mm/mm_main.c
  *
  *   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

apps/examples/mount/Makefile

@@ -2,7 +2,7 @@
 # apps/Makefile
 #
 #   Copyright (C) 2007-2008, 2010-2010 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

apps/examples/mount/mount.h

@@ -2,7 +2,7 @@
  * examples/mount/mount.h
  *
  *   Copyright (C) 2008 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

apps/examples/mount/mount_main.c

@@ -2,7 +2,7 @@
  * examples/mount/mount_main.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

apps/examples/mount/ramdisk.c

@@ -2,7 +2,7 @@
  * examples/mount/ramdisk.c
  *
  *   Copyright (C) 2008-2009 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

apps/examples/nsh/Kconfig

@@ -6,6 +6,8 @@
 config EXAMPLES_NSH
 	bool "NuttShell (NSH) example"
 	default n
+	select NSH_LIBRARY
+	select SYSTEM_READLINE
 	---help---
 		Enable the NuttShell (NSH) example
 

apps/examples/nsh/Makefile

@@ -2,7 +2,7 @@
 # apps/examples/nsh/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

apps/examples/null/Makefile

@@ -2,7 +2,7 @@
 # examples/null/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

apps/examples/null/null_main.c

@@ -2,7 +2,7 @@
  * examples/null/null_main.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

apps/examples/ostest/Kconfig

@@ -10,4 +10,33 @@ config EXAMPLES_OSTEST
 		Enable the OS test example
 
 if EXAMPLES_OSTEST
+
+config EXAMPLES_OSTEST_BUILTIN
+	bool "NSH built-in application"
+	default y if NSH_LIBRARY
+	default n if !NSH_LIBRARY
+	---help---
+		Build the OS test example as an NSH built-in application.
+
+config EXAMPLES_OSTEST_LOOPS
+	int "OS test loop"
+	default 1
+	---help---
+		Used to control the number of executions of the test.  If undefined, the test
+		executes one time.  If defined to be zero, the test runs forever.
+
+config EXAMPLES_OSTEST_STACKSIZE
+	int "OS test stack size"
+	default 8192
+	---help---
+		Size of the stack used to create the ostest task.  Default is 8192.
+
+config EXAMPLES_OSTEST_NBARRIER_THREADS
+	int "Number of barrier threads"
+	default 8
+	---help---
+		Specifies the number of threads to create in the barrier test.  The default
+		is 8 but a smaller number may be needed on systems without sufficient memory
+		to start so many threads.
+
 endif

apps/examples/ostest/Makefile

@@ -46,7 +46,7 @@ STACKSIZE	= 2048
 # NuttX OS Test
 
 ASRCS		=
-CSRCS		= main.c dev_null.c
+CSRCS		= ostest_main.c dev_null.c
 
 ifeq ($(CONFIG_ARCH_FPU),y)
 CSRCS		+= fpu.c

apps/examples/ostest/barrier.c

@@ -2,7 +2,7 @@
  * examples/ostest/barrier.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

apps/examples/ostest/cancel.c

@@ -2,7 +2,7 @@
  * examples/ostest/cancel.c
  *
  *   Copyright (C) 2007-2009 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

apps/examples/ostest/cond.c

@@ -2,7 +2,7 @@
  * cond.c
  *
  *   Copyright (C) 2007, 2008 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

apps/examples/ostest/dev_null.c

@@ -2,7 +2,7 @@
  * examples/ostest/dev_null.c
  *
  *   Copyright (C) 2007, 2008 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

apps/examples/ostest/mutex.c

@@ -2,7 +2,7 @@
  * mutex.c
  *
  *   Copyright (C) 2007, 2008 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

apps/examples/ostest/ostest_main.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/examples/ostest/main.c
+ * apps/examples/ostest/ostest_main.c
  *
  *   Copyright (C) 2007-2009, 2011-2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>

apps/examples/ostest/posixtimer.c

@@ -2,7 +2,7 @@
  * examples/ostest/posixtimer.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

apps/examples/ostest/prioinherit.c

@@ -2,7 +2,7 @@
  * examples/ostest/prioinherit.c
  *
  *   Copyright (C) 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

apps/examples/ostest/rmutex.c

@@ -2,7 +2,7 @@
  * rmutex.c
  *
  *   Copyright (C) 2008 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

apps/examples/ostest/roundrobin.c

@@ -2,7 +2,7 @@
  * examples/ostest/roundrobin.c
  *
  *   Copyright (C) 2007, 2008 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

apps/examples/ostest/sem.c

@@ -2,7 +2,7 @@
  * sem.c
  *
  *   Copyright (C) 2007-2009 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

apps/examples/ostest/sighand.c

@@ -2,7 +2,7 @@
  * apps/examples/ostest/sighand.c
  *
  *   Copyright (C) 2007, 2008, 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

apps/examples/ostest/timedmqueue.c

@@ -2,7 +2,7 @@
  * apps/examples/ostest/mqueue.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

apps/examples/ostest/timedwait.c

@@ -2,7 +2,7 @@
  * examples/ostest/timedwait.c
  *
  *   Copyright (C) 2007, 2008, 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

apps/examples/pipe/Makefile

@@ -2,7 +2,7 @@
 # apps/examples/pipe/Makefile
 #
 #   Copyright (C) 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

apps/examples/pipe/interlock_test.c

@@ -2,7 +2,7 @@
  * examples/pipe/interlock_test.c
  *
  *   Copyright (C) 2008 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

apps/examples/pipe/pipe.h

@@ -2,7 +2,7 @@
  * examples/pipe/pipe.h
  *
  *   Copyright (C) 2008 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

apps/examples/pipe/pipe_main.c

@@ -2,7 +2,7 @@
  * examples/pipe/pipe_main.c
  *
  *   Copyright (C) 2008-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

apps/examples/pipe/redirect_test.c

@@ -2,7 +2,7 @@
  * examples/pipe/redirect_test.c
  *
  *   Copyright (C) 2008-2009 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

apps/examples/pipe/transfer_test.c

@@ -2,7 +2,7 @@
  * examples/pipe/transfer_test.c
  *
  *   Copyright (C) 2008-2009 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

apps/examples/poll/Makefile

@@ -2,7 +2,7 @@
 # apps/examples/poll/Makefile
 #
 #   Copyright (C) 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

apps/examples/poll/Makefile.host

@@ -2,7 +2,7 @@
 # apps/examples/poll/Makefile.host
 #
 #   Copyright (C) 2008, 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

apps/examples/poll/poll_internal.h

@@ -2,7 +2,7 @@
  * examples/poll/poll_internal.h
  *
  *   Copyright (C) 2008, 2009 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

apps/examples/poll/poll_listener.c

@@ -2,7 +2,7 @@
  * examples/poll/poll_listener.c
  *
  *   Copyright (C) 2008 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