Skip to content

Commit b0e699f

Browse files
author
Arto Kinnunen
committed
Squashed 'connectivity/nanostack/sal-stack-nanostack/' changes from 715ae9a..3183d87
3183d87 Merge branch 'release_internal' into release_external 9e27a77 Disabled BR IID verify from DODAG ID 33ac791 Merge pull request #2548 from PelionIoT/sync_with_mbed_os 6f8b282 compile out trace when not available 825373d Add SPDX license identifier to Arm files 3ec3bc6 fixed warnings: static method defined but not used ee34352 Check if RX channel needs to be updated when RX slot detected (#2540) d59dc5d Fix doxygen 1.8.17 warnings (#2546) 1e0beb3 Update unit tests to support Ubuntu 2020_04 LTS (#2545) b9b2ffd Fixed FHSS get retry period (#2543) a0bf6ae Check if RX channel needs to be updated after broadcast received (#2539) fde325e Wi-SUN Neighbour ARO registration failure handling update: 1e1f9c6 RPL dio Handler update: 0421502 Asynch message advertiment enable added to DAO done when disabled. 0374f74 Corrected memory leak on key storage allocation on low memory situation 23c2f7e Disable ASYNCH messages at enter Local repair state. c1df6b0 Added Poison_count check for First DIO time blocker. 944f934 Added channel mask size to FHSS configuration (#2536) 20e79e0 RPL Local repair disable clear advertised_dodag_membership_since_last_repair state 8a46380 Fix doxygen comments (#2534) fe06236 MAC ACK RX guarantee update 2388a80 MAC layer send ack allways when it requirement's 29b387b RPL dao dynamic timeout 00bbd02 Don't allow TX slot length go below allowed minimum (#2528) 8333faa Out of memory improvement to remove packets from routing 0a12aeb Support channel plan IDs 1, 2 and 5 with NA and BZ bands (#2526) ee4333d Wi-SUN Timing configuration is selected based on network size and data rate a5b2a26 WS: API to set PHY mode and Channel plan IDs as defined by FAN 1.1 (#2520) b86a044 Update nanostack v12.7.0 changelog (#2525) 35b95da Remove unnecessary files from release 0717432 Merge remote-tracking branch 'origin/release_internal' into release_external f68126b Adaptation layer MCPS confirmation handle update e483a07 Added OFDM configurations and FEC in RF config structure (#2513) b88abfa BUG fix: Fixed broken Brodcast MAC overflow handling 9cad478 Random early detection congestion API update 00aed73 Modified the Wi-SUN stack Latency estimates a bit slower 6b83d82 Remove periodic PAN version increase from Wi-SUN border router ef670e2 Integrated ReD congestion packet drop to Wi-SUN bootstrap interface. b956d9e Revert "Improved transmission in high traffic (#2511)" (#2512) 01749c2 Improved transmission in high traffic (#2511) 3158e96 Adaption layer queue trace update 5a32f4a Update changelog, random_early_detection_congestion_check nameupdate and minor comment fix. b818f12 Extented network status for support dropped tx congestion packet. 11c0763 Added new service Random early detection f2c358d Optimized medium NWK MPL parameters to 40 second multicast interval (#2508) c013bc7 Added traces to EAPOL TX failure c29ee94 Changed TLS return value to int32_t 501a2c8 Added trace for mbed TLS errors 9d7cd22 Updated change log 1290225 Corrected radius message memory allocation 7b1c596 Removed trace print's efb8393 Adaptation layer MCPS confirmation handle update ac1025e Bug Fix: Accept only next possible BSI for detect BR reboot and drop unkown's. 58f0e56 Updated change log 102e525 Nanostack now indicates connection down on RPL local repair start 395791d FHSS WS: Do not allow broadcast TX on unicast channel (#2501) 72f8ecb Updated changelog.md 2376208 Activated higher priority by traffic class CS6 for NS/NA and RPL, EAPOL/ DHCP Relay messages. afbe906 Adaptation layer update 13fb2bf Update CHANGELOG.md af81c48 DIO init TX filter update 13a872c Fix typos in github template (#2498) 1af20e1 Initial version of CHANGELOG (#2497) d9874ed Feature update: Improved MAC TX queue purge 6926442 Wi-SUN Aro registration temporary address registation bug fix. d3170ed Removed generic event and wrong trace info. 0db3486 Removed trace from place which is normal and not needed a080f18 Added debug tarce for dropped unsecured and MPL packets. 51cd564 Wi-SUN NS probe update: 579f756 Adaptation layer: Do not push CCA failed packet back to MAC (Wi-SUN) (#2487) git-subtree-dir: connectivity/nanostack/sal-stack-nanostack git-subtree-split: 3183d87
1 parent 48fcb2b commit b0e699f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+2063
-530
lines changed

Doxyfile

Lines changed: 380 additions & 188 deletions
Large diffs are not rendered by default.

nanostack/fhss_config.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,9 @@ typedef struct fhss_ws_configuration {
132132
/** Wi-SUN specific unicast channel mask */
133133
uint32_t unicast_channel_mask[8];
134134

135+
/** Channel mask size */
136+
uint16_t channel_mask_size;
137+
135138
/** Vendor defined channel function. */
136139
fhss_vendor_defined_cf *vendor_defined_cf;
137140

nanostack/mac_api.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ typedef enum {
7878
} mlme_primitive;
7979

8080
/**
81-
* \struct mac_description_storage_size_t
81+
* \struct mac_description_storage_size_s
8282
* \brief Container for MAC storage sizes.
8383
*/
8484
typedef struct mac_description_storage_size_s {
@@ -305,7 +305,7 @@ struct mac_api_s {
305305
};
306306

307307
/**
308-
* \struct mac_statistics_t
308+
* \struct mac_statistics_s
309309
* \brief MAC statistics structure.
310310
*/
311311
typedef struct mac_statistics_s {

nanostack/net_interface.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ typedef enum arm_library_event_type_e {
103103
#define SOCKET_BIND_DONE SOCKET_CONNECT_DONE /**< Backward compatibility */
104104
#define SOCKET_BIND_FAIL SOCKET_CONNECT_FAIL /**< Backward compatibility */
105105
#define SOCKET_BIND_AUTH_FAIL SOCKET_CONNECT_AUTH_FAIL /**< Backward compatibility */
106-
/* @} */
106+
/** @} */
107107

108108
/** Network security levels. */
109109
typedef enum net_security_t {
@@ -1228,3 +1228,4 @@ extern const cca_threshold_table_s *arm_nwk_get_cca_threshold_table(int8_t inter
12281228
}
12291229
#endif
12301230
#endif /* NET_INTERFACE_H_ */
1231+

nanostack/net_nvm_api.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ typedef enum pana_client_nvm_update_process_t {
8989
} pana_client_nvm_update_process_t;
9090

9191
/*!
92-
* \struct wpan_nvm_params_t
92+
* \struct wpan_nvm_params
9393
* \brief Network nvm parameters.
9494
*/
9595
typedef struct wpan_nvm_params {

nanostack/net_polling_api.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ extern "C" {
5252
#endif
5353

5454
/*!
55-
* \enum net_host_mode_t
55+
* \enum net_host_mode
5656
* \brief Sleepy host states.
5757
*/
5858
typedef enum net_host_mode {

nanostack/ns_mdns_api.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ typedef struct ns_mdns *ns_mdns_t; /**< Instance */
3636
typedef struct ns_mdns_service *ns_mdns_service_t; /**< Service instance */
3737

3838
/*!
39-
* \struct ns_mdns_service_param_t
39+
* \struct ns_mdns_service_param
4040
* \brief Structure for mDNS service parameters
4141
*/
4242
typedef struct ns_mdns_service_param {

nanostack/nwk_stats_api.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ typedef struct nwk_stats_t {
7373
/* MAC */
7474
uint16_t adapt_layer_tx_queue_size; /**< Adaptation layer direct TX queue size. */
7575
uint16_t adapt_layer_tx_queue_peak; /**< Adaptation layer direct TX queue size peak. */
76+
uint32_t adapt_layer_tx_congestion_drop; /**< Adaptation layer direct TX randon early detection drop packet. */
7677
} nwk_stats_t;
7778

7879
/**

nanostack/platform/arm_hal_aes.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ extern "C" {
4848
#define ARM_AES_MBEDTLS_CONTEXT_MIN 1 /**</ event loop use only */
4949
#endif
5050

51+
/** AES context */
5152
typedef struct arm_aes_context arm_aes_context_t;
5253

5354
/**

nanostack/platform/arm_hal_phy.h

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,25 @@ typedef enum {
175175
MODULATION_INDEX_UNDEFINED ///< Modulation index undefined
176176
} phy_modulation_index_e;
177177

178+
/** OFDM option */
179+
typedef enum {
180+
OFDM_OPTION_1 = 1, ///< OFDM option 1
181+
OFDM_OPTION_2 = 2, ///< OFDM option 2
182+
OFDM_OPTION_3 = 3, ///< OFDM option 3
183+
OFDM_OPTION_4 = 4 ///< OFDM option 4
184+
} phy_ofdm_option_e;
185+
186+
/** Modulation and coding scheme (OFDM) */
187+
typedef enum {
188+
OFDM_MCS_0 = 0, ///< OFDM MCS 0
189+
OFDM_MCS_1 = 1, ///< OFDM MCS 1
190+
OFDM_MCS_2 = 2, ///< OFDM MCS 2
191+
OFDM_MCS_3 = 3, ///< OFDM MCS 3
192+
OFDM_MCS_4 = 4, ///< OFDM MCS 4
193+
OFDM_MCS_5 = 5, ///< OFDM MCS 5
194+
OFDM_MCS_6 = 6 ///< OFDM MCS 6
195+
} phy_ofdm_mcs_e;
196+
178197
/**
179198
* @brief enum phy_802_15_4_mode_t IEEE 802.15.4 mode
180199
*
@@ -192,6 +211,9 @@ typedef struct phy_rf_channel_configuration_s {
192211
uint16_t number_of_channels; ///< Number of channels
193212
phy_modulation_e modulation; ///< Modulation scheme
194213
phy_modulation_index_e modulation_index; ///< Modulation index
214+
bool fec; ///< Forward error correction, true - enabled, false - disabled
215+
phy_ofdm_option_e ofdm_option; ///< OFDM option
216+
phy_ofdm_mcs_e ofdm_mcs; ///< OFDM modulation and coding scheme
195217
} phy_rf_channel_configuration_s;
196218

197219
/** Channel page configuration */

0 commit comments

Comments
 (0)