Merge pull request #2017 from ARMmbed/IOTTHD-3065

FHSS WS: Fixed large broadcast interval issue

Author: Jarkko Paso

source/Service_Libs/fhss/fhss_ws.c

@@ -82,7 +82,7 @@ static void fhss_event_timer_cb(int8_t timer_id, uint16_t slots);
 static void fhss_ws_update_uc_channel_callback(fhss_structure_t *fhss_structure);
 static void fhss_unicast_handler(const fhss_api_t *fhss_api, uint16_t delay);
 static bool fhss_ws_check_tx_allowed(fhss_structure_t *fhss_structure);
-static uint8_t fhss_set_txrx_slot_length(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)
@@ -169,9 +169,9 @@ static int fhss_ws_manage_channel_table_allocation(fhss_structure_t *fhss_struct
     return 0;
 }
 
-static uint8_t fhss_set_txrx_slot_length(fhss_structure_t *fhss_structure)
+static uint32_t fhss_set_txrx_slot_length(fhss_structure_t *fhss_structure)
 {
-    uint8_t number_of_tx_slots = ((fhss_structure->ws->fhss_configuration.fhss_broadcast_interval - fhss_structure->ws->fhss_configuration.fhss_bc_dwell_interval) / WS_MAX_TXRX_SLOT_LEN_MS) / 2;
+    uint32_t number_of_tx_slots = ((fhss_structure->ws->fhss_configuration.fhss_broadcast_interval - fhss_structure->ws->fhss_configuration.fhss_bc_dwell_interval) / WS_MAX_TXRX_SLOT_LEN_MS) / 2;
     if (!number_of_tx_slots) {
         return 0;
     }
@@ -519,7 +519,7 @@ static bool fhss_ws_check_tx_allowed(fhss_structure_t *fhss_structure)
     if (fhss_structure->ws->is_on_bc_channel == true) {
         return true;
     }
-    uint8_t number_of_tx_slots = fhss_set_txrx_slot_length(fhss_structure);
+    uint32_t number_of_tx_slots = fhss_set_txrx_slot_length(fhss_structure);
     // Allow transmission when broadcast interval is very short comparing to MAX slot length
     if (!number_of_tx_slots) {
         return true;
@@ -528,7 +528,7 @@ static bool fhss_ws_check_tx_allowed(fhss_structure_t *fhss_structure)
     uint32_t remaining_time_ms = get_remaining_slots_us(fhss_structure, fhss_broadcast_handler, MS_TO_US(fhss_structure->ws->fhss_configuration.fhss_broadcast_interval)) / 1000;
     uint32_t tx_slot_begin = (fhss_structure->ws->fhss_configuration.fhss_broadcast_interval - fhss_structure->ws->fhss_configuration.fhss_bc_dwell_interval) - (fhss_structure->ws->txrx_slot_length_ms * (fhss_structure->own_hop & 1));
     uint32_t rx_slot_begin = tx_slot_begin - fhss_structure->ws->txrx_slot_length_ms;
-    uint8_t n_o_tx_slots = number_of_tx_slots;
+    uint32_t n_o_tx_slots = number_of_tx_slots;
 
     while (n_o_tx_slots--) {
         if ((remaining_time_ms <= tx_slot_begin) && (remaining_time_ms > rx_slot_begin)) {