Fhss info print (ARMmbed#1486)

* Added FHSS synch info state and error print's

* Added more print for debug.

* Corrected FHSS timestamp value for timeout synchinfo eventhandling.

* Fix thread commercial stub definition.

(cherry picked from commit 414267d19c41e3a07d5f6646f3519b608b140173)

Change-Id: Ibe0c3a5cb4bdb0b580a494d38499153847610372

Author: juhhei01

source/Service_Libs/fhss/fhss.c

@@ -949,6 +949,7 @@ static fhss_beacon_info_t *fhss_create_beacon_info(fhss_structure_t *fhss_struct
 
 static int fhss_remove_beacon_info(fhss_structure_t *fhss_structure, uint16_t pan_id)
 {
+    tr_debug("Remove synch info %u", pan_id);
     if (!fhss_structure || !fhss_structure->fhss_beacon_info_store) {
         return -1;
     }
@@ -1001,6 +1002,7 @@ int fhss_add_beacon_info(fhss_structure_t *fhss_structure, uint16_t pan_id, uint
         beacon_info = fhss_create_beacon_info(fhss_structure);
     }
     if (!beacon_info) {
+        tr_error("Beacon data not allocated");
         return -2;
     }
     fhss_write_beacon_info(beacon_info, pan_id, source_address, timestamp, synch_info);
@@ -1015,6 +1017,10 @@ void fhss_update_beacon_info_lifetimes(fhss_structure_t *fhss_structure, uint32_
         uint32_t time_since_added = timestamp - beacon_info->timestamp;
         // timestamp is microseconds, lifetime is seconds
         if (time_since_added >= ((uint32_t)BEACON_INFO_LIFETIME * 1000000)) {
+            tr_debug("Remove synch info by timeout");
+            tr_debug("time_since_added: %"PRIu32"", time_since_added);
+            tr_debug("beacon_info->timestamp: %"PRIu32"", beacon_info->timestamp);
+            tr_debug("timestamp: %"PRIu32"", timestamp);
             if (fhss_remove_beacon_info(fhss_structure, beacon_info->pan_id) == 0) {
                 return;
             }

source/Service_Libs/fhss/fhss_beacon_tasklet.c

@@ -26,6 +26,7 @@
 #include "fhss.h"
 #include "fhss_beacon.h"
 #include "fhss_statistics.h"
+#include "fhss_mac_interface.h"
 #include "platform/arm_hal_interrupt.h"
 
 #include <string.h> // memset
@@ -122,7 +123,7 @@ static void fhss_beacon_tasklet_func(arm_event_s* event)
     // Update Beacon info lifetimes
     else if(event->event_type == FHSS_UPDATE_SYNCH_INFO_STORAGE)
     {
-        fhss_update_beacon_info_lifetimes(fhss_structure, fhss_structure->platform_functions.fhss_get_timestamp(fhss_structure->fhss_api));
+        fhss_update_beacon_info_lifetimes(fhss_structure, fhss_read_timestamp_cb(fhss_structure->fhss_api));
     }
 }
 

source/Service_Libs/fhss/fhss_mac_interface.c

@@ -204,14 +204,17 @@ void fhss_synch_state_set_cb(const fhss_api_t *api, fhss_states fhss_state, uint
 
     // 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;
         }
         uint32_t datarate = fhss_structure->callbacks.read_datarate(api);
@@ -222,6 +225,7 @@ void fhss_synch_state_set_cb(const fhss_api_t *api, fhss_states fhss_state, uint
         // Get Beacon info from storage
         fhss_beacon_info_t *beacon_info = fhss_get_beacon_info(fhss_structure, pan_id);
         if (beacon_info) {
+            tr_debug("Synch to storaged value");
             memcpy(fhss_structure->synch_parent, beacon_info->source_address, 8);
             platform_enter_critical();
             // Calculate time since the Beacon was received
@@ -230,11 +234,14 @@ void fhss_synch_state_set_cb(const fhss_api_t *api, fhss_states fhss_state, uint
             fhss_beacon_received(fhss_structure, beacon_info->synch_info, elapsed_time);
             platform_exit_critical();
             // Delete stored Beacon infos
+            tr_debug("Flush storaged Beacon's");
             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_beacon_tasklet/Makefile

@@ -17,6 +17,7 @@ TEST_SRC_FILES = \
         ../../stub/fhss_statistics_stub.c \
         ../../stub/fhss_callbacks_stub.c \
         ../../stub/fhss_platform_stub.c \
+        ../../stub/fhss_mac_interface_stub.c \
         ../../stub/event_stub.c \
 
 include ../../MakefileWorker.mk