Skip to content

Commit f5801aa

Browse files
adbridgeadbridge
authored
Merge pull request #13254 from LDong-Arm/move_nanostack-libservice
Move nanostack-libservice into connectivity/libraries
2 parents 2bd3c96 + 08aec8b commit f5801aa

File tree

76 files changed

+82
-82
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+82
-82
lines changed

‎UNITTESTS/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@ set(unittest-includes-base
125125
"${PROJECT_SOURCE_DIR}/../cmsis"
126126
"${PROJECT_SOURCE_DIR}/../features/frameworks"
127127
"${PROJECT_SOURCE_DIR}/../features/frameworks/mbed-trace"
128-
"${PROJECT_SOURCE_DIR}/../features/frameworks/nanostack-libservice"
129-
"${PROJECT_SOURCE_DIR}/../features/frameworks/nanostack-libservice/mbed-client-libservice"
128+
"${PROJECT_SOURCE_DIR}/../connectivity/libraries/nanostack-libservice"
129+
"${PROJECT_SOURCE_DIR}/../connectivity/libraries/nanostack-libservice/mbed-client-libservice"
130130
"${PROJECT_SOURCE_DIR}/../features/filesystem/fat"
131131
"${PROJECT_SOURCE_DIR}/../features/filesystem/fat/ChaN"
132132
"${PROJECT_SOURCE_DIR}/../features/filesystem/bd"

‎UNITTESTS/features/cellular/framework/AT/at_cellularstack/unittest.cmake

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ set(unittest-includes ${unittest-includes}
1515
# Source files
1616
set(unittest-sources
1717
../features/cellular/framework/AT/AT_CellularStack.cpp
18-
../features/frameworks/nanostack-libservice/source/libip4string/ip4tos.c
19-
../features/frameworks/nanostack-libservice/source/libip6string/ip6tos.c
20-
../features/frameworks/nanostack-libservice/source/libip4string/stoip4.c
21-
../features/frameworks/nanostack-libservice/source/libip6string/stoip6.c
22-
../features/frameworks/nanostack-libservice/source/libBits/common_functions.c
18+
../connectivity/libraries/nanostack-libservice/source/libip4string/ip4tos.c
19+
../connectivity/libraries/nanostack-libservice/source/libip6string/ip6tos.c
20+
../connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c
21+
../connectivity/libraries/nanostack-libservice/source/libip6string/stoip6.c
22+
../connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c
2323
../features/netsocket/SocketAddress.cpp
2424
)
2525

‎UNITTESTS/features/cellular/framework/device/cellularcontext/unittest.cmake

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ set(unittest-includes ${unittest-includes}
1414
# Source files
1515
set(unittest-sources
1616
../features/cellular/framework/device/CellularContext.cpp
17-
../features/frameworks/nanostack-libservice/source/libip4string/ip4tos.c
18-
../features/frameworks/nanostack-libservice/source/libip6string/ip6tos.c
19-
../features/frameworks/nanostack-libservice/source/libip4string/stoip4.c
20-
../features/frameworks/nanostack-libservice/source/libip6string/stoip6.c
21-
../features/frameworks/nanostack-libservice/source/libBits/common_functions.c
17+
../connectivity/libraries/nanostack-libservice/source/libip4string/ip4tos.c
18+
../connectivity/libraries/nanostack-libservice/source/libip6string/ip6tos.c
19+
../connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c
20+
../connectivity/libraries/nanostack-libservice/source/libip6string/stoip6.c
21+
../connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c
2222
../features/netsocket/SocketAddress.cpp
2323
)
2424

‎UNITTESTS/features/netsocket/DTLSSocket/unittest.cmake

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ set(unittest-sources
1212
../features/netsocket/DTLSSocket.cpp
1313
../features/netsocket/DTLSSocketWrapper.cpp
1414
../features/netsocket/TLSSocketWrapper.cpp
15-
../features/frameworks/nanostack-libservice/source/libip4string/ip4tos.c
16-
../features/frameworks/nanostack-libservice/source/libip6string/ip6tos.c
17-
../features/frameworks/nanostack-libservice/source/libip4string/stoip4.c
18-
../features/frameworks/nanostack-libservice/source/libip6string/stoip6.c
19-
../features/frameworks/nanostack-libservice/source/libBits/common_functions.c
15+
../connectivity/libraries/nanostack-libservice/source/libip4string/ip4tos.c
16+
../connectivity/libraries/nanostack-libservice/source/libip6string/ip6tos.c
17+
../connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c
18+
../connectivity/libraries/nanostack-libservice/source/libip6string/stoip6.c
19+
../connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c
2020
)
2121

2222
set(unittest-test-sources

‎UNITTESTS/features/netsocket/DTLSSocketWrapper/unittest.cmake

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ set(unittest-sources
1111
../features/netsocket/UDPSocket.cpp
1212
../features/netsocket/DTLSSocketWrapper.cpp
1313
../features/netsocket/TLSSocketWrapper.cpp
14-
../features/frameworks/nanostack-libservice/source/libip4string/ip4tos.c
15-
../features/frameworks/nanostack-libservice/source/libip6string/ip6tos.c
16-
../features/frameworks/nanostack-libservice/source/libip4string/stoip4.c
17-
../features/frameworks/nanostack-libservice/source/libip6string/stoip6.c
18-
../features/frameworks/nanostack-libservice/source/libBits/common_functions.c
14+
../connectivity/libraries/nanostack-libservice/source/libip4string/ip4tos.c
15+
../connectivity/libraries/nanostack-libservice/source/libip6string/ip6tos.c
16+
../connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c
17+
../connectivity/libraries/nanostack-libservice/source/libip6string/stoip6.c
18+
../connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c
1919
)
2020

2121
set(unittest-test-sources

‎UNITTESTS/features/netsocket/EthernetInterface/unittest.cmake

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ set(unittest-sources
1313
../features/netsocket/EMACInterface.cpp
1414
../features/netsocket/NetworkInterface.cpp
1515
../features/netsocket/NetworkStack.cpp
16-
../features/frameworks/nanostack-libservice/source/libip4string/ip4tos.c
17-
../features/frameworks/nanostack-libservice/source/libip6string/ip6tos.c
18-
../features/frameworks/nanostack-libservice/source/libip4string/stoip4.c
19-
../features/frameworks/nanostack-libservice/source/libip6string/stoip6.c
20-
../features/frameworks/nanostack-libservice/source/libBits/common_functions.c
21-
../features/frameworks/nanostack-libservice/source/libList/ns_list.c
16+
../connectivity/libraries/nanostack-libservice/source/libip4string/ip4tos.c
17+
../connectivity/libraries/nanostack-libservice/source/libip6string/ip6tos.c
18+
../connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c
19+
../connectivity/libraries/nanostack-libservice/source/libip6string/stoip6.c
20+
../connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c
21+
../connectivity/libraries/nanostack-libservice/source/libList/ns_list.c
2222
)
2323

2424
# Test files

‎UNITTESTS/features/netsocket/InternetSocket/unittest.cmake

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ set(unittest-sources
99
../features/netsocket/SocketAddress.cpp
1010
../features/netsocket/NetworkStack.cpp
1111
../features/netsocket/InternetSocket.cpp
12-
../features/frameworks/nanostack-libservice/source/libip4string/ip4tos.c
13-
../features/frameworks/nanostack-libservice/source/libip6string/ip6tos.c
14-
../features/frameworks/nanostack-libservice/source/libip4string/stoip4.c
15-
../features/frameworks/nanostack-libservice/source/libip6string/stoip6.c
16-
../features/frameworks/nanostack-libservice/source/libBits/common_functions.c
12+
../connectivity/libraries/nanostack-libservice/source/libip4string/ip4tos.c
13+
../connectivity/libraries/nanostack-libservice/source/libip6string/ip6tos.c
14+
../connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c
15+
../connectivity/libraries/nanostack-libservice/source/libip6string/stoip6.c
16+
../connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c
1717
)
1818

1919
set(unittest-test-sources

‎UNITTESTS/features/netsocket/NetworkInterface/unittest.cmake

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ set(unittest-sources
1010
../features/netsocket/SocketAddress.cpp
1111
../features/netsocket/NetworkStack.cpp
1212
../features/netsocket/NetworkInterface.cpp
13-
../features/frameworks/nanostack-libservice/source/libip4string/ip4tos.c
14-
../features/frameworks/nanostack-libservice/source/libip6string/ip6tos.c
15-
../features/frameworks/nanostack-libservice/source/libip4string/stoip4.c
16-
../features/frameworks/nanostack-libservice/source/libip6string/stoip6.c
17-
../features/frameworks/nanostack-libservice/source/libBits/common_functions.c
18-
../features/frameworks/nanostack-libservice/source/libList/ns_list.c
13+
../connectivity/libraries/nanostack-libservice/source/libip4string/ip4tos.c
14+
../connectivity/libraries/nanostack-libservice/source/libip6string/ip6tos.c
15+
../connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c
16+
../connectivity/libraries/nanostack-libservice/source/libip6string/stoip6.c
17+
../connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c
18+
../connectivity/libraries/nanostack-libservice/source/libList/ns_list.c
1919
)
2020

2121
# Test files

‎UNITTESTS/features/netsocket/NetworkStack/unittest.cmake

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ set(unittest-sources
1111
../features/netsocket/SocketAddress.cpp
1212
../features/netsocket/NetworkStack.cpp
1313
../features/netsocket/NetworkInterface.cpp
14-
../features/frameworks/nanostack-libservice/source/libip4string/ip4tos.c
15-
../features/frameworks/nanostack-libservice/source/libip6string/ip6tos.c
16-
../features/frameworks/nanostack-libservice/source/libip4string/stoip4.c
17-
../features/frameworks/nanostack-libservice/source/libip6string/stoip6.c
18-
../features/frameworks/nanostack-libservice/source/libBits/common_functions.c
14+
../connectivity/libraries/nanostack-libservice/source/libip4string/ip4tos.c
15+
../connectivity/libraries/nanostack-libservice/source/libip6string/ip6tos.c
16+
../connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c
17+
../connectivity/libraries/nanostack-libservice/source/libip6string/stoip6.c
18+
../connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c
1919
)
2020

2121
# Test files

‎UNITTESTS/features/netsocket/PPPInterface/unittest.cmake

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ set(unittest-sources
1313
../features/netsocket/EMACInterface.cpp
1414
../features/netsocket/NetworkInterface.cpp
1515
../features/netsocket/NetworkStack.cpp
16-
../features/frameworks/nanostack-libservice/source/libip4string/ip4tos.c
17-
../features/frameworks/nanostack-libservice/source/libip6string/ip6tos.c
18-
../features/frameworks/nanostack-libservice/source/libip4string/stoip4.c
19-
../features/frameworks/nanostack-libservice/source/libip6string/stoip6.c
20-
../features/frameworks/nanostack-libservice/source/libBits/common_functions.c
21-
../features/frameworks/nanostack-libservice/source/libList/ns_list.c
16+
../connectivity/libraries/nanostack-libservice/source/libip4string/ip4tos.c
17+
../connectivity/libraries/nanostack-libservice/source/libip6string/ip6tos.c
18+
../connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c
19+
../connectivity/libraries/nanostack-libservice/source/libip6string/stoip6.c
20+
../connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c
21+
../connectivity/libraries/nanostack-libservice/source/libList/ns_list.c
2222
)
2323

2424
# Test files

0 commit comments

Comments
 (0)