From 0e5bb9d042d74dd2997228f20f8bbcd5b56246da Mon Sep 17 00:00:00 2001
From: Meco Man <920369182@qq.com>
Date: Sun, 15 May 2022 20:08:14 -0400
Subject: [PATCH] revert docking

---
 components/net/sal/SConscript                        | 12 ++++++------
 components/net/sal/{docking => impl}/af_inet.h       |  0
 components/net/sal/{docking => impl}/af_inet_at.c    |  0
 components/net/sal/{docking => impl}/af_inet_lwip.c  |  0
 .../net/sal/{docking => impl}/af_inet_winsock.c      |  0
 components/net/sal/{docking => impl}/proto_mbedtls.c |  0
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename components/net/sal/{docking => impl}/af_inet.h (100%)
 rename components/net/sal/{docking => impl}/af_inet_at.c (100%)
 rename components/net/sal/{docking => impl}/af_inet_lwip.c (100%)
 rename components/net/sal/{docking => impl}/af_inet_winsock.c (100%)
 rename components/net/sal/{docking => impl}/proto_mbedtls.c (100%)

diff --git a/components/net/sal/SConscript b/components/net/sal/SConscript
index 2b8164df64..9611af1d2b 100644
--- a/components/net/sal/SConscript
+++ b/components/net/sal/SConscript
@@ -11,24 +11,24 @@ CPPPATH = [cwd + '/include']
 CPPPATH += [cwd + '/include/socket']
 
 if GetDepend('SAL_USING_LWIP') or GetDepend('SAL_USING_AT'):
-    CPPPATH += [cwd + '/docking']
+    CPPPATH += [cwd + '/impl']
 
 if GetDepend('SAL_USING_LWIP'):
-    src += ['docking/af_inet_lwip.c']
+    src += ['impl/af_inet_lwip.c']
 
 if GetDepend('SAL_USING_AT'):
-    src += ['docking/af_inet_at.c']
+    src += ['impl/af_inet_at.c']
 
 if GetDepend('SAL_USING_WINSOCK'):
-    src += ['docking/af_inet_winsock.c']
+    src += ['impl/af_inet_winsock.c']
 
 if GetDepend('SAL_USING_TLS'):
-    src += ['docking/proto_mbedtls.c']
+    src += ['impl/proto_mbedtls.c']
 
 if GetDepend('SAL_USING_POSIX'):
     CPPPATH += [cwd + '/include/dfs_net']
     src += ['socket/net_sockets.c']
-    src += ['dfs_net/*.c']
+    src += Glob('dfs_net/*.c')
 
 if not GetDepend('HAVE_SYS_SOCKET_H'):
     CPPPATH += [cwd + '/include/socket/sys_socket']
diff --git a/components/net/sal/docking/af_inet.h b/components/net/sal/impl/af_inet.h
similarity index 100%
rename from components/net/sal/docking/af_inet.h
rename to components/net/sal/impl/af_inet.h
diff --git a/components/net/sal/docking/af_inet_at.c b/components/net/sal/impl/af_inet_at.c
similarity index 100%
rename from components/net/sal/docking/af_inet_at.c
rename to components/net/sal/impl/af_inet_at.c
diff --git a/components/net/sal/docking/af_inet_lwip.c b/components/net/sal/impl/af_inet_lwip.c
similarity index 100%
rename from components/net/sal/docking/af_inet_lwip.c
rename to components/net/sal/impl/af_inet_lwip.c
diff --git a/components/net/sal/docking/af_inet_winsock.c b/components/net/sal/impl/af_inet_winsock.c
similarity index 100%
rename from components/net/sal/docking/af_inet_winsock.c
rename to components/net/sal/impl/af_inet_winsock.c
diff --git a/components/net/sal/docking/proto_mbedtls.c b/components/net/sal/impl/proto_mbedtls.c
similarity index 100%
rename from components/net/sal/docking/proto_mbedtls.c
rename to components/net/sal/impl/proto_mbedtls.c