maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

temporary fix for pucch tx amp

Browse Source
This commit is contained in:
francescomani
2021-07-29 07:46:16 +02:00
parent 5e3e4714d6
commit 13d30c96b3
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
executables/nr-uesoftmodem.c
-1
View File
@@ -320,7 +320,6 @@ void set_options(int CC_id, PHY_VARS_NR_UE *UE){
UE->rf_map.card = card_offset; UE->rf_map.card = card_offset;
UE->rf_map.chain = CC_id + chain_offset; UE->rf_map.chain = CC_id + chain_offset;
LOG_I(PHY,"Set UE mode %d, UE_fo_compensation %d, UE_scan_carrier %d, UE_no_timing_correction %d \n", LOG_I(PHY,"Set UE mode %d, UE_fo_compensation %d, UE_scan_carrier %d, UE_no_timing_correction %d \n",
UE->mode, UE->UE_fo_compensation, UE->UE_scan_carrier, UE->no_timing_correction); UE->mode, UE->UE_fo_compensation, UE->UE_scan_carrier, UE->no_timing_correction);
openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
+8 -11
View File
@@ -837,9 +837,9 @@ bool pucch_procedures_ue_nr(PHY_VARS_NR_UE *ue, uint8_t gNB_id, UE_nr_rxtx_proc_
/* Generate PUCCH signal according to its format and parameters */ /* Generate PUCCH signal according to its format and parameters */
ue->generate_ul_signal[gNB_id] = 1; ue->generate_ul_signal[gNB_id] = 1;
int16_t pucch_tx_power = get_pucch_tx_power_ue( ue, gNB_id, proc, format, int16_t pucch_tx_power = get_pucch_tx_power_ue(ue, gNB_id, proc, format,
nb_of_prbs, N_sc_ctrl_RB, nb_symbols, N_UCI, O_SR, O_CSI, O_ACK, nb_of_prbs, N_sc_ctrl_RB, nb_symbols, N_UCI, O_SR, O_CSI, O_ACK,
O_CRC, n_HARQ_ACK); O_CRC, n_HARQ_ACK);
/* set tx power */ /* set tx power */
ue->tx_power_dBm[nr_slot_tx] = pucch_tx_power; ue->tx_power_dBm[nr_slot_tx] = pucch_tx_power;
@@ -847,15 +847,12 @@ bool pucch_procedures_ue_nr(PHY_VARS_NR_UE *ue, uint8_t gNB_id, UE_nr_rxtx_proc_
int tx_amp; int tx_amp;
#if defined(EXMIMO) || defined(OAI_USRP) || defined(OAI_BLADERF) || defined(OAI_LMSSDR) || defined(OAI_ADRV9371_ZC706)
tx_amp = nr_get_tx_amp(pucch_tx_power, tx_amp = nr_get_tx_amp(pucch_tx_power,
ue->tx_power_max_dBm, ue->tx_power_max_dBm,
ue->frame_parms.N_RB_UL, ue->frame_parms.N_RB_UL,
nb_of_prbs); nb_of_prbs);
#else if (tx_amp == 0)
tx_amp = AMP; tx_amp = AMP;
#endif
switch(format) { switch(format) {
case pucch_format0_nr: case pucch_format0_nr: