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

Fix issues after merge

Browse Source
This commit is contained in:
rmagueta
2021-04-30 12:14:37 +01:00
parent cb0bb5f8b9
commit fece683445
4 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/PHY/NR_TRANSPORT/pucch_rx.c
+1
View File
@@ -363,6 +363,7 @@ void nr_decode_pucch0(PHY_VARS_gNB *gNB,
if (10*xrtmag_dB < uci_stats->pucch0_thres) if (10*xrtmag_dB < uci_stats->pucch0_thres)
no_conf=true; no_conf=true;
} }
gNB->bad_pucch += no_conf;
// first bit of bitmap for sr presence and second bit for acknack presence // first bit of bitmap for sr presence and second bit for acknack presence
uci_pdu->pduBitmap = pucch_pdu->sr_flag | ((pucch_pdu->bit_len_harq>0)<<1); uci_pdu->pduBitmap = pucch_pdu->sr_flag | ((pucch_pdu->bit_len_harq>0)<<1);
uci_pdu->pucch_format = 0; // format 0 uci_pdu->pucch_format = 0; // format 0
openair1/SCHED_NR/phy_procedures_nr_gNB.c
+4
View File
@@ -693,6 +693,10 @@ void phy_procedures_gNB_uespec_RX(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx)
} }
stop_meas(&gNB->phy_proc_rx); stop_meas(&gNB->phy_proc_rx);
// figure out a better way to choose slot_rx, 19 is ok for a particular TDD configuration with 30kHz SCS // figure out a better way to choose slot_rx, 19 is ok for a particular TDD configuration with 30kHz SCS
if ((frame_rx&127) == 0 && slot_rx==19) {
LOG_I(PHY, "Number of bad PUCCH received: %lu\n", gNB->bad_pucch);
}
if (pucch_decode_done || pusch_decode_done) { if (pucch_decode_done || pusch_decode_done) {
T(T_GNB_PHY_PUCCH_PUSCH_IQ, T_INT(frame_rx), T_INT(slot_rx), T_BUFFER(&gNB->common_vars.rxdataF[0][0], gNB->frame_parms.symbols_per_slot * gNB->frame_parms.ofdm_symbol_size * 4)); T(T_GNB_PHY_PUCCH_PUSCH_IQ, T_INT(frame_rx), T_INT(slot_rx), T_BUFFER(&gNB->common_vars.rxdataF[0][0], gNB->frame_parms.symbols_per_slot * gNB->frame_parms.ofdm_symbol_size * 4));
} }
openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
+2 -1
View File
@@ -991,12 +991,13 @@ void nr_DRB_preconfiguration(uint16_t crnti)
PROTOCOL_CTXT_SET_BY_MODULE_ID(&ctxt, 0, ENB_FLAG_NO, crnti, 0, 0,0); PROTOCOL_CTXT_SET_BY_MODULE_ID(&ctxt, 0, ENB_FLAG_NO, crnti, 0, 0,0);
} }
// FIXME: integrity_algorithm was temporarily set to 0
nr_rrc_pdcp_config_asn1_req( nr_rrc_pdcp_config_asn1_req(
&ctxt, &ctxt,
(NR_SRB_ToAddModList_t *) NULL, (NR_SRB_ToAddModList_t *) NULL,
rbconfig->drb_ToAddModList , rbconfig->drb_ToAddModList ,
rbconfig->drb_ToReleaseList, rbconfig->drb_ToReleaseList,
0xff, 0,
NULL, NULL,
NULL, NULL,
NULL, NULL,
openair2/RRC/NR/rrc_gNB.c
+1 -1
View File
@@ -1009,7 +1009,7 @@ rrc_gNB_generate_dedicatedRRCReconfiguration(
break; break;
default: default:
LOG_E(NR_RRC,"not supported 5qi %d\n", ue_context_pP->ue_context.pdusession[i].param.qos[qos_flow_index].fiveQI); LOG_E(NR_RRC,"not supported 5qi %lu\n", ue_context_pP->ue_context.pdusession[i].param.qos[qos_flow_index].fiveQI);
ue_context_pP->ue_context.pdusession[i].status = PDU_SESSION_STATUS_FAILED; ue_context_pP->ue_context.pdusession[i].status = PDU_SESSION_STATUS_FAILED;
ue_context_pP->ue_context.pdusession[i].xid = xid; ue_context_pP->ue_context.pdusession[i].xid = xid;
pdu_sessions_done++; pdu_sessions_done++;