Skip to content

Commit f786fc9

Browse files
author
Jarkko Paso
authored
Merge pull request ARMmbed#2152 from ARMmbed/fhss_coverity_fix
fhss_ws: Coverity fixes
2 parents d743e91 + 6efff35 commit f786fc9

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

source/Service_Libs/fhss/fhss_ws.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ static bool fhss_ws_check_tx_allowed(fhss_structure_t *fhss_structure);
8686
static uint32_t fhss_set_txrx_slot_length(fhss_structure_t *fhss_structure);
8787

8888
// This function supports rounding up
89-
static int32_t divide_integer(int64_t dividend, int32_t divisor)
89+
static int64_t divide_integer(int64_t dividend, int32_t divisor)
9090
{
9191
if (dividend < 0) {
9292
return (dividend - divisor / 2) / divisor;
@@ -867,9 +867,9 @@ int fhss_ws_set_parent(fhss_structure_t *fhss_structure, const uint8_t eui64[8],
867867
drift_per_ms_tmp = -MAX_DRIFT_COMPENSATION_STEP;
868868
}
869869
fhss_structure->ws->drift_per_millisecond_ns += drift_per_ms_tmp;
870-
fhss_stats_update(fhss_structure, STATS_FHSS_DRIFT_COMP, NS_TO_US(fhss_structure->ws->drift_per_millisecond_ns * bc_timing_info->broadcast_dwell_interval));
870+
fhss_stats_update(fhss_structure, STATS_FHSS_DRIFT_COMP, NS_TO_US((int64_t)(fhss_structure->ws->drift_per_millisecond_ns * bc_timing_info->broadcast_dwell_interval)));
871871
}
872-
tr_debug("synch to parent: %s, drift: %"PRIi32"ms in %"PRIu32" seconds, compensation: %"PRIi32"ns per ms", trace_array(eui64, 8), true_bc_interval_offset - own_bc_interval_offset + ((int32_t)(fhss_structure->ws->bc_slot - own_bc_slot) * bc_timing_info->broadcast_interval), US_TO_S(time_since_last_synch_us), fhss_structure->ws->drift_per_millisecond_ns);
872+
tr_debug("synch to parent: %s, drift: %"PRIi32"ms in %"PRIu64" seconds, compensation: %"PRIi32"ns per ms", trace_array(eui64, 8), true_bc_interval_offset - own_bc_interval_offset + ((int32_t)(fhss_structure->ws->bc_slot - own_bc_slot) * bc_timing_info->broadcast_interval), US_TO_S(time_since_last_synch_us), fhss_structure->ws->drift_per_millisecond_ns);
873873
} else {
874874
//IOTTHD-3571 temporary debug traces
875875
tr_debug("Do not compensate");

0 commit comments

Comments
 (0)