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

Initialize the interface at the construction and make sure 

that it's done only once.
pull/8975/head
Kari Haapalehto 2018-12-05 13:33:42 +02:00
parent e02a8ab2f1
commit f7de4a4a0f
3 changed files with 43 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -178,8 +178,19 @@ bool LoWPANNDInterface::getRouterIpAddress(char *address, int8_t len)
#if MBED_CONF_NSAPI_DEFAULT_MESH_TYPE == LOWPAN && DEVICE_802_15_4_PHY #if MBED_CONF_NSAPI_DEFAULT_MESH_TYPE == LOWPAN && DEVICE_802_15_4_PHY
MBED_WEAK MeshInterface *MeshInterface::get_target_default_instance() MBED_WEAK MeshInterface *MeshInterface::get_target_default_instance()
{ {
static LoWPANNDInterface lowpan(&NanostackRfPhy::get_default_instance()); static bool inited;
static LoWPANNDInterface interface;
return &lowpan; singleton_lock();
if (!inited) {
nsapi_error_t result = interface.initialize(&NanostackRfPhy::get_default_instance());
if (result != 0) {
tr_error("LoWPANND initialize failed: %d", error);
singleton_unlock();
return NULL;
}
inited = true;
}
singleton_unlock();
return &interface;
} }
#endif #endif

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

@ -269,10 +269,22 @@ mesh_error_t Nanostack::ThreadInterface::device_pskd_set(const char *pskd)
#define THREAD 0x2345 #define THREAD 0x2345
#if MBED_CONF_NSAPI_DEFAULT_MESH_TYPE == THREAD && DEVICE_802_15_4_PHY #if MBED_CONF_NSAPI_DEFAULT_MESH_TYPE == THREAD && DEVICE_802_15_4_PHY
MBED_WEAK MeshInterface *MeshInterface::get_target_default_instance() MBED_WEAK MeshInterface *MeshInterface::get_target_default_instance()
{ {
static ThreadInterface thread(&NanostackRfPhy::get_default_instance()); static bool inited;
static ThreadInterface interface;
return &thread; singleton_lock();
if (!inited) {
nsapi_error_t result = interface.initialize(&NanostackRfPhy::get_default_instance());
if (result != 0) {
tr_error("Thread initialize failed: %d", error);
singleton_unlock();
return NULL;
}
inited = true;
}
singleton_unlock();
return &interface;
} }
#endif #endif

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

@ -178,8 +178,19 @@ bool WisunInterface::getRouterIpAddress(char *address, int8_t len)
#if MBED_CONF_NSAPI_DEFAULT_MESH_TYPE == WISUN && DEVICE_802_15_4_PHY #if MBED_CONF_NSAPI_DEFAULT_MESH_TYPE == WISUN && DEVICE_802_15_4_PHY
MBED_WEAK MeshInterface *MeshInterface::get_target_default_instance() MBED_WEAK MeshInterface *MeshInterface::get_target_default_instance()
{ {
static WisunInterface wisun(&NanostackRfPhy::get_default_instance()); static bool inited;
static WisunInterface interface;
return &wisun; singleton_lock();
if (!inited) {
nsapi_error_t result = interface.initialize(&NanostackRfPhy::get_default_instance());
if (result != 0) {
tr_error("Wi-SUN initialize failed: %d", error);
singleton_unlock();
return NULL;
}
inited = true;
}
singleton_unlock();
return &interface;
} }
#endif #endif