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

Fixed the emac_interface_t struct so that the struct constructor is not used. 

We can not rely on the struct constructor to be run since wifi_emac_get_interface can be run from the OdinWiFiInterface constructor before that.
pull/3053/head
andreas.larsson 2016-10-18 00:36:30 +02:00
parent 7bcc63b202
commit b8355c2073
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
targets/TARGET_STM/TARGET_STM32F4/TARGET_UBLOX_EVK_ODIN_W2/sdk/wifi_emac/wifi_emac_api.cpp
View File

@ -69,7 +69,7 @@ const emac_interface_ops_t wifi_emac_interface = {
.set_link_state_cb = wifi_set_link_state_cb .set_link_state_cb = wifi_set_link_state_cb
}; };
static emac_interface_t _intf = { wifi_emac_interface, NULL }; static emac_interface_t* _intf = NULL;
static const cbWLANTARGET_Callback _wlanTargetCallback = static const cbWLANTARGET_Callback _wlanTargetCallback =
{ {
@ -318,7 +318,12 @@ static void wifi_set_link_state_cb(emac_interface_t *emac, emac_link_state_chang
emac_interface_t* wifi_emac_get_interface() emac_interface_t* wifi_emac_get_interface()
{ {
return &_intf; if (_intf == NULL) {
_intf = new emac_interface_t();
_intf->hw = NULL;
memcpy((void*)&_intf->ops, &wifi_emac_interface, sizeof(wifi_emac_interface));
}
return _intf;
} }
void wifi_emac_init_mem(void) void wifi_emac_init_mem(void)