Skip to content

Commit 576f2bf

Browse files
author
Jarkko Paso
committed
FHSS unit tests: Fixed channel function variable name
1 parent f33d163 commit 576f2bf

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

test/nanostack/unittest/service_libs/fhss_ws/test_fhss_ws.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ bool test_fhss_ws_check_tx_conditions_callback()
301301
return false;
302302
}
303303
// Test broadcast destination on unicast channel
304-
fhss_common_stub.fhss_struct.ws->fhss_configuration.ws_channel_function = WS_TR51CF;
304+
fhss_common_stub.fhss_struct.ws->fhss_configuration.ws_uc_channel_function = WS_TR51CF;
305305
if (fhss_common_stub.fhss_struct.fhss_api->check_tx_conditions(api, true, DEFAULT_HANDLE, DEFAULT_FRAME_TYPE, DEFAULT_FRAME_LENGTH, DEFAULT_PHY_HEAD_LENGTH, DEFAULT_PHY_TAIL_LENGTH) != false) {
306306
return false;
307307
}
@@ -386,7 +386,7 @@ bool test_fhss_ws_data_tx_done_callback()
386386
// Test when FHSS struct can be found
387387
enable_fhss_struct();
388388
fhss_common_stub.fhss_struct.fhss_state = FHSS_SYNCHRONIZED;
389-
fhss_common_stub.fhss_struct.ws->fhss_configuration.ws_channel_function = WS_TR51CF;
389+
fhss_common_stub.fhss_struct.ws->fhss_configuration.ws_uc_channel_function = WS_TR51CF;
390390
fhss_common_stub.fhss_struct.fhss_api->data_tx_done(api, DEFAULT_WAITING_ACK, DEFAULT_TX_COMPLETED, DEFAULT_HANDLE);
391391

392392
return true;
@@ -452,7 +452,7 @@ bool test_fhss_ws_synch_state_set_callback()
452452
bool test_fhss_ws_write_synch_info_callback()
453453
{
454454
fhss_api_t *api = test_generate_fhss_api();
455-
fhss_common_stub.fhss_struct.ws->fhss_configuration.ws_channel_function = WS_TR51CF;
455+
fhss_common_stub.fhss_struct.ws->fhss_configuration.ws_uc_channel_function = WS_TR51CF;
456456
fhss_common_stub.fhss_struct.rx_channel = 0;
457457
uint8_t synch_info[100] = {0x05, 0x15, 0x02, 0x00, 0x00, 0x00, 0x00, 0x05, 0x15, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0x3f};
458458
// Test when FHSS struct not found
@@ -561,28 +561,28 @@ bool test_fhss_ws_update_uc_channel_callback()
561561
return false;
562562
}
563563
// Test setting TR51 unicast channel
564-
fhss_common_stub.fhss_struct.ws->fhss_configuration.ws_channel_function = WS_TR51CF;
564+
fhss_common_stub.fhss_struct.ws->fhss_configuration.ws_uc_channel_function = WS_TR51CF;
565565
fhss_common_stub.fhss_struct.fhss_api->synch_state_set(api, DEFAULT_FHSS_STATE, DEFAULT_PANID);
566566
if ((3 != fhss_callbacks_stub.uint8_value) || (fhss_common_stub.fhss_struct.ws->uc_slot != 0)) {
567567
return false;
568568
}
569569
// Test setting direct hash unicast channel
570-
fhss_common_stub.fhss_struct.ws->fhss_configuration.ws_channel_function = WS_DH1CF;
570+
fhss_common_stub.fhss_struct.ws->fhss_configuration.ws_uc_channel_function = WS_DH1CF;
571571
fhss_common_stub.fhss_struct.fhss_api->synch_state_set(api, DEFAULT_FHSS_STATE, DEFAULT_PANID);
572572
if ((1 != fhss_callbacks_stub.uint8_value) || (fhss_common_stub.fhss_struct.ws->uc_slot != 1)) {
573573
return false;
574574
}
575575
// Test setting vendor defined unicast channel
576576
fhss_common_stub.fhss_struct.ws->fhss_configuration.vendor_defined_cf = app_channel_function;
577-
fhss_common_stub.fhss_struct.ws->fhss_configuration.ws_channel_function = WS_VENDOR_DEF_CF;
577+
fhss_common_stub.fhss_struct.ws->fhss_configuration.ws_uc_channel_function = WS_VENDOR_DEF_CF;
578578
fhss_common_stub.fhss_struct.fhss_api->synch_state_set(api, DEFAULT_FHSS_STATE, DEFAULT_PANID);
579579
if ((VENDOR_CHANNEL != fhss_callbacks_stub.uint8_value) || (fhss_common_stub.fhss_struct.ws->uc_slot != 1)) {
580580
return false;
581581
}
582582
// Test changing unicast channel when broadcast channel is active
583583
api = test_generate_fhss_api();
584584
enable_fhss_struct();
585-
fhss_common_stub.fhss_struct.ws->fhss_configuration.ws_channel_function = WS_TR51CF;
585+
fhss_common_stub.fhss_struct.ws->fhss_configuration.ws_uc_channel_function = WS_TR51CF;
586586
fhss_common_stub.fhss_struct.fhss_api->synch_state_set(api, DEFAULT_FHSS_STATE, DEFAULT_PANID);
587587
if ((3 != fhss_common_stub.fhss_struct.rx_channel) || (3 == fhss_callbacks_stub.uint8_value)) {
588588
return false;
@@ -597,7 +597,7 @@ bool test_fhss_unicast_handler()
597597
fhss_common_stub.fhss_struct.ws->fhss_configuration.fhss_bc_dwell_interval = 0;
598598
fhss_common_stub.fhss_struct.ws->fhss_configuration.fhss_broadcast_interval = 0;
599599
fhss_common_stub.fhss_struct.ws->uc_slot = fhss_common_stub.fhss_struct.number_of_channels - 1;
600-
fhss_common_stub.fhss_struct.ws->fhss_configuration.ws_channel_function = WS_TR51CF;
600+
fhss_common_stub.fhss_struct.ws->fhss_configuration.ws_uc_channel_function = WS_TR51CF;
601601

602602
// Call state set just to get fhss_stub.callback
603603
enable_fhss_struct();
@@ -629,7 +629,7 @@ bool test_fhss_ws_set_parent()
629629
}
630630

631631
// Test success
632-
fhss_common_stub.fhss_struct.ws->fhss_configuration.ws_channel_function = WS_TR51CF;
632+
fhss_common_stub.fhss_struct.ws->fhss_configuration.ws_uc_channel_function = WS_TR51CF;
633633
bc_timing_info.broadcast_channel_function = WS_TR51CF;
634634
bc_timing_info.broadcast_dwell_interval = 250;
635635
bc_timing_info.broadcast_interval = 1000;

0 commit comments

Comments
 (0)