FHSS: Created FHSS state set handler

Author: Jarkko Paso

source/Service_Libs/fhss/fhss.c

@@ -28,6 +28,7 @@
 #include "ns_trace.h"
 #include "eventOS_event.h"
 #include "eventOS_callback_timer.h"
+#include "platform/arm_hal_interrupt.h"
 #include "randLIB.h"
 #include <string.h>
 
@@ -746,3 +747,55 @@ void fhss_failed_list_free(fhss_structure_t *fhss_structure)
         fhss_failed_handle_remove(fhss_structure, i);
     }
 }
+
+int fhss_handle_state_set(fhss_structure_t *fhss_structure, fhss_states fhss_state, uint16_t pan_id)
+{
+    // State is already set
+    if (fhss_structure->fhss_state == fhss_state) {
+        tr_debug("Synch same state %u", fhss_state);
+        return -1;
+    }
+
+    if (fhss_state == FHSS_UNSYNCHRONIZED) {
+        tr_debug("FHSS down");
+        fhss_down(fhss_structure);
+    } else {
+        // Do not synchronize to current pan
+        if (fhss_structure->synch_panid == pan_id) {
+            tr_debug("Synch same panid %u", pan_id);
+            return -1;
+        }
+        if (fhss_structure->fhss_scramble_table == NULL) {
+            if (fhss_generate_scramble_table(fhss_structure)) {
+                tr_error("Failed to generate scramble table");
+                return -1;
+            }
+        }
+        uint32_t datarate = fhss_structure->callbacks.read_datarate(fhss_structure->fhss_api);
+        fhss_set_datarate(fhss_structure, datarate);
+        uint8_t mac_address[8];
+        fhss_structure->callbacks.read_mac_address(fhss_structure->fhss_api, mac_address);
+        fhss_structure->uc_channel_index = fhss_get_offset(fhss_structure, mac_address);
+        // Get Beacon info from storage
+        fhss_beacon_info_t *beacon_info = fhss_get_beacon_info(fhss_structure, pan_id);
+        if (beacon_info) {
+            memcpy(fhss_structure->synch_parent, beacon_info->source_address, 8);
+            platform_enter_critical();
+            // Calculate time since the Beacon was received
+            uint32_t elapsed_time = fhss_structure->fhss_api->read_timestamp(fhss_structure->fhss_api) - beacon_info->timestamp;
+            // Synchronize to given PAN
+            fhss_beacon_received(fhss_structure, beacon_info->synch_info, elapsed_time);
+            platform_exit_critical();
+            // Delete stored Beacon infos
+            fhss_flush_beacon_info_storage(fhss_structure);
+            fhss_structure->synch_panid = pan_id;
+        } else if (fhss_is_synch_root(fhss_structure) == true) {
+            // Synch root will start new network
+            fhss_start_timer(fhss_structure, fhss_structure->synch_configuration.fhss_superframe_length, fhss_superframe_handler);
+        } else {
+            tr_error("Synch info not found");
+            return -1;
+        }
+    }
+    return 0;
+}

source/Service_Libs/fhss/fhss.h

@@ -43,6 +43,7 @@ int fhss_failed_handle_remove(fhss_structure_t *fhss_structure, uint8_t handle);
 int fhss_generate_scramble_table(fhss_structure_t *fhss_structure);
 void fhss_failed_list_free(fhss_structure_t *fhss_structure);
 int fhss_reset_synch_monitor(fhss_synch_monitor_s *synch_monitor);
+int fhss_handle_state_set(fhss_structure_t *fhss_structure, fhss_states fhss_state, uint16_t pan_id);
 #define MAX_FHSS_TIMER_DIVIDER  100
 #define SYNCH_MONITOR_AVG_SAMPLES   5
 

source/Service_Libs/fhss/fhss_mac_interface.c

@@ -197,52 +197,10 @@ void fhss_synch_state_set_cb(const fhss_api_t *api, fhss_states fhss_state, uint
     if (!fhss_structure) {
         return;
     }
+    if (fhss_structure->mode == MODE_FHSS) {
+        fhss_handle_state_set(fhss_structure, fhss_state, pan_id);
+    } else if (fhss_structure->mode == MODE_W_S) {
 
-    // State is already set
-    if (fhss_structure->fhss_state == fhss_state) {
-        tr_debug("Synch same state %u", fhss_state);
-        return;
-    }
-
-    if (fhss_state == FHSS_UNSYNCHRONIZED) {
-        tr_debug("FHSS down");
-        fhss_down(fhss_structure);
-    } else {
-        // Do not synchronize to current pan
-        if (fhss_structure->synch_panid == pan_id) {
-            tr_debug("Synch same panid %u", pan_id);
-            return;
-        }
-        if (fhss_structure->fhss_scramble_table == NULL) {
-            if (fhss_generate_scramble_table(fhss_structure)) {
-                tr_error("Failed to generate scramble table");
-                return;
-            }
-        }
-        uint32_t datarate = fhss_structure->callbacks.read_datarate(api);
-        fhss_set_datarate(fhss_structure, datarate);
-        uint8_t mac_address[8];
-        fhss_structure->callbacks.read_mac_address(fhss_structure->fhss_api, mac_address);
-        fhss_structure->uc_channel_index = fhss_get_offset(fhss_structure, mac_address);
-        // Get Beacon info from storage
-        fhss_beacon_info_t *beacon_info = fhss_get_beacon_info(fhss_structure, pan_id);
-        if (beacon_info) {
-            memcpy(fhss_structure->synch_parent, beacon_info->source_address, 8);
-            platform_enter_critical();
-            // Calculate time since the Beacon was received
-            uint32_t elapsed_time = api->read_timestamp(api) - beacon_info->timestamp;
-            // Synchronize to given PAN
-            fhss_beacon_received(fhss_structure, beacon_info->synch_info, elapsed_time);
-            platform_exit_critical();
-            // Delete stored Beacon infos
-            fhss_flush_beacon_info_storage(fhss_structure);
-            fhss_structure->synch_panid = pan_id;
-        } else if (fhss_is_synch_root(fhss_structure) == true) {
-            // Synch root will start new network
-            fhss_start_timer(fhss_structure, fhss_structure->synch_configuration.fhss_superframe_length, fhss_superframe_handler);
-        } else {
-            tr_error("Synch info not find");
-        }
     }
     fhss_structure->fhss_state = fhss_state;
 }

test/nanostack/unittest/service_libs/fhss/Makefile

@@ -27,6 +27,7 @@ TEST_SRC_FILES = \
         ../../stub/event_stub.c \
         ../../stub/fhss_callbacks_stub.c \
         ../../stub/ns_list_stub.c \
+        ../../stub/platform_stub.c \
 
 include ../../MakefileWorker.mk
 

test/nanostack/unittest/stub/fhss_stub.c

@@ -191,3 +191,8 @@ int fhss_generate_scramble_table(fhss_structure_t *fhss_structure)
 {
     return 0;
 }
+
+int fhss_handle_state_set(fhss_structure_t *fhss_structure, fhss_states fhss_state, uint16_t pan_id)
+{
+    return 0;
+}