Merge pull request #3053 from andreaslarssonublox/ublox_fix_static_init_of_wifi_intf

Odin: Fixed the emac_interface_t struct for wifi_emac_api.cpp
pull/2798/merge
Martin Kojtal 2016-10-18 10:33:39 +01:00 committed by GitHub
commit efc7fe0a10
1 changed files with 7 additions and 2 deletions

View File

@ -69,7 +69,7 @@ const emac_interface_ops_t wifi_emac_interface = {
.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 =
{
@ -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()
{
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)