From 9c01bbc199f4e837bce1171f68b1096954f33fa3 Mon Sep 17 00:00:00 2001 From: Russ Butler Date: Tue, 26 Jul 2016 10:33:18 -0500 Subject: [PATCH] Update client and nanostack to include mbed.h Include mbed.h rather than mbed-drivers/mbed.h. --- .../sal-stack-nanostack-eventloop/source/system_timer.cpp | 2 +- .../net/FEATURE_IPV6/mbed-mesh-api/mbed-mesh-api/AbstractMesh.h | 2 +- .../mbed-mesh-api/source/AbstractNetworkInterface.cpp | 2 +- .../net/FEATURE_IPV6/mbed-mesh-api/source/Mesh6LoWPAN_ND.cpp | 2 +- .../FEATURE_IPV6/mbed-mesh-api/source/MeshInterfaceFactory.cpp | 2 +- features/net/FEATURE_IPV6/mbed-mesh-api/source/MeshThread.cpp | 2 +- .../mbed-mesh-api/source/include/callback_handler.h | 2 +- .../net/FEATURE_IPV6/mbed-mesh-api/test/system_test/main.cpp | 2 +- .../FEATURE_IPV6/mbed-mesh-api/test/system_test/test_cases.cpp | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/features/FEATURE_COMMON_PAL/sal-stack-nanostack-eventloop/source/system_timer.cpp b/features/FEATURE_COMMON_PAL/sal-stack-nanostack-eventloop/source/system_timer.cpp index cea8281f61..84592ff1fd 100644 --- a/features/FEATURE_COMMON_PAL/sal-stack-nanostack-eventloop/source/system_timer.cpp +++ b/features/FEATURE_COMMON_PAL/sal-stack-nanostack-eventloop/source/system_timer.cpp @@ -22,7 +22,7 @@ #include "eventOS_event.h" #include "eventOS_event_timer.h" #include "minar/minar.h" -#include "mbed-drivers/mbed.h" +#include "mbed.h" #include "core-util/FunctionPointer.h" #include "core-util/Event.h" diff --git a/features/net/FEATURE_IPV6/mbed-mesh-api/mbed-mesh-api/AbstractMesh.h b/features/net/FEATURE_IPV6/mbed-mesh-api/mbed-mesh-api/AbstractMesh.h index 84a430b26a..34b8cd6cde 100644 --- a/features/net/FEATURE_IPV6/mbed-mesh-api/mbed-mesh-api/AbstractMesh.h +++ b/features/net/FEATURE_IPV6/mbed-mesh-api/mbed-mesh-api/AbstractMesh.h @@ -18,7 +18,7 @@ #define __ABSTRACTMESH_H__ #include "AbstractNetworkInterface.h" -#include "mbed-drivers/mbed.h" +#include "mbed.h" #ifdef YOTTA_CFG #include "core-util/FunctionPointer.h" diff --git a/features/net/FEATURE_IPV6/mbed-mesh-api/source/AbstractNetworkInterface.cpp b/features/net/FEATURE_IPV6/mbed-mesh-api/source/AbstractNetworkInterface.cpp index dba4d1c771..b6168bb3df 100644 --- a/features/net/FEATURE_IPV6/mbed-mesh-api/source/AbstractNetworkInterface.cpp +++ b/features/net/FEATURE_IPV6/mbed-mesh-api/source/AbstractNetworkInterface.cpp @@ -17,7 +17,7 @@ * Abstract networking interface. */ -#include "mbed-drivers/mbed.h" +#include "mbed.h" #include "mbed-mesh-api/AbstractNetworkInterface.h" AbstractNetworkInterface::~AbstractNetworkInterface() diff --git a/features/net/FEATURE_IPV6/mbed-mesh-api/source/Mesh6LoWPAN_ND.cpp b/features/net/FEATURE_IPV6/mbed-mesh-api/source/Mesh6LoWPAN_ND.cpp index 8ce18aad2c..cf30ee21d7 100644 --- a/features/net/FEATURE_IPV6/mbed-mesh-api/source/Mesh6LoWPAN_ND.cpp +++ b/features/net/FEATURE_IPV6/mbed-mesh-api/source/Mesh6LoWPAN_ND.cpp @@ -20,7 +20,7 @@ */ #include -#include "mbed-drivers/mbed.h" +#include "mbed.h" #include "mbed-mesh-api/Mesh6LoWPAN_ND.h" #include "include/nd_tasklet.h" diff --git a/features/net/FEATURE_IPV6/mbed-mesh-api/source/MeshInterfaceFactory.cpp b/features/net/FEATURE_IPV6/mbed-mesh-api/source/MeshInterfaceFactory.cpp index 8108b902a2..ce82f5e19d 100644 --- a/features/net/FEATURE_IPV6/mbed-mesh-api/source/MeshInterfaceFactory.cpp +++ b/features/net/FEATURE_IPV6/mbed-mesh-api/source/MeshInterfaceFactory.cpp @@ -17,7 +17,7 @@ /* * Mesh networking interface. */ -#include "mbed-drivers/mbed.h" +#include "mbed.h" #include "mbed-mesh-api/Mesh6LoWPAN_ND.h" #include "mbed-mesh-api/MeshThread.h" #include "include/callback_handler.h" diff --git a/features/net/FEATURE_IPV6/mbed-mesh-api/source/MeshThread.cpp b/features/net/FEATURE_IPV6/mbed-mesh-api/source/MeshThread.cpp index 476c4419a6..cf3e37aef9 100644 --- a/features/net/FEATURE_IPV6/mbed-mesh-api/source/MeshThread.cpp +++ b/features/net/FEATURE_IPV6/mbed-mesh-api/source/MeshThread.cpp @@ -20,7 +20,7 @@ */ #include -#include "mbed-drivers/mbed.h" +#include "mbed.h" #include "mbed-mesh-api/MeshThread.h" #include "include/thread_tasklet.h" #include "include/callback_handler.h" diff --git a/features/net/FEATURE_IPV6/mbed-mesh-api/source/include/callback_handler.h b/features/net/FEATURE_IPV6/mbed-mesh-api/source/include/callback_handler.h index 016c559369..77625f26f7 100644 --- a/features/net/FEATURE_IPV6/mbed-mesh-api/source/include/callback_handler.h +++ b/features/net/FEATURE_IPV6/mbed-mesh-api/source/include/callback_handler.h @@ -17,7 +17,7 @@ #ifndef __INCLUDE_CALLBACK_HANDLER_H__ #define __INCLUDE_CALLBACK_HANDLER_H__ -#include "mbed-drivers/mbed.h" +#include "mbed.h" #include "mbed-mesh-api/AbstractMesh.h" extern AbstractMesh *__abstract_mesh_interface; diff --git a/features/net/FEATURE_IPV6/mbed-mesh-api/test/system_test/main.cpp b/features/net/FEATURE_IPV6/mbed-mesh-api/test/system_test/main.cpp index bf41675050..b921d2866d 100644 --- a/features/net/FEATURE_IPV6/mbed-mesh-api/test/system_test/main.cpp +++ b/features/net/FEATURE_IPV6/mbed-mesh-api/test/system_test/main.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "mbed-drivers/mbed.h" +#include "mbed.h" #include "mbed-mesh-api/Mesh6LoWPAN_ND.h" #include "mbed-mesh-api/MeshThread.h" #include "mbed-mesh-api/MeshInterfaceFactory.h" diff --git a/features/net/FEATURE_IPV6/mbed-mesh-api/test/system_test/test_cases.cpp b/features/net/FEATURE_IPV6/mbed-mesh-api/test/system_test/test_cases.cpp index 25ebafa259..1f425d3cae 100644 --- a/features/net/FEATURE_IPV6/mbed-mesh-api/test/system_test/test_cases.cpp +++ b/features/net/FEATURE_IPV6/mbed-mesh-api/test/system_test/test_cases.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "mbed-drivers/mbed.h" +#include "mbed.h" #include "mbed-mesh-api/Mesh6LoWPAN_ND.h" #include "mbed-mesh-api/MeshThread.h" #include "mbed-mesh-api/MeshInterfaceFactory.h"