X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Fsch_fcfs.c;h=ef74b58d6f2ee281639be0a2ad9d5cd2656445d5;hb=refs%2Fchanges%2F49%2F12949%2F3;hp=6b043d45ca41c8080a12edbbe1b94fae6af8c8e6;hpb=9aed9ab1046cd7786f705238e05e8491954717a9;p=o-du%2Fl2.git

diff --git a/src/5gnrsch/sch_fcfs.c b/src/5gnrsch/sch_fcfs.c
index 6b043d45c..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)
@@ -1273,7 +1270,7 @@ void schFcfsScheduleSlot(SchCellCb *cell, SlotTimingInfo *slotInd, Inst schInst)
                   else
                   {
 #ifdef NR_DRX
-                     schHdlDrxInActvStrtTmr(cell, &cell->ueCb[ueId-1], PHY_DELTA_DL + SCHED_DELTA);
+                     schHdlDrxInActvStrtTmr(cell, &cell->ueCb[ueId-1], gConfigInfo.gPhyDeltaDl + SCHED_DELTA);
 #endif
                   }
                }
@@ -1319,7 +1316,7 @@ void schFcfsScheduleSlot(SchCellCb *cell, SlotTimingInfo *slotInd, Inst schInst)
                   else
                   {
 #ifdef NR_DRX
-                     schHdlDrxInActvStrtTmr(cell, &cell->ueCb[ueId-1], PHY_DELTA_UL + SCHED_DELTA);
+                     schHdlDrxInActvStrtTmr(cell, &cell->ueCb[ueId-1], gConfigInfo.gPhyDeltaUl + SCHED_DELTA);
 #endif
                   }
                }