From 1538ee206ddc4fb213c38fb89eab1ab6efd49c73 Mon Sep 17 00:00:00 2001 From: sunghan Date: Wed, 10 May 2017 20:09:42 +0900 Subject: [PATCH] register TASH command using builtin for example remove registering TASH commands for example on c source codes --- apps/examples/artik_demo/Makefile | 12 +- apps/examples/dnsclient_test/Makefile | 12 +- apps/examples/dtls_client/Makefile | 13 +- apps/examples/dtls_server/Makefile | 13 +- apps/examples/easysetup/Makefile | 4 +- apps/examples/fota_sample/Makefile | 18 ++- apps/examples/fota_sample/fota_sample.c | 10 -- apps/examples/hello/Makefile | 6 +- apps/examples/iperf/Makefile | 13 +- apps/examples/kernel_sample/Makefile | 6 +- apps/examples/mdns_test/Makefile | 12 +- apps/examples/mqtt_test/Makefile | 21 ++-- apps/examples/nettest/Makefile | 16 +++ apps/examples/ntpclient_test/Makefile | 12 +- apps/examples/proc_test/Makefile | 14 +++ apps/examples/select_test/Makefile | 12 +- apps/examples/sensorbd_demo/Makefile | 4 +- apps/examples/slsiwifi/Makefile | 19 +-- apps/examples/smart/Makefile | 4 +- apps/examples/sysio_test/Makefile | 12 +- apps/examples/telnetd/Makefile | 12 +- apps/examples/testcase/Makefile | 16 +++ apps/examples/tls_client/Makefile | 12 +- apps/examples/tls_selftest/Makefile | 13 +- apps/examples/tls_server/Makefile | 12 +- apps/examples/wakaama_client/Makefile | 14 ++- apps/examples/webclient/Makefile | 12 +- apps/examples/webserver/Makefile | 14 +++ apps/examples/websocket/Makefile | 12 +- apps/examples/wifi_test/Makefile | 12 +- apps/examples/workqueue/Makefile | 4 +- apps/include/system/utils.h | 1 - apps/system/init/init.c | 1 - apps/system/utils/kernelcmd.c | 27 ----- apps/system/utils/netcmd.c | 155 ------------------------ os/arch/arm/src/artik053/src/artik053_tash.c | 17 --- os/arch/arm/src/sidk_s5jt200/src/s5jt200_tash.c | 17 --- 37 files changed, 280 insertions(+), 304 deletions(-) diff --git a/apps/examples/artik_demo/Makefile b/apps/examples/artik_demo/Makefile index 7bcb7ec..0f5c918 100644 --- a/apps/examples/artik_demo/Makefile +++ b/apps/examples/artik_demo/Makefile @@ -57,8 +57,7 @@ include $(APPDIR)/Make.defs # built-in application info APPNAME = artik_demo -PRIORITY = SCHED_PRIORITY_DEFAULT -STACKSIZE = 20480 +THREADEXEC = TASH_EXECMD_SYNC # artik demo example @@ -126,8 +125,17 @@ install: endif +ifeq ($(CONFIG_BUILTIN_APPS),y) +$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile + $(call REGISTER,$(APPNAME),$(APPNAME)_main,$(THREADEXEC)) + +context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat + +else context: +endif + .depend: Makefile $(SRCS) @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ diff --git a/apps/examples/dnsclient_test/Makefile b/apps/examples/dnsclient_test/Makefile index 3bfbfac..d49b93d 100644 --- a/apps/examples/dnsclient_test/Makefile +++ b/apps/examples/dnsclient_test/Makefile @@ -57,8 +57,7 @@ include $(APPDIR)/Make.defs # built-in application info APPNAME = dnsclient -PRIORITY = SCHED_PRIORITY_DEFAULT -STACKSIZE = 2048 +THREADEXEC = TASH_EXECMD_ASYNC # dnsclient test example @@ -128,8 +127,17 @@ install: endif +ifeq ($(CONFIG_BUILTIN_APPS),y) +$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile + $(call REGISTER,$(APPNAME),$(APPNAME)_main,$(THREADEXEC)) + +context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat + +else context: +endif + .depend: Makefile $(SRCS) @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ diff --git a/apps/examples/dtls_client/Makefile b/apps/examples/dtls_client/Makefile index 1581e07..6f2c3ca 100644 --- a/apps/examples/dtls_client/Makefile +++ b/apps/examples/dtls_client/Makefile @@ -57,9 +57,7 @@ include $(APPDIR)/Make.defs # built-in application info APPNAME = dtls_client -PRIORITY = SCHED_PRIORITY_DEFAULT -STACKSIZE = 10240 - +THREADEXEC = TASH_EXECMD_ASYNC ASRCS = CSRCS = @@ -127,8 +125,17 @@ install: endif +ifeq ($(CONFIG_BUILTIN_APPS),y) +$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile + $(call REGISTER,$(APPNAME),$(APPNAME)_main,$(THREADEXEC)) + +context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat + +else context: +endif + .depend: Makefile $(SRCS) @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ diff --git a/apps/examples/dtls_server/Makefile b/apps/examples/dtls_server/Makefile index a3c5621..89b0d72 100644 --- a/apps/examples/dtls_server/Makefile +++ b/apps/examples/dtls_server/Makefile @@ -57,9 +57,7 @@ include $(APPDIR)/Make.defs # built-in application info APPNAME = dtls_server -PRIORITY = SCHED_PRIORITY_DEFAULT -STACKSIZE = 10240 - +THREADEXEC = TASH_EXECMD_ASYNC ASRCS = CSRCS = @@ -127,8 +125,17 @@ install: endif +ifeq ($(CONFIG_BUILTIN_APPS),y) +$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile + $(call REGISTER,$(APPNAME),$(APPNAME)_main,$(THREADEXEC)) + +context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat + +else context: +endif + .depend: Makefile $(SRCS) @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ diff --git a/apps/examples/easysetup/Makefile b/apps/examples/easysetup/Makefile index b5faf92..603a2e1 100644 --- a/apps/examples/easysetup/Makefile +++ b/apps/examples/easysetup/Makefile @@ -40,8 +40,6 @@ include $(APPDIR)/Make.defs # built-in application info APPNAME = easysetup -PRIORITY = SCHED_PRIORITY_DEFAULT -STACKSIZE = 2048 THREADEXEC = TASH_EXECMD_ASYNC # easysetup example @@ -113,7 +111,7 @@ install: endif -ifeq ($(CONFIG_EXAMPLES_EASYSETUP),y) +ifeq ($(CONFIG_BUILTIN_APPS),y) $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile $(call REGISTER,$(APPNAME),$(APPNAME)_main,$(THREADEXEC)) diff --git a/apps/examples/fota_sample/Makefile b/apps/examples/fota_sample/Makefile index 20757e6..e7e607e 100644 --- a/apps/examples/fota_sample/Makefile +++ b/apps/examples/fota_sample/Makefile @@ -54,10 +54,13 @@ -include $(TOPDIR)/Make.defs include $(APPDIR)/Make.defs +# built-in application info -APPNAME = fota_sample -PRIORITY = SCHED_PRIORITY_DEFAULT -STACKSIZE = 1024 +APPNAME = fota_update +FUNCNAME = fota_sample +THREADEXEC = TASH_EXECMD_ASYNC + +# fota test example ASRCS = CSRCS = @@ -127,8 +130,17 @@ endif # Register application +ifeq ($(CONFIG_BUILTIN_APPS),y) +$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile + $(call REGISTER,$(APPNAME),$(FUNCNAME),$(THREADEXEC)) + +context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat + +else context: +endif + # Create dependencies .depend: Makefile $(SRCS) diff --git a/apps/examples/fota_sample/fota_sample.c b/apps/examples/fota_sample/fota_sample.c index 1da5178..c74019f 100644 --- a/apps/examples/fota_sample/fota_sample.c +++ b/apps/examples/fota_sample/fota_sample.c @@ -157,13 +157,3 @@ open_error: return ret; } -/**************************************************************************** - * Name: fota_sample_app_install - * - * Description: - * Install fota_sample command to TASH - ****************************************************************************/ -void fota_sample_app_install(void) -{ - tash_cmd_install("fota_update", fota_sample, TASH_EXECMD_ASYNC); -} diff --git a/apps/examples/hello/Makefile b/apps/examples/hello/Makefile index 3088c13..1878ee9 100644 --- a/apps/examples/hello/Makefile +++ b/apps/examples/hello/Makefile @@ -57,9 +57,7 @@ include $(APPDIR)/Make.defs # Hello, World! built-in application info APPNAME = hello -PRIORITY = SCHED_PRIORITY_DEFAULT -STACKSIZE = 2048 -THREADEXEC = TASH_EXECMD_SYNC +THREADEXEC = TASH_EXECMD_ASYNC # Hello, World! Example @@ -129,7 +127,7 @@ install: endif -ifeq ($(CONFIG_EXAMPLES_HELLO),y) +ifeq ($(CONFIG_BUILTIN_APPS),y) $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile $(call REGISTER,$(APPNAME),$(APPNAME)_main,$(THREADEXEC)) diff --git a/apps/examples/iperf/Makefile b/apps/examples/iperf/Makefile index 81b5a96..80f4287 100644 --- a/apps/examples/iperf/Makefile +++ b/apps/examples/iperf/Makefile @@ -23,9 +23,7 @@ include $(APPDIR)/Make.defs # built-in application info APPNAME = iperf -PRIORITY = SCHED_PRIORITY_DEFAULT -STACKSIZE = 4096 - +THREADEXEC = TASH_EXECMD_ASYNC ASRCS = CSRCS = iperf_api.c iperf_error.c iperf_server_api.c @@ -96,8 +94,17 @@ install: endif +ifeq ($(CONFIG_BUILTIN_APPS),y) +$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile + $(call REGISTER,$(APPNAME),$(APPNAME)_main,$(THREADEXEC)) + +context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat + +else context: +endif + .depend: Makefile $(SRCS) @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ diff --git a/apps/examples/kernel_sample/Makefile b/apps/examples/kernel_sample/Makefile index 2dc3928..e57c572 100644 --- a/apps/examples/kernel_sample/Makefile +++ b/apps/examples/kernel_sample/Makefile @@ -57,9 +57,7 @@ include $(APPDIR)/Make.defs # kernel_sample built-in application info APPNAME = kernel_sample -PRIORITY = SCHED_PRIORITY_DEFAULT -STACKSIZE = 2048 -THREADEXEC = TASH_EXECMD_SYNC +THREADEXEC = TASH_EXECMD_ASYNC # TinyAra OS Test @@ -181,7 +179,7 @@ install: endif -ifeq ($(CONFIG_EXAMPLES_KERNEL_SAMPLE),y) +ifeq ($(CONFIG_BUILTIN_APPS),y) $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile $(call REGISTER,$(APPNAME),$(APPNAME)_main,$(THREADEXEC)) diff --git a/apps/examples/mdns_test/Makefile b/apps/examples/mdns_test/Makefile index dc1aec5..8469f1b 100644 --- a/apps/examples/mdns_test/Makefile +++ b/apps/examples/mdns_test/Makefile @@ -57,8 +57,7 @@ include $(APPDIR)/Make.defs # built-in application info APPNAME = mdns -PRIORITY = SCHED_PRIORITY_DEFAULT -STACKSIZE = 2048 +THREADEXEC = TASH_EXECMD_SYNC # mdns test example @@ -128,8 +127,17 @@ install: endif +ifeq ($(CONFIG_BUILTIN_APPS),y) +$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile + $(call REGISTER,$(APPNAME),$(APPNAME)_main,$(THREADEXEC)) + +context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat + +else context: +endif + .depend: Makefile $(SRCS) @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ diff --git a/apps/examples/mqtt_test/Makefile b/apps/examples/mqtt_test/Makefile index e11476d..1549096 100644 --- a/apps/examples/mqtt_test/Makefile +++ b/apps/examples/mqtt_test/Makefile @@ -42,9 +42,11 @@ include $(APPDIR)/Make.defs # built-in application info -APPNAME = mqtt -PRIORITY = SCHED_PRIORITY_DEFAULT -STACKSIZE = 20480 +SUBAPPNAME = mqtt_sub +PUBAPPNAME = mqtt_pub +SUBFUNCNAME = mqtt_client_sub_main +PUBFUNCNAME = mqtt_client_pub_main +THREADEXEC = TASH_EXECMD_SYNC # mqtt test example @@ -117,13 +119,18 @@ install: endif -ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) -$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) +ifeq ($(CONFIG_BUILTIN_APPS),y) +$(BUILTIN_REGISTRY)$(DELIM)$(SUBAPPNAME)_main.bdat: $(DEPCONFIG) Makefile + $(call REGISTER,$(SUBAPPNAME),$(SUBFUNCNAME),$(THREADEXEC)) + +$(BUILTIN_REGISTRY)$(DELIM)$(PUBAPPNAME)_main.bdat: $(DEPCONFIG) Makefile + $(call REGISTER,$(PUBAPPNAME),$(PUBFUNCNAME),$(THREADEXEC)) + +context: $(BUILTIN_REGISTRY)$(DELIM)$(SUBAPPNAME)_main.bdat $(BUILTIN_REGISTRY)$(DELIM)$(PUBAPPNAME)_main.bdat -context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat else context: + endif .depend: Makefile $(SRCS) diff --git a/apps/examples/nettest/Makefile b/apps/examples/nettest/Makefile index ba36640..cc698e1 100644 --- a/apps/examples/nettest/Makefile +++ b/apps/examples/nettest/Makefile @@ -54,6 +54,13 @@ -include $(TOPDIR)/Make.defs include $(APPDIR)/Make.defs +# built-in application info + +APPNAME = nettest +THREADEXEC = TASH_EXECMD_ASYNC + +# transport layer (TCP / UDP) / IP multicast functionality test example + ASRCS = CSRCS = MAINSRC = nettest.c @@ -122,8 +129,17 @@ endif # Register application +ifeq ($(CONFIG_BUILTIN_APPS),y) +$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile + $(call REGISTER,$(APPNAME),$(APPNAME)_main,$(THREADEXEC)) + +context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat + +else context: +endif + # Create dependencies .depend: Makefile $(SRCS) diff --git a/apps/examples/ntpclient_test/Makefile b/apps/examples/ntpclient_test/Makefile index 840b046..2250a11 100644 --- a/apps/examples/ntpclient_test/Makefile +++ b/apps/examples/ntpclient_test/Makefile @@ -57,8 +57,7 @@ include $(APPDIR)/Make.defs # built-in application info APPNAME = ntpclient -PRIORITY = SCHED_PRIORITY_DEFAULT -STACKSIZE = 2048 +THREADEXEC = TASH_EXECMD_ASYNC # ntpclient test example @@ -128,8 +127,17 @@ install: endif +ifeq ($(CONFIG_BUILTIN_APPS),y) +$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile + $(call REGISTER,$(APPNAME),$(APPNAME)_main,$(THREADEXEC)) + +context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat + +else context: +endif + .depend: Makefile $(SRCS) @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ diff --git a/apps/examples/proc_test/Makefile b/apps/examples/proc_test/Makefile index 27b8bbb..d365286 100644 --- a/apps/examples/proc_test/Makefile +++ b/apps/examples/proc_test/Makefile @@ -54,6 +54,11 @@ -include $(TOPDIR)/Make.defs include $(APPDIR)/Make.defs +# built-in application info + +APPNAME = proc_test +THREADEXEC = TASH_EXECMD_ASYNC + # procfs test Example ASRCS = @@ -122,8 +127,17 @@ install: endif +ifeq ($(CONFIG_BUILTIN_APPS),y) +$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile + $(call REGISTER,$(APPNAME),$(APPNAME)_main,$(THREADEXEC)) + +context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat + +else context: +endif + .depend: Makefile $(SRCS) @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ diff --git a/apps/examples/select_test/Makefile b/apps/examples/select_test/Makefile index 4621e43..49f38a2 100644 --- a/apps/examples/select_test/Makefile +++ b/apps/examples/select_test/Makefile @@ -57,8 +57,7 @@ include $(APPDIR)/Make.defs # LWIP NetStack! built-in application info APPNAME = select_test -PRIORITY = SCHED_PRIORITY_DEFAULT -STACKSIZE = 2048 +THREADEXEC = TASH_EXECMD_ASYNC # LWIP NetStack Example @@ -128,8 +127,17 @@ install: endif +ifeq ($(CONFIG_BUILTIN_APPS),y) +$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile + $(call REGISTER,$(APPNAME),$(APPNAME)_main,$(THREADEXEC)) + +context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat + +else context: +endif + .depend: Makefile $(SRCS) @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ diff --git a/apps/examples/sensorbd_demo/Makefile b/apps/examples/sensorbd_demo/Makefile index cbd6307..86528e1 100644 --- a/apps/examples/sensorbd_demo/Makefile +++ b/apps/examples/sensorbd_demo/Makefile @@ -57,8 +57,6 @@ include $(APPDIR)/Make.defs # built-in application info APPNAME = sensorbd -PRIORITY = SCHED_PRIORITY_DEFAULT -STACKSIZE = 2048 THREADEXEC = TASH_EXECMD_SYNC # Example @@ -130,7 +128,7 @@ install: endif -ifeq ($(CONFIG_EXAMPLES_SENSORBOARD),y) +ifeq ($(CONFIG_BUILTIN_APPS),y) $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile $(call REGISTER,$(APPNAME),$(APPNAME)_main,$(THREADEXEC)) diff --git a/apps/examples/slsiwifi/Makefile b/apps/examples/slsiwifi/Makefile index a920d00..a43027e 100644 --- a/apps/examples/slsiwifi/Makefile +++ b/apps/examples/slsiwifi/Makefile @@ -53,15 +53,11 @@ -include $(TOPDIR)/Make.defs include $(APPDIR)/Make.defs - -CONFIG_EXAMPLES_SLSIWIFI_PRIORITY ?= SCHED_PRIORITY_DEFAULT -CONFIG_EXAMPLES_SLSIWIFI_STACKSIZE ?= 2048 - # built-in application info -APPNAME = slsiwifi -PRIORITY = $(CONFIG_EXAMPLES_SLSIWIFI_PRIORITY) -STACKSIZE = $(CONFIG_EXAMPLES_SLSIWIFI_STACKSIZE) +APPNAME = wifi +FUNCNAME = slsi_wifi_main +THREADEXEC = TASH_EXECMD_ASYNC # wifi test example using slsi wifi api @@ -143,8 +139,17 @@ install: endif +ifeq ($(CONFIG_BUILTIN_APPS),y) +$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile + $(call REGISTER,$(APPNAME),$(FUNCNAME),$(THREADEXEC)) + +context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat + +else context: +endif + .depend: Makefile $(SRCS) @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ diff --git a/apps/examples/smart/Makefile b/apps/examples/smart/Makefile index 690b714..3c51ffc 100644 --- a/apps/examples/smart/Makefile +++ b/apps/examples/smart/Makefile @@ -57,8 +57,6 @@ include $(APPDIR)/Make.defs # built-in application info APPNAME = smart -PRIORITY = SCHED_PRIORITY_DEFAULT -STACKSIZE = 2048 THREADEXEC = TASH_EXECMD_SYNC # smart file sytem test example @@ -128,7 +126,7 @@ install: endif -ifeq ($(CONFIG_EXAMPLES_SMART),y) +ifeq ($(CONFIG_BUILTIN_APPS),y) $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile $(call REGISTER,$(APPNAME),$(APPNAME)_main,$(THREADEXEC)) diff --git a/apps/examples/sysio_test/Makefile b/apps/examples/sysio_test/Makefile index 7150828..ce6beb3 100644 --- a/apps/examples/sysio_test/Makefile +++ b/apps/examples/sysio_test/Makefile @@ -57,8 +57,7 @@ include $(APPDIR)/Make.defs # built-in application info APPNAME = sysio -PRIORITY = SCHED_PRIORITY_DEFAULT -STACKSIZE = 2048 +THREADEXEC = TASH_EXECMD_ASYNC # system input / output test example @@ -130,8 +129,17 @@ install: endif +ifeq ($(CONFIG_BUILTIN_APPS),y) +$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile + $(call REGISTER,$(APPNAME),$(APPNAME)_main,$(THREADEXEC)) + +context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat + +else context: +endif + .depend: Makefile $(SRCS) @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ diff --git a/apps/examples/telnetd/Makefile b/apps/examples/telnetd/Makefile index 6baaa5c..f3342c8 100644 --- a/apps/examples/telnetd/Makefile +++ b/apps/examples/telnetd/Makefile @@ -57,8 +57,7 @@ include $(APPDIR)/Make.defs # built-in application info APPNAME = telnetd -PRIORITY = SCHED_PRIORITY_DEFAULT -STACKSIZE = 1024 +THREADEXEC = TASH_EXECMD_ASYNC # telnet daemon example @@ -130,8 +129,17 @@ install: endif +ifeq ($(CONFIG_BUILTIN_APPS),y) +$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile + $(call REGISTER,$(APPNAME),$(APPNAME)_main,$(THREADEXEC)) + +context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat + +else context: +endif + .depend: Makefile $(SRCS) @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ diff --git a/apps/examples/testcase/Makefile b/apps/examples/testcase/Makefile index fec180c..4071d8f 100644 --- a/apps/examples/testcase/Makefile +++ b/apps/examples/testcase/Makefile @@ -55,6 +55,13 @@ -include $(TOPDIR)/Make.defs include $(APPDIR)/Make.defs +# built-in application info + +APPNAME = tc +THREADEXEC = TASH_EXECMD_ASYNC + +# testcase example + ASRCS = CSRCS = @@ -118,8 +125,17 @@ endif install: +ifeq ($(CONFIG_BUILTIN_APPS),y) +$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile + $(call REGISTER,$(APPNAME),$(APPNAME)_main,$(THREADEXEC)) + +context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat + +else context: +endif + .depend: Makefile $(SRCS) ifeq ($(CONFIG_EXAMPLES_TESTCASE),y) $(Q) $(MKDEP) $(DEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep diff --git a/apps/examples/tls_client/Makefile b/apps/examples/tls_client/Makefile index 3f03c74..ebd06de 100644 --- a/apps/examples/tls_client/Makefile +++ b/apps/examples/tls_client/Makefile @@ -57,8 +57,7 @@ include $(APPDIR)/Make.defs # built-in application info APPNAME = tls_client -PRIORITY = SCHED_PRIORITY_DEFAULT -STACKSIZE = 10240 +THREADEXEC = TASH_EXECMD_ASYNC # tls client example @@ -128,8 +127,17 @@ install: endif +ifeq ($(CONFIG_BUILTIN_APPS),y) +$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile + $(call REGISTER,$(APPNAME),$(APPNAME)_main,$(THREADEXEC)) + +context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat + +else context: +endif + .depend: Makefile $(SRCS) @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ diff --git a/apps/examples/tls_selftest/Makefile b/apps/examples/tls_selftest/Makefile index f39d85d..fef9227 100644 --- a/apps/examples/tls_selftest/Makefile +++ b/apps/examples/tls_selftest/Makefile @@ -57,9 +57,7 @@ include $(APPDIR)/Make.defs # built-in application info APPNAME = tls_selftest -PRIORITY = SCHED_PRIORITY_DEFAULT -STACKSIZE = 40960 -# 10240 ~ 204800 +THREADEXEC = TASH_EXECMD_ASYNC # tls self test example @@ -129,8 +127,17 @@ install: endif +ifeq ($(CONFIG_BUILTIN_APPS),y) +$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile + $(call REGISTER,$(APPNAME),$(APPNAME)_main,$(THREADEXEC)) + +context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat + +else context: +endif + .depend: Makefile $(SRCS) @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ diff --git a/apps/examples/tls_server/Makefile b/apps/examples/tls_server/Makefile index 0166add..27d84aa 100644 --- a/apps/examples/tls_server/Makefile +++ b/apps/examples/tls_server/Makefile @@ -57,8 +57,7 @@ include $(APPDIR)/Make.defs # built-in application info APPNAME = tls_server -PRIORITY = SCHED_PRIORITY_DEFAULT -STACKSIZE = 10240 +THREADEXEC = TASH_EXECMD_ASYNC # tls server example @@ -128,8 +127,17 @@ install: endif +ifeq ($(CONFIG_BUILTIN_APPS),y) +$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile + $(call REGISTER,$(APPNAME),$(APPNAME)_main,$(THREADEXEC)) + +context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat + +else context: +endif + .depend: Makefile $(SRCS) @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ diff --git a/apps/examples/wakaama_client/Makefile b/apps/examples/wakaama_client/Makefile index 136b608..3b9b948 100644 --- a/apps/examples/wakaama_client/Makefile +++ b/apps/examples/wakaama_client/Makefile @@ -56,9 +56,8 @@ include $(APPDIR)/Make.defs # built-in application info -APPNAME = wakaama_client -PRIORITY = SCHED_PRIORITY_DEFAULT -STACKSIZE = 2048 +APPNAME = wakaamaclient +THREADEXEC = TASH_EXECMD_ASYNC CFLAGS+=-I$(TOPDIR)/../external/wakaama/examples/shared CFLAGS+=-I$(TOPDIR)/../external/wakaama/examples/client @@ -135,8 +134,17 @@ install: endif +ifeq ($(CONFIG_BUILTIN_APPS),y) +$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile + $(call REGISTER,$(APPNAME),$(APPNAME)_main,$(THREADEXEC)) + +context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat + +else context: +endif + .depend: Makefile $(SRCS) @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ diff --git a/apps/examples/webclient/Makefile b/apps/examples/webclient/Makefile index b1e053a..e9c524e 100644 --- a/apps/examples/webclient/Makefile +++ b/apps/examples/webclient/Makefile @@ -57,8 +57,7 @@ include $(APPDIR)/Make.defs # built-in application info APPNAME = webclient -PRIORITY = SCHED_PRIORITY_DEFAULT -STACKSIZE = 16384 +THREADEXEC = TASH_EXECMD_ASYNC # webclient example @@ -128,8 +127,17 @@ install: endif +ifeq ($(CONFIG_BUILTIN_APPS),y) +$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile + $(call REGISTER,$(APPNAME),$(APPNAME)_main,$(THREADEXEC)) + +context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat + +else context: +endif + .depend: Makefile $(SRCS) @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ diff --git a/apps/examples/webserver/Makefile b/apps/examples/webserver/Makefile index 1905be4..d3610ee 100644 --- a/apps/examples/webserver/Makefile +++ b/apps/examples/webserver/Makefile @@ -54,6 +54,11 @@ -include $(TOPDIR)/Make.defs include $(APPDIR)/Make.defs +# built-in application info + +APPNAME = webserver +THREADEXEC = TASH_EXECMD_ASYNC + # webserver example ASRCS = @@ -125,8 +130,17 @@ install: endif +ifeq ($(CONFIG_BUILTIN_APPS),y) +$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile + $(call REGISTER,$(APPNAME),$(APPNAME)_main,$(THREADEXEC)) + +context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat + +else context: +endif + .depend: Makefile $(SRCS) @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ diff --git a/apps/examples/websocket/Makefile b/apps/examples/websocket/Makefile index 1e31333..0c6a091 100644 --- a/apps/examples/websocket/Makefile +++ b/apps/examples/websocket/Makefile @@ -57,8 +57,7 @@ include $(APPDIR)/Make.defs # Websocket built-in application info APPNAME = websocket -PRIORITY = SCHED_PRIORITY_DEFAULT -STACKSIZE = 1024 * 10 +THREADEXEC = TASH_EXECMD_ASYNC # Websocket Example @@ -129,8 +128,17 @@ install: endif +ifeq ($(CONFIG_BUILTIN_APPS),y) +$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile + $(call REGISTER,$(APPNAME),$(APPNAME)_main,$(THREADEXEC)) + +context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat + +else context: +endif + .depend: Makefile $(SRCS) @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ diff --git a/apps/examples/wifi_test/Makefile b/apps/examples/wifi_test/Makefile index 6e55ea0..6458180 100644 --- a/apps/examples/wifi_test/Makefile +++ b/apps/examples/wifi_test/Makefile @@ -22,8 +22,7 @@ include $(APPDIR)/Make.defs # WIFI APIs built-in application info APPNAME = wifi_test -PRIORITY = SCHED_PRIORITY_DEFAULT -STACKSIZE = 16480 +THREADEXEC = TASH_EXECMD_ASYNC # WIFI APIs Example @@ -93,8 +92,17 @@ install: endif +ifeq ($(CONFIG_BUILTIN_APPS),y) +$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile + $(call REGISTER,$(APPNAME),$(APPNAME)_main,$(THREADEXEC)) + +context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat + +else context: +endif + .depend: Makefile $(SRCS) @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ diff --git a/apps/examples/workqueue/Makefile b/apps/examples/workqueue/Makefile index 1f39453..934beb5 100644 --- a/apps/examples/workqueue/Makefile +++ b/apps/examples/workqueue/Makefile @@ -57,8 +57,6 @@ include $(APPDIR)/Make.defs # built-in application info APPNAME = workqueue -PRIORITY = SCHED_PRIORITY_DEFAULT -STACKSIZE = 2048 THREADEXEC = TASH_EXECMD_SYNC # workqueue example @@ -129,7 +127,7 @@ install: endif -ifeq ($(CONFIG_EXAMPLES_WORKQUEUE),y) +ifeq ($(CONFIG_BUILTIN_APPS),y) $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile $(call REGISTER,$(APPNAME),$(APPNAME)_main,$(THREADEXEC)) diff --git a/apps/include/system/utils.h b/apps/include/system/utils.h index 3379bc2..4c97aac 100644 --- a/apps/include/system/utils.h +++ b/apps/include/system/utils.h @@ -23,7 +23,6 @@ #ifdef CONFIG_KERNEL_CMDS void kernel_register_utilcmds(void); #endif -void kernel_register_appcmds(void); #ifdef CONFIG_FS_CMDS void fs_register_utilcmds(void); #endif diff --git a/apps/system/init/init.c b/apps/system/init/init.c index 56881a1..7675369 100644 --- a/apps/system/init/init.c +++ b/apps/system/init/init.c @@ -59,7 +59,6 @@ static void tash_register_cmds(void) #if defined(CONFIG_KERNEL_CMDS) && !defined(CONFIG_BUILD_PROTECTED) kernel_register_utilcmds(); #endif - kernel_register_appcmds(); #ifdef CONFIG_FS_CMDS fs_register_utilcmds(); diff --git a/apps/system/utils/kernelcmd.c b/apps/system/utils/kernelcmd.c index dd0a2ce..2fa6546 100644 --- a/apps/system/utils/kernelcmd.c +++ b/apps/system/utils/kernelcmd.c @@ -22,16 +22,6 @@ #ifdef CONFIG_KERNEL_CMDS #include "kdbg_commands.h" #endif -#if defined(CONFIG_EXAMPLES_FOTA_SAMPLE) -extern void fota_sample_app_install(void); -#endif - -#ifdef CONFIG_EXAMPLES_KERNEL_SAMPLE -extern int kernel_sample_main(int argc, char **args); -#endif -#ifdef CONFIG_EXAMPLES_TESTCASE -extern int tc_main(int argc, char **args); -#endif #ifdef CONFIG_KERNEL_CMDS const static tash_cmdlist_t kdbg_cmds[] = { @@ -77,20 +67,3 @@ void kernel_register_utilcmds(void) } #endif -const static tash_cmdlist_t kernel_appcmds[] = { -#if defined(CONFIG_EXAMPLES_KERNEL_SAMPLE) - {"kernel_sample", kernel_sample_main, TASH_EXECMD_SYNC}, -#endif -#if defined(CONFIG_EXAMPLES_TESTCASE) - {"tc", tc_main, TASH_EXECMD_SYNC}, -#endif - {NULL, NULL, 0} -}; - -void kernel_register_appcmds(void) -{ -#if defined(CONFIG_EXAMPLES_FOTA_SAMPLE) - fota_sample_app_install(); -#endif - tash_cmdlist_install(kernel_appcmds); -} diff --git a/apps/system/utils/netcmd.c b/apps/system/utils/netcmd.c index 1614065..e4a988b 100644 --- a/apps/system/utils/netcmd.c +++ b/apps/system/utils/netcmd.c @@ -77,19 +77,6 @@ #define DEFAULT_PING_DATALEN 56 - -#ifdef CONFIG_EXAMPLES_WAKAAMA_CLIENT -extern int wakaamaclient_main(int argc, char *argv[]); -#endif -#ifdef CONFIG_EXAMPLES_DTLS_CLIENT -extern int dtls_client_main(int argc, char *argv[]); -#endif -#ifdef CONFIG_EXAMPLES_DTLS_SERVER -extern int dtls_server_main(int argc, char *argv[]); -#endif -#ifdef CONFIG_EXAMPLES_FTPD -extern int ftpd_main(int argc, char *argv[]); -#endif #ifdef CONFIG_EXAMPLES_IOTIVITY extern int iotivity_main(int argc, char *argv[]); #ifdef CONFIG_EXAMPLES_IOTIVITY_SECURED @@ -99,79 +86,15 @@ extern int iotivity_sec_main(int argc, char *argv[]); extern int iotivity_cloud_main(int argc, char *argv[]); #endif #endif -#ifdef CONFIG_EXAMPLES_IPERF -extern int iperf_main(int argc, char *argv[]); -#endif -#ifdef CONFIG_EXAMPLES_LWIPDHCPC -extern int lwipdhcpc_main(int argc, char *argv[]); -#endif -#ifdef CONFIG_EXAMPLES_LWIPDHCPS -extern int lwipdhcps_main(int argc, char *argv[]); -#endif -#ifdef CONFIG_EXAMPLES_LWIPDNS -extern int lwipdns_main(int argc, char *argv[]); -#endif -#ifdef CONFIG_EXAMPLES_MDNS_TEST -extern int mdns_main(int argc, char *argv[]); -#endif #ifdef CONFIG_SYSTEM_NETDB extern int netdb_main(int argc, char *argv[]); #endif -#ifdef CONFIG_EXAMPLES_NETSTRESSTEST -extern int netstresstest_main(int argc, char *argv[]); -#endif -#ifdef CONFIG_EXAMPLES_NETTEST -extern int nettest_main(int argc, char *argv[]); -#endif -#ifdef CONFIG_EXAMPLES_NTPCLIENT_TEST -extern int ntpclient_main(int argc, char *argv[]); -#endif -#ifdef CONFIG_EXAMPLES_SELECT_TEST -extern int select_test_main(int argc, char *argv[]); -#endif -#ifdef CONFIG_EXAMPLES_TELNETC -extern int telnetc_main(int argc, char *argv[]); -#endif -#ifdef CONFIG_EXAMPLES_TELNETD -extern int telnetd_main(int argc, char *argv[]); -#endif -#ifdef CONFIG_EXAMPLES_TLS_CLIENT -extern int tls_client_main(int argc, char *argv[]); -#endif -#ifdef CONFIG_EXAMPLES_TLS_SELFTEST -extern int tls_selftest_main(int argc, char *argv[]); -#endif -#ifdef CONFIG_EXAMPLES_TLS_SERVER -extern int tls_server_main(int argc, char *argv[]); -#endif -#ifdef CONFIG_EXAMPLES_WEBCLIENT -extern int webclient_main(int argc, char *argv[]); -#endif -#ifdef CONFIG_EXAMPLES_WEBSERVER -extern int webserver_main(int argc, char *argv[]); -#endif -#ifdef CONFIG_EXAMPLES_WEBSOCKET -extern int websocket_main(int argc, char *argv[]); -#endif -#ifdef CONFIG_EXAMPLES_ARTIK_DEMO -extern int artik_demo_main(int argc, char *argv[]); -#endif -#ifdef CONFIG_EXAMPLES_SLSIWIFI -extern int slsi_wifi_main(int argc, char *argv[]); -#endif -#ifdef CONFIG_EXAMPLES_MQTT_TEST -extern int mqtt_client_sub_main(int argc, char *argv[]); -extern int mqtt_client_pub_main(int argc, char *argv[]); -#endif #ifdef CONFIG_LWM2M_CLIENT_MODE extern int lwm2m_client_main(int argc, char *argv[]); #endif #ifdef CONFIG_LWM2M_SERVER_MODE extern int lwm2m_server_main(int argc, char *argv[]); #endif -#ifdef CONFIG_EXAMPLES_DNSCLIENT_TEST -extern int dnsclient_main(int argc, char *argv[]); -#endif #if defined(CONFIG_NETUTILS_TFTPC) struct tftpc_args_s { @@ -671,30 +594,6 @@ const static tash_cmdlist_t net_utilcmds[] = { }; const static tash_cmdlist_t net_appcmds[] = { -#ifdef CONFIG_EXAMPLES_ARTIK_DEMO - {"artik_demo", artik_demo_main, TASH_EXECMD_SYNC}, -#endif -#ifdef CONFIG_EXAMPLES_SLSIWIFI - {"artikwifi", slsi_wifi_main, TASH_EXECMD_SYNC}, -#endif -#ifdef CONFIG_EXAMPLES_LWIPDHCPC - {"dhcpc", lwipdhcpc_main, TASH_EXECMD_ASYNC}, -#endif -#ifdef CONFIG_EXAMPLES_LWIPDHCPS - {"dhcps", lwipdhcps_main, TASH_EXECMD_ASYNC}, -#endif -#ifdef CONFIG_EXAMPLES_LWIPDNS - {"dns", lwipdns_main, TASH_EXECMD_ASYNC}, -#endif -#ifdef CONFIG_EXAMPLES_DTLS_CLIENT - {"dtlsc", dtls_client_main, TASH_EXECMD_ASYNC}, -#endif -#ifdef CONFIG_EXAMPLES_DTLS_SERVER - {"dtlss", dtls_server_main, TASH_EXECMD_ASYNC}, -#endif -#ifdef CONFIG_EXAMPLES_FTPD - {"ftpd", ftpd_main, TASH_EXECMD_ASYNC}, -#endif #ifdef CONFIG_EXAMPLES_IOTIVITY {"iotivity", iotivity_main, TASH_EXECMD_ASYNC}, #ifdef CONFIG_EXAMPLES_IOTIVITY_CLOUD @@ -704,69 +603,15 @@ const static tash_cmdlist_t net_appcmds[] = { {"iotivity_sec", iotivity_sec_main, TASH_EXECMD_ASYNC}, #endif #endif /* CONFIG_EXAMPLES_IOTIVITY */ -#ifdef CONFIG_EXAMPLES_IPERF - {"iperf", iperf_main, TASH_EXECMD_ASYNC}, -#endif -#ifdef CONFIG_EXAMPLES_MDNS_TEST - {"mdns", mdns_main, TASH_EXECMD_SYNC}, -#endif #ifdef CONFIG_SYSTEM_NETDB {"netdb", netdb_main, TASH_EXECMD_SYNC}, #endif -#ifdef CONFIG_EXAMPLES_NETSTRESSTEST - /* Sample App to stress test Transport Layer (TCP / UDP) / IP Multicast Functionality */ - {"netstresstest", netstresstest_main, TASH_EXECMD_ASYNC}, -#endif -#ifdef CONFIG_EXAMPLES_NETTEST - /* Sample App to test Transport Layer (TCP / UDP) / IP Multicast Functionality */ - {"nettest", nettest_main, TASH_EXECMD_ASYNC}, -#endif -#ifdef CONFIG_EXAMPLES_NTPCLIENT_TEST - {"ntpclient", ntpclient_main, TASH_EXECMD_ASYNC}, -#endif -#ifdef CONFIG_EXAMPLES_SELECT_TEST - {"select_test", select_test_main, TASH_EXECMD_ASYNC}, -#endif -#ifdef CONFIG_EXAMPLES_TELNETC - {"telnetc", telnetc_main, TASH_EXECMD_ASYNC}, -#endif -#ifdef CONFIG_EXAMPLES_TELNETD - {"telnetd", telnetd_main, TASH_EXECMD_ASYNC}, -#endif -#ifdef CONFIG_EXAMPLES_TLS_CLIENT - {"tlsc", tls_client_main, TASH_EXECMD_ASYNC}, -#endif -#ifdef CONFIG_EXAMPLES_TLS_SERVER - {"tlss", tls_server_main, TASH_EXECMD_ASYNC}, -#endif -#ifdef CONFIG_EXAMPLES_TLS_SELFTEST - {"tlsself", tls_selftest_main, TASH_EXECMD_ASYNC}, -#endif -#ifdef CONFIG_EXAMPLES_WEBSOCKET - {"websocket", websocket_main, TASH_EXECMD_ASYNC}, -#endif -#ifdef CONFIG_EXAMPLES_WAKAAMA_CLIENT - {"wakaamaclient", wakaamaclient_main, TASH_EXECMD_ASYNC}, -#endif -#ifdef CONFIG_EXAMPLES_WEBCLIENT - {"webclient", webclient_main, TASH_EXECMD_ASYNC}, -#endif -#ifdef CONFIG_EXAMPLES_WEBSERVER - {"webserver", webserver_main, TASH_EXECMD_ASYNC}, -#endif -#ifdef CONFIG_EXAMPLES_MQTT_TEST - {"mqtt_sub", mqtt_client_sub_main, TASH_EXECMD_SYNC}, - {"mqtt_pub", mqtt_client_pub_main, TASH_EXECMD_SYNC}, -#endif #ifdef CONFIG_LWM2M_CLIENT_MODE {"lwm2mclient", lwm2m_client_main, TASH_EXECMD_SYNC}, #endif #ifdef CONFIG_LWM2M_SERVER_MODE {"lwm2mserver", lwm2m_server_main, TASH_EXECMD_SYNC}, #endif -#ifdef CONFIG_EXAMPLES_DNSCLIENT_TEST - {"dnsclient", dnsclient_main, TASH_EXECMD_ASYNC}, -#endif {NULL, NULL, 0} }; diff --git a/os/arch/arm/src/artik053/src/artik053_tash.c b/os/arch/arm/src/artik053/src/artik053_tash.c index 0664d3f..25e7cf3 100644 --- a/os/arch/arm/src/artik053/src/artik053_tash.c +++ b/os/arch/arm/src/artik053/src/artik053_tash.c @@ -219,19 +219,6 @@ static void artik053_configure_partitions(void) #endif /* CONFIG_ARTIK053_FLASH_PART */ } -#ifdef CONFIG_TASH -#ifdef CONFIG_EXAMPLES_SLSIWIFI -int slsi_wifi_main(int argc, char *argv[]); -#endif - -const static tash_cmdlist_t tash_s5j_cmds[] = { -#ifdef CONFIG_EXAMPLES_SLSIWIFI - {"artikwifi", slsi_wifi_main, TASH_EXECMD_SYNC}, -#endif - {NULL, NULL, 0} -}; -#endif - static void scsc_wpa_ctrl_iface_init(void) { #ifdef CONFIG_SCSC_WLAN @@ -313,10 +300,6 @@ int board_app_initialize(void) scsc_wpa_ctrl_iface_init(); -#ifdef CONFIG_TASH - tash_cmdlist_install(tash_s5j_cmds); -#endif - UNUSED(ret); return OK; diff --git a/os/arch/arm/src/sidk_s5jt200/src/s5jt200_tash.c b/os/arch/arm/src/sidk_s5jt200/src/s5jt200_tash.c index ccaba5e..4c4a036 100644 --- a/os/arch/arm/src/sidk_s5jt200/src/s5jt200_tash.c +++ b/os/arch/arm/src/sidk_s5jt200/src/s5jt200_tash.c @@ -93,19 +93,6 @@ char *s5j_get_binary_version(uint32_t baddr) return version; } -#ifdef CONFIG_TASH -#ifdef CONFIG_EXAMPLES_SLSIWIFI -int slsi_wifi_main(int argc, char *argv[]); -#endif - -const static tash_cmdlist_t tash_s5j_cmds[] = { -#ifdef CONFIG_EXAMPLES_SLSIWIFI - { "artikwifi", slsi_wifi_main, TASH_EXECMD_SYNC }, -#endif - { NULL, NULL, 0 } -}; -#endif - static void scsc_wpa_ctrl_iface_init(void) { #ifdef CONFIG_SCSC_WLAN @@ -357,10 +344,6 @@ int board_app_initialize(void) scsc_wpa_ctrl_iface_init(); -#ifdef CONFIG_TASH - tash_cmdlist_install(tash_s5j_cmds); -#endif - #ifdef CONFIG_EXAMPLES_EEPROM_TEST ee_test_main(0, NULL); #endif -- 2.7.4