FHSS: Platform API to support multiple simultaneous timeouts

Author: Jarkko Paso

nanostack/fhss_config.h

@@ -69,14 +69,14 @@ typedef struct fhss_configuration
  */
 typedef struct fhss_timer
 {
-    /** Start timeout (1us) */
+    /** Start timeout (1us). Timer must support multiple simultaneous timeouts */
     int (*fhss_timer_start)(uint32_t, void (*fhss_timer_callback)(const fhss_api_t *fhss_api, uint16_t), const fhss_api_t *fhss_api);
 
     /** Stop timeout */
-    int (*fhss_timer_stop)(const fhss_api_t *fhss_api);
+    int (*fhss_timer_stop)(void (*fhss_timer_callback)(const fhss_api_t *fhss_api, uint16_t), const fhss_api_t *fhss_api);
 
     /** Get remaining time of started timeout*/
-    uint32_t (*fhss_get_remaining_slots)(const fhss_api_t *fhss_api);
+    uint32_t (*fhss_get_remaining_slots)(void (*fhss_timer_callback)(const fhss_api_t *fhss_api, uint16_t), const fhss_api_t *fhss_api);
 
     /** Get timestamp since initialization of driver. Overflow of 32-bit counter is allowed (1us) */
     uint32_t (*fhss_get_timestamp)(const fhss_api_t *fhss_api);

source/Service_Libs/fhss/fhss.c

@@ -311,7 +311,7 @@ static int fhss_reset_synch_monitor(fhss_synch_monitor_s *synch_monitor, bool re
 static int fhss_reset(fhss_structure_t *fhss_structure)
 {
     if (fhss_structure) {
-        fhss_structure->platform_functions.fhss_timer_stop(fhss_structure->fhss_api);
+        fhss_structure->platform_functions.fhss_timer_stop(fhss_superframe_handler, fhss_structure->fhss_api);
         fhss_struct->synch_panid = 0xffff;
         fhss_beacon_periodic_stop(fhss_structure);
         fhss_struct->current_superframe = 0;
@@ -374,7 +374,7 @@ void fhss_start_timer(fhss_structure_t *fhss_structure, uint32_t time, void (*ca
 
 uint32_t fhss_get_remaining_time_to_next_superframe(const fhss_structure_t *fhss_structure)
 {
-    const uint32_t slots = fhss_structure->platform_functions.fhss_get_remaining_slots(fhss_structure->fhss_api);
+    const uint32_t slots = fhss_structure->platform_functions.fhss_get_remaining_slots(fhss_superframe_handler, fhss_structure->fhss_api);
     const uint32_t time = slots * fhss_structure->platform_functions.fhss_resolution_divider;
     return time;
 }
@@ -657,7 +657,7 @@ int fhss_sync_with_beacon(fhss_structure_t *fhss_structure,
             fhss_structure->uc_channel_index -= (fhss_structure->number_of_channels - payload->number_of_broadcast_channels);
         }
 
-        fhss_structure->platform_functions.fhss_timer_stop(fhss_structure->fhss_api);
+        fhss_structure->platform_functions.fhss_timer_stop(fhss_superframe_handler, fhss_structure->fhss_api);
         // start timer to elapse at approximately same time as the parent will.
         const int32_t time_to_next_superframe = payload->remaining_slots;
         remaining_time_own = fhss_get_remaining_time_to_next_superframe(fhss_structure);