@@ -208,24 +208,25 @@ bool test_fhss_ws_tx_handle_callback()
208
208
return false;
209
209
}
210
210
// Test when no neighbor info found
211
- fhss_common_stub .fhss_struct .ws -> fhss_configuration .ws_channel_function = WS_TR51CF ;
211
+ neighbor_info .uc_timing_info .unicast_channel_function = WS_TR51CF ;
212
+ neighbor_info .uc_timing_info .unicast_number_of_channels = fhss_common_stub .fhss_struct .number_of_channels ;
212
213
fhss_common_stub .fhss_struct .fhss_state = DEFAULT_FHSS_STATE ;
213
214
fhss_common_stub .fhss_struct .ws -> fhss_configuration .get_neighbor_info = & app_no_neighbor_info ;
214
- if (fhss_common_stub .fhss_struct .fhss_api -> tx_handle (api , DEFAULT_IS_BC_DEST , dest_address , DEFAULT_FRAME_TYPE , DEFAULT_FRAME_LENGTH , DEFAULT_PHY_HEAD_LENGTH , DEFAULT_PHY_TAIL_LENGTH , DEFAULT_TX_TIME ) != -1 ) {
215
+ if (fhss_common_stub .fhss_struct .fhss_api -> tx_handle (api , DEFAULT_IS_BC_DEST , dest_address , DEFAULT_FRAME_TYPE , DEFAULT_FRAME_LENGTH , DEFAULT_PHY_HEAD_LENGTH , DEFAULT_PHY_TAIL_LENGTH , DEFAULT_TX_TIME ) != -2 ) {
215
216
return false;
216
217
}
217
218
// Test fixed channel
218
219
fhss_common_stub .fhss_struct .ws -> fhss_configuration .get_neighbor_info = & app_get_neighbor_info ;
219
- fhss_common_stub . fhss_struct . ws -> fhss_configuration . ws_channel_function = WS_FIXED_CHANNEL ;
220
- if (fhss_common_stub .fhss_struct .fhss_api -> tx_handle (api , DEFAULT_IS_BC_DEST , dest_address , DEFAULT_FRAME_TYPE , DEFAULT_FRAME_LENGTH , DEFAULT_PHY_HEAD_LENGTH , DEFAULT_PHY_TAIL_LENGTH , DEFAULT_TX_TIME ) != -2 ) {
220
+ neighbor_info . uc_timing_info . unicast_channel_function = WS_FIXED_CHANNEL ;
221
+ if (fhss_common_stub .fhss_struct .fhss_api -> tx_handle (api , DEFAULT_IS_BC_DEST , dest_address , DEFAULT_FRAME_TYPE , DEFAULT_FRAME_LENGTH , DEFAULT_PHY_HEAD_LENGTH , DEFAULT_PHY_TAIL_LENGTH , DEFAULT_TX_TIME ) != 0 ) {
221
222
return false;
222
223
}
223
224
/* Test TR51 channel function
224
225
* Dest. slot: | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 |
225
226
* |dest. ufsi| 900ms |
226
227
* timestamps: 100000us| 1000000us|
227
228
*/
228
- fhss_common_stub . fhss_struct . ws -> fhss_configuration . ws_channel_function = WS_TR51CF ;
229
+ neighbor_info . uc_timing_info . unicast_channel_function = WS_TR51CF ;
229
230
if ((fhss_common_stub .fhss_struct .fhss_api -> tx_handle (api , DEFAULT_IS_BC_DEST , dest_address , DEFAULT_FRAME_TYPE , DEFAULT_FRAME_LENGTH , DEFAULT_PHY_HEAD_LENGTH , DEFAULT_PHY_TAIL_LENGTH , DEFAULT_TX_TIME ) != 0 )
230
231
|| (channel_functions_stub .uint8_value != 7 )) {
231
232
return false;
@@ -236,7 +237,7 @@ bool test_fhss_ws_tx_handle_callback()
236
237
* timestamps: 4294867000us| 900000us|
237
238
*/
238
239
neighbor_info .uc_timing_info .utt_rx_timestamp = 4294867000 ;
239
- fhss_common_stub . fhss_struct . ws -> fhss_configuration . ws_channel_function = WS_TR51CF ;
240
+ neighbor_info . uc_timing_info . unicast_channel_function = WS_TR51CF ;
240
241
if ((fhss_common_stub .fhss_struct .fhss_api -> tx_handle (api , DEFAULT_IS_BC_DEST , dest_address , DEFAULT_FRAME_TYPE , DEFAULT_FRAME_LENGTH , DEFAULT_PHY_HEAD_LENGTH , DEFAULT_PHY_TAIL_LENGTH , 900000 ) != 0 )
241
242
|| (channel_functions_stub .uint8_value != 7 )) {
242
243
return false;
@@ -248,20 +249,20 @@ bool test_fhss_ws_tx_handle_callback()
248
249
*/
249
250
neighbor_info .uc_timing_info .utt_rx_timestamp = 100000 ;
250
251
uint32_t tx_time = neighbor_info .uc_timing_info .utt_rx_timestamp + (fhss_common_stub .fhss_struct .number_of_channels * neighbor_info .uc_timing_info .unicast_dwell_interval * 1000 );
251
- fhss_common_stub . fhss_struct . ws -> fhss_configuration . ws_channel_function = WS_TR51CF ;
252
+ neighbor_info . uc_timing_info . unicast_channel_function = WS_TR51CF ;
252
253
if ((fhss_common_stub .fhss_struct .fhss_api -> tx_handle (api , DEFAULT_IS_BC_DEST , dest_address , DEFAULT_FRAME_TYPE , DEFAULT_FRAME_LENGTH , DEFAULT_PHY_HEAD_LENGTH , DEFAULT_PHY_TAIL_LENGTH , tx_time ) != 0 )
253
254
|| (channel_functions_stub .uint8_value != 2 )) {
254
255
return false;
255
256
}
256
257
// For more coverage, set neighbor info NULL
257
258
memset (& neighbor_info , 0 , sizeof (fhss_ws_neighbor_timing_info_t ));
258
259
// Test direct hash channel function
259
- fhss_common_stub . fhss_struct . ws -> fhss_configuration . ws_channel_function = WS_DH1CF ;
260
+ neighbor_info . uc_timing_info . unicast_channel_function = WS_DH1CF ;
260
261
if (fhss_common_stub .fhss_struct .fhss_api -> tx_handle (api , DEFAULT_IS_BC_DEST , dest_address , DEFAULT_FRAME_TYPE , DEFAULT_FRAME_LENGTH , DEFAULT_PHY_HEAD_LENGTH , DEFAULT_PHY_TAIL_LENGTH , DEFAULT_TX_TIME ) != 0 ) {
261
262
return false;
262
263
}
263
264
// Test vendor defined channel function without application callback
264
- fhss_common_stub . fhss_struct . ws -> fhss_configuration . ws_channel_function = WS_VENDOR_DEF_CF ;
265
+ neighbor_info . uc_timing_info . unicast_channel_function = WS_VENDOR_DEF_CF ;
265
266
if (fhss_common_stub .fhss_struct .fhss_api -> tx_handle (api , DEFAULT_IS_BC_DEST , dest_address , DEFAULT_FRAME_TYPE , DEFAULT_FRAME_LENGTH , DEFAULT_PHY_HEAD_LENGTH , DEFAULT_PHY_TAIL_LENGTH , DEFAULT_TX_TIME ) != -1 ) {
266
267
return false;
267
268
}
0 commit comments