From 222fe50d3a5051dcda3c433f24ddc9076637eb97 Mon Sep 17 00:00:00 2001
From: Anthony Merlino <anthony@vergeaero.com>
Date: Mon, 17 Jul 2017 03:57:28 -0400
Subject: [PATCH 1/4] ieee802154: Trivial
---
include/nuttx/wireless/ieee802154/ieee802154_mac.h | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/include/nuttx/wireless/ieee802154/ieee802154_mac.h b/include/nuttx/wireless/ieee802154/ieee802154_mac.h
index 24ed1388bd..a1238ba0ad 100644
--- a/include/nuttx/wireless/ieee802154/ieee802154_mac.h
+++ b/include/nuttx/wireless/ieee802154/ieee802154_mac.h
@@ -564,11 +564,10 @@ struct ieee802154_capability_info_s
struct ieee802154_superframespec_s
{
- uint16_t beaconorder : 4; /* Transmission interval of beacon */
- uint16_t sforder : 4; /* Length of active portion of superframe */
+ uint16_t beaconorder : 4; /* Transmission interval of beacon */
+ uint16_t sforder : 4; /* Length of active portion of superframe */
uint16_t final_capslot : 4; /* Last slot utilized by CAP */
uint16_t ble : 1; /* Battery Life Extension (BLE) */
- uint16_t reserved : 1; /* Reserved bit */
uint16_t pancoord : 1; /* 1 if beacon sent by pan coordinator */
uint16_t assocpermit : 1; /* 1 if coordinator is accepting associaton */
};
From eaf4c05f27fd790b31f92b7a58509df9ee2cc190 Mon Sep 17 00:00:00 2001
From: Anthony Merlino <anthony@vergeaero.com>
Date: Tue, 18 Jul 2017 14:01:30 -0400
Subject: [PATCH 2/4] ieee802154: Sets txdesc retrycount to the maxretries MAC
attribute when allocated
---
wireless/ieee802154/mac802154.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/wireless/ieee802154/mac802154.c b/wireless/ieee802154/mac802154.c
index 6c93de3f15..7bc0d6c4c9 100644
--- a/wireless/ieee802154/mac802154.c
+++ b/wireless/ieee802154/mac802154.c
@@ -229,9 +229,8 @@ int mac802154_txdesc_alloc(FAR struct ieee802154_privmac_s *priv,
return -EINTR;
}
- /* Set the purge time to zero */
-
(*txdesc)->purgetime = 0;
+ (*txdesc)->retrycount = priv->maxretries;
(*txdesc)->conf = ¬if->u.dataconf;
return OK;
From 706bce0eb7da343ef47573ca838e75eb55089059 Mon Sep 17 00:00:00 2001
From: Anthony Merlino <anthony@vergeaero.com>
Date: Tue, 18 Jul 2017 14:02:13 -0400
Subject: [PATCH 3/4] configs/clicker2-stm32: Fixes Kconfig option dependency
---
configs/clicker2-stm32/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configs/clicker2-stm32/Kconfig b/configs/clicker2-stm32/Kconfig
index fb4b89d98a..694b9f3582 100644
--- a/configs/clicker2-stm32/Kconfig
+++ b/configs/clicker2-stm32/Kconfig
@@ -38,7 +38,7 @@ config CLICKER2_STM32_MB2_BEE
config CLICKER2_STM32_MRF24J40LH_VERBOSE
bool "Verbose MRF24J40 lowerhalf"
default n
- depends on DEBUG_WIRELESS_INFO
+ depends on IEEE802154_MRF24J40 && DEBUG_WIRELESS_INFO
---help---
Enable verbose syslog for MRF24J40 lowerhalf
From f665c3e506f8d6588330dfd36206f059c29f5354 Mon Sep 17 00:00:00 2001
From: Anthony Merlino <anthony@vergeaero.com>
Date: Tue, 18 Jul 2017 14:04:58 -0400
Subject: [PATCH 4/4] ieee802154: Adds special attribut that can be used to
perform a regdump of the radio
---
.../wireless/ieee802154/ieee802154_mac.h | 36 ++++++++++---------
1 file changed, 20 insertions(+), 16 deletions(-)
diff --git a/include/nuttx/wireless/ieee802154/ieee802154_mac.h b/include/nuttx/wireless/ieee802154/ieee802154_mac.h
index a1238ba0ad..a3fc7bc618 100644
--- a/include/nuttx/wireless/ieee802154/ieee802154_mac.h
+++ b/include/nuttx/wireless/ieee802154/ieee802154_mac.h
@@ -423,26 +423,30 @@ enum ieee802154_attr_e
IEEE802154_ATTR_MAC_SADDR,
IEEE802154_ATTR_MAC_SUPERFRAME_ORDER,
IEEE802154_ATTR_MAC_SYNC_SYMBOL_OFFSET,
- IEEE802154_PIB_MAC_TIMESTAMP_SUPPORT,
- IEEE802154_PIB_MAC_TRANSACTION_PERSIST_TIME,
- IEEE802154_PIB_MAC_TX_CTRL_ACTIVE_DUR,
- IEEE802154_PIB_MAC_TX_CTRL_PAUSE_DUR,
- IEEE802154_PIB_MAC_TX_TOTAL_DUR,
+ IEEE802154_ATTR_MAC_TIMESTAMP_SUPPORT,
+ IEEE802154_ATTR_MAC_TRANSACTION_PERSIST_TIME,
+ IEEE802154_ATTR_MAC_TX_CTRL_ACTIVE_DUR,
+ IEEE802154_ATTR_MAC_TX_CTRL_PAUSE_DUR,
+ IEEE802154_ATTR_MAC_TX_TOTAL_DUR,
IEEE802154_ATTR_MAC_DEVMODE, /* Non-standard */
/* MAC Security Attributes */
- IEEE802154_PIB_MAC_KEY_TABLE = 0x70,
- IEEE802154_PIB_MAC_DEV_TABLE,
- IEEE802154_PIB_MAC_SEC_LVL_TABLE,
- IEEE802154_PIB_MAC_FRAME_COUNTER,
- IEEE802154_PIB_MAC_AUTOREQ_SEC_LVL,
- IEEE802154_PIB_MAC_AUTOREQ_KEY_ID_MODE,
- IEEE802154_PIB_MAC_AUTOREQ_KEY_SOURCE,
- IEEE802154_PIB_MAC_AUTOREQ_KEY_INDEX,
- IEEE802154_PIB_MAC_DEFAULT_KEY_SRC,
- IEEE802154_PIB_MAC_PANCOORD_EXT_ADDR,
- IEEE802154_PIB_MAC_PANCOORD_SHORT_ADDR,
+ IEEE802154_ATTR_MAC_KEY_TABLE = 0x70,
+ IEEE802154_ATTR_MAC_DEV_TABLE,
+ IEEE802154_ATTR_MAC_SEC_LVL_TABLE,
+ IEEE802154_ATTR_MAC_FRAME_COUNTER,
+ IEEE802154_ATTR_MAC_AUTOREQ_SEC_LVL,
+ IEEE802154_ATTR_MAC_AUTOREQ_KEY_ID_MODE,
+ IEEE802154_ATTR_MAC_AUTOREQ_KEY_SOURCE,
+ IEEE802154_ATTR_MAC_AUTOREQ_KEY_INDEX,
+ IEEE802154_ATTR_MAC_DEFAULT_KEY_SRC,
+ IEEE802154_ATTR_MAC_PANCOORD_EXT_ADDR,
+ IEEE802154_ATTR_MAC_PANCOORD_SHORT_ADDR,
+
+ /* Special Attributes */
+
+ IEEE802154_ATTR_RADIO_REGDUMP = 0xF0,
};
/* Frame Type */