From 3a07455493130243b72f85d899a92f4abb094f6b Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Fri, 24 Mar 2017 10:16:18 -0600 Subject: [PATCH] Trivial changes from review of last PR --- configs/clicker2-stm32/src/stm32_mrf24j40.c | 1 - include/nuttx/wireless/ieee802154/ieee802154.h | 3 ++- .../nuttx/wireless/ieee802154/ieee802154_mac.h | 16 +++++++++------- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/configs/clicker2-stm32/src/stm32_mrf24j40.c b/configs/clicker2-stm32/src/stm32_mrf24j40.c index 12131190fbe..5c61750f469 100644 --- a/configs/clicker2-stm32/src/stm32_mrf24j40.c +++ b/configs/clicker2-stm32/src/stm32_mrf24j40.c @@ -229,7 +229,6 @@ static int stm32_mrf24j40_devsetup(FAR struct stm32_priv_s *priv) FAR struct ieee802154_mac_s *mac; #endif FAR struct spi_dev_s *spi; - int ret; /* Configure the interrupt pin */ diff --git a/include/nuttx/wireless/ieee802154/ieee802154.h b/include/nuttx/wireless/ieee802154/ieee802154.h index 1b89748c1dd..38410a622f2 100644 --- a/include/nuttx/wireless/ieee802154/ieee802154.h +++ b/include/nuttx/wireless/ieee802154/ieee802154.h @@ -69,7 +69,8 @@ struct ieee802154_packet_s * Extended address + PAN id : PPPP/LLLLLLLLLLLLLLLL */ -enum ieee802154_addr_mode_e { +enum ieee802154_addr_mode_e +{ IEEE802154_ADDRMODE_NONE = 0, IEEE802154_ADDRMODE_SHORT = 2, IEEE802154_ADDRMODE_EXTENDED diff --git a/include/nuttx/wireless/ieee802154/ieee802154_mac.h b/include/nuttx/wireless/ieee802154/ieee802154_mac.h index 992b03e0e8a..f4b408fdb91 100644 --- a/include/nuttx/wireless/ieee802154/ieee802154_mac.h +++ b/include/nuttx/wireless/ieee802154/ieee802154_mac.h @@ -55,16 +55,16 @@ /* Configuration ************************************************************/ /* None at the moment */ - /* IEEE 802.15.4 MAC Character Driver IOCTL Commands ************************/ /* The IEEE 802.15.4 standard specifies a MLME Service Access Point (SAP) * including a series of primitives that are used as an interface between * the MLME and the next highest layer. There are 4 types of primitives: - * - Request - * - Indication - * - Response - * - Confirm + * + * - Request + * - Indication + * - Response + * - Confirm * * Of these, Request and Response primitives are sent from the next highest layer * to the MLME. Indication and Confirm primitives are used to notify the next @@ -294,9 +294,11 @@ struct ieee802154_pan_desc_s struct ieee802154_pend_addr_s { - union { + union + { uint8_t pa_spec; - struct { + struct + { uint8_t num_short_addr : 3; /* Number of short addresses pending */ uint8_t reserved_3 : 1; /* Reserved bit */ uint8_t num_ext_addr : 3; /* Number of extended addresses pending */