Update netsocket header and source reference in other libraries

pull/13335/head
Rajkumar Kanagaraj 2020-07-22 07:05:52 -07:00
parent b1a5e1b72d
commit 21325e281a
23 changed files with 24 additions and 28 deletions

View File

@ -112,7 +112,6 @@ set(unittest-includes-base
"${PROJECT_SOURCE_DIR}/stubs" "${PROJECT_SOURCE_DIR}/stubs"
"${PROJECT_SOURCE_DIR}/.." "${PROJECT_SOURCE_DIR}/.."
"${PROJECT_SOURCE_DIR}/../features" "${PROJECT_SOURCE_DIR}/../features"
"${PROJECT_SOURCE_DIR}/../features/netsocket"
"${PROJECT_SOURCE_DIR}/../platform" "${PROJECT_SOURCE_DIR}/../platform"
"${PROJECT_SOURCE_DIR}/../storage/filesystem/littlefs/include" "${PROJECT_SOURCE_DIR}/../storage/filesystem/littlefs/include"
"${PROJECT_SOURCE_DIR}/../storage/filesystem/fat/include" "${PROJECT_SOURCE_DIR}/../storage/filesystem/fat/include"
@ -128,6 +127,7 @@ set(unittest-includes-base
"${PROJECT_SOURCE_DIR}/../features/frameworks/mbed-trace" "${PROJECT_SOURCE_DIR}/../features/frameworks/mbed-trace"
"${PROJECT_SOURCE_DIR}/../connectivity/libraries/nanostack-libservice" "${PROJECT_SOURCE_DIR}/../connectivity/libraries/nanostack-libservice"
"${PROJECT_SOURCE_DIR}/../connectivity/libraries/nanostack-libservice/mbed-client-libservice" "${PROJECT_SOURCE_DIR}/../connectivity/libraries/nanostack-libservice/mbed-client-libservice"
"${PROJECT_SOURCE_DIR}/../connectivity/netsocket/include"
"${PROJECT_SOURCE_DIR}/../features/filesystem/fat" "${PROJECT_SOURCE_DIR}/../features/filesystem/fat"
"${PROJECT_SOURCE_DIR}/../features/filesystem/fat/ChaN" "${PROJECT_SOURCE_DIR}/../features/filesystem/fat/ChaN"
"${PROJECT_SOURCE_DIR}/../features/filesystem/bd" "${PROJECT_SOURCE_DIR}/../features/filesystem/bd"

View File

@ -16,7 +16,7 @@
*/ */
#include <ctype.h> #include <ctype.h>
#include "nsapi_types.h" #include "netsocket/nsapi_types.h"
#include "events/EventQueue.h" #include "events/EventQueue.h"
#include "ATHandler_stub.h" #include "ATHandler_stub.h"

View File

@ -18,7 +18,7 @@
#include "stdint.h" #include "stdint.h"
#include "stdbool.h" #include "stdbool.h"
#include <cstddef> #include <cstddef>
#include "nsapi_types.h" #include "netsocket/nsapi_types.h"
#include "ATHandler.h" #include "ATHandler.h"
#include "FileHandle_stub.h" #include "FileHandle_stub.h"
#include "Callback.h" #include "Callback.h"

View File

@ -16,7 +16,7 @@
*/ */
#include "AT_CellularInformation.h" #include "AT_CellularInformation.h"
#include "nsapi_types.h" #include "netsocket/nsapi_types.h"
using namespace mbed; using namespace mbed;

View File

@ -20,7 +20,7 @@
#include "CellularUtil.h" #include "CellularUtil.h"
#include "CellularLog.h" #include "CellularLog.h"
#include "FileHandle.h" #include "FileHandle.h"
#include "nsapi_types.h" #include "netsocket/nsapi_types.h"
using namespace mbed; using namespace mbed;
using namespace mbed_cellular_util; using namespace mbed_cellular_util;

View File

@ -15,7 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include "CellularInterface.h" #include "netsocket/CellularInterface.h"
MBED_WEAK CellularInterface *CellularInterface::get_target_default_instance() MBED_WEAK CellularInterface *CellularInterface::get_target_default_instance()
{ {

View File

@ -15,7 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include "ControlPlane_netif.h" #include "netsocket/ControlPlane_netif.h"
#include <list> #include <list>
namespace mbed { namespace mbed {

View File

@ -20,7 +20,7 @@
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include "gmock/gmock.h" #include "gmock/gmock.h"
#include "features/netsocket/EMAC.h" #include "netsocket/EMAC.h"
class MockEMAC : public EMAC { class MockEMAC : public EMAC {
public: public:

View File

@ -15,7 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include "MeshInterface.h" #include "netsocket/MeshInterface.h"
MBED_WEAK MeshInterface *MeshInterface::get_target_default_instance() MBED_WEAK MeshInterface *MeshInterface::get_target_default_instance()
{ {

View File

@ -15,9 +15,9 @@
* limitations under the License. * limitations under the License.
*/ */
#include "netsocket/NetworkInterface.h" #include "netsocket/NetworkInterface.h"
#include "WiFiInterface.h" #include "netsocket/WiFiInterface.h"
#include "CellularInterface.h" #include "netsocket/CellularInterface.h"
#include "MeshInterface.h" #include "netsocket/MeshInterface.h"
MBED_WEAK WiFiInterface *WiFiInterface::get_default_instance() MBED_WEAK WiFiInterface *WiFiInterface::get_default_instance()
{ {

View File

@ -15,8 +15,8 @@
* limitations under the License. * limitations under the License.
*/ */
#include "NetworkStack.h" #include "netsocket/NetworkStack.h"
#include "nsapi_dns.h" #include "netsocket/nsapi_dns.h"
#include "mbed.h" #include "mbed.h"
#include "stddef.h" #include "stddef.h"
#include <new> #include <new>

View File

@ -15,7 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include "SocketAddress.h" #include "netsocket/SocketAddress.h"
SocketAddress::SocketAddress(const nsapi_addr_t &addr, uint16_t port) SocketAddress::SocketAddress(const nsapi_addr_t &addr, uint16_t port)

View File

@ -15,7 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include "SocketStats.h" #include "netsocket/SocketStats.h"
#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED #if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED
int SocketStats::get_entry_position(const Socket *const reference_id) int SocketStats::get_entry_position(const Socket *const reference_id)

View File

@ -9,7 +9,6 @@ set(unittest-includes ${unittest-includes}
../connectivity/cellular/include/cellular/framework/common ../connectivity/cellular/include/cellular/framework/common
../connectivity/cellular/include/cellular/framework/AT ../connectivity/cellular/include/cellular/framework/AT
../connectivity/cellular/include/cellular/framework/device ../connectivity/cellular/include/cellular/framework/device
../features/netsocket/cellular
) )
# Source files # Source files

View File

@ -12,7 +12,7 @@ set(unittest-includes ${unittest-includes}
../features/frameworks/mbed-client-randlib/mbed-client-randlib ../features/frameworks/mbed-client-randlib/mbed-client-randlib
../drivers ../drivers
../hal ../hal
../features/netsocket/cellular ../features/cellular
) )
# Source files # Source files

View File

@ -9,7 +9,7 @@ set(unittest-includes ${unittest-includes}
../connectivity/cellular/include/cellular/framework/common ../connectivity/cellular/include/cellular/framework/common
../connectivity/cellular/include/cellular/framework/AT ../connectivity/cellular/include/cellular/framework/AT
../features/frameworks/mbed-client-randlib/mbed-client-randlib ../features/frameworks/mbed-client-randlib/mbed-client-randlib
../features/netsocket/cellular ../features/cellular
) )
# Source files # Source files

View File

@ -9,7 +9,7 @@ set(unittest-includes ${unittest-includes}
../connectivity/cellular/include/cellular/framework/common ../connectivity/cellular/include/cellular/framework/common
../connectivity/cellular/include/cellular/framework/AT ../connectivity/cellular/include/cellular/framework/AT
../features/frameworks/mbed-client-randlib/mbed-client-randlib ../features/frameworks/mbed-client-randlib/mbed-client-randlib
../features/netsocket/cellular ../features/cellular
) )
# Source files # Source files

View File

@ -9,7 +9,7 @@ set(unittest-includes ${unittest-includes}
../connectivity/cellular/include/cellular/framework/common ../connectivity/cellular/include/cellular/framework/common
../connectivity/cellular/include/cellular/framework/AT ../connectivity/cellular/include/cellular/framework/AT
../features/frameworks/mbed-client-randlib/mbed-client-randlib ../features/frameworks/mbed-client-randlib/mbed-client-randlib
../features/netsocket/cellular ../features/cellular
) )
# Source files # Source files

View File

@ -24,7 +24,7 @@
#include "FileHandle_stub.h" #include "FileHandle_stub.h"
#include "CellularLog.h" #include "CellularLog.h"
#include "ATHandler_stub.h" #include "ATHandler_stub.h"
#include "SocketAddress.h" #include "netsocket/SocketAddress.h"
#include "CellularDevice_stub.h" #include "CellularDevice_stub.h"
#include "AT_CellularDevice_stub.h" #include "AT_CellularDevice_stub.h"
#include "myCellularDevice.h" #include "myCellularDevice.h"

View File

@ -9,7 +9,7 @@ set(unittest-includes ${unittest-includes}
../connectivity/cellular/include/cellular/framework/common ../connectivity/cellular/include/cellular/framework/common
../connectivity/cellular/include/cellular/framework/AT ../connectivity/cellular/include/cellular/framework/AT
../features/frameworks/mbed-client-randlib/mbed-client-randlib ../features/frameworks/mbed-client-randlib/mbed-client-randlib
../features/netsocket/cellular ../features/cellular
) )
# Source files # Source files
@ -20,7 +20,7 @@ set(unittest-sources
../connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c ../connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c
../connectivity/libraries/nanostack-libservice/source/libip6string/stoip6.c ../connectivity/libraries/nanostack-libservice/source/libip6string/stoip6.c
../connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c ../connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c
../features/netsocket/SocketAddress.cpp ../connectivity/netsocket/source/SocketAddress.cpp
) )
# Test files # Test files

View File

@ -8,7 +8,6 @@ set(unittest-includes ${unittest-includes}
../connectivity/cellular/include/cellular/framework/device/cellulardevice ../connectivity/cellular/include/cellular/framework/device/cellulardevice
../connectivity/cellular/include/cellular/framework/device ../connectivity/cellular/include/cellular/framework/device
../connectivity/cellular/include/cellular/framework/common ../connectivity/cellular/include/cellular/framework/common
../features/netsocket/cellular
) )
# Source files # Source files
@ -19,7 +18,7 @@ set(unittest-sources
../connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c ../connectivity/libraries/nanostack-libservice/source/libip4string/stoip4.c
../connectivity/libraries/nanostack-libservice/source/libip6string/stoip6.c ../connectivity/libraries/nanostack-libservice/source/libip6string/stoip6.c
../connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c ../connectivity/libraries/nanostack-libservice/source/libBits/common_functions.c
../features/netsocket/SocketAddress.cpp ../connectivity/netsocket/source/SocketAddress.cpp
) )
# Test files # Test files

View File

@ -8,7 +8,6 @@ set(unittest-includes ${unittest-includes}
../connectivity/cellular/include/cellular/framework/device/cellulardevice ../connectivity/cellular/include/cellular/framework/device/cellulardevice
../connectivity/cellular/include/cellular/framework/device ../connectivity/cellular/include/cellular/framework/device
../connectivity/cellular/include/cellular/framework/common ../connectivity/cellular/include/cellular/framework/common
../features/netsocket/cellular
) )
# Source files # Source files

View File

@ -8,7 +8,6 @@ set(unittest-includes ${unittest-includes}
../connectivity/cellular/include/cellular/framework/device/cellularstatemachine ../connectivity/cellular/include/cellular/framework/device/cellularstatemachine
../connectivity/cellular/include/cellular/framework/device ../connectivity/cellular/include/cellular/framework/device
../connectivity/cellular/include/cellular/framework/common ../connectivity/cellular/include/cellular/framework/common
../features/netsocket/cellular
) )
# Source files # Source files