Merge pull request #2064 from ARMmbed/IOTTHD-3426

Iotthd 3426

Author: Jarkko Paso

source/MAC/IEEE802_15_4/mac_mcps_sap.c

@@ -1838,7 +1838,7 @@ static int8_t mcps_pd_data_cca_trig(protocol_interface_rf_mac_setup_s *rf_ptr, m
         // Use double CCA check with FHSS for data packets only
         if (rf_ptr->fhss_api && !rf_ptr->mac_ack_tx_active && !rf_ptr->active_pd_data_request->asynch_request) {
             if ((buffer->tx_time - (rf_ptr->multi_cca_interval * (rf_ptr->number_of_csma_ca_periods - 1))) > mac_mcps_sap_get_phy_timestamp(rf_ptr)) {
-                buffer->csma_periods_left = rf_ptr->number_of_csma_ca_periods;
+                buffer->csma_periods_left = rf_ptr->number_of_csma_ca_periods - 1;
                 buffer->tx_time -= (rf_ptr->multi_cca_interval * (rf_ptr->number_of_csma_ca_periods - 1));
             }
         }

source/MAC/IEEE802_15_4/mac_pd_sap.c

@@ -41,7 +41,7 @@
 // Measured 3750us with 1280 byte secured packet from calculating TX time to starting CSMA timer on PHY.
 // Typically varies from 500us to several milliseconds depending on packet size and the platform.
 // MAC should learn and make this dynamic by sending first few packets with predefined CSMA period.
-#define MIN_FHSS_CSMA_PERIOD_US    4000
+#define MIN_FHSS_CSMA_PERIOD_US    5000
 
 static int8_t mac_data_interface_tx_done_cb(protocol_interface_rf_mac_setup_s *rf_ptr, phy_link_tx_status_e status, uint8_t cca_retry, uint8_t tx_retry);
 static void  mac_sap_cca_fail_cb(protocol_interface_rf_mac_setup_s *rf_ptr);
@@ -448,7 +448,8 @@ static int8_t mac_data_interface_tx_done_cb(protocol_interface_rf_mac_setup_s *r
                 mac_tx_done_state_set(rf_ptr, MAC_UNKNOWN_DESTINATION);
                 return PHY_TX_NOT_ALLOWED;
             }
-            if (--active_buf->csma_periods_left > 0) {
+            if (active_buf->csma_periods_left > 0) {
+                active_buf->csma_periods_left--;
                 active_buf->tx_time += rf_ptr->multi_cca_interval;
                 mac_pd_sap_set_phy_tx_time(rf_ptr, active_buf->tx_time, true);
                 return PHY_RESTART_CSMA;

source/Service_Libs/fhss/fhss_ws.c

@@ -861,12 +861,6 @@ int fhss_ws_set_parent(fhss_structure_t *fhss_structure, const uint8_t eui64[8],
             fhss_structure->ws->drift_per_millisecond_ns += drift_per_ms_tmp;
         }
         tr_debug("synch to parent: %s, drift: %"PRIi32"ms in %"PRIu32" seconds, compensation: %"PRIi32"ns per ms", trace_array(eui64, 8), true_bc_interval_offset - own_bc_interval_offset + ((int32_t)(fhss_structure->ws->bc_slot - own_bc_slot) * bc_timing_info->broadcast_interval), US_TO_S(time_since_last_synch_us), fhss_structure->ws->drift_per_millisecond_ns);
-        // Temporary debug traces (IOTTHD-3426)
-        int32_t drift_tmp = true_bc_interval_offset - own_bc_interval_offset + ((int32_t)(fhss_structure->ws->bc_slot - own_bc_slot) * bc_timing_info->broadcast_interval);
-        if ((drift_tmp > 5) || (drift_tmp < -5)) {
-            tr_debug("High drift");
-        }
-        tr_debug("%"PRIu32" tr_bc_int_off: %"PRIu32", own_bc_int_off: %"PRIu32", received bc slot: %u, slots since RX: %u, own slot: %u, time from RX: %"PRIu32", prev synch: %"PRIu32", timeout: %"PRIu32", is BC: %i", fhss_structure->callbacks.read_timestamp(fhss_structure->fhss_api), true_bc_interval_offset, own_bc_interval_offset, bc_timing_info->broadcast_slot, slots_since_reception, own_bc_slot, time_from_reception_ms, prev_synchronization_time, timeout, fhss_structure->ws->is_on_bc_channel);
     }
     return 0;
 }

test/nanostack/unittest/mac/mac_pd_sap/test_mac_pd_sap.c

@@ -829,7 +829,7 @@ bool test_mac_cca_prepare_cb()
 
     memset(&test_packet, 0, sizeof(mac_pre_build_frame_t));
     rf_ptr.active_pd_data_request = &test_packet;
-    test_packet.csma_periods_left = 1;
+    test_packet.csma_periods_left = 0;
     test_packet.fcf_dsn.frametype = FC_BEACON_FRAME;
     test_packet.asynch_request = false;
     fhss_callback_response = -1;