Merge pull request #1945 from ARMmbed/fix_synch_parent_warn

Jarkko Paso · web-flow · commit 7b7f1c1e24b2 · 2019-01-18T15:54:45.000+02:00
FHSS WS: Fixed synch parent warning
diff --git a/source/Service_Libs/fhss/fhss_ws.c b/source/Service_Libs/fhss/fhss_ws.c
@@ -749,7 +749,7 @@ int fhss_ws_set_parent(fhss_structure_t *fhss_structure, const uint8_t eui64[8],
     if (!bc_timing_info->broadcast_interval || !bc_timing_info->broadcast_dwell_interval) {
         return -1;
     }
-    if ((S_TO_US(fhss_structure->ws->min_synch_interval) > (fhss_structure->callbacks.read_timestamp(fhss_structure->fhss_api) - fhss_structure->ws->synchronization_time)) && !force_synch) {
+    if (((uint32_t)S_TO_US(fhss_structure->ws->min_synch_interval) > (fhss_structure->callbacks.read_timestamp(fhss_structure->fhss_api) - fhss_structure->ws->synchronization_time)) && !force_synch) {
         return 0;
     }
     platform_enter_critical();

Original file line number	Diff line number	Diff line change
`@@ -749,7 +749,7 @@ int fhss_ws_set_parent(fhss_structure_t *fhss_structure, const uint8_t eui64[8],`
`749`	`749`	`if (!bc_timing_info->broadcast_interval \|\| !bc_timing_info->broadcast_dwell_interval) {`
`750`	`750`	`return -1;`
`751`	`751`	`}`
`752`		`- if ((S_TO_US(fhss_structure->ws->min_synch_interval) > (fhss_structure->callbacks.read_timestamp(fhss_structure->fhss_api) - fhss_structure->ws->synchronization_time)) && !force_synch) {`
	`752`	`+ if (((uint32_t)S_TO_US(fhss_structure->ws->min_synch_interval) > (fhss_structure->callbacks.read_timestamp(fhss_structure->fhss_api) - fhss_structure->ws->synchronization_time)) && !force_synch) {`
`753`	`753`	`return 0;`
`754`	`754`	`}`
`755`	`755`	`platform_enter_critical();`