Merge pull request ARMmbed#1682 from ARMmbed/IOTTHD-2460

FHSS: Do not change channel during asynch transmissions
deepakvenugopal · Apr 27, 2018 · e73e9b2 · e73e9b2
2 parents 03f7105 + cbdd2a9
commit e73e9b2
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 4 deletions.
diff --git a/source/MAC/IEEE802_15_4/mac_fhss_callbacks.c b/source/MAC/IEEE802_15_4/mac_fhss_callbacks.c
@@ -66,7 +66,9 @@ int mac_set_channel(const fhss_api_t *fhss_api, uint8_t channel_number)
     if (!mac_setup) {
         return -1;
     }
-
+    if (mac_setup->active_pd_data_request && mac_setup->active_pd_data_request->asynch_request) {
+        return -1;
+    }
     return mac_mlme_rf_channel_change(mac_setup, channel_number);
 }
 

diff --git a/source/MAC/IEEE802_15_4/mac_mcps_sap.c b/source/MAC/IEEE802_15_4/mac_mcps_sap.c
@@ -1053,6 +1053,10 @@ static void mac_pd_data_confirm_handle(protocol_interface_rf_mac_setup_s *rf_mac
         mac_pre_build_frame_t *buffer = rf_mac_setup->active_pd_data_request;
         if (mac_data_request_confirmation_finnish(rf_mac_setup, buffer) ) {
             rf_mac_setup->active_pd_data_request = NULL;
+            if (buffer->asynch_request && rf_mac_setup->fhss_api) {
+                // Must return to scheduled channel after asynch process by calling TX done
+                rf_mac_setup->fhss_api->data_tx_done(rf_mac_setup->fhss_api, false, true, buffer->msduHandle);
+            }
             mcps_data_confirm_handle(rf_mac_setup, buffer);
         } else {
             if (mcps_pd_data_request(rf_mac_setup, buffer) != 0) {

diff --git a/source/Service_Libs/fhss/fhss_ws.c b/source/Service_Libs/fhss/fhss_ws.c
@@ -115,7 +115,7 @@ static void fhss_broadcast_handler(const fhss_api_t *fhss_api, uint16_t delay)
     if (fhss_structure->ws->is_on_bc_channel == false) {
         fhss_start_timer(fhss_structure, fhss_structure->ws->fhss_configuration.fhss_bc_dwell_interval*1000, fhss_broadcast_handler);
         fhss_structure->ws->is_on_bc_channel = true;
-        next_channel = fhss_ws_calc_bc_channel(fhss_structure);
+        next_channel = fhss_structure->ws->bc_channel = fhss_ws_calc_bc_channel(fhss_structure);
     } else {
         uint32_t timeout = (fhss_structure->ws->fhss_configuration.fhss_broadcast_interval - fhss_structure->ws->fhss_configuration.fhss_bc_dwell_interval) * 1000;
         fhss_start_timer(fhss_structure, timeout, fhss_broadcast_handler);
@@ -390,8 +390,12 @@ static void fhss_ws_data_tx_done_callback(const fhss_api_t *api, bool waiting_ac
         return;
     }
     if ((fhss_structure->fhss_state == FHSS_SYNCHRONIZED) && (fhss_structure->ws->fhss_configuration.ws_channel_function != WS_FIXED_CHANNEL)) {
-        if ((waiting_ack == false) && (fhss_structure->ws->is_on_bc_channel == false)) {
-            fhss_structure->callbacks.change_channel(fhss_structure->fhss_api, fhss_structure->rx_channel);
+        if (waiting_ack == false) {
+            if (fhss_structure->ws->is_on_bc_channel == false) {
+                fhss_structure->callbacks.change_channel(fhss_structure->fhss_api, fhss_structure->rx_channel);
+            } else {
+                fhss_structure->callbacks.change_channel(fhss_structure->fhss_api, fhss_structure->ws->bc_channel);
+            }
         }
     }
     // Buffer was successfully transmitted. Remove stored failure handle if exists.

diff --git a/source/Service_Libs/fhss/fhss_ws.h b/source/Service_Libs/fhss/fhss_ws.h
@@ -25,6 +25,7 @@ typedef struct fhss_ws fhss_ws_t;
 
 struct fhss_ws
 {
+    uint8_t bc_channel;
     uint16_t uc_slot;
     uint16_t bc_slot;
     bool is_on_bc_channel;

diff --git a/test/nanostack/unittest/mac/fhss_callbacks/test_fhss_callbacks.c b/test/nanostack/unittest/mac/fhss_callbacks/test_fhss_callbacks.c
@@ -123,6 +123,7 @@ bool test_mac_set_channel()
     arm_device_driver_list_s dev_driver;
     phy_driver.phy_tx_done_cb = tx_done;
     dev_driver.phy_driver = &phy_driver;
+    memset(&setup, 0, sizeof(protocol_interface_rf_mac_setup_s));
     setup.fhss_api = &fhss_api;
     setup.dev_driver = &dev_driver;
     mac_mlme_stub.int8_value = 0;