Merge branch 'NuttX/master'

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@5060 7fd9a85b-ad96-42d3-883c-3090e2eb8679

apps/ChangeLog.txt

@@ -283,4 +283,11 @@
 
 	* apps/netutils/thttpd/thttpd_cgi.c:  Missing NULL in argv[]
 	  list (contributed by Kate).
+	* apps/nshlib/nsh_parse.c: CONFIG_NSH_DISABLE_WGET not CONFIG_NSH_DISABLE_GET
+	  in one location (found by Kate).
+	* apps/examples/ostest/prioinherit.c:  Limit the number of test
+	  threds to no more than 3 of each priority.  Bad things happen
+	  when the existing logic tried to created several hundred test
+	  treads!
+
 

apps/examples/ostest/prioinherit.c

@@ -59,20 +59,28 @@
 #  define CONFIG_SEM_PREALLOCHOLDERS 0
 #endif
 
+/* If resources were configured for lots of holders, then run 3 low priority
+ * threads.  Otherwise, just one.
+ */
+
 #if CONFIG_SEM_PREALLOCHOLDERS > 3
 #  define NLOWPRI_THREADS 3
 #else
-#  define NLOWPRI_THREADS (CONFIG_SEM_PREALLOCHOLDERS+1)
+#  define NLOWPRI_THREADS 1
 #endif
 
 #ifndef CONFIG_SEM_NNESTPRIO
 #  define CONFIG_SEM_NNESTPRIO 0
 #endif
 
+/* Where resources configured for lots of waiters?  If so then run 3 high
+ * priority threads.  Otherwise, just one.
+ */
+
 #if CONFIG_SEM_NNESTPRIO > 3
 #  define NHIGHPRI_THREADS 3
 #else
-#  define NHIGHPRI_THREADS (CONFIG_SEM_NNESTPRIO+1)
+#  define NHIGHPRI_THREADS 1
 #endif
 
 /****************************************************************************

apps/nshlib/nsh_parse.c

@@ -370,7 +370,7 @@ static const struct cmdmap_s g_cmdmap[] =
 #endif
 
 #if defined(CONFIG_NET_TCP) && CONFIG_NFILE_DESCRIPTORS > 0
-# ifndef CONFIG_NSH_DISABLE_GET
+# ifndef CONFIG_NSH_DISABLE_WGET
   { "wget",     cmd_wget,     2, 4, "[-o <local-path>] <url>" },
 # endif
 #endif