Rename apps/include/apps.h to builtin.h. Move parts of apps/builtins/exec_builtin.c to binfmt/libbuiltin/libbuiltin_utils.c

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

3 files changed, 2 insertions, 55 deletions

diff --git a/apps/builtin/Kconfig b/apps/builtin/Kconfig
index 37150e8a9..c3371d708 100644
--- a/apps/builtin/Kconfig
+++ b/apps/builtin/Kconfig
@@ -3,21 +3,13 @@
 # see misc/tools/kconfig-language.txt.
 #
 
-config BUILTIN
-	bool "Support Builtin Applications"
-	default n
-	---help---
-		Enable support for builtin applications.  This features assigns a string
-		name to an application.  This feature is also the underlying requirement
-		to support built-in applications in the NuttShell (NSH).
-
 if BUILTIN
 
 config BUILTIN_PROXY_STACKSIZE
 	int "Builtin Proxy Stack Size"
 	default 1024
 	---help---
-		If exec_builting uses I/O redirection options, then it will require
+		If exec_builtin uses I/O redirection options, then it will require
 		an intermediary/proxy task to muck with the file descriptors.  This
 		configuration item specifies the stack size used for the proxy. Default:
 		1024 bytes.
diff --git a/apps/builtin/builtin.c b/apps/builtin/builtin.c
index 90c0b1353..7655a531d 100644
--- a/apps/builtin/builtin.c
+++ b/apps/builtin/builtin.c
@@ -42,7 +42,6 @@
 #include <nuttx/config.h>
 
 #include <nuttx/binfmt/builtin.h>
-#include <apps/apps.h>
 
 /****************************************************************************
  * Private Types
diff --git a/apps/builtin/exec_builtin.c b/apps/builtin/exec_builtin.c
index 6868d7ee7..05648590d 100644
--- a/apps/builtin/exec_builtin.c
+++ b/apps/builtin/exec_builtin.c
@@ -54,7 +54,7 @@
 #include <debug.h>
 
 #include <nuttx/binfmt/builtin.h>
-#include <apps/apps.h>
+#include <apps/builtin.h>
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -366,50 +366,6 @@ errout:
  ****************************************************************************/
 
 /****************************************************************************
- * Name: builtin_getname
- *
- * Description:
- *   Return the name of the application at index in the table of builtin
- *   applications.
- *
- ****************************************************************************/
-
-const char *builtin_getname(int index)
-{
-  if (index < 0 || index >= number_builtins())
-   {
-     return NULL;
-   }
-
-  return g_builtins[index].name;
-}
-
-/****************************************************************************
- * Name: builtin_isavail
- *
- * Description:
- *   Return the index into the table of applications for the applicaiton with
- *   the name 'appname'.
- *
- ****************************************************************************/
-
-int builtin_isavail(FAR const char *appname)
-{
-  int i;
-
-  for (i = 0; g_builtins[i].name; i++)
-    {
-      if (!strcmp(g_builtins[i].name, appname))
-        {
-          return i;
-        }
-    }
-
-  set_errno(ENOENT);
-  return ERROR;
-}
-
-/****************************************************************************
  * Name: exec_builtin
  *
  * Description: