@@ -456,10 +456,7 @@ static int8_t mac_data_interface_tx_done_cb(protocol_interface_rf_mac_setup_s *r
456
456
if (rf_ptr -> mac_ack_tx_active ) {
457
457
//Accept direct non crypted acks and crypted only if neighbor is at list
458
458
if (rf_ptr -> ack_tx_possible ) {
459
- #ifdef TIMING_TOOL_TRACES
460
- tr_info ("%u TX_start %u" , mac_mcps_sap_get_phy_timestamp (rf_ptr ), rf_ptr -> mac_channel );
461
- #endif
462
- return PHY_TX_ALLOWED ;
459
+ goto VALIDATE_TX_TIME ;
463
460
}
464
461
465
462
//Compare time to started time
@@ -471,19 +468,16 @@ static int8_t mac_data_interface_tx_done_cb(protocol_interface_rf_mac_setup_s *r
471
468
}
472
469
473
470
if (rf_ptr -> mac_edfe_tx_active ) {
474
- return PHY_TX_ALLOWED ;
471
+ goto VALIDATE_TX_TIME ;
475
472
}
476
473
477
474
if (mac_data_asynch_channel_switch (rf_ptr , rf_ptr -> active_pd_data_request )) {
478
- #ifdef TIMING_TOOL_TRACES
479
- tr_info ("%u TX_start %u" , mac_mcps_sap_get_phy_timestamp (rf_ptr ), rf_ptr -> mac_channel );
480
- #endif
481
475
rf_ptr -> active_pd_data_request -> initial_tx_channel = rf_ptr -> mac_channel ;
482
476
int8_t channel_cca_threshold = mac_cca_thr_get_dbm (rf_ptr , rf_ptr -> mac_channel );
483
477
if (CCA_FAILED_DBM != channel_cca_threshold ) {
484
478
rf_ptr -> dev_driver -> phy_driver -> extension (PHY_EXTENSION_SET_CHANNEL_CCA_THRESHOLD , (uint8_t * )& channel_cca_threshold );
485
479
}
486
- return PHY_TX_ALLOWED ;
480
+ goto VALIDATE_TX_TIME ;
487
481
}
488
482
489
483
if (rf_ptr -> fhss_api ) {
@@ -525,10 +519,12 @@ static int8_t mac_data_interface_tx_done_cb(protocol_interface_rf_mac_setup_s *r
525
519
return PHY_RESTART_CSMA ;
526
520
}
527
521
}
522
+ VALIDATE_TX_TIME :
523
+ // TODO: Validate TX time here
528
524
#ifdef TIMING_TOOL_TRACES
529
525
tr_info ("%u TX_start %u" , mac_mcps_sap_get_phy_timestamp (rf_ptr ), rf_ptr -> mac_channel );
530
526
#endif
531
- return 0 ;
527
+ return PHY_TX_ALLOWED ;
532
528
}
533
529
534
530
if (rf_ptr -> mac_ack_tx_active ) {
0 commit comments