Merge pull request #3053 from andreaslarssonublox/ublox_fix_static_init_of_wifi_intf

0xc0170 · web-flow · commit efc7fe0a10d3 · 2016-10-18T10:33:39.000+01:00
Odin: Fixed the emac_interface_t struct for wifi_emac_api.cpp
diff --git a/targets/TARGET_STM/TARGET_STM32F4/TARGET_UBLOX_EVK_ODIN_W2/sdk/wifi_emac/wifi_emac_api.cpp b/targets/TARGET_STM/TARGET_STM32F4/TARGET_UBLOX_EVK_ODIN_W2/sdk/wifi_emac/wifi_emac_api.cpp
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ const emac_interface_ops_t wifi_emac_interface = {`
`69`	`69`	`.set_link_state_cb = wifi_set_link_state_cb`
`70`	`70`	`};`
`71`	`71`
`72`		`-static emac_interface_t _intf = { wifi_emac_interface, NULL };`
	`72`	`+static emac_interface_t* _intf = NULL;`
`73`	`73`
`74`	`74`	`static const cbWLANTARGET_Callback _wlanTargetCallback =`
`75`	`75`	`{`
`@@ -318,7 +318,12 @@ static void wifi_set_link_state_cb(emac_interface_t *emac, emac_link_state_chang`
`318`	`318`
`319`	`319`	`emac_interface_t* wifi_emac_get_interface()`
`320`	`320`	`{`
`321`		`- return &_intf;`
	`321`	`+ if (_intf == NULL) {`
	`322`	`+ _intf = new emac_interface_t();`
	`323`	`+ _intf->hw = NULL;`
	`324`	`+ memcpy((void*)&_intf->ops, &wifi_emac_interface, sizeof(wifi_emac_interface));`
	`325`	`+ }`
	`326`	`+ return _intf;`
`322`	`327`	`}`
`323`	`328`
`324`	`329`	`void wifi_emac_init_mem(void)`