ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

mbed.h includes removed

pull/9210/head
Antti Kauppila 2018-12-28 14:36:10 +02:00
parent 51143eab02
commit 02b0f79e15
19 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/storage/blockdevice/COMPONENT_FLASHIAP/FlashIAPBlockDevice.cpp
View File

@ -19,7 +19,6 @@
#include "FlashIAPBlockDevice.h" #include "FlashIAPBlockDevice.h"
#include "mbed_critical.h" #include "mbed_critical.h"
#include "mbed.h"
using namespace mbed; using namespace mbed;
#include <inttypes.h> #include <inttypes.h>

1
features/FEATURE_BLE/ble/services/EddystoneConfigService.h
View File

@ -19,7 +19,6 @@
#warning ble/services/EddystoneConfigService.h is deprecated. Please use the example in 'github.com/ARMmbed/ble-examples/tree/master/BLE_EddystoneService'. #warning ble/services/EddystoneConfigService.h is deprecated. Please use the example in 'github.com/ARMmbed/ble-examples/tree/master/BLE_EddystoneService'.
#include "mbed.h"
#include "ble/BLE.h" #include "ble/BLE.h"
#include "ble/services/EddystoneService.h" #include "ble/services/EddystoneService.h"

1
features/FEATURE_BLE/ble/services/EddystoneService.h
View File

@ -20,7 +20,6 @@
#warning ble/services/EddystoneService.h is deprecated. Please use the example in 'github.com/ARMmbed/ble-examples/tree/master/BLE_EddystoneService'. #warning ble/services/EddystoneService.h is deprecated. Please use the example in 'github.com/ARMmbed/ble-examples/tree/master/BLE_EddystoneService'.
#include "ble/BLE.h" #include "ble/BLE.h"
#include "mbed.h"
#include "CircularBuffer.h" #include "CircularBuffer.h"
static const uint8_t BEACON_EDDYSTONE[] = {0xAA, 0xFE}; static const uint8_t BEACON_EDDYSTONE[] = {0xAA, 0xFE};

1
features/FEATURE_BLE/ble/services/UARTService.h
View File

@ -21,7 +21,6 @@
#include "mbed-drivers/mbed.h" #include "mbed-drivers/mbed.h"
#include "mbed-drivers/Stream.h" #include "mbed-drivers/Stream.h"
#else #else
#include "mbed.h"
#include "Stream.h" #include "Stream.h"
#endif #endif

2
features/FEATURE_BLE/ble/services/URIBeaconConfigService.h
View File

@ -22,7 +22,7 @@
#ifdef YOTTA_CFG_MBED_OS #ifdef YOTTA_CFG_MBED_OS
#include "mbed-drivers/mbed.h" #include "mbed-drivers/mbed.h"
#else #else
#include "mbed.h"
#endif #endif
extern const uint8_t UUID_URI_BEACON_SERVICE[UUID::LENGTH_OF_LONG_UUID]; extern const uint8_t UUID_URI_BEACON_SERVICE[UUID::LENGTH_OF_LONG_UUID];

1
features/nanostack/mbed-mesh-api/mbed-mesh-api/MeshInterfaceNanostack.h
View File

@ -16,7 +16,6 @@
#ifndef MESHINTERFACENANOSTACK_H #ifndef MESHINTERFACENANOSTACK_H
#define MESHINTERFACENANOSTACK_H #define MESHINTERFACENANOSTACK_H
#include "mbed.h"
#include "MeshInterface.h" #include "MeshInterface.h"
#include "NanostackRfPhy.h" #include "NanostackRfPhy.h"

1
features/nanostack/mbed-mesh-api/source/MeshInterfaceNanostack.cpp
View File

@ -21,6 +21,7 @@
#include "nanostack/net_interface.h" #include "nanostack/net_interface.h"
#include "thread_management_if.h" #include "thread_management_if.h"
#include "ip6string.h" #include "ip6string.h"
#include "mbed_error.h"
char *Nanostack::Interface::get_ip_address(char *buf, nsapi_size_t buflen) char *Nanostack::Interface::get_ip_address(char *buf, nsapi_size_t buflen)
{ {

1
features/nanostack/mbed-mesh-api/source/NanostackEMACInterface.cpp
View File

@ -8,6 +8,7 @@
#include "arm_hal_phy.h" #include "arm_hal_phy.h"
#include "EMAC.h" #include "EMAC.h"
#include "enet_tasklet.h" #include "enet_tasklet.h"
#include "mbed_interface.h"
class EMACPhy : public NanostackEthernetPhy { class EMACPhy : public NanostackEthernetPhy {
public: public:

2
features/nanostack/mbed-mesh-api/source/WisunInterface.cpp
View File

@ -50,7 +50,7 @@ Nanostack::WisunInterface *WisunInterface::get_interface() const
nsapi_error_t WisunInterface::do_initialize() nsapi_error_t WisunInterface::do_initialize()
{ {
if (!_interface) { if (!_interface) {
_interface = new (nothrow) Nanostack::WisunInterface(*_phy); _interface = new (std::nothrow) Nanostack::WisunInterface(*_phy);
if (!_interface) { if (!_interface) {
return NSAPI_ERROR_NO_MEMORY; return NSAPI_ERROR_NO_MEMORY;
} }

1
features/nanostack/mbed-mesh-api/source/include/callback_handler.h
View File

@ -17,7 +17,6 @@
#ifndef __INCLUDE_CALLBACK_HANDLER_H__ #ifndef __INCLUDE_CALLBACK_HANDLER_H__
#define __INCLUDE_CALLBACK_HANDLER_H__ #define __INCLUDE_CALLBACK_HANDLER_H__
#include "mbed.h"
#include "mesh_interface_types.h" #include "mesh_interface_types.h"
#ifdef __cplusplus #ifdef __cplusplus

5
features/nanostack/nanostack-hal-mbed-cmsis-rtos/arm_hal_fhss_timer.cpp
View File

@ -16,10 +16,13 @@
#include "ns_types.h" #include "ns_types.h"
#include "fhss_api.h" #include "fhss_api.h"
#include "fhss_config.h" #include "fhss_config.h"
#include "mbed.h"
#include "mbed_trace.h" #include "mbed_trace.h"
#include "platform/arm_hal_interrupt.h" #include "platform/arm_hal_interrupt.h"
#include <Timer.h> #include <Timer.h>
#include "equeue.h"
#include "EventQueue.h"
#include "mbed_shared_queues.h"
#include "Timeout.h"
#define TRACE_GROUP "fhdr" #define TRACE_GROUP "fhdr"
#ifndef NUMBER_OF_SIMULTANEOUS_TIMEOUTS #ifndef NUMBER_OF_SIMULTANEOUS_TIMEOUTS

1
features/nanostack/nanostack-interface/NanostackInterface.h
View File

@ -18,7 +18,6 @@
#ifndef NANOSTACK_INTERFACE_H_ #ifndef NANOSTACK_INTERFACE_H_
#define NANOSTACK_INTERFACE_H_ #define NANOSTACK_INTERFACE_H_
#include "mbed.h"
#include "MeshInterface.h" #include "MeshInterface.h"
// Include here for backward compatibility // Include here for backward compatibility
#include "LoWPANNDInterface.h" #include "LoWPANNDInterface.h"

2
features/nanostack/targets/TARGET_NCS36510/NanostackRfPhyNcs36510.cpp
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
#include "mbed.h"
#include "ns_types.h" #include "ns_types.h"
#include <string.h> #include <string.h>
#include "common_functions.h" #include "common_functions.h"

1
features/nanostack/targets/TARGET_NCS36510/NanostackRfPhyNcs36510.h
View File

@ -17,7 +17,6 @@
#ifndef NANOSTACK_PHY_NCS36510_H_ #ifndef NANOSTACK_PHY_NCS36510_H_
#define NANOSTACK_PHY_NCS36510_H_ #define NANOSTACK_PHY_NCS36510_H_
#include "mbed.h"
#include "NanostackRfPhy.h" #include "NanostackRfPhy.h"
class NanostackRfPhyNcs36510 : public NanostackRfPhy { class NanostackRfPhyNcs36510 : public NanostackRfPhy {

3
features/netsocket/NetworkStack.cpp
View File

@ -16,9 +16,10 @@
#include "NetworkStack.h" #include "NetworkStack.h"
#include "nsapi_dns.h" #include "nsapi_dns.h"
#include "mbed.h"
#include "stddef.h" #include "stddef.h"
#include <new> #include <new>
#include "EventQueue.h"
#include "mbed_shared_queues.h"
// Default NetworkStack operations // Default NetworkStack operations
const char *NetworkStack::get_ip_address() const char *NetworkStack::get_ip_address()

4
features/netsocket/cellular/generic_modem_driver/PPPCellularInterface.cpp
View File

@ -24,6 +24,10 @@
#include "mbed_trace.h" #include "mbed_trace.h"
#define TRACE_GROUP "UCID" #define TRACE_GROUP "UCID"
#include "mbed_wait_api.h"
using namespace mbed;
/** /**
* PDP (packet data profile) Context * PDP (packet data profile) Context
*/ */

14
features/netsocket/cellular/generic_modem_driver/PPPCellularInterface.h
View File

@ -18,7 +18,9 @@
#include "CellularBase.h" #include "CellularBase.h"
#include "platform/ATCmdParser.h" #include "platform/ATCmdParser.h"
#include "mbed.h" #include "ATCmdParser.h"
#include "FileHandle.h"
#include "Callback.h"
#if NSAPI_PPP_AVAILABLE #if NSAPI_PPP_AVAILABLE
@ -114,7 +116,7 @@ public:
* use - this permits a derived class to pass a pointer to a not-yet-constructed member object. * use - this permits a derived class to pass a pointer to a not-yet-constructed member object.
*/ */
MBED_DEPRECATED_SINCE("mbed-os-5.9", "This API will be deprecated, use mbed-os/features/cellular/easy_cellular/EasyCellularConnection.h instead.") MBED_DEPRECATED_SINCE("mbed-os-5.9", "This API will be deprecated, use mbed-os/features/cellular/easy_cellular/EasyCellularConnection.h instead.")
PPPCellularInterface(FileHandle *fh, bool debug = false); PPPCellularInterface(mbed::FileHandle *fh, bool debug = false);
/** Destructor /** Destructor
* *
@ -286,7 +288,7 @@ public:
* @param status_cb The callback for status changes * @param status_cb The callback for status changes
*/ */
MBED_DEPRECATED_SINCE("mbed-os-5.9", "This API will be deprecated, use mbed-os/features/cellular/easy_cellular/EasyCellularConnection.h instead.") MBED_DEPRECATED_SINCE("mbed-os-5.9", "This API will be deprecated, use mbed-os/features/cellular/easy_cellular/EasyCellularConnection.h instead.")
virtual void attach(Callback<void(nsapi_event_t, intptr_t)> status_cb); virtual void attach(mbed::Callback<void(nsapi_event_t, intptr_t)> status_cb);
/** Get the connection status /** Get the connection status
* *
@ -308,8 +310,8 @@ public:
virtual nsapi_error_t set_blocking(bool blocking); virtual nsapi_error_t set_blocking(bool blocking);
private: private:
FileHandle *_fh; mbed::FileHandle *_fh;
ATCmdParser *_at; mbed::ATCmdParser *_at;
const char *_new_pin; const char *_new_pin;
const char *_pin; const char *_pin;
const char *_apn; const char *_apn;
@ -317,7 +319,7 @@ private:
const char *_pwd; const char *_pwd;
bool _debug_trace_on; bool _debug_trace_on;
nsapi_ip_stack_t _stack; nsapi_ip_stack_t _stack;
Callback<void(nsapi_event_t, intptr_t)> _connection_status_cb; mbed::Callback<void(nsapi_event_t, intptr_t)> _connection_status_cb;
nsapi_connection_status_t _connect_status; nsapi_connection_status_t _connect_status;
bool _connect_is_blocking; bool _connect_is_blocking;
void base_initialization(); void base_initialization();

2
features/netsocket/cellular/generic_modem_driver/UARTCellularInterface.h
View File

@ -54,7 +54,7 @@ public:
virtual ~UARTCellularInterface(); virtual ~UARTCellularInterface();
private: private:
UARTSerial _serial; mbed::UARTSerial _serial;
PinName _dcd_pin; PinName _dcd_pin;
bool _active_high; bool _active_high;

5
rtos/rtos.h
View File

@ -42,10 +42,7 @@
using namespace rtos; using namespace rtos;
#endif #endif
/* Get mbed lib version number, as RTOS depends on mbed lib features #include "platform/mbed_version.h"
like mbed_error, Callback and others.
*/
#include "mbed.h"
#endif #endif