From c3aea1098ec442af4ae5711e5513a79a116ac7d3 Mon Sep 17 00:00:00 2001 From: Ivan Date: Sun, 26 Mar 2017 18:16:25 +0900 Subject: [PATCH] sidk_s5jt200: enable artikwifi application Now that the artikwifi application is added, enable it by default in the 'sidk_tash_wlan' configuration. Change-Id: Ie51377c127f37ccbd89e5f3a6fa0544d102e069f Signed-off-by: Ivan Signed-off-by: Siwon Kang [Shin: split the original commit into two separated commits] Signed-off-by: Heesub Shin --- .../configs/sidk_s5jt200/sidk_tash_wlan/defconfig | 20 +++++++++++++++++--- os/arch/arm/src/sidk_s5jt200/src/s5jt200_tash.c | 22 ++++++++++++++++++++-- 2 files changed, 37 insertions(+), 5 deletions(-) diff --git a/build/configs/sidk_s5jt200/sidk_tash_wlan/defconfig b/build/configs/sidk_s5jt200/sidk_tash_wlan/defconfig index e3ddca2..9d2d013 100755 --- a/build/configs/sidk_s5jt200/sidk_tash_wlan/defconfig +++ b/build/configs/sidk_s5jt200/sidk_tash_wlan/defconfig @@ -614,7 +614,7 @@ CONFIG_UART3_2STOP=0 # # CONFIG_RAMLOG is not set # CONFIG_SYSLOG_CONSOLE is not set -# CONFIG_DRIVERS_WIRELESS is not set +CONFIG_DRIVERS_WIRELESS=y # # Networking Support @@ -624,7 +624,13 @@ CONFIG_ARCH_HAVE_NET=y CONFIG_NET=y CONFIG_NET_LWIP=y -# CONFIG_NET_SECURITY_TLS is not set +# +# LwIP DHCP options +# +CONFIG_NET_LWIP_DHCPC=y +CONFIG_NET_LWIP_DHCPS=y +CONFIG_NET_SECURITY_TLS=y +# CONFIG_TLS_WITH_SSS is not set CONFIG_NET_NOINTS=y # @@ -918,6 +924,9 @@ CONFIG_EXAMPLES_IPERF=y # CONFIG_EXAMPLES_WEBCLIENT is not set # CONFIG_EXAMPLES_WORKQUEUE is not set # CONFIG_EXAMPLES_ARTIK_DEMO is not set +CONFIG_EXAMPLES_SLSIWIFI=y +CONFIG_EXAMPLES_SLSIWIFI_PRIORITY=50 +CONFIG_EXAMPLES_SLSIWIFI_STACKSIZE=2048 # # Network Utilities @@ -934,10 +943,15 @@ CONFIG_NETUTILS_JSON=y CONFIG_NETUTILS_NETLIB=y # CONFIG_NETUTILS_WEBCLIENT is not set # CONFIG_NETUTILS_WEBSERVER is not set +# CONFIG_NETUTILS_WEBSOCKET is not set # CONFIG_NETUTILS_NTPCLIENT is not set # CONFIG_NETUTILS_XMLRPC is not set # CONFIG_NETUTILS_MDNS is not set -# CONFIG_NETUTILS_WIFI is not set +CONFIG_NETUTILS_WIFI=y +CONFIG_SLSI_WIFI_DEFAULT_WLAN_COUNTRY_CODE="00" +CONFIG_SLSI_WIFI_DEFAULT_WLAN_TX_POWER=30 +CONFIG_SCSC_WLAN=y +CONFIG_SCSC_CORE=y # # Platform-specific Support 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 400dac0..b7ea704 100644 --- a/os/arch/arm/src/sidk_s5jt200/src/s5jt200_tash.c +++ b/os/arch/arm/src/sidk_s5jt200/src/s5jt200_tash.c @@ -68,6 +68,8 @@ #include "s5j_rtc.h" #include "up_internal.h" +#include + #include #include "sidk_s5jt200.h" @@ -87,10 +89,23 @@ char *s5j_get_binary_version(uint32_t baddr) static char version[13]; version[12] = '\0'; strncpy(version, (char *)baddr, sizeof(version) - 1); - return version; + 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 @@ -272,7 +287,6 @@ int board_app_initialize(void) pwmdrv_register(); #endif - #if defined(CONFIG_RTC) && defined(CONFIG_RTC_DRIVER) && defined(CONFIG_S5J_RTC) up_rtc_getdatetime(&tp); lldbg("RTC getdatetime %d/%d/%d/%d/%d/%d\n", @@ -284,6 +298,10 @@ int board_app_initialize(void) scsc_wpa_ctrl_iface_init(); +#ifdef CONFIG_TASH + tash_cmdlist_install(tash_s5j_cmds); +#endif + /* to suppress a compiler warning */ UNUSED(ret); -- 2.7.4