MAC: Updated calling FHSS TX done (#2295)

Author: Jarkko Paso

source/MAC/IEEE802_15_4/mac_pd_sap.c

@@ -481,10 +481,6 @@ static int8_t mac_data_interface_tx_done_cb(protocol_interface_rf_mac_setup_s *r
         return 0;
     }
 
-    //
-    bool waiting_ack = false;
-
-
     if (rf_ptr->mac_ack_tx_active) {
         mac_data_ack_tx_finish(rf_ptr);
         return 0;
@@ -506,11 +502,40 @@ static int8_t mac_data_interface_tx_done_cb(protocol_interface_rf_mac_setup_s *r
         timer_mac_stop(rf_ptr);
     }
 
+    if (rf_ptr->fhss_api && rf_ptr->active_pd_data_request->asynch_request == false) {
+        /* waiting_ack == false allows FHSS to change back to RX channel after transmission
+         * tx_completed == true allows FHSS to delete stored failure handles
+         */
+        bool waiting_ack = false, tx_completed = false;
+        if (status == PHY_LINK_TX_SUCCESS && !rf_ptr->macTxRequestAck) {
+            waiting_ack = false;
+            tx_completed = true;
+        } else if (status == PHY_LINK_TX_SUCCESS && rf_ptr->macTxRequestAck) {
+            waiting_ack = true;
+            tx_completed = false;
+        } else if (status == PHY_LINK_CCA_FAIL) {
+            waiting_ack = false;
+            tx_completed = false;
+        } else if (status == PHY_LINK_CCA_OK) {
+            waiting_ack = false;
+            tx_completed = false;
+        } else if (status == PHY_LINK_TX_FAIL) {
+            waiting_ack = false;
+            tx_completed = false;
+        } else if (status == PHY_LINK_TX_DONE) {
+            waiting_ack = false;
+            tx_completed = true;
+        } else if (status == PHY_LINK_TX_DONE_PENDING) {
+            waiting_ack = false;
+            tx_completed = true;
+        }
+        rf_ptr->fhss_api->data_tx_done(rf_ptr->fhss_api, waiting_ack, tx_completed, rf_ptr->active_pd_data_request->msduHandle);
+    }
+
     switch (status) {
         case PHY_LINK_TX_SUCCESS:
             if (rf_ptr->macTxRequestAck) {
                 timer_mac_start(rf_ptr, MAC_TIMER_ACK, rf_ptr->mac_ack_wait_duration); /*wait for ACK 1 ms*/
-                waiting_ack = true;
             } else {
                 //TODO CHECK this is MAC_TX_ PERMIT OK
                 mac_tx_done_state_set(rf_ptr, MAC_TX_DONE);
@@ -540,15 +565,6 @@ static int8_t mac_data_interface_tx_done_cb(protocol_interface_rf_mac_setup_s *r
         default:
             break;
     }
-    if (rf_ptr->fhss_api) {
-        bool tx_is_done = false;
-        if (rf_ptr->mac_tx_result == MAC_TX_DONE) {
-            tx_is_done = true;
-        }
-        if (rf_ptr->active_pd_data_request->asynch_request == false) {
-            rf_ptr->fhss_api->data_tx_done(rf_ptr->fhss_api, waiting_ack, tx_is_done, rf_ptr->active_pd_data_request->msduHandle);
-        }
-    }
     return 0;
 }