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

9 files changed, 18 insertions, 102 deletions

diff --git a/apps/ChangeLog.txt b/apps/ChangeLog.txt
index 5bc3b2149..6faac9e4b 100644
--- a/apps/ChangeLog.txt
+++ b/apps/ChangeLog.txt
@@ -475,3 +475,9 @@
 	  binfmt.
 	* builtin/binfs.c:  Move apps/builtin/binfs.c to fs/binfs/fs_binfs.c
 	  CONFIG_APPS_BINDIR rename CONFIG_FS_BINFS
+	* apps/include/builtin.h:  Some of the content of
+	  apps/include/apps.h moved to include/nuttx/binfmt/builtin.h.
+	  apps/include/apps.h renamed builtin.h
+	* pps/builtin/exec_builtins.c:  Move utility builtin
+	  utility functions from apps/builtin/exec_builtins.c to
+	  binfmt/libbuiltin/libbuiltin_utils.c
\ No newline at end of file
diff --git a/apps/README.txt b/apps/README.txt
index 4a336abdb..55accfcf6 100644
--- a/apps/README.txt
+++ b/apps/README.txt
@@ -7,7 +7,6 @@ Contents
   General
   Directory Location
   Built-In Applications
-  Built-In Startup main() function
   NuttShell (NSH) Built-In Commands
   Synchronous Built-In Commands
   Application Configuration File
@@ -62,7 +61,7 @@ collected during the make context build phase.
 
 To execute an application function:
 
-  exec_builtin() is defined in the nuttx/include/apps/apps.h 
+  exec_builtin() is defined in the nuttx/include/apps/builtin.h 
 
 NuttShell (NSH) Built-In Commands
 ---------------------------------
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:
diff --git a/apps/include/apps.h b/apps/include/builtin.h
index 0fb807c14..24cf204fa 100644
--- a/apps/include/apps.h
+++ b/apps/include/builtin.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * apps/include/apps.h
+ * apps/include/builtin.h
  *
  * Originally by:
  *
@@ -40,8 +40,8 @@
  *
  ****************************************************************************/
 
-#ifndef __APPS_INCLUDE_APPS_H
-#define __APPS_INCLUDE_APPS_H
+#ifndef __APPS_INCLUDE_BUILTIN_H
+#define __APPS_INCLUDE_BUILTIN_H
 
 /****************************************************************************
  * Included Files
@@ -50,9 +50,8 @@
 #include <nuttx/config.h>
 
 #include <sys/types.h>
-#include <stdint.h>
 
-#include <nuttx/fs/ioctl.h>
+#include <nuttx/binfmt/builtin.h>
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -79,42 +78,6 @@ extern "C" {
  ****************************************************************************/
 
 /****************************************************************************
- * Name: builtin_isavail
- *
- * Description:
- *   Checks for availabiliy of application registerred during compile time.
- *
- * Input Parameter:
- *   filename - Name of the linked-in binary to be started.
- *
- * Returned Value:
- *   This is an end-user function, so it follows the normal convention:
- *   Returns index of builtin application. If it is not found then it
- *   returns -1 (ERROR) and sets errno appropriately.
- *
- ****************************************************************************/
-
-EXTERN int builtin_isavail(FAR const char *appname);
-
-/****************************************************************************
- * Name: builtin_getname
- *
- * Description:
- *   Returns pointer to a name of built-in application pointed by the
- *   index.
- *
- * Input Parameter:
- *   index, from 0 and on ...
- *
- * Returned Value:
- *   Returns valid pointer pointing to the app name if index is valid.
- *   Otherwise NULL is returned.
- *
- ****************************************************************************/
-
-EXTERN const char *builtin_getname(int index);
-
-/****************************************************************************
  * Name: exec_builtin
  *
  * Description:
@@ -145,4 +108,4 @@ EXTERN int exec_builtin(FAR const char *appname, FAR const char **argv,
 }
 #endif
 
-#endif /* __APPS_INCLUDE_APPS_H */
+#endif /* __APPS_INCLUDE_BUILTIN_H */
diff --git a/apps/nshlib/Kconfig b/apps/nshlib/Kconfig
index e60e9c480..9cfc020a5 100644
--- a/apps/nshlib/Kconfig
+++ b/apps/nshlib/Kconfig
@@ -15,7 +15,7 @@ if NSH_LIBRARY
 config NSH_BUILTIN_APPS
 	bool "Enable built-in applications"
 	default y
-	depends on BUILTIN
+	select BUILTIN
 	---help---
 		Support external registered, "built-in" applications that can be
 		executed from the NSH command line (see apps/README.txt for
diff --git a/apps/nshlib/nsh_builtin.c b/apps/nshlib/nsh_builtin.c
index 16e3e9427..ba39e8dfe 100644
--- a/apps/nshlib/nsh_builtin.c
+++ b/apps/nshlib/nsh_builtin.c
@@ -54,7 +54,8 @@
 #include <errno.h>
 #include <string.h>
 
-#include <apps/apps.h>
+#include <nuttx/binfmt/builtin.h>
+#include <apps/builtin.h>
 
 #include "nsh.h"
 #include "nsh_console.h"
diff --git a/apps/nshlib/nsh_parse.c b/apps/nshlib/nsh_parse.c
index 15723b497..c36724372 100644
--- a/apps/nshlib/nsh_parse.c
+++ b/apps/nshlib/nsh_parse.c
@@ -59,7 +59,7 @@
 #endif
 
 #ifdef CONFIG_NSH_BUILTIN_APPS
-#  include <apps/apps.h>
+#  include <nuttx/binfmt/builtin.h>
 #endif
 #include <apps/nsh.h>