@@ -356,8 +356,8 @@ static int8_t ws_fhss_initialize(protocol_interface_info_entry_t *cur)
356
356
}
357
357
358
358
fhss_configuration .fhss_uc_dwell_interval = cur -> ws_info -> fhss_uc_dwell_interval ;
359
- fhss_configuration .ws_uc_channel_function = cur -> ws_info -> fhss_uc_channel_function ;
360
- fhss_configuration .ws_bc_channel_function = cur -> ws_info -> fhss_bc_channel_function ;
359
+ fhss_configuration .ws_uc_channel_function = ( fhss_ws_channel_functions ) cur -> ws_info -> fhss_uc_channel_function ;
360
+ fhss_configuration .ws_bc_channel_function = ( fhss_ws_channel_functions ) cur -> ws_info -> fhss_bc_channel_function ;
361
361
fhss_configuration .fhss_bc_dwell_interval = cur -> ws_info -> fhss_bc_dwell_interval ;
362
362
fhss_configuration .fhss_broadcast_interval = cur -> ws_info -> fhss_bc_interval ;
363
363
@@ -386,8 +386,8 @@ static int8_t ws_fhss_initialize(protocol_interface_info_entry_t *cur)
386
386
static int8_t ws_fhss_set_defaults (protocol_interface_info_entry_t * cur , fhss_ws_configuration_t * fhss_configuration )
387
387
{
388
388
fhss_configuration -> fhss_uc_dwell_interval = cur -> ws_info -> fhss_uc_dwell_interval ;
389
- fhss_configuration -> ws_uc_channel_function = cur -> ws_info -> fhss_uc_channel_function ;
390
- fhss_configuration -> ws_bc_channel_function = cur -> ws_info -> fhss_bc_channel_function ;
389
+ fhss_configuration -> ws_uc_channel_function = ( fhss_ws_channel_functions ) cur -> ws_info -> fhss_uc_channel_function ;
390
+ fhss_configuration -> ws_bc_channel_function = ( fhss_ws_channel_functions ) cur -> ws_info -> fhss_bc_channel_function ;
391
391
fhss_configuration -> fhss_bc_dwell_interval = cur -> ws_info -> fhss_bc_dwell_interval ;
392
392
fhss_configuration -> fhss_broadcast_interval = cur -> ws_info -> fhss_bc_interval ;
393
393
if (cur -> ws_info -> fhss_uc_fixed_channel != 0xffff ) {
@@ -405,7 +405,9 @@ static int8_t ws_fhss_set_defaults(protocol_interface_info_entry_t *cur, fhss_ws
405
405
static int8_t ws_fhss_border_router_configure (protocol_interface_info_entry_t * cur )
406
406
{
407
407
// Read configuration of existing FHSS and start using the default values for any network
408
- fhss_ws_configuration_t fhss_configuration = {0 };
408
+ fhss_ws_configuration_t fhss_configuration ;
409
+ memset (& fhss_configuration , 0 , sizeof (fhss_ws_configuration_t ));
410
+
409
411
if (ns_fhss_ws_configuration_get (cur -> ws_info -> fhss_api )) {
410
412
memcpy (& fhss_configuration , ns_fhss_ws_configuration_get (cur -> ws_info -> fhss_api ), sizeof (fhss_ws_configuration_t ));
411
413
}
@@ -428,7 +430,9 @@ static uint16_t ws_randomize_fixed_channel(uint16_t configured_fixed_channel, ui
428
430
static int8_t ws_fhss_discovery_configure (protocol_interface_info_entry_t * cur )
429
431
{
430
432
// Read configuration of existing FHSS and start using the default values for any network
431
- fhss_ws_configuration_t fhss_configuration = {0 };
433
+ fhss_ws_configuration_t fhss_configuration ;
434
+ memset (& fhss_configuration , 0 , sizeof (fhss_ws_configuration_t ));
435
+
432
436
if (ns_fhss_ws_configuration_get (cur -> ws_info -> fhss_api )) {
433
437
memcpy (& fhss_configuration , ns_fhss_ws_configuration_get (cur -> ws_info -> fhss_api ), sizeof (fhss_ws_configuration_t ));
434
438
}
@@ -487,7 +491,7 @@ static void ws_bootstrap_primary_parent_set(struct protocol_interface_info_entry
487
491
// Learning broadcast network configuration
488
492
if (neighbor_info -> ws_neighbor -> broadcast_shedule_info_stored ) {
489
493
ws_fhss_set_defaults (cur , & fhss_configuration );
490
- fhss_configuration .ws_bc_channel_function = neighbor_info -> ws_neighbor -> fhss_data .bc_timing_info .broadcast_channel_function ;
494
+ fhss_configuration .ws_bc_channel_function = ( fhss_ws_channel_functions ) neighbor_info -> ws_neighbor -> fhss_data .bc_timing_info .broadcast_channel_function ;
491
495
if (fhss_configuration .ws_bc_channel_function == WS_FIXED_CHANNEL ) {
492
496
cur -> ws_info -> hopping_schdule .bc_fixed_channel = neighbor_info -> ws_neighbor -> fhss_data .bc_timing_info .fixed_channel ;
493
497
cur -> ws_info -> fhss_bc_fixed_channel = neighbor_info -> ws_neighbor -> fhss_data .bc_timing_info .fixed_channel ;
@@ -1335,7 +1339,7 @@ static bool ws_neighbor_entry_nud_notify(mac_neighbor_table_entry_t *entry_ptr,
1335
1339
uint16_t switch_prob = randLIB_get_random_in_range (0 , probe_period - 1 );
1336
1340
//Take Random from time WS_NEIGHBOR_NUD_TIMEOUT - WS_NEIGHBOR_NUD_TIMEOUT*1.5
1337
1341
if (switch_prob < 2 ) {
1338
- tr_debug ("Link Probe test with jitter %u , sample %u" , time_from_start , etx_entry -> etx_samples );
1342
+ tr_debug ("Link Probe test with jitter %" PRIu32 " , sample %u" , time_from_start , etx_entry -> etx_samples );
1339
1343
activate_nud = true;
1340
1344
}
1341
1345
}
0 commit comments