Merge pull request #8996 from jamesbeyond/fm_eth_fix

Cruz Monrreal · web-flow · commit 0e3d71270239 · 2018-12-07T14:47:57.000-06:00
Fix uninitialized handler pointer in FastModels ethernet driver
diff --git a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/drivers/lan91c111.c b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/drivers/lan91c111.c
@@ -18,7 +18,7 @@
 #include "lan91c111.h"
 #include <stddef.h>
 
-static lan91_handle_t *lan91c111_handle;
+static lan91_handle_t lan91c111_handle;
 
 void LAN91_init(void)
 {
@@ -95,8 +95,8 @@ void read_MACaddr(uint8_t *addr)
 void LAN91_SetCallback(lan91_callback_t callback, void *userData)
 {
     /* Set callback and userData. */
-    lan91c111_handle->callback = callback;
-    lan91c111_handle->userData = userData;
+    lan91c111_handle.callback = callback;
+    lan91c111_handle.userData = userData;
 }
 
 
@@ -216,8 +216,8 @@ void ETHERNET_Handler(void)
     if ((LREG(uint8_t, B2_IST) & IST_RCV) != 0) {
         LREG(uint8_t,  B2_MSK) = 0;
         /* Callback function. */
-        if (lan91c111_handle->callback) {
-            lan91c111_handle->callback(LAN91_RxEvent, lan91c111_handle->userData);
+        if (lan91c111_handle.callback) {
+            lan91c111_handle.callback(LAN91_RxEvent, lan91c111_handle.userData);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`#include "lan91c111.h"`
`19`	`19`	`#include <stddef.h>`
`20`	`20`
`21`		`-static lan91_handle_t *lan91c111_handle;`
	`21`	`+static lan91_handle_t lan91c111_handle;`
`22`	`22`
`23`	`23`	`void LAN91_init(void)`
`24`	`24`	`{`
`@@ -95,8 +95,8 @@ void read_MACaddr(uint8_t *addr)`
`95`	`95`	`void LAN91_SetCallback(lan91_callback_t callback, void *userData)`
`96`	`96`	`{`
`97`	`97`	`/* Set callback and userData. */`
`98`		`- lan91c111_handle->callback = callback;`
`99`		`- lan91c111_handle->userData = userData;`
	`98`	`+ lan91c111_handle.callback = callback;`
	`99`	`+ lan91c111_handle.userData = userData;`
`100`	`100`	`}`
`101`	`101`
`102`	`102`
`@@ -216,8 +216,8 @@ void ETHERNET_Handler(void)`
`216`	`216`	`if ((LREG(uint8_t, B2_IST) & IST_RCV) != 0) {`
`217`	`217`	`LREG(uint8_t, B2_MSK) = 0;`
`218`	`218`	`/* Callback function. */`
`219`		`- if (lan91c111_handle->callback) {`
`220`		`- lan91c111_handle->callback(LAN91_RxEvent, lan91c111_handle->userData);`
	`219`	`+ if (lan91c111_handle.callback) {`
	`220`	`+ lan91c111_handle.callback(LAN91_RxEvent, lan91c111_handle.userData);`
`221`	`221`	`}`
`222`	`222`	`}`
`223`	`223`	`}`