sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix sixlowpan_utils.c nxstyle complaints

Browse Source 
Signed-off-by: liuhaitao <liuhaitao@xiaomi.com>
This commit is contained in:
liuhaitao 2020-04-16 21:26:12 +08:00 committed by Xiang Xiao
parent 7afd8c6a21
commit 2353e46ee9
1 changed files with 38 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
net/sixlowpan/sixlowpan_utils.c
View File

@ -113,17 +113,18 @@
* sixlowpan_eaddrfromip() handle short and extended addresses, * sixlowpan_eaddrfromip() handle short and extended addresses,
* respectively. * respectively.
* *
* 128 112 96 80 64 48 32 16 * 128 112 96 80 64 48 32 16
* ---- ---- ---- ---- ---- ---- ---- ---- * ---- ---- ---- ---- ---- ---- ---- ----
* fe80 0000 0000 0000 0000 00ff fe00 xx00 1-byte short address IEEE 48-bit MAC * fe80 0000 0000 0000 0000 00ff fe00 xx00 1-byte short address 48-bit MAC
* xxxx 0000 0000 0000 0000 00ff fe00 xxxx 2-byte short address IEEE 48-bit MAC * xxxx 0000 0000 0000 0000 00ff fe00 xxxx 2-byte short address 48-bit MAC
* xxxx 0000 0000 0000 xxxx xxxx xxxx xxxx 8-byte extended address IEEE EUI-64 * xxxx 0000 0000 0000 xxxx xxxx xxxx xxxx 8-byte extended address EUI-64
* *
****************************************************************************/ ****************************************************************************/
#ifndef CONFIG_NET_STARPOINT #ifndef CONFIG_NET_STARPOINT
#ifdef HAVE_BYTEADDR #ifdef HAVE_BYTEADDR
static void sixlowpan_baddrfromip(const net_ipv6addr_t ipaddr, FAR uint8_t *baddr) static void sixlowpan_baddrfromip(const net_ipv6addr_t ipaddr,
FAR uint8_t *baddr)
{ {
/* Big-endian uint16_t to byte order */ /* Big-endian uint16_t to byte order */
@ -132,7 +133,8 @@ static void sixlowpan_baddrfromip(const net_ipv6addr_t ipaddr, FAR uint8_t *badd
#endif #endif
#ifdef HAVE_SADDR #ifdef HAVE_SADDR
static void sixlowpan_saddrfromip(const net_ipv6addr_t ipaddr, FAR uint8_t *saddr) static void sixlowpan_saddrfromip(const net_ipv6addr_t ipaddr,
FAR uint8_t *saddr)
{ {
/* Big-endian uint16_t to byte order */ /* Big-endian uint16_t to byte order */
@ -142,7 +144,8 @@ static void sixlowpan_saddrfromip(const net_ipv6addr_t ipaddr, FAR uint8_t *sadd
#endif #endif
#ifdef HAVE_EADDR #ifdef HAVE_EADDR
static void sixlowpan_eaddrfromip(const net_ipv6addr_t ipaddr, FAR uint8_t *eaddr) static void sixlowpan_eaddrfromip(const net_ipv6addr_t ipaddr,
FAR uint8_t *eaddr)
{ {
FAR uint8_t *eptr = eaddr; FAR uint8_t *eptr = eaddr;
int i; int i;
@ -169,10 +172,10 @@ static void sixlowpan_eaddrfromip(const net_ipv6addr_t ipaddr, FAR uint8_t *eadd
* *
* Description: * Description:
* sixlowpan_nexthopaddr(): If the destination is on-link, extract the * sixlowpan_nexthopaddr(): If the destination is on-link, extract the
* IEEE 802.15.14 destination address from the destination IP address. If the * IEEE 802.15.14 destination address from the destination IP address.
* destination is not reachable directly, use the routing table (if available) * If the destination is not reachable directly, use the routing table
* or fall back to the default router IP address and use the router IP address * (if available) or fall back to the default router IP address and use
* to derive the IEEE 802.15.4 MAC address. * the router IP address to derive the IEEE 802.15.4 MAC address.
* *
****************************************************************************/ ****************************************************************************/
@ -230,13 +233,13 @@ int sixlowpan_nexthopaddr(FAR struct radio_driver_s *radio,
* handles a tagged address union which may either a short or and * handles a tagged address union which may either a short or and
* extended destination address. * extended destination address.
* *
* 128 112 96 80 64 48 32 16 * 128 112 96 80 64 48 32 16
* ---- ---- ---- ---- ---- ---- ---- ---- * ---- ---- ---- ---- ---- ---- ---- ----
* ffxx xxxx xxxx xxxx xxxx xxxx xxxx xxxx Multicast address (RFC 3513) * ffxx xxxx xxxx xxxx xxxx xxxx xxxx xxxx Multicast address (RFC 3513)
* ff02 0000 0000 0000 0000 0000 0000 0001 All nodes multicast group * ff02 0000 0000 0000 0000 0000 0000 0001 All nodes multicast group
* xxxx 0000 0000 0000 0000 00ff fe00 xx00 1-byte short address IEEE 48-bit MAC * xxxx 0000 0000 0000 0000 00ff fe00 xx00 1-byte short address 48-bit MAC
* xxxx 0000 0000 0000 0000 00ff fe00 xxxx 2-byte short address IEEE 48-bit MAC * xxxx 0000 0000 0000 0000 00ff fe00 xxxx 2-byte short address 48-bit MAC
* xxxx 0000 0000 0000 xxxx xxxx xxxx xxxx 8-byte extended address IEEE EUI-64 * xxxx 0000 0000 0000 xxxx xxxx xxxx xxxx 8-byte extended address EUI-64
* *
* In the case there the IEEE 802.15.4 node functions as an endpoint in a * In the case there the IEEE 802.15.4 node functions as an endpoint in a
* start topology, the destination address will, instead, be the address * start topology, the destination address will, instead, be the address
@ -310,8 +313,9 @@ int sixlowpan_destaddrfromip(FAR struct radio_driver_s *radio,
/* Otherwise, the destination MAC address is encoded in the IP address */ /* Otherwise, the destination MAC address is encoded in the IP address */
/* If the address is link-local, or matches the prefix of the local address, /* If the address is link-local, or matches the prefix of the local
* the interface identifier can be extracted from the lower bits of the address. * address, the interface identifier can be extracted from the lower
* bits of the address.
*/ */
if (!sixlowpan_islinklocal(ipaddr) && if (!sixlowpan_islinklocal(ipaddr) &&
@ -414,11 +418,11 @@ int sixlowpan_destaddrfromip(FAR struct radio_driver_s *radio,
* address from an IEEE802.15.4 short address (saddr), extended address * address from an IEEE802.15.4 short address (saddr), extended address
* (eaddr), or other variable length radio addresses. * (eaddr), or other variable length radio addresses.
* *
* 128 112 96 80 64 48 32 16 * 128 112 96 80 64 48 32 16
* ---- ---- ---- ---- ---- ---- ---- ---- * ---- ---- ---- ---- ---- ---- ---- ----
* fe80 0000 0000 0000 0000 00ff fe00 xx00 1-byte short address IEEE 48-bit MAC * fe80 0000 0000 0000 0000 00ff fe00 xx00 1-byte short address 48-bit MAC
* fe80 0000 0000 0000 0000 00ff fe00 xxxx 2-byte short address IEEE 48-bit MAC * fe80 0000 0000 0000 0000 00ff fe00 xxxx 2-byte short address 48-bit MAC
* fe80 0000 0000 0000 xxxx xxxx xxxx xxxx 8-byte extended address IEEE EUI-64 * fe80 0000 0000 0000 xxxx xxxx xxxx xxxx 8-byte extended address EUI-64
* *
****************************************************************************/ ****************************************************************************/
@ -514,11 +518,11 @@ void sixlowpan_ipfromaddr(FAR const struct netdev_varaddr_s *addr,
* IEEE802.15.4 MAC addresses. sixlowpan_destaddrfromip() is intended to * IEEE802.15.4 MAC addresses. sixlowpan_destaddrfromip() is intended to
* handle a tagged address or any size. * handle a tagged address or any size.
* *
* 128 112 96 80 64 48 32 16 * 128 112 96 80 64 48 32 16
* ---- ---- ---- ---- ---- ---- ---- ---- * ---- ---- ---- ---- ---- ---- ---- ----
* fe80 0000 0000 0000 0000 00ff fe00 xx00 1-byte short address IEEE 48-bit MAC * fe80 0000 0000 0000 0000 00ff fe00 xx00 1-byte short address 48-bit MAC
* fe80 0000 0000 0000 0000 00ff fe00 xxxx 2-byte short address IEEE 48-bit MAC * fe80 0000 0000 0000 0000 00ff fe00 xxxx 2-byte short address 48-bit MAC
* fe80 0000 0000 0000 xxxx xxxx xxxx xxxx 8-byte extended address IEEE EUI-64 * fe80 0000 0000 0000 xxxx xxxx xxxx xxxx 8-byte extended address EUI-64
* *
****************************************************************************/ ****************************************************************************/
@ -653,7 +657,9 @@ int sixlowpan_src_panid(FAR struct radio_driver_s *radio,
return ret; return ret;
} }
/* MAC802154 gives us PAN ID in Little Endinan Order, but we need it in Network Order */ /* MAC802154 gives us PAN ID in Little Endinan Order, but we need
* it in Network Order.
*/
panid[0] = arg.u.getreq.attrval.mac.panid[1]; panid[0] = arg.u.getreq.attrval.mac.panid[1];
panid[1] = arg.u.getreq.attrval.mac.panid[0]; panid[1] = arg.u.getreq.attrval.mac.panid[0];