FHSS: fhss_struct defined static

Author: Jarkko Paso

source/Service_Libs/fhss/fhss.h

@@ -69,9 +69,9 @@ struct fhss_bs
     uint8_t beacons_received_timer;
     uint8_t broadcast_start_superframe;
     uint8_t synch_infos_sent_counter;
-    bool tx_allowed;
-    bool send_synch_info_on_next_broadcast_channel;
-    bool beacon_received_on_this_bc_channel;
+    bool tx_allowed:1;
+    bool send_synch_info_on_next_broadcast_channel:1;
+    bool beacon_received_on_this_bc_channel:1;
     uint16_t channel_list_counter;
     uint16_t synch_panid;
     uint32_t synch_interval;

source/Service_Libs/fhss/fhss_common.c

@@ -33,7 +33,7 @@
 
 #define TRACE_GROUP "fhssc"
 
-fhss_structure_t *fhss_struct = 0;
+static fhss_structure_t *fhss_struct = NULL;
 
 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);

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

@@ -31,12 +31,15 @@
 #include "fhss_callbacks_stub.h"
 #include "fhss_beacon_tasklet_stub.h"
 
-extern fhss_structure_t *fhss_struct;
+static fhss_api_t fhss_test_api;
+static fhss_timer_t fhss_test_timer;
+static fhss_structure_t *fhss_struct;
 
 
 static void test_alloc_fhss_struct(void)
 {
-    fhss_struct = malloc(sizeof(fhss_structure_t));
+    nsdynmemlib_stub.returnCounter += 1;
+    fhss_struct = fhss_allocate_instance(&fhss_test_api, &fhss_test_timer);
     fhss_struct->bs = malloc(sizeof(fhss_bs_t));
 }