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

nullPointer

Browse Source
This commit is contained in:
francescomani
2024-04-09 16:55:51 +02:00
parent 86ca5fdd55
commit 13d33163e9
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/SIMULATION/LTE_PHY/syncsim.c
+3 -3
View File
@@ -312,7 +312,7 @@ int main(int argc, char **argv) {
#ifdef IFFT_FPGA #ifdef IFFT_FPGA
int **txdataF2; int **txdataF2;
#endif #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 **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; double iqim = 0.0;
unsigned char pbch_pdu[6]; unsigned char pbch_pdu[6];
@@ -1180,12 +1180,12 @@ int main(int argc, char **argv) {
s_re[aa][i] = tmp_re; s_re[aa][i] = tmp_re;
s_im[aa][i] = tmp_im; s_im[aa][i] = tmp_im;
if (interf1>-20) { if (interf1 >- 20 && txdata1) {
s_re1[aa][i] = ((double)(((short *)txdata1[aa]))[(i<<1)]); s_re1[aa][i] = ((double)(((short *)txdata1[aa]))[(i<<1)]);
s_im1[aa][i] = ((double)(((short *)txdata1[aa]))[(i<<1)+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_re2[aa][i] = ((double)(((short *)txdata2[aa]))[(i<<1)]);
s_im2[aa][i] = ((double)(((short *)txdata2[aa]))[(i<<1)+1]); s_im2[aa][i] = ((double)(((short *)txdata2[aa]))[(i<<1)+1]);
} }
openair2/RRC/NR/rrc_gNB.c
+5 -8
View File
@@ -729,7 +729,6 @@ rrc_gNB_modify_dedicatedRRCReconfiguration(
struct NR_RRCReconfiguration_v1530_IEs__dedicatedNAS_MessageList *dedicatedNAS_MessageList = struct NR_RRCReconfiguration_v1530_IEs__dedicatedNAS_MessageList *dedicatedNAS_MessageList =
CALLOC(1, sizeof(*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++) { for (int i = 0; i < ue_p->nb_of_pdusessions; i++) {
// bypass the new and already configured pdu sessions // 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; ue_p->pduSession[i].cause_value = NGAP_CauseRadioNetwork_not_supported_5QI_value;
continue; continue;
} }
LOG_I(NR_RRC, LOG_I(NR_RRC,
"PDU SESSION ID %ld, DRB ID %ld (index %d), QOS flow %d, 5QI %ld \n", "index %d, QOS flow %d, 5QI %ld \n",
DRB_config->cnAssociation->choice.sdap_Config->pdu_Session, i,
DRB_config->drb_Identity, qos_flow_index,
i, ue_p->pduSession[i].param.qos[qos_flow_index].fiveQI);
qos_flow_index,
ue_p->pduSession[i].param.qos[qos_flow_index].fiveQI);
} }
ue_p->pduSession[i].status = PDU_SESSION_STATUS_DONE; ue_p->pduSession[i].status = PDU_SESSION_STATUS_DONE;