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

Nanostack: Add required header file and namespace element instead add all

pull/8479/head
Deepika 2018-09-05 12:00:12 -05:00 committed by adbridge
parent 74832b3edd
commit 9c8c736e88
7 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -138,7 +138,7 @@ int8_t EMACPhy::phy_register()
phy.phy_tx_done_cb = NULL; phy.phy_tx_done_cb = NULL;
emac.set_memory_manager(memory_manager); emac.set_memory_manager(memory_manager);
emac.set_link_input_cb(callback(this, &EMACPhy::emac_phy_rx)); emac.set_link_input_cb(mbed::callback(this, &EMACPhy::emac_phy_rx));
if (!emac.power_up()) { if (!emac.power_up()) {
return -1; return -1;
@ -183,7 +183,7 @@ nsapi_error_t Nanostack::add_ethernet_interface(EMAC &emac, bool default_if, Nan
return NSAPI_ERROR_DEVICE_ERROR; return NSAPI_ERROR_DEVICE_ERROR;
} }
single_phy = new (nothrow) EMACPhy(this->memory_manager, emac); single_phy = new (std::nothrow) EMACPhy(this->memory_manager, emac);
if (!single_phy) { if (!single_phy) {
return NSAPI_ERROR_NO_MEMORY; return NSAPI_ERROR_NO_MEMORY;
} }
@ -194,7 +194,7 @@ nsapi_error_t Nanostack::add_ethernet_interface(EMAC &emac, bool default_if, Nan
Nanostack::EthernetInterface *interface; Nanostack::EthernetInterface *interface;
interface = new (nothrow) Nanostack::EthernetInterface(*single_phy); interface = new (std::nothrow) Nanostack::EthernetInterface(*single_phy);
if (!interface) { if (!interface) {
return NSAPI_ERROR_NO_MEMORY; return NSAPI_ERROR_NO_MEMORY;
} }

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

@ -38,7 +38,7 @@ nsapi_error_t NanostackEthernetInterface::initialize(NanostackEthernetPhy *phy)
return NSAPI_ERROR_PARAMETER; return NSAPI_ERROR_PARAMETER;
} }
_interface = new (nothrow) Nanostack::EthernetInterface(*phy); _interface = new (std::nothrow) Nanostack::EthernetInterface(*phy);
if (!_interface) { if (!_interface) {
return NSAPI_ERROR_NO_MEMORY; return NSAPI_ERROR_NO_MEMORY;
} }

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

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

10
features/nanostack/nanostack-hal-mbed-cmsis-rtos/arm_hal_timer.cpp
View File

@ -17,11 +17,17 @@
// Include before mbed.h to properly get UINT*_C() // Include before mbed.h to properly get UINT*_C()
#include "ns_types.h" #include "ns_types.h"
#include "mbed.h"
#include "platform/SingletonPtr.h" #include "platform/SingletonPtr.h"
#include "platform/arm_hal_timer.h" #include "platform/arm_hal_timer.h"
#include "platform/arm_hal_interrupt.h" #include "platform/arm_hal_interrupt.h"
#include <mbed_assert.h> #include "platform/mbed_assert.h"
#include "Timeout.h"
#include "Timer.h"
#include "events/Event.h"
#include "events/mbed_shared_queues.h"
using namespace mbed;
using namespace events;
static SingletonPtr<Timer> timer; static SingletonPtr<Timer> timer;
static SingletonPtr<Timeout> timeout; static SingletonPtr<Timeout> timeout;

2
features/nanostack/nanostack-interface/Nanostack.cpp
View File

@ -17,8 +17,6 @@
/* Nanostack implementation of NetworkSocketAPI */ /* Nanostack implementation of NetworkSocketAPI */
#include "mbed.h"
#include "rtos.h"
#include "Nanostack.h" #include "Nanostack.h"
#include "NanostackLockGuard.h" #include "NanostackLockGuard.h"

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

@ -18,7 +18,6 @@
#ifndef NANOSTACK_H_ #ifndef NANOSTACK_H_
#define NANOSTACK_H_ #define NANOSTACK_H_
#include "mbed.h"
#include "OnboardNetworkStack.h" #include "OnboardNetworkStack.h"
#include "NanostackMemoryManager.h" #include "NanostackMemoryManager.h"
#include "MeshInterface.h" #include "MeshInterface.h"