Merge pull request #1928 from ARMmbed/IOTTHD-3028

MAC/WS: Implemented Ack wait duration set

Author: Jarkko Paso

source/6LoWPAN/ws/ws_common.c

@@ -29,6 +29,7 @@
 #include "6LoWPAN/ws/ws_bbr_api_internal.h"
 #include "Service_Libs/mac_neighbor_table/mac_neighbor_table.h"
 #include "ws_management_api.h"
+#include "mac_api.h"
 
 #ifdef HAVE_WS
 #define TRACE_GROUP "wscm"
@@ -130,6 +131,13 @@ int8_t ws_common_regulatory_domain_config(protocol_interface_info_entry_t *cur)
     }
     // Note: doesn't work for Brazil region
     ws_generate_channel_list(cur->ws_info->hopping_schdule.channel_mask, cur->ws_info->hopping_schdule.number_of_channels, cur->ws_info->hopping_schdule.regulatory_domain);
+
+    uint16_t ack_wait_symbols = WS_ACK_WAIT_SYMBOLS;
+    mlme_set_t set_request;
+    set_request.attr = macAckWaitDuration;
+    set_request.value_pointer = &ack_wait_symbols;
+    set_request.value_size = sizeof(ack_wait_symbols);
+    cur->mac_api->mlme_req(cur->mac_api, MLME_SET, &set_request);
     return 0;
 }
 

source/6LoWPAN/ws/ws_common_defines.h

@@ -215,6 +215,11 @@ typedef struct ws_bs_ie {
  */
 #define WS_RPL_DIS_TIMEOUT 1800
 
+/*
+ * MAC Ack wait duration in symbols. 2-FSK modulation used -> 1 bit per symbol.
+ */
+#define WS_ACK_WAIT_SYMBOLS    800
+
 /* Default FHSS timing information
  *
  */

source/MAC/IEEE802_15_4/mac_defines.h

@@ -216,7 +216,7 @@ typedef struct protocol_interface_rf_mac_setup {
     uint8_t mac_sequence;
     uint8_t mac_tx_retry;
     uint8_t mac_cca_retry;
-    uint8_t mac_ack_wait_duration;
+    uint16_t mac_ack_wait_duration;
     uint8_t mac_mlme_retry_max;
     uint8_t aUnitBackoffPeriod;
     /* Indirect queue parameters */

source/MAC/IEEE802_15_4/mac_mlme.c

@@ -635,6 +635,29 @@ void mac_extended_mac_set(protocol_interface_rf_mac_setup_s *rf_mac_setup, const
     }
 }
 
+static uint32_t mac_calc_ack_wait_duration(protocol_interface_rf_mac_setup_s *rf_mac_setup, uint16_t symbols)
+{
+    uint32_t AckWaitDuration = 0;
+    if (rf_mac_setup->rf_csma_extension_supported) {
+        AckWaitDuration = symbols * rf_mac_setup->symbol_time_us;
+    }
+    return AckWaitDuration;
+}
+
+static int8_t mac_mlme_set_ack_wait_duration(protocol_interface_rf_mac_setup_s *rf_mac_setup, const mlme_set_t *set_req)
+{
+    uint16_t symbols = common_read_16_bit_inverse((uint8_t *)set_req->value_pointer);
+    uint32_t ack_wait_time_us = mac_calc_ack_wait_duration(rf_mac_setup, symbols);
+    if (ack_wait_time_us < 50) {
+        return -1;
+    }
+    // MAC timer uses 50us resolution
+    rf_mac_setup->mac_ack_wait_duration = ack_wait_time_us/50;
+    tr_debug("Set macAckWaitDuration: %uus", rf_mac_setup->mac_ack_wait_duration*50);
+
+    return 0;
+}
+
 static int8_t mac_mlme_device_description_set(protocol_interface_rf_mac_setup_s *rf_mac_setup, const mlme_set_t *set_req)
 {
 
@@ -707,6 +730,8 @@ int8_t mac_mlme_set_req(protocol_interface_rf_mac_setup_s *rf_mac_setup, const m
     }
 
     switch (set_req->attr) {
+        case macAckWaitDuration:
+            return mac_mlme_set_ack_wait_duration(rf_mac_setup, set_req);
         case macDeviceTable:
             return mac_mlme_device_description_set(rf_mac_setup, set_req);
         case macKeyTable: