Merge branch 'master' into folder_modification

diff --cc apps/examples/artik_demo/artik_demo.c
Simple merge

diff --cc apps/examples/slsiwifi/nettest_functions.c
Simple merge

diff --cc apps/examples/testcase/ta_tc/device_management/itc/itc_dm_main.c
index 433ae9a,5015e53..7a2cc4d
--- 1/apps/examples/testcase/ta_tc/device_management/itc/itc_dm_main.c
--- 2/apps/examples/testcase/ta_tc/device_management/itc/itc_dm_main.c
+++ b/apps/examples/testcase/ta_tc/device_management/itc/itc_dm_main.c
@@@ -27,9 -27,9 +27,9 @@@
  #include <dm/dm_error.h>
  #include <dm/dm_connectivity.h>
  
 -#include <apps/netutils/dhcpc.h>
 +#include <protocols/dhcpc.h>
  
- #include <protocols/wifi/slsi_wifi_api.h>
+ #include <slsi_wifi/slsi_wifi_api.h>
  
  #define NET_DEVNAME "wl1"
  

diff --cc apps/examples/testcase/ta_tc/device_management/utc/utc_dm_main.c
index dbc4281,b020cfb..bf1e950
--- 1/apps/examples/testcase/ta_tc/device_management/utc/utc_dm_main.c
--- 2/apps/examples/testcase/ta_tc/device_management/utc/utc_dm_main.c
+++ b/apps/examples/testcase/ta_tc/device_management/utc/utc_dm_main.c
@@@ -27,8 -27,8 +27,8 @@@
  #include <dm/dm_error.h>
  #include <dm/dm_connectivity.h>
  
 -#include <apps/netutils/dhcpc.h>
 +#include <protocols/dhcpc.h>
- #include <protocols/wifi/slsi_wifi_api.h>
+ #include <slsi_wifi/slsi_wifi_api.h>
  
  #define NET_DEVNAME "wl1"
  

diff --cc apps/examples/wakaama_client/wakaama_client.c
index 1e17d37,03d2296..537bcb4
--- 1/apps/examples/wakaama_client/wakaama_client.c
--- 2/apps/examples/wakaama_client/wakaama_client.c
+++ b/apps/examples/wakaama_client/wakaama_client.c
@@@ -26,11 -26,11 +26,10 @@@
  #include "connection.h"
  #include <tinyara/wqueue.h>
  #include <tinyara/clock.h>
 -
 -#include <apps/netutils/dhcpc.h>
--
 +#include <protocols/dhcpc.h>
+ #include <slsi_wifi/slsi_wifi_api.h>
  
- #include <protocols/wifi/slsi_wifi_api.h>
 +
  #define NET_DEVNAME "wl1"
  
  #define WAKAAMA_CHECK_ARG() \

diff --cc apps/examples/websocket/websocket_main.c
Simple merge

diff --cc external/Makefile
index 8414de3,df2f9b8..dc6faa8
--- 1/external/Makefile
--- 2/external/Makefile
+++ b/external/Makefile
@@@ -77,26 -77,10 +77,30 @@@ include aws/Make.def
  include aws/src/Make.defs
  endif
  
+ ifeq ($(CONFIG_NETUTILS_WIFI),y)
+ include slsi_wifi/Make.defs
+ endif
  
- include dhcpd/Make.defs #DHCPD
++include dhcpd/Make.defs
 +include xmlrpc/Make.defs
 +include ntpclient/Make.defs
 +include webserver/Make.defs
 +include ftpc/Make.defs
 +include mdns/Make.defs
 +include webclient/Make.defs
 +include mosquitto/Make.defs
 +include ftpd/Make.defs
 +include dhcpc/Make.defs
 +include websocket/Make.defs
 +include libcoap/Make.defs
 +include tftpc/Make.defs
 +include telnetd/Make.defs
 +include smtp/Make.defs
 +include netlib/Make.defs
 +include json/Make.defs
 +include mbedtls/Make.defs
 +
++
  AOBJS = $(ASRCS:.S=$(OBJEXT))
  COBJS = $(CSRCS:.c=$(OBJEXT))
  CXXOBJS = $(CXXSRCS:.cpp=$(OBJEXT))

diff --cc framework/src/dm/arch/sidk_s5jt200/s5j_dm_connectivity.c
index 9f4084f,23224ce..72982a5
--- 1/framework/src/dm/arch/sidk_s5jt200/s5j_dm_connectivity.c
--- 2/framework/src/dm/arch/sidk_s5jt200/s5j_dm_connectivity.c
+++ b/framework/src/dm/arch/sidk_s5jt200/s5j_dm_connectivity.c
@@@ -40,9 -40,9 +40,9 @@@
  #include <dm/dm_error.h>
  #include <dm/dm_connectivity.h>
  
 -#include <apps/netutils/dhcpc.h>
 +#include <protocols/dhcpc.h>
- #include <apps/netutils/wifi/slsi_wifi_api.h>
- #include <apps/netutils/wifi/slsi_wifi_utils.h>
+ #include <slsi_wifi/slsi_wifi_api.h>
+ #include <slsi_wifi/slsi_wifi_utils.h>
  #include <arpa/inet.h>
  
  #define DM_GET_INTERFACE_INFO 0