Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-04 14:53:47 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merged in antmerlino/nuttx/sixlowpan-ieee802154-address-endianness (pull request #790)

Browse Source 
sixlowpan/ieee802154: IEEE802.15.4 stores and uses addresses in little endian order.

# Conflicts:
#	drivers/wireless/ieee802154/xbee/xbee_netdev.c

Approved-by: GregoryN <gnutt@nuttx.org>
This commit is contained in:
Anthony Merlino
2018-12-18 15:06:41 +00:00
committed by GregoryN
parent f47e0da90c
commit c897790e55
6 changed files with 146 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wireless/ieee802154/mac802154_loopback.c
+6 -6
View File
@@ -225,16 +225,16 @@ static void lo_addr2ip(FAR struct net_driver_s *dev)
dev->d_ipv6addr[1] = 0;
dev->d_ipv6addr[2] = 0;
dev->d_ipv6addr[3] = 0;
dev->d_ipv6addr[4] = (uint16_t)g_eaddr[0] << 8 | (uint16_t)g_eaddr[1];
dev->d_ipv6addr[5] = (uint16_t)g_eaddr[2] << 8 | (uint16_t)g_eaddr[3];
dev->d_ipv6addr[6] = (uint16_t)g_eaddr[4] << 8 | (uint16_t)g_eaddr[5];
dev->d_ipv6addr[7] = (uint16_t)g_eaddr[6] << 8 | (uint16_t)g_eaddr[7];
dev->d_ipv6addr[4] = HTONS((uint16_t)g_eaddr[7] << 8 | (uint16_t)g_eaddr[6]);
dev->d_ipv6addr[5] = HTONS((uint16_t)g_eaddr[5] << 8 | (uint16_t)g_eaddr[4]);
dev->d_ipv6addr[6] = HTONS((uint16_t)g_eaddr[3] << 8 | (uint16_t)g_eaddr[2]);
dev->d_ipv6addr[7] = HTONS((uint16_t)g_eaddr[1] << 8 | (uint16_t)g_eaddr[0]);
/* Invert the U/L bit */
dev->d_ipv6addr[4] ^= HTONS(0x0200);
}
#endif
}
#else
static void lo_addr2ip(FAR struct net_driver_s *dev)
{
@@ -253,7 +253,7 @@ static void lo_addr2ip(FAR struct net_driver_s *dev)
dev->d_ipv6addr[4] = 0;
dev->d_ipv6addr[5] = HTONS(0x00ff);
dev->d_ipv6addr[6] = HTONS(0xfe00);
dev->d_ipv6addr[7] = (uint16_t)g_saddr[0] << 8 | (uint16_t)g_saddr[1];
dev->d_ipv6addr[7] = HTONS((uint16_t)g_saddr[1] << 8 | (uint16_t)g_saddr[0]);
#endif
}
#endif
wireless/ieee802154/mac802154_netdev.c
+23 -7
View File
@@ -283,7 +283,18 @@ static int macnet_advertise(FAR struct net_driver_s *dev)
/* Set the MAC address as the eaddr */
eaddr = arg.getreq.attrval.mac.eaddr;
IEEE802154_EADDRCOPY(dev->d_mac.radio.nv_addr, eaddr);
/* Network layers expect address in Network Order (Big Endian) */
dev->d_mac.radio.nv_addr[0] = eaddr[7];
dev->d_mac.radio.nv_addr[1] = eaddr[6];
dev->d_mac.radio.nv_addr[2] = eaddr[5];
dev->d_mac.radio.nv_addr[3] = eaddr[4];
dev->d_mac.radio.nv_addr[4] = eaddr[3];
dev->d_mac.radio.nv_addr[5] = eaddr[2];
dev->d_mac.radio.nv_addr[6] = eaddr[1];
dev->d_mac.radio.nv_addr[7] = eaddr[0];
dev->d_mac.radio.nv_addrlen = IEEE802154_EADDRSIZE;
/* Set the IP address based on the eaddr */
@@ -292,10 +303,10 @@ static int macnet_advertise(FAR struct net_driver_s *dev)
dev->d_ipv6addr[1] = 0;
dev->d_ipv6addr[2] = 0;
dev->d_ipv6addr[3] = 0;
dev->d_ipv6addr[4] = (uint16_t)eaddr[0] << 8 | (uint16_t)eaddr[1];
dev->d_ipv6addr[5] = (uint16_t)eaddr[2] << 8 | (uint16_t)eaddr[3];
dev->d_ipv6addr[6] = (uint16_t)eaddr[4] << 8 | (uint16_t)eaddr[5];
dev->d_ipv6addr[7] = (uint16_t)eaddr[6] << 8 | (uint16_t)eaddr[7];
dev->d_ipv6addr[4] = HTONS((uint16_t)eaddr[7] << 8 | (uint16_t)eaddr[6]);
dev->d_ipv6addr[5] = HTONS((uint16_t)eaddr[5] << 8 | (uint16_t)eaddr[4]);
dev->d_ipv6addr[6] = HTONS((uint16_t)eaddr[3] << 8 | (uint16_t)eaddr[2]);
dev->d_ipv6addr[7] = HTONS((uint16_t)eaddr[1] << 8 | (uint16_t)eaddr[0]);
/* Invert the U/L bit */
@@ -324,7 +335,12 @@ static int macnet_advertise(FAR struct net_driver_s *dev)
/* Set the MAC address as the saddr */
saddr = arg.getreq.attrval.mac.saddr;
IEEE802154_SADDRCOPY(dev->d_mac.radio.nv_addr, saddr);
/* Network layers expect address in Network Order (Big Endian) */
dev->d_mac.radio.nv_addr[0] = saddr[1];
dev->d_mac.radio.nv_addr[1] = saddr[0];
dev->d_mac.radio.nv_addrlen = IEEE802154_SADDRSIZE;
/* Set the IP address based on the saddr */
@@ -336,7 +352,7 @@ static int macnet_advertise(FAR struct net_driver_s *dev)
dev->d_ipv6addr[4] = 0;
dev->d_ipv6addr[5] = HTONS(0x00ff);
dev->d_ipv6addr[6] = HTONS(0xfe00);
dev->d_ipv6addr[7] = (uint16_t)saddr[0] << 8 | (uint16_t)saddr[1];
dev->d_ipv6addr[7] = HTONS((uint16_t)saddr[1] << 8 | (uint16_t)saddr[0]);
return OK;
}
#endif