From 36e29b4bed4c27911d1fb2f53b249bef354bf7cb Mon Sep 17 00:00:00 2001 From: Seppo Takalo Date: Wed, 15 Jun 2016 14:20:53 +0300 Subject: [PATCH 1/4] Include right Socket.h --- features/NetworkSocketAPI/Socket.cpp | 2 +- features/NetworkSocketAPI/TCPServer.h | 2 +- features/NetworkSocketAPI/TCPSocket.h | 2 +- features/NetworkSocketAPI/UDPSocket.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/features/NetworkSocketAPI/Socket.cpp b/features/NetworkSocketAPI/Socket.cpp index 49b92f4d13..bd9930d849 100644 --- a/features/NetworkSocketAPI/Socket.cpp +++ b/features/NetworkSocketAPI/Socket.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "Socket.h" +#include "NetworkSocketAPI/Socket.h" Socket::Socket() : _iface(0) diff --git a/features/NetworkSocketAPI/TCPServer.h b/features/NetworkSocketAPI/TCPServer.h index 6c32286216..aaae9070e2 100644 --- a/features/NetworkSocketAPI/TCPServer.h +++ b/features/NetworkSocketAPI/TCPServer.h @@ -17,7 +17,7 @@ #ifndef TCPSERVER_H #define TCPSERVER_H -#include "Socket.h" +#include "NetworkSocketAPI/Socket.h" #include "TCPSocket.h" #include "NetworkStack.h" #include "Semaphore.h" diff --git a/features/NetworkSocketAPI/TCPSocket.h b/features/NetworkSocketAPI/TCPSocket.h index 4f19b60a0b..6b6d91aec5 100644 --- a/features/NetworkSocketAPI/TCPSocket.h +++ b/features/NetworkSocketAPI/TCPSocket.h @@ -17,7 +17,7 @@ #ifndef TCPSOCKET_H #define TCPSOCKET_H -#include "Socket.h" +#include "NetworkSocketAPI/Socket.h" #include "NetworkStack.h" #include "Semaphore.h" diff --git a/features/NetworkSocketAPI/UDPSocket.h b/features/NetworkSocketAPI/UDPSocket.h index 7e3439678e..8db58b9c16 100644 --- a/features/NetworkSocketAPI/UDPSocket.h +++ b/features/NetworkSocketAPI/UDPSocket.h @@ -17,7 +17,7 @@ #ifndef UDPSOCKET_H #define UDPSOCKET_H -#include "Socket.h" +#include "NetworkSocketAPI/Socket.h" #include "NetworkStack.h" #include "Semaphore.h" From e553dd42e6d31519c748d6f58b2a5f5d4351ffdf Mon Sep 17 00:00:00 2001 From: Seppo Takalo Date: Wed, 15 Jun 2016 14:35:40 +0300 Subject: [PATCH 2/4] Move Mesh-API under FEATURE_IPV6 --- features/{FEATURE_CLIENT => FEATURE_IPV6}/mbed-mesh-api.lib | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename features/{FEATURE_CLIENT => FEATURE_IPV6}/mbed-mesh-api.lib (100%) diff --git a/features/FEATURE_CLIENT/mbed-mesh-api.lib b/features/FEATURE_IPV6/mbed-mesh-api.lib similarity index 100% rename from features/FEATURE_CLIENT/mbed-mesh-api.lib rename to features/FEATURE_IPV6/mbed-mesh-api.lib From 166ea15333958c09405432afee9bc548b20c7119 Mon Sep 17 00:00:00 2001 From: Seppo Takalo Date: Wed, 15 Jun 2016 14:39:16 +0300 Subject: [PATCH 3/4] Remove statically linked Atmel driver --- features/FEATURE_IPV6/atmel-rf-driver.lib | 1 - 1 file changed, 1 deletion(-) delete mode 100644 features/FEATURE_IPV6/atmel-rf-driver.lib diff --git a/features/FEATURE_IPV6/atmel-rf-driver.lib b/features/FEATURE_IPV6/atmel-rf-driver.lib deleted file mode 100644 index 2e57d0fc32..0000000000 --- a/features/FEATURE_IPV6/atmel-rf-driver.lib +++ /dev/null @@ -1 +0,0 @@ -https://github.com/ARMmbed/atmel-rf-driver/#0e3cc04ffd2dc36c0d3edd6be5692fdc5bd9e682 From 5573974714b572e09e34265dfe3e2e8e1bafd0d6 Mon Sep 17 00:00:00 2001 From: Seppo Takalo Date: Wed, 15 Jun 2016 21:26:53 +0300 Subject: [PATCH 4/4] Update core to support FEATURES https://github.com/mbedmicro/mbed/compare/d0db5c94e5ce899412280d8c71d65850e0c8b30b...42561b91931e793fe0151fbd3852c924fe394016 --- core.lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core.lib b/core.lib index 1029889dc0..4d9802479f 100644 --- a/core.lib +++ b/core.lib @@ -1 +1 @@ -https://github.com/mbedmicro/mbed/#d0db5c94e5ce899412280d8c71d65850e0c8b30b +https://github.com/mbedmicro/mbed/#42561b91931e793fe0151fbd3852c924fe394016