You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ac...@apache.org on 2020/04/17 22:46:09 UTC
[incubator-nuttx] branch releases/9.0 updated (3c82922 -> e4d5363)
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a change to branch releases/9.0
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git.
from 3c82922 Fix typos and nxstyle complaints.
new c269a6e Fix sixlowpan build break with -Werror option under macos
new a5540fd Fix sixlowpan_utils.c nxstyle complaints
new e4d5363 Fix sixlowpan_framer.c build warnings under macos
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
net/sixlowpan/sixlowpan_framer.c | 2 +-
net/sixlowpan/sixlowpan_utils.c | 74 +++++++++++++++++++++++-----------------
2 files changed, 43 insertions(+), 33 deletions(-)
[incubator-nuttx] 03/03: Fix sixlowpan_framer.c build warnings
under macos
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch releases/9.0
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit e4d5363935d10ceee1be91beaec92723ac102dde
Author: liuhaitao <li...@xiaomi.com>
AuthorDate: Thu Apr 16 23:40:34 2020 +0800
Fix sixlowpan_framer.c build warnings under macos
sixlowpan/sixlowpan_framer.c:104:20: warning: unused function 'sixlowpan_saddrnull'
[-Wunused-function]
static inline bool sixlowpan_saddrnull(FAR const uint8_t *saddr)
^
sixlowpan/sixlowpan_framer.c:124:20: warning: unused function 'sixlowpan_eaddrnull'
[-Wunused-function]
static inline bool sixlowpan_eaddrnull(FAR const uint8_t *eaddr)
^
2 warnings generated.
Signed-off-by: liuhaitao <li...@xiaomi.com>
---
net/sixlowpan/sixlowpan_framer.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/sixlowpan/sixlowpan_framer.c b/net/sixlowpan/sixlowpan_framer.c
index 7f6a4f9..8a2c702 100644
--- a/net/sixlowpan/sixlowpan_framer.c
+++ b/net/sixlowpan/sixlowpan_framer.c
@@ -53,6 +53,7 @@
#ifdef CONFIG_NET_6LOWPAN
+#ifdef CONFIG_WIRELESS_IEEE802154
/****************************************************************************
* Public Functions
****************************************************************************/
@@ -150,7 +151,6 @@ static inline bool sixlowpan_eaddrnull(FAR const uint8_t *eaddr)
*
****************************************************************************/
-#ifdef CONFIG_WIRELESS_IEEE802154
int sixlowpan_meta_data(FAR struct radio_driver_s *radio,
FAR const struct ieee802_txmetadata_s *pktmeta,
FAR struct ieee802154_frame_meta_s *meta)
[incubator-nuttx] 02/03: Fix sixlowpan_utils.c nxstyle complaints
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch releases/9.0
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit a5540fdfb67ef5dd08a22558319b6aed4e58793a
Author: liuhaitao <li...@xiaomi.com>
AuthorDate: Thu Apr 16 21:26:12 2020 +0800
Fix sixlowpan_utils.c nxstyle complaints
Signed-off-by: liuhaitao <li...@xiaomi.com>
---
net/sixlowpan/sixlowpan_utils.c | 70 ++++++++++++++++++++++-------------------
1 file changed, 38 insertions(+), 32 deletions(-)
diff --git a/net/sixlowpan/sixlowpan_utils.c b/net/sixlowpan/sixlowpan_utils.c
index 18fb15e..0b49c26 100644
--- a/net/sixlowpan/sixlowpan_utils.c
+++ b/net/sixlowpan/sixlowpan_utils.c
@@ -113,17 +113,18 @@
* sixlowpan_eaddrfromip() handle short and extended addresses,
* respectively.
*
- * 128 112 96 80 64 48 32 16
- * ---- ---- ---- ---- ---- ---- ---- ----
- * fe80 0000 0000 0000 0000 00ff fe00 xx00 1-byte short address IEEE 48-bit MAC
- * xxxx 0000 0000 0000 0000 00ff fe00 xxxx 2-byte short address IEEE 48-bit MAC
- * xxxx 0000 0000 0000 xxxx xxxx xxxx xxxx 8-byte extended address IEEE EUI-64
+ * 128 112 96 80 64 48 32 16
+ * ---- ---- ---- ---- ---- ---- ---- ----
+ * 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 48-bit MAC
+ * xxxx 0000 0000 0000 xxxx xxxx xxxx xxxx 8-byte extended address EUI-64
*
****************************************************************************/
#ifndef CONFIG_NET_STARPOINT
#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 */
@@ -132,7 +133,8 @@ static void sixlowpan_baddrfromip(const net_ipv6addr_t ipaddr, FAR uint8_t *badd
#endif
#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 */
@@ -142,7 +144,8 @@ static void sixlowpan_saddrfromip(const net_ipv6addr_t ipaddr, FAR uint8_t *sadd
#endif
#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;
int i;
@@ -169,10 +172,10 @@ static void sixlowpan_eaddrfromip(const net_ipv6addr_t ipaddr, FAR uint8_t *eadd
*
* Description:
* sixlowpan_nexthopaddr(): If the destination is on-link, extract the
- * IEEE 802.15.14 destination address from the destination IP address. If the
- * destination is not reachable directly, use the routing table (if available)
- * or fall back to the default router IP address and use the router IP address
- * to derive the IEEE 802.15.4 MAC address.
+ * IEEE 802.15.14 destination address from the destination IP address.
+ * If the destination is not reachable directly, use the routing table
+ * (if available) or fall back to the default router IP address and use
+ * 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
* extended destination address.
*
- * 128 112 96 80 64 48 32 16
- * ---- ---- ---- ---- ---- ---- ---- ----
- * ffxx xxxx xxxx xxxx xxxx xxxx xxxx xxxx Multicast address (RFC 3513)
- * 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 xxxx 2-byte short address IEEE 48-bit MAC
- * xxxx 0000 0000 0000 xxxx xxxx xxxx xxxx 8-byte extended address IEEE EUI-64
+ * 128 112 96 80 64 48 32 16
+ * ---- ---- ---- ---- ---- ---- ---- ----
+ * ffxx xxxx xxxx xxxx xxxx xxxx xxxx xxxx Multicast address (RFC 3513)
+ * ff02 0000 0000 0000 0000 0000 0000 0001 All nodes multicast group
+ * 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 48-bit MAC
+ * 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
* 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 */
- /* If the address is link-local, or matches the prefix of the local address,
- * the interface identifier can be extracted from the lower bits of the address.
+ /* If the address is link-local, or matches the prefix of the local
+ * address, the interface identifier can be extracted from the lower
+ * bits of the address.
*/
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
* (eaddr), or other variable length radio addresses.
*
- * 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 xxxx 2-byte short address IEEE 48-bit MAC
- * fe80 0000 0000 0000 xxxx xxxx xxxx xxxx 8-byte extended address IEEE EUI-64
+ * 128 112 96 80 64 48 32 16
+ * ---- ---- ---- ---- ---- ---- ---- ----
+ * 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 48-bit MAC
+ * 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
* handle a tagged address or any size.
*
- * 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 xxxx 2-byte short address IEEE 48-bit MAC
- * fe80 0000 0000 0000 xxxx xxxx xxxx xxxx 8-byte extended address IEEE EUI-64
+ * 128 112 96 80 64 48 32 16
+ * ---- ---- ---- ---- ---- ---- ---- ----
+ * 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 48-bit MAC
+ * 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;
}
- /* 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[1] = arg.u.getreq.attrval.mac.panid[0];
[incubator-nuttx] 01/03: Fix sixlowpan build break with -Werror
option under macos
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch releases/9.0
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit c269a6e7ad3ba6f1535666089ad5e1194738ed40
Author: liuhaitao <li...@xiaomi.com>
AuthorDate: Thu Apr 16 20:13:57 2020 +0800
Fix sixlowpan build break with -Werror option under macos
sixlowpan/sixlowpan_utils.c:535:20: error: unused function 'sixlowpan_issaddrbased' [-Werror,-Wunused-function]
static inline bool sixlowpan_issaddrbased(const net_ipv6addr_t ipaddr,
^
sixlowpan/sixlowpan_utils.c:543:20: error: unused function 'sixlowpan_iseaddrbased' [-Werror,-Wunused-function]
static inline bool sixlowpan_iseaddrbased(const net_ipv6addr_t ipaddr,
^
2 errors generated.
make[1]: *** [sixlowpan_utils.o] Error 1
Signed-off-by: liuhaitao <li...@xiaomi.com>
---
net/sixlowpan/sixlowpan_utils.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/net/sixlowpan/sixlowpan_utils.c b/net/sixlowpan/sixlowpan_utils.c
index 5ec41c1..18fb15e 100644
--- a/net/sixlowpan/sixlowpan_utils.c
+++ b/net/sixlowpan/sixlowpan_utils.c
@@ -532,6 +532,7 @@ static inline bool sixlowpan_isbytebased(const net_ipv6addr_t ipaddr,
}
#endif
+#ifdef HAVE_SADDR
static inline bool sixlowpan_issaddrbased(const net_ipv6addr_t ipaddr,
FAR const uint8_t *saddr)
{
@@ -539,7 +540,9 @@ static inline bool sixlowpan_issaddrbased(const net_ipv6addr_t ipaddr,
ipaddr[6] == HTONS(0xfe00) &&
ipaddr[7] == *(uint16_t *)saddr);
}
+#endif
+#ifdef HAVE_EADDR
static inline bool sixlowpan_iseaddrbased(const net_ipv6addr_t ipaddr,
FAR const uint8_t *eaddr)
{
@@ -554,6 +557,7 @@ static inline bool sixlowpan_iseaddrbased(const net_ipv6addr_t ipaddr,
ipaddr[6] == *(uint16_t *)(eaddr + 4) &&
ipaddr[7] == *(uint16_t *)(eaddr + 6));
}
+#endif
bool sixlowpan_ismacbased(const net_ipv6addr_t ipaddr,
FAR const struct netdev_varaddr_s *addr)