Code Review
/
o-du
/
l2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Building mib PDU and SSB changes at scheduler
[o-du/l2.git]
/
src
/
5gnrsch
/
rg_sch_dhm.c
diff --git
a/src/5gnrsch/rg_sch_dhm.c
b/src/5gnrsch/rg_sch_dhm.c
index
f6c8c59
..
16def81
100755
(executable)
--- a/
src/5gnrsch/rg_sch_dhm.c
+++ b/
src/5gnrsch/rg_sch_dhm.c
@@
-1203,7
+1203,7
@@
CmLteTimingInfo timingInfo;
RETVALUE(NULLP);
}
RETVALUE(NULLP);
}
- idx = ((timingInfo.sfn * RGSCH_NUM_SUB_FRAMES_5G + timingInfo.s
ubframe
)/
+ idx = ((timingInfo.sfn * RGSCH_NUM_SUB_FRAMES_5G + timingInfo.s
lot
)/
ue->dl.dlSpsCfg.dlSpsPrdctyEnum) % ue->dl.dlSpsCfg.numSpsHqProc;
ue->dl.dlSpsCfg.dlSpsPrdctyEnum) % ue->dl.dlSpsCfg.numSpsHqProc;
@@
-1445,7
+1445,7
@@
RgSchCellCb *cell;
RETVALUE(ROK);
}
}
RETVALUE(ROK);
}
}
- ascIdx = rgSchTddDlAscSetIdxKTbl[cell->ulDlCfgIdx][timeInfo.s
ubframe
];
+ ascIdx = rgSchTddDlAscSetIdxKTbl[cell->ulDlCfgIdx][timeInfo.s
lot
];
noFdbks = ascIdx.numFdbkSubfrms;
for(idx=0; idx<noFdbks; idx++)
noFdbks = ascIdx.numFdbkSubfrms;
for(idx=0; idx<noFdbks; idx++)
@@
-2019,7
+2019,7
@@
PRIVATE Void rgSchGetHqFdbkPosForM234(ue,hqP,isAck,fdbk,tbIdx,anInfo,M,timeInfo)
statsCnt = statsCnt % 10000;
dlHqStats[statsCnt].cellId = hqP->hqE->cell->cellId;
dlHqStats[statsCnt].sfn = hqP->tbInfo[tbIdx].timingInfo.sfn;
statsCnt = statsCnt % 10000;
dlHqStats[statsCnt].cellId = hqP->hqE->cell->cellId;
dlHqStats[statsCnt].sfn = hqP->tbInfo[tbIdx].timingInfo.sfn;
- dlHqStats[statsCnt].sf = hqP->tbInfo[tbIdx].timingInfo.s
ubframe
;
+ dlHqStats[statsCnt].sf = hqP->tbInfo[tbIdx].timingInfo.s
lot
;
dlHqStats[statsCnt].ack = *isAck;
dlHqStats[statsCnt].fdbkIdx = fdbkIdx;
dlHqStats[statsCnt].ue = hqP->hqE->ue->ueId;;
dlHqStats[statsCnt].ack = *isAck;
dlHqStats[statsCnt].fdbkIdx = fdbkIdx;
dlHqStats[statsCnt].ue = hqP->hqE->ue->ueId;;
@@
-2177,7
+2177,7
@@
RgSchErrInfo *err;
}
#if ((defined LTEMAC_SPS_AN_MUX) || (defined LTE_ADV))
}
#if ((defined LTEMAC_SPS_AN_MUX) || (defined LTE_ADV))
- ascIdx = rgSchTddDlAscSetIdxKTbl[cellCb->ulDlCfgIdx][timeInfo.s
ubframe
];
+ ascIdx = rgSchTddDlAscSetIdxKTbl[cellCb->ulDlCfgIdx][timeInfo.s
lot
];
noFdbks = ascIdx.numFdbkSubfrms;
#endif
#ifdef LTEMAC_SPS_AN_MUX
noFdbks = ascIdx.numFdbkSubfrms;
#endif
#ifdef LTEMAC_SPS_AN_MUX
@@
-2647,7
+2647,7
@@
RgSchErrInfo *err;
ulDlCfgIdx = cellCb->ulDlCfgIdx;
maxFdbks = rgSchTddDlAscSetIdxKTbl[ulDlCfgIdx]
ulDlCfgIdx = cellCb->ulDlCfgIdx;
maxFdbks = rgSchTddDlAscSetIdxKTbl[ulDlCfgIdx]
- [timeInfo.s
ubframe
].
+ [timeInfo.s
lot
].
numFdbkSubfrms;
for(itr=0; itr< maxFdbks; itr++)
numFdbkSubfrms;
for(itr=0; itr< maxFdbks; itr++)
@@
-2659,12
+2659,12
@@
RgSchErrInfo *err;
if(ue->uciFrmtTyp == RG_SCH_UCI_FORMAT1B_CS)
{/* Using the sorted K table */
RGSCHDECRFRMCRNTTIME (timeInfo, txTime,
if(ue->uciFrmtTyp == RG_SCH_UCI_FORMAT1B_CS)
{/* Using the sorted K table */
RGSCHDECRFRMCRNTTIME (timeInfo, txTime,
- rgSchTddDlHqPucchResCalTbl[ulDlCfgIdx][timeInfo.s
ubframe
].subfrmNum[itr]);
+ rgSchTddDlHqPucchResCalTbl[ulDlCfgIdx][timeInfo.s
lot
].subfrmNum[itr]);
}else
#endif
{
RGSCHDECRFRMCRNTTIME (timeInfo, txTime,
}else
#endif
{
RGSCHDECRFRMCRNTTIME (timeInfo, txTime,
- rgSchTddDlAscSetIdxKTbl[ulDlCfgIdx][timeInfo.s
ubframe
].subfrmNum[itr]);
+ rgSchTddDlAscSetIdxKTbl[ulDlCfgIdx][timeInfo.s
lot
].subfrmNum[itr]);
}
if (RGSCH_TIMEINFO_SAME (txTime, ue->relPdcchTxTime))
}
if (RGSCH_TIMEINFO_SAME (txTime, ue->relPdcchTxTime))
@@
-2719,8
+2719,8
@@
RgSchErrInfo *err;
{
RGSCH_NULL_CHECK(cellCb->instIdx, ue);
RLOG_ARG3(L_ERROR,DBG_CELLID,cellCb->cellId,"CRNTI:%d"
{
RGSCH_NULL_CHECK(cellCb->instIdx, ue);
RLOG_ARG3(L_ERROR,DBG_CELLID,cellCb->cellId,"CRNTI:%d"
- " NO HARQ proc available for feedback:timeInfo:snf %d,s
ubframe
%d",
- ue->ueId,timeInfo.sfn, timeInfo.s
ubframe
);
+ " NO HARQ proc available for feedback:timeInfo:snf %d,s
lot
%d",
+ ue->ueId,timeInfo.sfn, timeInfo.s
lot
);
err->errType = RGSCHERR_DHM_FDBK_IND;
err->errCause = RGSCHERR_DHM_FDBK_IND_INVALID_CB;
RETVALUE(RFAILED);
err->errType = RGSCHERR_DHM_FDBK_IND;
err->errCause = RGSCHERR_DHM_FDBK_IND_INVALID_CB;
RETVALUE(RFAILED);
@@
-3529,8
+3529,8
@@
RgSchErrInfo *err;
{
RLOG_ARG3(L_ERROR,DBG_CELLID,cell->cellId,
"CRNTI:%d NO HARQ proc available for feedback: TimingInfo: "
{
RLOG_ARG3(L_ERROR,DBG_CELLID,cell->cellId,
"CRNTI:%d NO HARQ proc available for feedback: TimingInfo: "
- "sfn %d s
ubframe
%d", ue->ueId, timingInfo.sfn,
- timingInfo.s
ubframe
);
+ "sfn %d s
lot
%d", ue->ueId, timingInfo.sfn,
+ timingInfo.s
lot
);
RETVALUE(RFAILED);
}
RETVALUE(RFAILED);
}
@@
-4108,7
+4108,7
@@
CmLteTimingInfo uciTimingInfo;
TRC2(rgSCHDhmTddRlsSubFrm)
ascIdx =
TRC2(rgSCHDhmTddRlsSubFrm)
ascIdx =
- rgSchTddDlAscSetIdxKTbl[cellCb->ulDlCfgIdx][uciTimingInfo.s
ubframe
];
+ rgSchTddDlAscSetIdxKTbl[cellCb->ulDlCfgIdx][uciTimingInfo.s
lot
];
noFdbks = ascIdx.numFdbkSubfrms;
for(i=0; i < noFdbks; i++)
{
noFdbks = ascIdx.numFdbkSubfrms;
for(i=0; i < noFdbks; i++)
{
@@
-4176,7
+4176,7
@@
CmLteTimingInfo uciTimingInfo;
TRC2(rgSCHDhmRlsDlsfHqProc)
ascIdx =
TRC2(rgSCHDhmRlsDlsfHqProc)
ascIdx =
- rgSchTddDlAscSetIdxKTbl[cellCb->ulDlCfgIdx][uciTimingInfo.s
ubframe
];
+ rgSchTddDlAscSetIdxKTbl[cellCb->ulDlCfgIdx][uciTimingInfo.s
lot
];
noFdbks = ascIdx.numFdbkSubfrms;
for(i=0; i < noFdbks; i++)
{
noFdbks = ascIdx.numFdbkSubfrms;
for(i=0; i < noFdbks; i++)
{
@@
-4277,9
+4277,9
@@
CmLteTimingInfo uciTimingInfo;
if(anInfo == NULLP)
{
RGSCHDBGERR(cellCb->instIdx, (rgSchPBuf(cellCb->instIdx),
if(anInfo == NULLP)
{
RGSCHDBGERR(cellCb->instIdx, (rgSchPBuf(cellCb->instIdx),
- "Ack/Nack Info is NULL, Processing %dth feedback s
ubframe
for DTX"
+ "Ack/Nack Info is NULL, Processing %dth feedback s
lot
for DTX"
"received on SFN [%d] and SF [%d]\n",i, uciTimingInfo.sfn,
"received on SFN [%d] and SF [%d]\n",i, uciTimingInfo.sfn,
- uciTimingInfo.s
ubframe
));
+ uciTimingInfo.s
lot
));
}
else if (tbCb->fbkRepCntr == 0)
{
}
else if (tbCb->fbkRepCntr == 0)
{