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
warning set 3: fixed warning realted to unused-variable and implicit-function-declaration
[o-du/l2.git]
/
src
/
5gnrsch
/
rg_sch_drx.c
diff --git
a/src/5gnrsch/rg_sch_drx.c
b/src/5gnrsch/rg_sch_drx.c
index
3b40582
..
5b44497
100755
(executable)
--- a/
src/5gnrsch/rg_sch_drx.c
+++ b/
src/5gnrsch/rg_sch_drx.c
@@
-294,10
+294,10
@@
RgUeUlHqCb *hqE
* - Processing is divided into respective timer handling.
* - Calculate the DL and UL indices as follows
* @code
* - Processing is divided into respective timer handling.
* - Calculate the DL and UL indices as follows
* @code
- * dlIndex = (cell->crntTime.sfn * 10 + cell->crntTime.s
ubframe
+
+ * dlIndex = (cell->crntTime.sfn * 10 + cell->crntTime.s
lot
+
* RG_SCH_DRX_DL_DELTA) % RG_SCH_MAX_DRXQ_SIZE;
*
* RG_SCH_DRX_DL_DELTA) % RG_SCH_MAX_DRXQ_SIZE;
*
- * ulIndex = (cell->crntTime.sfn * 10 + cell->crntTime.s
ubframe
+
+ * ulIndex = (cell->crntTime.sfn * 10 + cell->crntTime.s
lot
+
* RG_SCH_DRX_UL_DELTA) % RG_SCH_MAX_DRXQ_SIZE;
* @endcode
* - Call rgSCHDrxTtiHdlOnDur to handle onDurationTimer handling
* RG_SCH_DRX_UL_DELTA) % RG_SCH_MAX_DRXQ_SIZE;
* @endcode
* - Call rgSCHDrxTtiHdlOnDur to handle onDurationTimer handling
@@
-335,10
+335,10
@@
RgSchCellCb *cell;
TRC2(rgSCHDrxTtiInd );
TRC2(rgSCHDrxTtiInd );
- dlIndex = (cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G + cell->crntTime.s
ubframe
+
+ dlIndex = (cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G + cell->crntTime.s
lot
+
RG_SCH_DRX_DL_DELTA) % RG_SCH_MAX_DRXQ_SIZE;
RG_SCH_DRX_DL_DELTA) % RG_SCH_MAX_DRXQ_SIZE;
- ulIndex = (cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G + cell->crntTime.s
ubframe
+
+ ulIndex = (cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G + cell->crntTime.s
lot
+
RG_SCH_DRX_UL_DELTA) % RG_SCH_MAX_DRXQ_SIZE;
#ifdef LTEMAC_R9
RG_SCH_DRX_UL_DELTA) % RG_SCH_MAX_DRXQ_SIZE;
#ifdef LTEMAC_R9
@@
-886,7
+886,7
@@
U8 direction;
{
#ifndef LTE_TDD
curTimeInSf = (cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G) +
{
#ifndef LTE_TDD
curTimeInSf = (cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G) +
- (cell->crntTime.s
ubframe
) +RG_SCH_DRX_UL_DELTA;
+ (cell->crntTime.s
lot
) +RG_SCH_DRX_UL_DELTA;
#endif
#ifdef LTE_TDD
#endif
#ifdef LTE_TDD
@@
-897,7
+897,7
@@
U8 direction;
{
#ifndef LTE_TDD
curTimeInSf = (cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G) +
{
#ifndef LTE_TDD
curTimeInSf = (cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G) +
- (cell->crntTime.s
ubframe
) + RG_SCH_DRX_DL_DELTA;
+ (cell->crntTime.s
lot
) + RG_SCH_DRX_DL_DELTA;
#endif
#ifdef LTE_TDD
#endif
#ifdef LTE_TDD
@@
-1089,7
+1089,7
@@
U8 tbCnt;
* so that UE is scheduled for retransmission in the next subframe*/
/* ccpu00134196-[Add]-DRX retx timer changes */
harqRTTExpIndx = ((hqP->tbInfo[tbCnt].timingInfo.sfn * RGSCH_NUM_SUB_FRAMES_5G) +
* so that UE is scheduled for retransmission in the next subframe*/
/* ccpu00134196-[Add]-DRX retx timer changes */
harqRTTExpIndx = ((hqP->tbInfo[tbCnt].timingInfo.sfn * RGSCH_NUM_SUB_FRAMES_5G) +
- hqP->tbInfo[tbCnt].timingInfo.s
ubframe
+ RG_SCH_MIN_HARQ_RTT)
+ hqP->tbInfo[tbCnt].timingInfo.s
lot
+ RG_SCH_MIN_HARQ_RTT)
% RG_SCH_MAX_DRXQ_SIZE;
fdbkDelta = RGSCH_CALC_SF_DIFF(cell->crntTime, hqP->tbInfo[tbCnt].timingInfo);
% RG_SCH_MAX_DRXQ_SIZE;
fdbkDelta = RGSCH_CALC_SF_DIFF(cell->crntTime, hqP->tbInfo[tbCnt].timingInfo);
@@
-1276,9
+1276,9
@@
PUBLIC S16 rgSCHDrxUeCfg (cell, ue, ueCfg)
rgSCHDrxGetNxtOnDur (cell, ueDrxCb, &nxtOnDur,RG_SCH_NO_DELTA);
rgSCHDrxGetNxtOnDur (cell, ueDrxCb, &nxtOnDur,RG_SCH_NO_DELTA);
- nxtOnDurTime = ((nxtOnDur.sfn * RGSCH_NUM_SUB_FRAMES_5G) + nxtOnDur.s
ubframe
);
+ nxtOnDurTime = ((nxtOnDur.sfn * RGSCH_NUM_SUB_FRAMES_5G) + nxtOnDur.s
lot
);
curTime = ((cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G) +
curTime = ((cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G) +
- cell->crntTime.s
ubframe
);
+ cell->crntTime.s
lot
);
onDurIndx = nxtOnDurTime % RG_SCH_MAX_DRXQ_SIZE;
onDurIndx = nxtOnDurTime % RG_SCH_MAX_DRXQ_SIZE;
@@
-1388,7
+1388,7
@@
PRIVATE S16 rgSCHDrxGetNxtOnDur (cell, drxCb, nxtOnDur, delta)
cycleLen = drxCb->shortDrxCycle;
}
cycleLen = drxCb->shortDrxCycle;
}
- curTime = ((cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G) + cell->crntTime.s
ubframe
);
+ curTime = ((cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G) + cell->crntTime.s
lot
);
curTime += delta; /*TODO: see if we need to take care of wrap arounds */
curTime += delta; /*TODO: see if we need to take care of wrap arounds */
@@
-1396,8
+1396,8
@@
PRIVATE S16 rgSCHDrxGetNxtOnDur (cell, drxCb, nxtOnDur, delta)
{
/* offset is the nextOnDur */
nxtOnDur->sfn = drxCb->drxStartOffset / RGSCH_NUM_SUB_FRAMES_5G;
{
/* offset is the nextOnDur */
nxtOnDur->sfn = drxCb->drxStartOffset / RGSCH_NUM_SUB_FRAMES_5G;
- nxtOnDur->s
ubframe
= (U8)(drxCb->drxStartOffset % RGSCH_NUM_SUB_FRAMES_5G);
- nxtDist = ((nxtOnDur->sfn * RGSCH_NUM_SUB_FRAMES_5G) + nxtOnDur->s
ubframe
);
+ nxtOnDur->s
lot
= (U8)(drxCb->drxStartOffset % RGSCH_NUM_SUB_FRAMES_5G);
+ nxtDist = ((nxtOnDur->sfn * RGSCH_NUM_SUB_FRAMES_5G) + nxtOnDur->s
lot
);
}
else
{
}
else
{
@@
-1410,8
+1410,8
@@
PRIVATE S16 rgSCHDrxGetNxtOnDur (cell, drxCb, nxtOnDur, delta)
/* Perfect match pick up the current time */
/*nxtOnDur should be set to equal to currentTime + DELTA */
nxtOnDur->sfn = (U16)curTime / RGSCH_NUM_SUB_FRAMES_5G;
/* Perfect match pick up the current time */
/*nxtOnDur should be set to equal to currentTime + DELTA */
nxtOnDur->sfn = (U16)curTime / RGSCH_NUM_SUB_FRAMES_5G;
- nxtOnDur->s
ubframe
= (U16)curTime % RGSCH_NUM_SUB_FRAMES_5G;
- nxtDist = ((nxtOnDur->sfn * RGSCH_NUM_SUB_FRAMES_5G) + nxtOnDur->s
ubframe
);
+ nxtOnDur->s
lot
= (U16)curTime % RGSCH_NUM_SUB_FRAMES_5G;
+ nxtDist = ((nxtOnDur->sfn * RGSCH_NUM_SUB_FRAMES_5G) + nxtOnDur->s
lot
);
}
else
}
else
@@
-1419,7
+1419,7
@@
PRIVATE S16 rgSCHDrxGetNxtOnDur (cell, drxCb, nxtOnDur, delta)
nxtDist = drxCb->drxStartOffset + (numOfCycles + 1) *
cycleLen;
nxtOnDur->sfn = (U16)nxtDist / RGSCH_NUM_SUB_FRAMES_5G;
nxtDist = drxCb->drxStartOffset + (numOfCycles + 1) *
cycleLen;
nxtOnDur->sfn = (U16)nxtDist / RGSCH_NUM_SUB_FRAMES_5G;
- nxtOnDur->s
ubframe
= (U16)nxtDist % RGSCH_NUM_SUB_FRAMES_5G;
+ nxtOnDur->s
lot
= (U16)nxtDist % RGSCH_NUM_SUB_FRAMES_5G;
}
}
}
}
@@
-1430,7
+1430,7
@@
PRIVATE S16 rgSCHDrxGetNxtOnDur (cell, drxCb, nxtOnDur, delta)
{
nxtDist = nxtDist + cycleLen;
nxtOnDur->sfn = (U16)nxtDist / RGSCH_NUM_SUB_FRAMES_5G;
{
nxtDist = nxtDist + cycleLen;
nxtOnDur->sfn = (U16)nxtDist / RGSCH_NUM_SUB_FRAMES_5G;
- nxtOnDur->s
ubframe
= (U16)nxtDist % RGSCH_NUM_SUB_FRAMES_5G;
+ nxtOnDur->s
lot
= (U16)nxtDist % RGSCH_NUM_SUB_FRAMES_5G;
}
RETVALUE(ROK);
} /* end of rgSCHDrxGetNxtOnDur */
}
RETVALUE(ROK);
} /* end of rgSCHDrxGetNxtOnDur */
@@
-1667,9
+1667,9
@@
PUBLIC S16 rgSCHDrxUeReCfg (cell, ue, ueReCfg)
}
}
- nxtOnDurTime = (nxtOnDur.sfn * RGSCH_NUM_SUB_FRAMES_5G) + nxtOnDur.s
ubframe
;
+ nxtOnDurTime = (nxtOnDur.sfn * RGSCH_NUM_SUB_FRAMES_5G) + nxtOnDur.s
lot
;
curTime = ((cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G) +
curTime = ((cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G) +
- cell->crntTime.s
ubframe
);
+ cell->crntTime.s
lot
);
/* If Onduration timer of old configuration is already running then waiting till it expires */
if((ueDrxCb->onDurExpIndx != DRX_INVALID) && (ueDrxCb->onDurExpDistance != DRX_TMR_EXPRD))
/* If Onduration timer of old configuration is already running then waiting till it expires */
if((ueDrxCb->onDurExpIndx != DRX_INVALID) && (ueDrxCb->onDurExpDistance != DRX_TMR_EXPRD))
@@
-2232,10
+2232,10
@@
Bool calcFrmOffst;
rgSCHDrxGetNxtOnDur(cell,drxUe,&nxtOnDur,(U8)idx);
nxtOnDurInSf = ((nxtOnDur.sfn * RGSCH_NUM_SUB_FRAMES_5G) +
rgSCHDrxGetNxtOnDur(cell,drxUe,&nxtOnDur,(U8)idx);
nxtOnDurInSf = ((nxtOnDur.sfn * RGSCH_NUM_SUB_FRAMES_5G) +
- nxtOnDur.s
ubframe
);
+ nxtOnDur.s
lot
);
curTime = ((cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G) +
curTime = ((cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G) +
- cell->crntTime.s
ubframe
);
+ cell->crntTime.s
lot
);
nxtOnDurIndex = nxtOnDurInSf % RG_SCH_MAX_DRXQ_SIZE;
drxUe->distance = (nxtOnDurInSf-curTime) / RG_SCH_MAX_DRXQ_SIZE;
nxtOnDurIndex = nxtOnDurInSf % RG_SCH_MAX_DRXQ_SIZE;
drxUe->distance = (nxtOnDurInSf-curTime) / RG_SCH_MAX_DRXQ_SIZE;
@@
-2339,14
+2339,14
@@
PRIVATE S16 rgSCHDrxGetNxtTmrExpry (cell,curTime,duration,tmrExpryIdx)
tddCfgMode = cell->ulDlCfgIdx;
crntTime.sfn = curTime / RGSCH_NUM_SUB_FRAMES_5G;
tddCfgMode = cell->ulDlCfgIdx;
crntTime.sfn = curTime / RGSCH_NUM_SUB_FRAMES_5G;
- crntTime.s
ubframe
= curTime % RGSCH_NUM_SUB_FRAMES_5G;
+ crntTime.s
lot
= curTime % RGSCH_NUM_SUB_FRAMES_5G;
/* First calculate the number of DL subframes till next SFN */
dlSfTillNxtSFN = rgSchDrxDLSfTillNxtSFN[isDwPtsCnted][tddCfgMode]
/* First calculate the number of DL subframes till next SFN */
dlSfTillNxtSFN = rgSchDrxDLSfTillNxtSFN[isDwPtsCnted][tddCfgMode]
- [(crntTime.s
ubframe
% RGSCH_NUM_SUB_FRAMES)];
+ [(crntTime.s
lot
% RGSCH_NUM_SUB_FRAMES)];
if ( dlSfTillNxtSFN >= duration )
if ( dlSfTillNxtSFN >= duration )
@@
-2476,7
+2476,7
@@
PRIVATE Void rgSCHDrxCalcNxtTmrExpry (cell,ue,delta,tmrLen,distance,idx)
TRC2(rgSCHDrxCalcNxtTmrExpry)
curTimeInSf = cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G +
TRC2(rgSCHDrxCalcNxtTmrExpry)
curTimeInSf = cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G +
- cell->crntTime.s
ubframe
;
+ cell->crntTime.s
lot
;
/* add delta to curTime */
curTimeInSf += delta;
/* add delta to curTime */
curTimeInSf += delta;
@@
-2779,7
+2779,7
@@
U16 dlIndex;
drxCell = (cell->drxCb);
delInUlScan = drxCell->delInUlScan;
drxCell = (cell->drxCb);
delInUlScan = drxCell->delInUlScan;
- //printf("CELL Timer [SFN : %d],[SF : %d]\n",cell->crntTime.sfn,cell->crntTime.s
ubframe
);
+ //printf("CELL Timer [SFN : %d],[SF : %d]\n",cell->crntTime.sfn,cell->crntTime.s
lot
);
node = drxCell->drxQ[dlIndex].onDurationQ.first;
node = drxCell->drxQ[dlIndex].onDurationQ.first;
@@
-2843,11
+2843,11
@@
U16 dlIndex;
cmLListAdd2Tail(&(drxCell->drxQ[expiryIndex].onDurationExpQ),
&(drxUe->onDurationExpEnt));
cmLListAdd2Tail(&(drxCell->drxQ[expiryIndex].onDurationExpQ),
&(drxUe->onDurationExpEnt));
- //printf("DRXOnDuration Timer Started at [SFN : %d],[SF : %d]\n",cell->crntTime.sfn,cell->crntTime.s
ubframe
);
+ //printf("DRXOnDuration Timer Started at [SFN : %d],[SF : %d]\n",cell->crntTime.sfn,cell->crntTime.s
lot
);
drxUe->onDurationExpEnt.node = (PTR)ue;
drxUe->onDurExpIndx = expiryIndex;
drxUe->onDurationExpEnt.node = (PTR)ue;
drxUe->onDurExpIndx = expiryIndex;
- //printf("DRxOnDuration will Expire = [%d]\n",(cell->crntTime.sfn*10+cell->crntTime.s
ubframe
+drxUe->onDurTmrLen));
+ //printf("DRxOnDuration will Expire = [%d]\n",(cell->crntTime.sfn*10+cell->crntTime.s
lot
+drxUe->onDurTmrLen));
if ( delInUlScan == FALSE )
{
if ( delInUlScan == FALSE )
{