From d40f56ddd2e5ab22695df061370eea9db12117b8 Mon Sep 17 00:00:00 2001 From: abgaber Date: Tue, 21 Apr 2026 16:58:36 +0200 Subject: [PATCH] PHY/UE: replace inline T() calls with log_ul_scrambled_tx_bits wrapper Remove redundant T_ACTIVE() guard and old timestamp formatting. --- openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c | 63 ++++------------------ 1 file changed, 9 insertions(+), 54 deletions(-) diff --git a/openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c b/openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c index 9ff9246c50..96a73a17aa 100644 --- a/openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c +++ b/openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c @@ -21,9 +21,9 @@ #include "PHY/TOOLS/tools_defs.h" #include "executables/nr-softmodem.h" #include "executables/softmodem-common.h" +#include "T_messages_creator.h" #include "PHY/NR_REFSIG/ul_ref_seq_nr.h" #include -#include "PHY/log_tools.h" #include "PHY/NR_UE_TRANSPORT/pucch_nr.h" #include @@ -1306,59 +1306,14 @@ void nr_ue_ulsch_procedures(PHY_VARS_NR_UE *UE, memcpy(UE->phy_sim_test_buf, scrambled_output, (available_bits + 7) / 8); } #if T_TRACER - if (T_ACTIVE(T_UE_PHY_UL_SCRAMBLED_TX_BITS)) { - // Get Time Stamp for T-tracer messages - char trace_time_stamp_str[30]; - get_time_stamp_usec(trace_time_stamp_str); - // trace_time_stamp_str = 8 bytes timestamp = YYYYMMDD - // + 9 bytes timestamp = HHMMSSMMM - - int dmrs_port = get_dmrs_port(0, pusch_pdu->dmrs_ports); - const uint8_t *in_bytes = (const uint8_t *)scrambled_output; - - // Log UE_PHY_UL_SCRAMBLED_TX_BITS using T-Tracer if activated - // FORMAT = int,frame : int,slot : int,datetime_yyyymmdd : int,datetime_hhmmssmmm : - // int,frame_type : int,freq_range : int,subcarrier_spacing : int,cyclic_prefix : int,symbols_per_slot : - // int,Nid_cell : int,rnti : - // int,rb_size : int,rb_start : int,start_symbol_index : int,nr_of_symbols : - // int,qam_mod_order : int,mcs_index : int,mcs_table : int,nrOfLayers : - // int,transform_precoding : int,dmrs_config_type : int,ul_dmrs_symb_pos : int,number_dmrs_symbols : int,dmrs_port : - // int,dmrs_nscid : nb_antennas_tx : int,number_of_bits : buffer,data Define the subcarrier spacing vector - // int subcarrier_spacing_vect[] = {15000, 30000, 60000, 120000}; - int subcarrier_spacing_index = frame_parms->subcarrier_spacing / 15000 - 1; - T(T_UE_PHY_UL_SCRAMBLED_TX_BITS, - T_INT((int)frame), - T_INT((int)slot), - T_INT((int)split_time_stamp_and_convert_to_int(trace_time_stamp_str, 0, 8)), - T_INT((int)split_time_stamp_and_convert_to_int(trace_time_stamp_str, 8, 9)), - T_INT((int)frame_parms->frame_type), // Frame type (0 FDD, 1 TDD) frame_structure - T_INT((int)frame_parms->freq_range), // Frequency range (0 FR1, 1 FR2) - T_INT((int)subcarrier_spacing_index), // Subcarrier spacing (0 15kHz, 1 30kHz, 2 60kHz) - T_INT((int)pusch_pdu->cyclic_prefix), // Normal or extended prefix (0 normal, 1 extended) - T_INT((int)frame_parms->symbols_per_slot), // Number of symbols per slot - T_INT((int)frame_parms->Nid_cell), - T_INT((int)pusch_pdu->rnti), - T_INT((int)pusch_pdu->rb_size), - T_INT((int)pusch_pdu->rb_start), - T_INT((int)pusch_pdu->start_symbol_index), // start_ofdm_symbol - T_INT((int)pusch_pdu->nr_of_symbols), // num_ofdm_symbols - T_INT((int)pusch_pdu->qam_mod_order), // modulation - T_INT((int)pusch_pdu->mcs_index), // mcs - T_INT((int)pusch_pdu->mcs_table), // mcs_table_index - T_INT((int)pusch_pdu->nrOfLayers), // num_layer - T_INT((int)pusch_pdu->transform_precoding), // transformPrecoder_enabled = 0, transformPrecoder_disabled = 1 - T_INT((int)pusch_pdu->dmrs_config_type), // dmrs_resource_map_config: pusch_dmrs_type1 = 0, pusch_dmrs_type2 = 1 - T_INT((int)pusch_pdu->ul_dmrs_symb_pos), // used to derive the DMRS symbol positions - T_INT((int)number_dmrs_symbols), - // dmrs_start_ofdm_symbol - // dmrs_duration_num_ofdm_symbols - // dmrs_num_add_positions - T_INT((int)dmrs_port), // dmrs_antenna_port - T_INT((int)pusch_pdu->scid), // dmrs_nscid - T_INT((int)frame_parms->nb_antennas_tx), // number of tx antennas - T_INT((int)available_bits), // number_of_bits - T_BUFFER((uint8_t *)in_bytes, available_bits / 8)); - } + { + // capture scrambled Tx bits via T-Tracer + log_ul_scrambled_tx_bits(frame, slot, frame_parms, pusch_pdu, + number_dmrs_symbols, + get_dmrs_port(0, pusch_pdu->dmrs_ports), + (const uint8_t *)scrambled_output, + available_bits); + } #endif /////////////////////////ULSCH modulation/////////////////////////