Added typecast when computing max_timout from drift (ARMmbed#2428)

Jarkko Paso · web-flow · commit a1bfed4846e5 · 2020-08-27T08:31:22.000+03:00
diff --git a/source/Service_Libs/fhss/fhss_ws.c b/source/Service_Libs/fhss/fhss_ws.c
@@ -419,7 +419,7 @@ static uint32_t fhss_ws_calculate_ufsi(fhss_structure_t *fhss_structure, uint32_
     cur_slot--;
     uint32_t remaining_time_ms = 0;
     if (fhss_structure->ws->unicast_timer_running == true) {
-        remaining_time_ms = US_TO_MS(get_remaining_slots_us(fhss_structure, fhss_unicast_handler, MS_TO_US(dwell_time) - NS_TO_US(dwell_time * fhss_structure->ws->drift_per_millisecond_ns)));
+        remaining_time_ms = US_TO_MS(get_remaining_slots_us(fhss_structure, fhss_unicast_handler, MS_TO_US(dwell_time) - NS_TO_US((int64_t)(fhss_structure->ws->drift_per_millisecond_ns * dwell_time))));
     }
     uint32_t time_to_tx = 0;
     uint32_t cur_time = fhss_structure->callbacks.read_timestamp(fhss_structure->fhss_api);

Original file line number	Diff line number	Diff line change
`@@ -419,7 +419,7 @@ static uint32_t fhss_ws_calculate_ufsi(fhss_structure_t *fhss_structure, uint32_`
`419`	`419`	`cur_slot--;`
`420`	`420`	`uint32_t remaining_time_ms = 0;`
`421`	`421`	`if (fhss_structure->ws->unicast_timer_running == true) {`
`422`		`- remaining_time_ms = US_TO_MS(get_remaining_slots_us(fhss_structure, fhss_unicast_handler, MS_TO_US(dwell_time) - NS_TO_US(dwell_time * fhss_structure->ws->drift_per_millisecond_ns)));`
	`422`	`+ remaining_time_ms = US_TO_MS(get_remaining_slots_us(fhss_structure, fhss_unicast_handler, MS_TO_US(dwell_time) - NS_TO_US((int64_t)(fhss_structure->ws->drift_per_millisecond_ns * dwell_time))));`
`423`	`423`	`}`
`424`	`424`	`uint32_t time_to_tx = 0;`
`425`	`425`	`uint32_t cur_time = fhss_structure->callbacks.read_timestamp(fhss_structure->fhss_api);`