X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Fsch_rr.c;h=c084b1edc8187682dde11ddd147b0b3c6ffab0ba;hb=6636207100c598cd70537d177670ef131e263931;hp=a6c52e2ec8a69be15b93398aab1bf336c7e81a0c;hpb=d9f7fc765d1fc24949ec5536c2a4e3296b250e5a;p=o-du%2Fl2.git diff --git a/src/5gnrsch/sch_rr.c b/src/5gnrsch/sch_rr.c index a6c52e2ec..c084b1edc 100644 --- a/src/5gnrsch/sch_rr.c +++ b/src/5gnrsch/sch_rr.c @@ -42,9 +42,6 @@ uint8_t schMsg3RetxSchedulingForUe(SchRaCb *raCb) { bool k2Found = false; -#ifdef NR_TDD - uint8_t totalCfgSlot = 0; -#endif uint16_t dciSlot = 0; SlotTimingInfo dciTime, msg3Time; SchCellCb *cell = NULLP; @@ -54,7 +51,7 @@ uint8_t schMsg3RetxSchedulingForUe(SchRaCb *raCb) currTime = cell->slotInfo; /* Calculating time frame to send DCI for MSG3 Retx*/ - ADD_DELTA_TO_TIME(currTime, dciTime, PHY_DELTA_DL + SCHED_DELTA); + ADD_DELTA_TO_TIME(currTime, dciTime, PHY_DELTA_DL + SCHED_DELTA, cell->numSlots); #ifdef NR_TDD /* Consider this slot for sending DCI, only if it is a DL slot */ if(schGetSlotSymbFrmt(dciSlot, raCb->cell->slotFrmtBitMap) == DL_SLOT) @@ -154,7 +151,7 @@ bool schGetMsg3K2(SchCellCb *cell, SchUlHqProcCb* msg3HqProc, uint16_t dlTime, S k2 = k2 + msg3Delta; if(k2 >= msg3MinSchTime) { - ADD_DELTA_TO_TIME(currTime, msg3TempTime, k2); + ADD_DELTA_TO_TIME(currTime, msg3TempTime, k2, cell->numSlots); #ifdef NR_TDD if(schGetSlotSymbFrmt(msg3TempTime.slot % totalCfgSlot, cell->slotFrmtBitMap) == DL_SLOT) continue; @@ -177,4 +174,4 @@ bool schGetMsg3K2(SchCellCb *cell, SchUlHqProcCb* msg3HqProc, uint16_t dlTime, S } /********************************************************************** End of file - **********************************************************************/ \ No newline at end of file + **********************************************************************/