FHSS: removed allocation of scramble table

- This table should always exist with FHSS

Author: Jarkko Paso

source/Service_Libs/fhss/fhss.c

@@ -36,7 +36,6 @@
 #define TRACE_GROUP "fhss"
 
 static int fhss_reset(fhss_structure_t *fhss_structure);
-static void fhss_destroy_scramble_table(fhss_structure_t *fhss_structure);
 static bool fhss_is_bc_sending_superframe(fhss_structure_t *fhss_structure);
 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 bool fhss_is_there_common_divisor(uint16_t i, uint8_t j);
@@ -529,10 +528,6 @@ static bool fhss_is_there_common_divisor(uint16_t i, uint8_t j)
 static int fhss_generate_scramble_table(fhss_structure_t *fhss_structure)
 {
     uint8_t j = 2;
-    fhss_structure->bs->fhss_scramble_table = ns_dyn_mem_alloc(MAX_SCRAMBLE_TABLE_INDEXES);
-    if (fhss_structure->bs->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;)
     {
@@ -641,7 +636,6 @@ static int fhss_reset(fhss_structure_t *fhss_structure)
     if (!fhss_structure) {
         return -1;
     }
-    fhss_destroy_scramble_table(fhss_structure);
     fhss_structure->platform_functions.fhss_timer_stop(fhss_superframe_handler, fhss_structure->fhss_api);
     fhss_structure->bs->synch_panid = 0xffff;
     fhss_beacon_periodic_stop(fhss_structure);
@@ -800,14 +794,6 @@ static void fhss_handle_state_set(const fhss_api_t *api, fhss_states fhss_state,
     return;
 }
 
-static void fhss_destroy_scramble_table(fhss_structure_t *fhss_structure)
-{
-    if (fhss_structure->bs->fhss_scramble_table) {
-        ns_dyn_mem_free(fhss_structure->bs->fhss_scramble_table);
-        fhss_structure->bs->fhss_scramble_table = NULL;
-    }
-}
-
 static void fhss_beacon_received(fhss_structure_t *fhss_structure, const uint8_t *synch_info, const uint32_t elapsed_time)
 {
 

test/nanostack/unittest/service_libs/fhss_beacon_tasklet/test_fhss_beacon_tasklet.c

@@ -28,11 +28,9 @@
 
 static fhss_structure_t fhss_structure;
 static fhss_bs_t bs;
-static fhss_scramble[MAX_SCRAMBLE_TABLE_INDEXES];
 
 static  init_fhss_struct(void)
 {
-    bs.fhss_scramble_table = fhss_scramble;
     fhss_structure.bs = &bs;
 }
 

test/nanostack/unittest/service_libs/fhss_channel/test_fhss_channel.c

@@ -30,11 +30,9 @@ static uint16_t rand_value = 0;
 static int rand_call_cnt = 0;
 static fhss_structure_t fhss_struct;
 static fhss_bs_t bs;
-static fhss_scramble[MAX_SCRAMBLE_TABLE_INDEXES];
 
 static  init_fhss_struct(void)
 {
-    bs.fhss_scramble_table = fhss_scramble;
     fhss_struct.bs = &bs;
 }
 
@@ -398,7 +396,6 @@ bool test_fhss_change_to_tx_channel()
     uint8_t destination_address[8] = {0, 0, 0, 0, 0, 0, 0 , 1};
     init_fhss_struct();
     // Must allocate scramble stable
-    fhss_struct.bs->fhss_scramble_table = malloc(20);
     fhss_struct.number_of_channels = 50;
     fhss_struct.bs->synch_configuration.fhss_number_of_bc_channels = 10;
     fhss_struct.rx_channel = 10;
@@ -424,7 +421,6 @@ bool test_fhss_change_to_tx_channel()
     if (fhss_callbacks_stub.uint8_value != 20) {
         return false;
     }
-    free(fhss_struct.bs->fhss_scramble_table);
     return true;
 }
 

test/nanostack/unittest/service_libs/fhss_statistics/test_fhss_statistics.c

@@ -26,13 +26,11 @@
 static fhss_structure_t fhss_struct;
 static fhss_bs_t bs;
 static fhss_statistics_t fhss_stats_ptr;
-static fhss_scramble[MAX_SCRAMBLE_TABLE_INDEXES];
 
 static  init_fhss_struct(void)
 {
     memset(&fhss_stats_ptr, 0, sizeof(fhss_statistics_t));
     bs.fhss_stats_ptr = &fhss_stats_ptr;
-    bs.fhss_scramble_table = fhss_scramble;
     fhss_struct.bs = &bs;
 }