Merge commit 'b0e699fe3e03f574aa2b6d74ff56a024d6e1d508'

* commit 'b0e699fe3e03f574aa2b6d74ff56a024d6e1d508':
  Squashed 'connectivity/nanostack/sal-stack-nanostack/' changes from 715ae9a..3183d87

Author: Arto Kinnunen

connectivity/nanostack/sal-stack-nanostack/Doxyfile

@@ -132,6 +132,9 @@ typedef struct fhss_ws_configuration {
     /** Wi-SUN specific unicast channel mask */
     uint32_t unicast_channel_mask[8];
 
+    /** Channel mask size */
+    uint16_t channel_mask_size;
+
     /** Vendor defined channel function. */
     fhss_vendor_defined_cf *vendor_defined_cf;
 

connectivity/nanostack/sal-stack-nanostack/nanostack/fhss_config.h

@@ -78,7 +78,7 @@ typedef enum {
 } mlme_primitive;
 
 /**
- * \struct mac_description_storage_size_t
+ * \struct mac_description_storage_size_s
  * \brief Container for MAC storage sizes.
  */
 typedef struct mac_description_storage_size_s {
@@ -305,7 +305,7 @@ struct mac_api_s {
 };
 
 /**
- * \struct mac_statistics_t
+ * \struct mac_statistics_s
  * \brief MAC statistics structure.
  */
 typedef struct mac_statistics_s {

connectivity/nanostack/sal-stack-nanostack/nanostack/mac_api.h

@@ -103,7 +103,7 @@ typedef enum arm_library_event_type_e {
 #define SOCKET_BIND_DONE                    SOCKET_CONNECT_DONE      /**< Backward compatibility */
 #define SOCKET_BIND_FAIL                    SOCKET_CONNECT_FAIL      /**< Backward compatibility */
 #define SOCKET_BIND_AUTH_FAIL               SOCKET_CONNECT_AUTH_FAIL /**< Backward compatibility */
-/* @} */
+/** @} */
 
 /** Network security levels. */
 typedef enum net_security_t {
@@ -1228,3 +1228,4 @@ extern const cca_threshold_table_s *arm_nwk_get_cca_threshold_table(int8_t inter
 }
 #endif
 #endif /* NET_INTERFACE_H_ */
+

connectivity/nanostack/sal-stack-nanostack/nanostack/net_interface.h

@@ -89,7 +89,7 @@ typedef enum pana_client_nvm_update_process_t {
 } pana_client_nvm_update_process_t;
 
 /*!
- * \struct wpan_nvm_params_t
+ * \struct wpan_nvm_params
  * \brief Network nvm parameters.
  */
 typedef struct wpan_nvm_params {

connectivity/nanostack/sal-stack-nanostack/nanostack/net_nvm_api.h

@@ -52,7 +52,7 @@ extern "C" {
 #endif
 
 /*!
- * \enum net_host_mode_t
+ * \enum net_host_mode
  * \brief Sleepy host states.
  */
 typedef enum net_host_mode {

connectivity/nanostack/sal-stack-nanostack/nanostack/net_polling_api.h

@@ -36,7 +36,7 @@ typedef struct ns_mdns *ns_mdns_t;  /**< Instance */
 typedef struct ns_mdns_service *ns_mdns_service_t;  /**< Service instance */
 
 /*!
- * \struct ns_mdns_service_param_t
+ * \struct ns_mdns_service_param
  * \brief Structure for mDNS service parameters
  */
 typedef struct ns_mdns_service_param {

connectivity/nanostack/sal-stack-nanostack/nanostack/ns_mdns_api.h

@@ -73,6 +73,7 @@ typedef struct nwk_stats_t {
     /* MAC */
     uint16_t adapt_layer_tx_queue_size; /**< Adaptation layer direct TX queue size. */
     uint16_t adapt_layer_tx_queue_peak; /**< Adaptation layer direct TX queue size peak. */
+    uint32_t adapt_layer_tx_congestion_drop; /**< Adaptation layer direct TX randon early detection drop packet. */
 } nwk_stats_t;
 
 /**

connectivity/nanostack/sal-stack-nanostack/nanostack/nwk_stats_api.h

@@ -48,6 +48,7 @@ extern "C" {
 #define ARM_AES_MBEDTLS_CONTEXT_MIN 1 /**</ event loop use only */
 #endif
 
+/** AES context */
 typedef struct arm_aes_context arm_aes_context_t;
 
 /**

connectivity/nanostack/sal-stack-nanostack/nanostack/platform/arm_hal_aes.h

@@ -175,6 +175,25 @@ typedef enum {
     MODULATION_INDEX_UNDEFINED  ///< Modulation index undefined
 } phy_modulation_index_e;
 
+/** OFDM option */
+typedef enum {
+    OFDM_OPTION_1 = 1,      ///< OFDM option 1
+    OFDM_OPTION_2 = 2,      ///< OFDM option 2
+    OFDM_OPTION_3 = 3,      ///< OFDM option 3
+    OFDM_OPTION_4 = 4       ///< OFDM option 4
+} phy_ofdm_option_e;
+
+/** Modulation and coding scheme (OFDM) */
+typedef enum {
+    OFDM_MCS_0 = 0,         ///< OFDM MCS 0
+    OFDM_MCS_1 = 1,         ///< OFDM MCS 1
+    OFDM_MCS_2 = 2,         ///< OFDM MCS 2
+    OFDM_MCS_3 = 3,         ///< OFDM MCS 3
+    OFDM_MCS_4 = 4,         ///< OFDM MCS 4
+    OFDM_MCS_5 = 5,         ///< OFDM MCS 5
+    OFDM_MCS_6 = 6          ///< OFDM MCS 6
+} phy_ofdm_mcs_e;
+
 /**
  * @brief enum phy_802_15_4_mode_t IEEE 802.15.4 mode
  *
@@ -192,6 +211,9 @@ typedef struct phy_rf_channel_configuration_s {
     uint16_t number_of_channels;                ///< Number of channels
     phy_modulation_e modulation;                ///< Modulation scheme
     phy_modulation_index_e modulation_index;    ///< Modulation index
+    bool fec;                                   ///< Forward error correction, true - enabled, false - disabled
+    phy_ofdm_option_e ofdm_option;              ///< OFDM option
+    phy_ofdm_mcs_e ofdm_mcs;                    ///< OFDM modulation and coding scheme
 } phy_rf_channel_configuration_s;
 
 /** Channel page configuration */