diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-03-11 12:36:30 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-03-11 12:36:30 +0000 |
commit | c390084bbc63e3c2548734af1b2c53a9a5771729 (patch) | |
tree | 1d665a4ce05d84882e165127198eeb10670a7dd6 /apps | |
parent | ee17172d5800fca4fab951e65050b711a6d3b0d4 (diff) | |
download | px4-nuttx-c390084bbc63e3c2548734af1b2c53a9a5771729.tar.gz px4-nuttx-c390084bbc63e3c2548734af1b2c53a9a5771729.tar.bz2 px4-nuttx-c390084bbc63e3c2548734af1b2c53a9a5771729.zip |
apps/-related updates
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3364 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'apps')
-rw-r--r-- | apps/Makefile | 4 | ||||
-rw-r--r-- | apps/README | 6 | ||||
-rw-r--r-- | apps/exec_nuttapp.c | 44 |
3 files changed, 36 insertions, 18 deletions
diff --git a/apps/Makefile b/apps/Makefile index 0deb46e9c..4ffca6343 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -97,11 +97,11 @@ $(BIN): $(OBJS) $(BUILTIN_APPS_BUILT) done ; ) .depend: Makefile $(SRCS) + @echo "/* List of application requirements, generated during make depend. */" > exec_nuttapp_list.h + @echo "/* List of application entry points, generated during make depend. */" > exec_nuttapp_proto.h @$(MKDEP) $(ROOTDEPPATH) \ $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ - echo "/* List of application requirements, generated during make depend. */" > exec_nuttapp_list.h - echo "/* List of application entry points, generated during make depend. */" > exec_nuttapp_proto.h @for dir in $(BUILTIN_APPS_DIR) ; do \ $(MAKE) -C $$dir TOPDIR="$(TOPDIR)" depend ; \ done diff --git a/apps/README b/apps/README index 61129e7d6..4ffee90c8 100644 --- a/apps/README +++ b/apps/README @@ -35,7 +35,7 @@ where each application can be controlled as: To include applications under the user ../apps directory: CONFIG_BUILTIN_APPS_USER=y/n -When the user defines an option: +When the user defines an option: (NOT IMPLEMENTED YET) CONFIG_BUILTIN_APP_START=<application name> then after initialization of the NuttX OS it starts this application @@ -56,7 +56,3 @@ define: 4. add enable/disable option in the top file in this directory as: ifeq CONFIG_BUILTIN_APPS_<NAME> ... - -To include user (external) application create an application under -../apps directory and steps 1. - 3. The last 4. step is not needed, as, -all applications under ../apps becomes a part of the build process. diff --git a/apps/exec_nuttapp.c b/apps/exec_nuttapp.c index 658cbf07f..4550de27e 100644 --- a/apps/exec_nuttapp.c +++ b/apps/exec_nuttapp.c @@ -91,27 +91,49 @@ static const struct nuttapp_s nuttapps[] = { * Public Functions ****************************************************************************/ + +const char * nuttapp_getname(int index) +{ + if ( index < 0 || index >= (sizeof(nuttapps)/sizeof(struct nuttapp_s)) ) + return NULL; + + return nuttapps[index].name; +} + + +int nuttapp_isavail(FAR const char *appname) +{ + int i; + + for (i=0; nuttapps[i].name; i++) + { + if ( !strcmp(nuttapps[i].name, appname) ) + return i; + } + + errno = ENOENT; + return -1; +} + + int exec_nuttapp(FAR const char *appname, FAR const char *argv[]) { - int i, ret = ERROR; + int i; // Not sure what to do with exports and nexports ... as found in exec // FAR const struct symtab_s *exports, int nexports // so they are ommited in the args list. - for (i=0; nuttapps[i].name; i++) + if ( (i = nuttapp_isavail(appname)) >= 0 ) { - if ( !strcmp(nuttapps[i].name, appname) ) - { #ifndef CONFIG_CUSTOM_STACK - ret = task_create(nuttapps[i].name, nuttapps[i].priority, - nuttapps[i].stacksize, nuttapps[i].main, &argv[1]); + i = task_create(nuttapps[i].name, nuttapps[i].priority, + nuttapps[i].stacksize, nuttapps[i].main, &argv[1]); #else - ret = task_create(nuttapps[i].name, nuttapps[i].priority, nuttapps[i].main, &argv[1]); + i = task_create(nuttapps[i].name, nuttapps[i].priority, nuttapps[i].main, &argv[1]); #endif - return ret; - } + return i; } - errno = ENOENT; - return ret; + + return i; } |