subsys: net: ip: l2: openthread: Fixed compiler errors and warnings

- Debug code did not compile when level set to DEBUG. - OpenThread has a define for BASE which conflicts with the BASE field in MTB_Type defined in MKW41Z4.h. The change is consistent with how it was handled in the KW41 port in OpenThread. Signed-off-by: David Leach <[email protected]>
a1ien · Apr 11, 2018 · 03b2408 · 03b2408
1 parent 51a2090
commit 03b2408
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/ext/hal/nxp/mcux/devices/MKW41Z4/MKW41Z4.h b/ext/hal/nxp/mcux/devices/MKW41Z4/MKW41Z4.h
@@ -4586,7 +4586,7 @@ typedef struct {
   __IO uint32_t POSITION;                          /**< MTB Position Register, offset: 0x0 */
   __IO uint32_t MASTER;                            /**< MTB Master Register, offset: 0x4 */
   __IO uint32_t FLOW;                              /**< MTB Flow Register, offset: 0x8 */
-  __I  uint32_t BASE;                              /**< MTB Base Register, offset: 0xC */
+  __I  uint32_t _BASE;                              /**< MTB Base Register, offset: 0xC */
        uint8_t RESERVED_0[3824];
   __I  uint32_t MODECTRL;                          /**< Integration Mode Control Register, offset: 0xF00 */
        uint8_t RESERVED_1[156];

diff --git a/subsys/net/ip/l2/openthread/openthread_utils.c b/subsys/net/ip/l2/openthread/openthread_utils.c
@@ -123,7 +123,7 @@ void add_ipv6_addr_to_ot(struct openthread_context *context)
 		char buf[NET_IPV6_ADDR_LEN];
 
 		NET_DBG("Added %s", net_addr_ntop(AF_INET6,
-						  &laddr, buf,
+						  &addr.mAddress, buf,
 						  sizeof(buf)));
 	}
 #endif
@@ -157,7 +157,7 @@ void add_ipv6_maddr_to_ot(struct openthread_context *context)
 		char buf[NET_IPV6_ADDR_LEN];
 
 		NET_DBG("Added multicast %s",
-			net_addr_ntop(AF_INET6, &laddr,
+			net_addr_ntop(AF_INET6, &addr,
 				      buf, sizeof(buf)));
 	}
 #endif