diff --git a/openair1/SIMULATION/LTE_PHY/syncsim.c b/openair1/SIMULATION/LTE_PHY/syncsim.c index 0a041258c2..e8976ea898 100644 --- a/openair1/SIMULATION/LTE_PHY/syncsim.c +++ b/openair1/SIMULATION/LTE_PHY/syncsim.c @@ -312,7 +312,7 @@ int main(int argc, char **argv) { #ifdef IFFT_FPGA int **txdataF2; #endif - int **txdata,**txdata1 = NULL,**txdata2 = NULL; + int **txdata, **txdata1 = NULL, **txdata2 = NULL; double **s_re,**s_im,**s_re1,**s_im1,**s_re2,**s_im2,**r_re,**r_im,**r_re1,**r_im1,**r_re2,**r_im2; double iqim = 0.0; unsigned char pbch_pdu[6]; @@ -1180,12 +1180,12 @@ int main(int argc, char **argv) { s_re[aa][i] = tmp_re; s_im[aa][i] = tmp_im; - if (interf1>-20) { + if (interf1 >- 20 && txdata1) { s_re1[aa][i] = ((double)(((short *)txdata1[aa]))[(i<<1)]); s_im1[aa][i] = ((double)(((short *)txdata1[aa]))[(i<<1)+1]); } - if (interf2>-20) { + if (interf2 >- 20 && txdata2) { s_re2[aa][i] = ((double)(((short *)txdata2[aa]))[(i<<1)]); s_im2[aa][i] = ((double)(((short *)txdata2[aa]))[(i<<1)+1]); } diff --git a/openair2/RRC/NR/rrc_gNB.c b/openair2/RRC/NR/rrc_gNB.c index 1dbedbbd07..0d745fb798 100644 --- a/openair2/RRC/NR/rrc_gNB.c +++ b/openair2/RRC/NR/rrc_gNB.c @@ -729,7 +729,6 @@ rrc_gNB_modify_dedicatedRRCReconfiguration( struct NR_RRCReconfiguration_v1530_IEs__dedicatedNAS_MessageList *dedicatedNAS_MessageList = CALLOC(1, sizeof(*dedicatedNAS_MessageList)); - NR_DRB_ToAddMod_t *DRB_config = NULL; for (int i = 0; i < ue_p->nb_of_pdusessions; i++) { // bypass the new and already configured pdu sessions @@ -784,13 +783,11 @@ rrc_gNB_modify_dedicatedRRCReconfiguration( ue_p->pduSession[i].cause_value = NGAP_CauseRadioNetwork_not_supported_5QI_value; continue; } - LOG_I(NR_RRC, - "PDU SESSION ID %ld, DRB ID %ld (index %d), QOS flow %d, 5QI %ld \n", - DRB_config->cnAssociation->choice.sdap_Config->pdu_Session, - DRB_config->drb_Identity, - i, - qos_flow_index, - ue_p->pduSession[i].param.qos[qos_flow_index].fiveQI); + LOG_I(NR_RRC, + "index %d, QOS flow %d, 5QI %ld \n", + i, + qos_flow_index, + ue_p->pduSession[i].param.qos[qos_flow_index].fiveQI); } ue_p->pduSession[i].status = PDU_SESSION_STATUS_DONE;