mirror of https://github.com/ARMmbed/mbed-os.git
				
				
				
			restructure - Fixed include paths damaged by the restructure
							parent
							
								
									960d69f081
								
							
						
					
					
						commit
						c2d9fc29ff
					
				| 
						 | 
				
			
			@ -18,7 +18,8 @@
 | 
			
		|||
 | 
			
		||||
typedef int FILEHANDLE;
 | 
			
		||||
 | 
			
		||||
#include <stdio.h>
 | 
			
		||||
#include <cstdio>
 | 
			
		||||
#include <cstring>
 | 
			
		||||
 | 
			
		||||
#if defined(__ARMCC_VERSION) || defined(__ICCARM__)
 | 
			
		||||
#    define O_RDONLY 0
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -14,7 +14,7 @@
 | 
			
		|||
 * limitations under the License.
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
#include "network-socket/CellularInterface.h"
 | 
			
		||||
#include "netsocket/CellularInterface.h"
 | 
			
		||||
#include <stdlib.h>
 | 
			
		||||
#include <string.h>
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -17,7 +17,7 @@
 | 
			
		|||
#ifndef CELLULAR_INTERFACE_H
 | 
			
		||||
#define CELLULAR_INTERFACE_H
 | 
			
		||||
 
 | 
			
		||||
#include "network-socket/NetworkInterface.h"
 | 
			
		||||
#include "netsocket/NetworkInterface.h"
 | 
			
		||||
 
 | 
			
		||||
 | 
			
		||||
/** CellularInterface class
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -17,7 +17,7 @@
 | 
			
		|||
#ifndef ETH_INTERFACE_H
 | 
			
		||||
#define ETH_INTERFACE_H
 | 
			
		||||
 | 
			
		||||
#include "network-socket/NetworkInterface.h"
 | 
			
		||||
#include "netsocket/NetworkInterface.h"
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
/** EthInterface class
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -17,7 +17,7 @@
 | 
			
		|||
#ifndef MESH_INTERFACE_H
 | 
			
		||||
#define MESH_INTERFACE_H
 | 
			
		||||
 | 
			
		||||
#include "network-socket/NetworkInterface.h"
 | 
			
		||||
#include "netsocket/NetworkInterface.h"
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
/** MeshInterface class
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -14,8 +14,8 @@
 | 
			
		|||
 * limitations under the License.
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
#include "network-socket/NetworkInterface.h"
 | 
			
		||||
#include "network-socket/NetworkStack.h"
 | 
			
		||||
#include "netsocket/NetworkInterface.h"
 | 
			
		||||
#include "netsocket/NetworkStack.h"
 | 
			
		||||
#include <string.h>
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -17,8 +17,8 @@
 | 
			
		|||
#ifndef NETWORK_INTERFACE_H
 | 
			
		||||
#define NETWORK_INTERFACE_H
 | 
			
		||||
 | 
			
		||||
#include "network-socket/nsapi_types.h"
 | 
			
		||||
#include "network-socket/SocketAddress.h"
 | 
			
		||||
#include "netsocket/nsapi_types.h"
 | 
			
		||||
#include "netsocket/SocketAddress.h"
 | 
			
		||||
 | 
			
		||||
// Predeclared class
 | 
			
		||||
class NetworkStack;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -18,8 +18,8 @@
 | 
			
		|||
#define NETWORK_STACK_H
 | 
			
		||||
 | 
			
		||||
#include "nsapi_types.h"
 | 
			
		||||
#include "network-socket/SocketAddress.h"
 | 
			
		||||
#include "network-socket/NetworkInterface.h"
 | 
			
		||||
#include "netsocket/SocketAddress.h"
 | 
			
		||||
#include "netsocket/NetworkInterface.h"
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
/** NetworkStack class
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -17,8 +17,8 @@
 | 
			
		|||
#ifndef SOCKET_H
 | 
			
		||||
#define SOCKET_H
 | 
			
		||||
 | 
			
		||||
#include "network-socket/SocketAddress.h"
 | 
			
		||||
#include "network-socket/NetworkStack.h"
 | 
			
		||||
#include "netsocket/SocketAddress.h"
 | 
			
		||||
#include "netsocket/NetworkStack.h"
 | 
			
		||||
#include "rtos/Mutex.h"
 | 
			
		||||
#include "Callback.h"
 | 
			
		||||
#include "toolchain.h"
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -17,10 +17,10 @@
 | 
			
		|||
#ifndef TCPSERVER_H
 | 
			
		||||
#define TCPSERVER_H
 | 
			
		||||
 | 
			
		||||
#include "network-socket/Socket.h"
 | 
			
		||||
#include "network-socket/TCPSocket.h"
 | 
			
		||||
#include "network-socket/NetworkStack.h"
 | 
			
		||||
#include "network-socket/NetworkInterface.h"
 | 
			
		||||
#include "netsocket/Socket.h"
 | 
			
		||||
#include "netsocket/TCPSocket.h"
 | 
			
		||||
#include "netsocket/NetworkStack.h"
 | 
			
		||||
#include "netsocket/NetworkInterface.h"
 | 
			
		||||
#include "rtos/Semaphore.h"
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -17,9 +17,9 @@
 | 
			
		|||
#ifndef TCPSOCKET_H
 | 
			
		||||
#define TCPSOCKET_H
 | 
			
		||||
 | 
			
		||||
#include "network-socket/Socket.h"
 | 
			
		||||
#include "network-socket/NetworkStack.h"
 | 
			
		||||
#include "network-socket/NetworkInterface.h"
 | 
			
		||||
#include "netsocket/Socket.h"
 | 
			
		||||
#include "netsocket/NetworkStack.h"
 | 
			
		||||
#include "netsocket/NetworkInterface.h"
 | 
			
		||||
#include "rtos/Semaphore.h"
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -17,9 +17,9 @@
 | 
			
		|||
#ifndef UDPSOCKET_H
 | 
			
		||||
#define UDPSOCKET_H
 | 
			
		||||
 | 
			
		||||
#include "network-socket/Socket.h"
 | 
			
		||||
#include "network-socket/NetworkStack.h"
 | 
			
		||||
#include "network-socket/NetworkInterface.h"
 | 
			
		||||
#include "netsocket/Socket.h"
 | 
			
		||||
#include "netsocket/NetworkStack.h"
 | 
			
		||||
#include "netsocket/NetworkInterface.h"
 | 
			
		||||
#include "rtos/Semaphore.h"
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -14,7 +14,7 @@
 | 
			
		|||
 * limitations under the License.
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
#include "network-socket/WiFiInterface.h"
 | 
			
		||||
#include "netsocket/WiFiInterface.h"
 | 
			
		||||
#include <stdlib.h>
 | 
			
		||||
#include <string.h>
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -17,7 +17,7 @@
 | 
			
		|||
#ifndef WIFI_INTERFACE_H
 | 
			
		||||
#define WIFI_INTERFACE_H
 | 
			
		||||
 | 
			
		||||
#include "network-socket/NetworkInterface.h"
 | 
			
		||||
#include "netsocket/NetworkInterface.h"
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
/** Enum of WiFi encryption types
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -24,19 +24,19 @@
 | 
			
		|||
#ifdef __cplusplus
 | 
			
		||||
 | 
			
		||||
// entry point for C++ api
 | 
			
		||||
#include "network-socket/SocketAddress.h"
 | 
			
		||||
#include "network-socket/NetworkStack.h"
 | 
			
		||||
#include "netsocket/SocketAddress.h"
 | 
			
		||||
#include "netsocket/NetworkStack.h"
 | 
			
		||||
 | 
			
		||||
#include "network-socket/NetworkInterface.h"
 | 
			
		||||
#include "network-socket/EthInterface.h"
 | 
			
		||||
#include "network-socket/WiFiInterface.h"
 | 
			
		||||
#include "network-socket/CellularInterface.h"
 | 
			
		||||
#include "network-socket/MeshInterface.h"
 | 
			
		||||
#include "netsocket/NetworkInterface.h"
 | 
			
		||||
#include "netsocket/EthInterface.h"
 | 
			
		||||
#include "netsocket/WiFiInterface.h"
 | 
			
		||||
#include "netsocket/CellularInterface.h"
 | 
			
		||||
#include "netsocket/MeshInterface.h"
 | 
			
		||||
 | 
			
		||||
#include "network-socket/Socket.h"
 | 
			
		||||
#include "network-socket/UDPSocket.h"
 | 
			
		||||
#include "network-socket/TCPSocket.h"
 | 
			
		||||
#include "network-socket/TCPServer.h"
 | 
			
		||||
#include "netsocket/Socket.h"
 | 
			
		||||
#include "netsocket/UDPSocket.h"
 | 
			
		||||
#include "netsocket/TCPSocket.h"
 | 
			
		||||
#include "netsocket/TCPServer.h"
 | 
			
		||||
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -15,7 +15,7 @@
 | 
			
		|||
 * limitations under the License.
 | 
			
		||||
 */
 | 
			
		||||
#include "nsapi_dns.h"
 | 
			
		||||
#include "network-socket/UDPSocket.h"
 | 
			
		||||
#include "netsocket/UDPSocket.h"
 | 
			
		||||
#include <string.h>
 | 
			
		||||
#include <stdlib.h>
 | 
			
		||||
#include <stdio.h>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -19,7 +19,7 @@
 | 
			
		|||
 | 
			
		||||
#include "nsapi_types.h"
 | 
			
		||||
#ifdef __cplusplus
 | 
			
		||||
#include "network-socket/NetworkStack.h"
 | 
			
		||||
#include "netsocket/NetworkStack.h"
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#ifndef __cplusplus
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										2
									
								
								mbed.h
								
								
								
								
							
							
						
						
									
										2
									
								
								mbed.h
								
								
								
								
							| 
						 | 
				
			
			@ -23,7 +23,7 @@
 | 
			
		|||
#endif
 | 
			
		||||
 | 
			
		||||
#if MBED_CONF_NSAPI_PRESENT
 | 
			
		||||
#include "network-socket/nsapi.h"
 | 
			
		||||
#include "netsocket/nsapi.h"
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#if MBED_CONF_EVENTS_PRESENT
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -16,13 +16,13 @@
 | 
			
		|||
#ifndef MBED_PLATFORM_H
 | 
			
		||||
#define MBED_PLATFORM_H
 | 
			
		||||
 | 
			
		||||
#include "device.h"
 | 
			
		||||
#include "PinNames.h"
 | 
			
		||||
#include "PeripheralNames.h"
 | 
			
		||||
 | 
			
		||||
#include <cstddef>
 | 
			
		||||
#include <cstdlib>
 | 
			
		||||
#include <cstdio>
 | 
			
		||||
#include <cstring>
 | 
			
		||||
 | 
			
		||||
#include "device.h"
 | 
			
		||||
#include "PinNames.h"
 | 
			
		||||
#include "PeripheralNames.h"
 | 
			
		||||
 | 
			
		||||
#endif
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue