From c052424ea15134144f188487fa6161dbf49583d2 Mon Sep 17 00:00:00 2001 From: pborla Date: Wed, 20 Mar 2024 15:27:40 +0530 Subject: [PATCH] [BUG-ID: ODUHIGH-574] Fix for Inconsistent behavious in ML Change-Id: Ifb97b72e178865f1102bb6d736f9618bbc7a3a69 Signed-off-by: svaidhya --- src/5gnrmac/lwr_mac_fsm.c | 6 ++++++ src/5gnrsch/sch_fcfs.c | 25 +++++++++++-------------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/5gnrmac/lwr_mac_fsm.c b/src/5gnrmac/lwr_mac_fsm.c index 02a381a3b..be9a69013 100644 --- a/src/5gnrmac/lwr_mac_fsm.c +++ b/src/5gnrmac/lwr_mac_fsm.c @@ -4534,6 +4534,9 @@ uint16_t fillUlTtiReq(SlotTimingInfo currTimingInfo, p_fapi_api_queue_elem_t pre ulTtiReq->nGroup = 0; if(ulTtiReq->nPdus > 0) { +#ifdef ODU_SLOT_IND_DEBUG_LOG + DU_LOG("\nDEBUG --> LWR_MAC: UL_TTI_REQ, datatype:%d, sfn/slot:%d/%d", currUlSlot->ulSchInfo.dataType, ulTtiReq->sfn, ulTtiReq->slot); +#endif /* Fill Prach Pdu */ if(currUlSlot->ulSchInfo.dataType & SCH_DATATYPE_PRACH) { @@ -4548,6 +4551,9 @@ uint16_t fillUlTtiReq(SlotTimingInfo currTimingInfo, p_fapi_api_queue_elem_t pre { if(currUlSlot->ulSchInfo.schPuschInfo[ueIdx].crnti != 0) { +#ifdef ODU_SLOT_IND_DEBUG_LOG + DU_LOG("\nDEBUG --> LWR_MAC: UL_TTI_REQ, PUSCH PDU ueId:%d", ueIdx); +#endif pduIdx++; fillPuschPdu(&ulTtiReq->pdus[pduIdx], &vendorUlTti->ul_pdus[pduIdx], &macCellCfg, &currUlSlot->ulSchInfo.schPuschInfo[ueIdx]); ulTtiReq->nUlsch++; diff --git a/src/5gnrsch/sch_fcfs.c b/src/5gnrsch/sch_fcfs.c index 93ec5c11a..ef74b58d6 100644 --- a/src/5gnrsch/sch_fcfs.c +++ b/src/5gnrsch/sch_fcfs.c @@ -936,21 +936,18 @@ uint8_t schFcfsScheduleUlLc(SlotTimingInfo dciTime, SlotTimingInfo puschTime, ui /* Update PUSCH allocation */ if(schFillPuschAlloc(ueCb, puschTime, totDataReq, startSymb, symbLen, startPrb, isRetx, *hqP) == ROK) { - if(cell->schUlSlotInfo[puschTime.slot]->schPuschInfo[ueCb->ueId]) + puschInfo = cell->schUlSlotInfo[puschTime.slot]->schPuschInfo[ueCb->ueId - 1]; + if(puschInfo != NULLP) { - puschInfo = cell->schUlSlotInfo[puschTime.slot]->schPuschInfo[ueCb->ueId]; - if(puschInfo != NULLP) - { - /* Fill DCI for UL grant */ - schFillUlDci(ueCb, puschInfo, dciInfo, isRetx, *hqP); - ueCb->srRcvd = false; - ueCb->bsrRcvd = false; - if(fcfsHqProcCb->lcCb.dedLcList.count != 0) - updateBsrAndLcList(&(fcfsHqProcCb->lcCb.dedLcList), ueCb->bsrInfo, ROK); - updateBsrAndLcList(&(fcfsHqProcCb->lcCb.defLcList), ueCb->bsrInfo, ROK); - cmLListAdd2Tail(&(ueCb->hqUlmap[puschTime.slot]->hqList), &(*hqP)->ulSlotLnk); - return ROK; - } + /* Fill DCI for UL grant */ + schFillUlDci(ueCb, puschInfo, dciInfo, isRetx, *hqP); + ueCb->srRcvd = false; + ueCb->bsrRcvd = false; + if(fcfsHqProcCb->lcCb.dedLcList.count != 0) + updateBsrAndLcList(&(fcfsHqProcCb->lcCb.dedLcList), ueCb->bsrInfo, ROK); + updateBsrAndLcList(&(fcfsHqProcCb->lcCb.defLcList), ueCb->bsrInfo, ROK); + cmLListAdd2Tail(&(ueCb->hqUlmap[puschTime.slot]->hqList), &(*hqP)->ulSlotLnk); + return ROK; } } if(fcfsHqProcCb->lcCb.dedLcList.count != 0) -- 2.16.6