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

fix for DLSCH DMRS reference point (regression at the OAI UE introduced when testing with OAI gNB for a missing implementation in OAI gNB)

Browse Source
This commit is contained in:
francescomani
2025-04-14 11:28:00 +02:00
parent 9185c29e33
commit 7c4eabdb6e
3 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/PHY/NR_TRANSPORT/nr_dlsch.c
+1 -1
View File
@@ -730,7 +730,7 @@ static int do_one_dlsch(unsigned char *input_ptr, PHY_VARS_gNB *gNB, NR_gNB_DLSC
#endif #endif
} }
uint32_t dmrs_idx = rel15->rbStart; uint32_t dmrs_idx = rel15->rbStart;
if (rel15->rnti != SI_RNTI) if (rel15->refPoint == 0)
dmrs_idx += rel15->BWPStart; dmrs_idx += rel15->BWPStart;
dmrs_idx *= dmrs_Type == NFAPI_NR_DMRS_TYPE1 ? 6 : 4; dmrs_idx *= dmrs_Type == NFAPI_NR_DMRS_TYPE1 ? 6 : 4;
c16_t txdataF_precoding[rel15->nrOfLayers][symbol_sz] __attribute__((aligned(64))); c16_t txdataF_precoding[rel15->nrOfLayers][symbol_sz] __attribute__((aligned(64)));
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
+2 -8
View File
@@ -749,14 +749,8 @@ static int nr_ue_process_dci_dl_10(NR_UE_MAC_INST_t *mac,
} }
dlsch_pdu->rb_offset = dlsch_pdu->start_rb + dlsch_pdu->BWPStart; dlsch_pdu->rb_offset = dlsch_pdu->start_rb + dlsch_pdu->BWPStart;
bool otherSI = false;
for (int i = 0; i < MAX_SI_GROUPS; i++) { if (mac->get_sib1)
if (mac->get_otherSI[i]) {
otherSI = true;
break;
}
}
if (mac->get_sib1 || otherSI)
dlsch_pdu->rb_offset -= dlsch_pdu->BWPStart; dlsch_pdu->rb_offset -= dlsch_pdu->BWPStart;
/* TIME_DOM_RESOURCE_ASSIGNMENT */ /* TIME_DOM_RESOURCE_ASSIGNMENT */
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
+1 -1
View File
@@ -460,7 +460,7 @@ static void nr_fill_nfapi_dl_SIB_pdu(gNB_MAC_INST *gNB_mac,
pdsch_pdu_rel15->dataScramblingId = *scc->physCellId; pdsch_pdu_rel15->dataScramblingId = *scc->physCellId;
pdsch_pdu_rel15->nrOfLayers = 1; pdsch_pdu_rel15->nrOfLayers = 1;
pdsch_pdu_rel15->transmissionScheme = 0; pdsch_pdu_rel15->transmissionScheme = 0;
pdsch_pdu_rel15->refPoint = 1; pdsch_pdu_rel15->refPoint = is_sib1;
pdsch_pdu_rel15->dmrsConfigType = 0; pdsch_pdu_rel15->dmrsConfigType = 0;
pdsch_pdu_rel15->dlDmrsScramblingId = *scc->physCellId; pdsch_pdu_rel15->dlDmrsScramblingId = *scc->physCellId;
pdsch_pdu_rel15->SCID = 0; pdsch_pdu_rel15->SCID = 0;