FHSS: Removed scramble table generation from fhss enable

Author: Jarkko Paso

source/Service_Libs/fhss/fhss.c

@@ -42,7 +42,6 @@ fhss_structure_t *fhss_struct = 0;
 static bool fhss_check_remaining_tx_time(fhss_structure_t *fhss_structure, uint16_t tx_length, uint8_t phy_header_length, uint8_t phy_tail_length);
 static void fhss_event_timer_cb(int8_t timer_id, uint16_t slots);
 static fhss_structure_t *fhss_get_object_with_timer_id(const int8_t timer_id);
-static int fhss_generate_scramble_table(fhss_structure_t *fhss_structure);
 static bool fhss_is_there_common_divisor(uint16_t i, uint8_t j);
 static void fhss_update_channel(fhss_structure_t *fhss_structure);
 static int fhss_reset_synch_monitor(fhss_synch_monitor_s *synch_monitor, bool reset_compensation);
@@ -65,6 +64,7 @@ int8_t fhss_enable(fhss_api_t *fhss_api, const fhss_configuration_t *fhss_config
     if (!fhss_struct) {
         return -3;
     }
+    memset(fhss_struct, 0, sizeof(fhss_structure_t));
     fhss_struct->fhss_api = fhss_api;
     fhss_struct->fhss_configuration = *fhss_configuration;
     fhss_struct->platform_functions = *fhss_timer;
@@ -89,8 +89,6 @@ int8_t fhss_enable(fhss_api_t *fhss_api, const fhss_configuration_t *fhss_config
     fhss_struct->fhss_beacon_info_store = NULL;
     fhss_struct->fhss_event_timer = eventOS_callback_timer_register(fhss_event_timer_cb);
 
-    fhss_generate_scramble_table(fhss_struct);
-
     if (fhss_beacon_create_tasklet(fhss_struct) < 0) {
         // XXX: should we free the fhss_structure here?
         return -5;
@@ -308,10 +306,19 @@ static int fhss_reset_synch_monitor(fhss_synch_monitor_s *synch_monitor, bool re
 	return -1;
 }
 
+static void fhss_destroy_scramble_table(fhss_structure_t *fhss_structure)
+{
+    if (fhss_structure->fhss_scramble_table) {
+        ns_dyn_mem_free(fhss_structure->fhss_scramble_table);
+        fhss_structure->fhss_scramble_table = NULL;
+    }
+}
+
 static int fhss_reset(fhss_structure_t *fhss_structure)
 {
     if (fhss_structure) {
         fhss_structure->platform_functions.fhss_timer_stop(fhss_superframe_handler, fhss_structure->fhss_api);
+        fhss_destroy_scramble_table(fhss_structure);
         fhss_struct->synch_panid = 0xffff;
         fhss_beacon_periodic_stop(fhss_structure);
         fhss_struct->current_superframe = 0;
@@ -355,6 +362,7 @@ int8_t fhss_disable(fhss_structure_t *fhss_structure)
     if (!fhss_structure) {
         return -1;
     }
+    fhss_destroy_scramble_table(fhss_structure);
     ns_dyn_mem_free(fhss_structure);
     fhss_structure = 0;
     fhss_struct = 0;
@@ -876,9 +884,13 @@ static bool fhss_is_there_common_divisor(uint16_t i, uint8_t j)
 }
 
 
-static int fhss_generate_scramble_table(fhss_structure_t *fhss_structure)
+int fhss_generate_scramble_table(fhss_structure_t *fhss_structure)
 {
     uint8_t j = 2;
+    fhss_structure->fhss_scramble_table = ns_dyn_mem_alloc(MAX_SCRAMBLE_TABLE_INDEXES);
+    if (fhss_structure->fhss_scramble_table == NULL) {
+        return -1;
+    }
     // Generate indexes to extend the channel sequence. Generated indexes cannot have common divisors with value number_of_channels.
     for(int i=0; i<MAX_SCRAMBLE_TABLE_INDEXES;)
     {

source/Service_Libs/fhss/fhss.h

@@ -100,7 +100,7 @@ typedef struct
     // Used for randomizing broadcast sending. Device is not allowed to start broadcasting before the given superframe.
     uint8_t broadcast_start_superframe;
     /*Indexes in this table will be used to extend the repeated channel sequence*/
-    uint8_t fhss_scramble_table[MAX_SCRAMBLE_TABLE_INDEXES];
+    uint8_t *fhss_scramble_table;
     /** Used to monitor and fix synchronization drift*/
     fhss_synch_monitor_s synch_monitor;
     /** Used to drop multiple synch info messages on same broadcast channel*/
@@ -151,6 +151,7 @@ int fhss_failed_handle_remove(fhss_structure_t *fhss_structure, uint8_t handle);
 void fhss_set_active_event(fhss_structure_t *fhss_structure, uint8_t event_type);
 void fhss_clear_active_event(fhss_structure_t *fhss_structure, uint8_t event_type);
 bool fhss_read_active_event(fhss_structure_t *fhss_structure, uint8_t event_type);
+int fhss_generate_scramble_table(fhss_structure_t *fhss_structure);
 #define MAX_FHSS_TIMER_DIVIDER  100
 #define SYNCH_MONITOR_AVG_SAMPLES   5
 

source/Service_Libs/fhss/fhss_mac_interface.c

@@ -212,6 +212,12 @@ void fhss_synch_state_set_cb(const fhss_api_t *api, fhss_states fhss_state, uint
             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];

test/nanostack/unittest/service_libs/fhss/test_fhss.c

@@ -826,6 +826,7 @@ bool test_fhss_down()
     fhss_struct = malloc(sizeof(fhss_structure_t));
     fhss_struct->platform_functions.fhss_timer_stop = &fhss_timer_stop_stub;
     fhss_struct->fhss_beacon_info_store = NULL;
+    fhss_struct->fhss_scramble_table = malloc(20);
     ns_list_init(&fhss_struct->fhss_failed_tx_list);
     // Test without FHSS
     if (fhss_down(NULL) == 0) {

test/nanostack/unittest/stub/fhss_stub.c

@@ -185,3 +185,8 @@ void fhss_update_beacon_info_lifetimes(fhss_structure_t *fhss_structure, uint32_
 {
 
 }
+
+int fhss_generate_scramble_table(fhss_structure_t *fhss_structure)
+{
+    return 0;
+}