fhss_ws: conversion macros/functions to support int64

Author: Jarkko Paso

source/Service_Libs/fhss/fhss_ws.c

@@ -44,23 +44,23 @@ void (*fhss_uc_switch)(void) = NULL;
 void (*fhss_bc_switch)(void) = NULL;
 #endif /*FHSS_CHANNEL_DEBUG_CBS*/
 // Seconds to milliseconds
-#define S_TO_MS(x) (((int32_t)x)*1000)
+#define S_TO_MS(x) (((int64_t)x)*1000)
 // Milliseconds to seconds
 #define MS_TO_S(x) divide_integer(x, 1000)
 // Seconds to microseconds
-#define S_TO_US(x) (((int32_t)x)*1000000)
+#define S_TO_US(x) (((int64_t)x)*1000000)
 // Microseconds to seconds
 #define US_TO_S(x) divide_integer(x, 1000000)
 // Milliseconds to microseconds
-#define MS_TO_US(x) (((int32_t)x)*1000)
+#define MS_TO_US(x) (((int64_t)x)*1000)
 // Microseconds to milliseconds
 #define US_TO_MS(x) divide_integer(x, 1000)
 // Milliseconds to nanoseconds
-#define MS_TO_NS(x) (((int32_t)x)*1000000)
+#define MS_TO_NS(x) (((int64_t)x)*1000000)
 // Nanoseconds to milliseconds
 #define NS_TO_MS(x) divide_integer(x, 1000000)
 // Microseconds to nanoseconds
-#define US_TO_NS(x) (((int32_t)x)*1000)
+#define US_TO_NS(x) (((int64_t)x)*1000)
 // Nanoseconds to microseconds
 #define NS_TO_US(x) divide_integer(x, 1000)
 #define DEF_2E24 0x1000000
@@ -86,7 +86,7 @@ static bool fhss_ws_check_tx_allowed(fhss_structure_t *fhss_structure);
 static uint32_t fhss_set_txrx_slot_length(fhss_structure_t *fhss_structure);
 
 // This function supports rounding up
-static int32_t divide_integer(int32_t dividend, int32_t divisor)
+static int32_t divide_integer(int64_t dividend, int32_t divisor)
 {
     if (dividend < 0) {
         return (dividend - divisor / 2) / divisor;
@@ -821,8 +821,6 @@ int fhss_ws_set_parent(fhss_structure_t *fhss_structure, const uint8_t eui64[8],
     uint32_t prev_synchronization_time = fhss_structure->ws->synchronization_time;
     fhss_structure->ws->synchronization_time = fhss_structure->callbacks.read_timestamp(fhss_structure->fhss_api);
     uint32_t time_since_last_synch_us = fhss_structure->ws->synchronization_time - prev_synchronization_time;
-    // IOTTHD-3571, temporary debug traces
-    tr_debug("time_since_last_synch_us: %"PRIu32", synchronization_time: %"PRIu32", prev_synchronization_time: %"PRIu32"", time_since_last_synch_us, fhss_structure->ws->synchronization_time, prev_synchronization_time);
     uint32_t own_bc_interval_offset = fhss_ws_calculate_broadcast_interval_offset(fhss_structure, fhss_structure->ws->synchronization_time);
     fhss_stop_timer(fhss_structure, fhss_broadcast_handler);
     uint32_t time_from_reception_ms = US_TO_MS(fhss_structure->callbacks.read_timestamp(fhss_structure->fhss_api) - bc_timing_info->bt_rx_timestamp);