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
Merge "JIRA-ID ODUHIGH-275 classification of logs of RLC part -2"
[o-du/l2.git]
/
src
/
5gnrsch
/
rg_sch_scell.c
diff --git
a/src/5gnrsch/rg_sch_scell.c
b/src/5gnrsch/rg_sch_scell.c
index
8c21fe7
..
773b840
100755
(executable)
--- a/
src/5gnrsch/rg_sch_scell.c
+++ b/
src/5gnrsch/rg_sch_scell.c
@@
-79,8
+79,8
@@
RgSchUeCb *ue
Void rgSCHSCellHndlFdbkInd ARGS((
RgSchDlHqProcCb *hqP,
Void rgSCHSCellHndlFdbkInd ARGS((
RgSchDlHqProcCb *hqP,
-
U8
tbIdx,
-
U8
fdbk,
+
uint8_t
tbIdx,
+
uint8_t
fdbk,
Bool maxHqRetxReached
));
Bool maxHqRetxReached
));
@@
-93,7
+93,7
@@
RgSchUeCellInfo *sCell
Void rgSCHSCellDelUeSCell ARGS((
RgSchCellCb *cellCb,
RgSchUeCb *ueCb,
Void rgSCHSCellDelUeSCell ARGS((
RgSchCellCb *cellCb,
RgSchUeCb *ueCb,
-
U8
sCellIdx
+
uint8_t
sCellIdx
));
S16 rgSCHSCellDelUe ARGS((
));
S16 rgSCHSCellDelUe ARGS((
@@
-107,13
+107,13
@@
RgSchCellCb *secCellCb,
RgSchUeCb *ueCb,
RgrUePrdDlCqiCfg *cqiCfg,
CmLteUeCategory ueCat,
RgSchUeCb *ueCb,
RgrUePrdDlCqiCfg *cqiCfg,
CmLteUeCategory ueCat,
-
U8
sCellIdx
+
uint8_t
sCellIdx
));
#endif
));
#endif
-
PRIVATE
S16 rgSCHSCellTrgMacHqEReset ARGS((
+
static
S16 rgSCHSCellTrgMacHqEReset ARGS((
Inst inst,
Inst inst,
-
U16
secCellId,
-
U16
rnti
+
uint16_t
secCellId,
+
uint16_t
rnti
));
));
@@
-132,21
+132,11
@@
U16 rnti
* @return Void
* -# None.
**/
* @return Void
* -# None.
**/
-#ifdef ANSI
-Void rgSCHSCellSchdActDeactCe
-(
-RgSchUeCb *ueCb,
-RgSchDlHqTbCb *tbInfo
-)
-#else
-Void rgSCHSCellSchdActDeactCe(ueCb, tbInfo)
-RgSchUeCb *ueCb;
-RgSchDlHqTbCb *tbInfo;
-#endif
+Void rgSCHSCellSchdActDeactCe(RgSchUeCb *ueCb,RgSchDlHqTbCb *tbInfo)
{
{
-
U8
bitVal = 0;
-
U8
sCellActDeactBitMask = 0;
+
uint8_t
bitVal = 0;
+
uint8_t
sCellActDeactBitMask = 0;
/* Change the state of all Scells waiting for
* activation */
/* Change the state of all Scells waiting for
* activation */
@@
-158,7
+148,7
@@
RgSchDlHqTbCb *tbInfo;
* 0 for deactivation
* */
* 0 for deactivation
* */
- for(
U8
idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++)
+ for(
uint8_t
idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++)
{
if(ueCb->cellInfo[idx] != NULLP)
{
{
if(ueCb->cellInfo[idx] != NULLP)
{
@@
-200,7
+190,7
@@
RgSchDlHqTbCb *tbInfo;
tbInfo->schdSCellActCe.pres = PRSNT_NODEF;
tbInfo->schdSCellActCe.val = sCellActDeactBitMask;
tbInfo->schdSCellActCe.pres = PRSNT_NODEF;
tbInfo->schdSCellActCe.val = sCellActDeactBitMask;
-
RETVOID
;
+
return
;
} /* rgSCHSCellSchdActDeactCe */
\f
} /* rgSCHSCellSchdActDeactCe */
\f
@@
-219,17
+209,7
@@
RgSchDlHqTbCb *tbInfo;
* @return Void
*
**/
* @return Void
*
**/
-#ifdef ANSI
-Void rgSCHSCellAddToActDeactLst
-(
-RgSchCellCb *cell,
-RgSchUeCb *ue
-)
-#else
-Void rgSCHSCellAddToActDeactLst(cell, ue)
-RgSchCellCb *cell;
-RgSchUeCb *ue;
-#endif
+Void rgSCHSCellAddToActDeactLst(RgSchCellCb *cell,RgSchUeCb *ue)
{
RgSchCmnDlCell *cellCmnDl = RG_SCH_CMN_GET_DL_CELL(cell);
{
RgSchCmnDlCell *cellCmnDl = RG_SCH_CMN_GET_DL_CELL(cell);
@@
-244,7
+224,7
@@
RgSchUeCb *ue;
"SCell is already added in the Act List: ueId(%u)\n", ue->ueId));
}
"SCell is already added in the Act List: ueId(%u)\n", ue->ueId));
}
-
RETVOID
;
+
return
;
}
\f
}
\f
@@
-263,17
+243,7
@@
RgSchUeCb *ue;
* @return Void
*
**/
* @return Void
*
**/
-#ifdef ANSI
-Void rgSCHSCellRmvFrmActLst
-(
-RgSchCellCb *cell,
-RgSchUeCb *ue
-)
-#else
-Void rgSCHSCellRmvFrmActLst(cell, ue)
-RgSchCellCb *cell;
-RgSchUeCb *ue;
-#endif
+Void rgSCHSCellRmvFrmActLst(RgSchCellCb *cell,RgSchUeCb *ue)
{
RgSchCmnDlCell *cellCmnDl = RG_SCH_CMN_GET_DL_CELL(cell);
if (NULLP != ue->sCellActLnk.node)
{
RgSchCmnDlCell *cellCmnDl = RG_SCH_CMN_GET_DL_CELL(cell);
if (NULLP != ue->sCellActLnk.node)
@@
-282,7
+252,7
@@
RgSchUeCb *ue;
}
ue->sCellActLnk.node = (PTR)NULLP;
}
ue->sCellActLnk.node = (PTR)NULLP;
-
RETVOID
;
+
return
;
}
\f
/**
}
\f
/**
@@
-302,15
+272,7
@@
RgSchUeCb *ue;
* @return ROK/RFAILED
*
**/
* @return ROK/RFAILED
*
**/
-#ifdef ANSI
-Void rgSCHSCellActivation
-(
-RgSchUeCellInfo *sCellInfo
-)
-#else
-Void rgSCHSCellActivation(sCellInfo)
-RgSchUeCellInfo *sCellInfo
-#endif
+Void rgSCHSCellActivation(RgSchUeCellInfo *sCellInfo)
{
RgSchCellCb *sCell = sCellInfo->cell;
RgSchUeCb *ueCb = sCellInfo->ue;
{
RgSchCellCb *sCell = sCellInfo->cell;
RgSchUeCb *ueCb = sCellInfo->ue;
@@
-319,15
+281,15
@@
RgSchUeCellInfo *sCellInfo
#ifdef DEBUGP
Inst inst = ueCb->cell->instIdx;
#endif
#ifdef DEBUGP
Inst inst = ueCb->cell->instIdx;
#endif
-
U16
tempIdx;
+
uint16_t
tempIdx;
RgrUePrdDlCqiCfg *cqiCfg;
RgrUePrdDlCqiCfg *cqiCfg;
-
U8
j; /*Bandwidth Parts*/
-
U16
riTrInsTime;
-
U16
periodicity;
-
U16
cqiTrInstTime;
+
uint8_t
j; /*Bandwidth Parts*/
+
uint16_t
riTrInsTime;
+
uint16_t
periodicity;
+
uint16_t
cqiTrInstTime;
RgSchUePCqiCb *cqiCb = NULLP;
CmLteTimingInfo timingInfo;
RgSchUePCqiCb *cqiCb = NULLP;
CmLteTimingInfo timingInfo;
-
U16
crntTime;
+
uint16_t
crntTime;
#endif
#endif
@@
-446,8
+408,8
@@
RgSchUeCellInfo *sCellInfo
% RG_SCH_PCQI_SRS_SR_TRINS_SIZE;
if(periodicity >= RG_SCH_PCQI_SRS_SR_TRINS_SIZE)
{
% RG_SCH_PCQI_SRS_SR_TRINS_SIZE;
if(periodicity >= RG_SCH_PCQI_SRS_SR_TRINS_SIZE)
{
- cqiCb->riDist = rgSCHUtlFindDist((
U16
)(crntTime + TFU_RECPREQ_DLDELTA),
- (
U16
) tempIdx);
+ cqiCb->riDist = rgSCHUtlFindDist((
uint16_t
)(crntTime + TFU_RECPREQ_DLDELTA),
+ (
uint16_t
) tempIdx);
}
else
{
}
else
{
@@
-490,7
+452,7
@@
RgSchUeCellInfo *sCellInfo
cellSch = RG_SCH_CMN_GET_CELL(sCellInfo->cell);
cellSch->apisDl->rgSCHDlSCellActv(sCellInfo->cell, sCellInfo->ue);
cellSch = RG_SCH_CMN_GET_CELL(sCellInfo->cell);
cellSch->apisDl->rgSCHDlSCellActv(sCellInfo->cell, sCellInfo->ue);
-
RETVOID
;
+
return
;
}
#ifdef TFU_UPGRADE
}
#ifdef TFU_UPGRADE
@@
-510,15
+472,7
@@
RgSchUeCellInfo *sCellInfo
* @return Void
*
**/
* @return Void
*
**/
-#ifdef ANSI
-PRIVATE Void rgSCHCellClearScellLstOfCQI
-(
-RgSchUeCellInfo *sCellInfo
-)
-#else
-PRIVATE Void rgSCHCellClearScellLstOfCQI(sCellInfo)
-RgSchUeCellInfo *sCellInfo;
-#endif
+static Void rgSCHCellClearScellLstOfCQI(RgSchUeCellInfo *sCellInfo)
{
RgSchUePCqiCb *cqiRiCb = NULLP;
{
RgSchUePCqiCb *cqiRiCb = NULLP;
@@
-553,7
+507,7
@@
RgSchUeCellInfo *sCellInfo;
}
}
}
}
-
RETVOID
;
+
return
;
}
#endif/*TFU_UPGRADE*/
\f
}
#endif/*TFU_UPGRADE*/
\f
@@
-577,15
+531,7
@@
RgSchUeCellInfo *sCellInfo;
* @return ROK/RFAILED
*
**/
* @return ROK/RFAILED
*
**/
-#ifdef ANSI
-PRIVATE S16 rgSCHSCellDeActivation
-(
-RgSchUeCellInfo *sCellInfo
-)
-#else
-PRIVATE S16 rgSCHSCellDeActivation(sCellInfo)
-RgSchUeCellInfo *sCellInfo
-#endif
+static S16 rgSCHSCellDeActivation(RgSchUeCellInfo *sCellInfo)
{
return ROK;
RgSchCmnCell *cellSch;
{
return ROK;
RgSchCmnCell *cellSch;
@@
-655,24
+601,12
@@
RgSchUeCellInfo *sCellInfo
*
* Invoked by: CommonScheduler
*
*
* Invoked by: CommonScheduler
*
- * @param[in]
U16
sCellId
- * @param[in]
U16
rnti
+ * @param[in]
uint16_t
sCellId
+ * @param[in]
uint16_t
rnti
* @return Void
*
**/
* @return Void
*
**/
-#ifdef ANSI
-PRIVATE S16 rgSCHSCellTrgMacHqEReset
-(
-Inst inst,
-U16 secCellId,
-U16 rnti
-)
-#else
-PRIVATE S16 rgSCHSCellTrgMacHqEReset(inst,secCellId,rnti)
-Inst inst;
-U16 secCellId;
-U16 rnti;
-#endif
+static S16 rgSCHSCellTrgMacHqEReset(Inst inst,uint16_t secCellId,uint16_ rnti)
{
Pst pst;
RgSchCellCb *secCellCb = NULLP;
{
Pst pst;
RgSchCellCb *secCellCb = NULLP;
@@
-717,21
+651,7
@@
U16 rnti;
* @return Void
*
**/
* @return Void
*
**/
-#ifdef ANSI
-Void rgSCHSCellHndlFdbkInd
-(
-RgSchDlHqProcCb *hqP,
-U8 tbIdx,
-U8 fdbk,
-Bool maxHqRetxReached
-)
-#else
-Void rgSCHSCellHndlFdbkInd(hqP, tbIdx, fdbk,maxHqRetxReached)
-RgSchDlHqProcCb *hqP;
-U8 tbIdx;
-U8 fdbk;
-Bool maxHqRetxReached;
-#endif
+Void rgSCHSCellHndlFdbkInd(RgSchDlHqProcCb *hqP,uint8_t tbIdx,uint8_t fdbk,Bool maxHqRetxReached)
{
RgSchUeCb *ueCb;
{
RgSchUeCb *ueCb;
@@
-747,7
+667,7
@@
Bool maxHqRetxReached;
{
hqP->tbInfo[tbIdx].schdSCellActCe.pres = FALSE;
{
hqP->tbInfo[tbIdx].schdSCellActCe.pres = FALSE;
- for(
U8
idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++)
+ for(
uint8_t
idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++)
{
if(ueCb->cellInfo[idx] != NULLP)
{
{
if(ueCb->cellInfo[idx] != NULLP)
{
@@
-777,7
+697,7
@@
Bool maxHqRetxReached;
if(TRUE == maxHqRetxReached)
{
hqP->tbInfo[tbIdx].schdSCellActCe.pres = FALSE;
if(TRUE == maxHqRetxReached)
{
hqP->tbInfo[tbIdx].schdSCellActCe.pres = FALSE;
- for(
U8
idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++)
+ for(
uint8_t
idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++)
{
if(ueCb->cellInfo[idx] != NULLP)
{
{
if(ueCb->cellInfo[idx] != NULLP)
{
@@
-802,7
+722,7
@@
Bool maxHqRetxReached;
default:
break;
}
default:
break;
}
-
RETVOID
;
+
return
;
}
#ifdef LTE_ADV
}
#ifdef LTE_ADV
@@
-825,15
+745,7
@@
Bool maxHqRetxReached;
* @return Void
*
**/
* @return Void
*
**/
-#ifdef ANSI
-Void rgSCHSCellDeactTmrExpry
-(
-RgSchUeCellInfo *sCellInfo
-)
-#else
-Void rgSCHSCellDeactTmrExpry(sCellInfo)
-RgSchUeCellInfo *sCellInfo;
-#endif
+Void rgSCHSCellDeactTmrExpry(RgSchUeCellInfo *sCellInfo)
{
if (sCellInfo->ue->isScellExplicitDeAct == TRUE)
{
if (sCellInfo->ue->isScellExplicitDeAct == TRUE)
@@
-856,7
+768,7
@@
RgSchUeCellInfo *sCellInfo;
/* Deactivation Timer is configured, thus assume that UE has deactivated */
rgSCHSCellDeActivation(sCellInfo);
}
/* Deactivation Timer is configured, thus assume that UE has deactivated */
rgSCHSCellDeActivation(sCellInfo);
}
-
RETVOID
;
+
return
;
}
#endif
\f
}
#endif
\f
@@
-875,27
+787,13
@@
RgSchUeCellInfo *sCellInfo;
*
* @param[in] RgSchCellCb *cellCb
* @param[in] RgSchUeCb *ueCb
*
* @param[in] RgSchCellCb *cellCb
* @param[in] RgSchUeCb *ueCb
- * @param[in]
U8
sCellIdx
- * @param[in]
U8
action
+ * @param[in]
uint8_t
sCellIdx
+ * @param[in]
uint8_t
action
*
* @return ROK/RFAILED
*
**/
*
* @return ROK/RFAILED
*
**/
-#ifdef ANSI
-S16 rgSCHSCellTrigActDeact
-(
-RgSchCellCb *cell,
-RgSchUeCb *ueCb,
-U8 sCellIdx,
-U8 action
-)
-#else
-S16 rgSCHSCellTrigActDeact(cell,ueCb,sCellIdx,action)
-RgSchCellCb *cell,
-RgSchUeCb *ueCb;
-U8 sCellIdx;
-U8 action;
-#endif
+S16 rgSCHSCellTrigActDeact(RgSchCellCb *cell,RgSchUeCb *ueCb,uint8_t sCellIdx,uint8_t action)
{
Inst inst = cell->instIdx;
S16 ret = ROK;
{
Inst inst = cell->instIdx;
S16 ret = ROK;
@@
-1004,19
+902,7
@@
U8 action;
* @return ROK/RFAILED
*
**/
* @return ROK/RFAILED
*
**/
-#ifdef ANSI
-PRIVATE S16 rgSCHSCellSelectForAct
-(
-RgSchCellCb *cell,
-RgSchUeCb *ueCb,
-U8 *sCellIdx
-)
-#else
-PRIVATE S16 rgSCHSCellSelectForAct(cell, ueCb)
-RgSchCellCb *cell;
-RgSchUeCb *ueCb;
-U8 *sCellIdx;
-#endif
+static S16 rgSCHSCellSelectForAct(RgSchCellCb *cell,RgSchUeCb *ueCb,uint8_t *sCellIdx)
{
for((*sCellIdx) = 1; (*sCellIdx) <= RG_SCH_MAX_SCELL; (*sCellIdx)++)
{
for((*sCellIdx) = 1; (*sCellIdx) <= RG_SCH_MAX_SCELL; (*sCellIdx)++)
@@
-1042,26
+928,14
@@
U8 *sCellIdx;
*
* @param[in] RgSchCellCb *cellCb
* @param[in] RgSchUeCb *ueCb
*
* @param[in] RgSchCellCb *cellCb
* @param[in] RgSchUeCb *ueCb
- * @param[in]
U8
action
+ * @param[in]
uint8_t
action
*
* @return Void
*
**/
*
* @return Void
*
**/
-#ifdef ANSI
-Void rgSCHSCellSelectAndActDeAct
-(
-RgSchCellCb *pCell,
-RgSchUeCb *ueCb,
-U8 action
-)
-#else
-Void rgSCHSCellSelectAndActDeAct(pCell, ueCb, action)
-RgSchCellCb *pCell;
-RgSchUeCb *ueCb;
-U8 action;
-#endif
+Void rgSCHSCellSelectAndActDeAct(RgSchCellCb *pCell,RgSchUeCb *ueCb,uint8_t action)
{
{
-
U8
sCellIdx = 0;
+
uint8_t
sCellIdx = 0;
S16 ret = ROK;
switch (action)
S16 ret = ROK;
switch (action)
@@
-1071,11
+945,11
@@
U8 action;
if(((ret = rgSCHSCellSelectForAct(pCell, ueCb, &sCellIdx)) == ROK)
&& (sCellIdx == 0))
if(((ret = rgSCHSCellSelectForAct(pCell, ueCb, &sCellIdx)) == ROK)
&& (sCellIdx == 0))
-
RETVOID
;
+
return
;
break;
}
default:
break;
}
default:
-
RETVOID
;
+
return
;
}
if ((ret != ROK) ||
(ROK != (rgSCHSCellTrigActDeact(pCell, ueCb, sCellIdx, action))))
}
if ((ret != ROK) ||
(ROK != (rgSCHSCellTrigActDeact(pCell, ueCb, sCellIdx, action))))
@@
-1083,7
+957,7
@@
U8 action;
RGSCHDBGERR(pCell->instIdx,(rgSchPBuf(pCell->instIdx), "SCell Actication failed"
"for UE [%d] with SCellIdx [%d]\n", ueCb->ueId, sCellIdx));
}
RGSCHDBGERR(pCell->instIdx,(rgSchPBuf(pCell->instIdx), "SCell Actication failed"
"for UE [%d] with SCellIdx [%d]\n", ueCb->ueId, sCellIdx));
}
-
RETVOID
;
+
return
;
}
\f
}
\f
@@
-1102,23
+976,11
@@
U8 action;
*
* @param[in] RgSchCellCb *cellCb
* @param[in] RgSchUeCb *ueCb
*
* @param[in] RgSchCellCb *cellCb
* @param[in] RgSchUeCb *ueCb
- * @param[in]
U8
idx
+ * @param[in]
uint8_t
idx
* @return ROK/RFAILED
*
**/
* @return ROK/RFAILED
*
**/
-#ifdef ANSI
-Void rgSCHSCellDelUeSCell
-(
-RgSchCellCb *cellCb,
-RgSchUeCb *ueCb,
-U8 sCellIdx
-)
-#else
-Void rgSCHSCellDelUeSCell(cellCb,ueCb,sCellIdx)
-RgSchCellCb *cellCb;
-RgSchUeCb *ueCb;
-U8 sCellIdx;
-#endif
+Void rgSCHSCellDelUeSCell(RgSchCellCb *cellCb,RgSchUeCb *ueCb,uint8_t sCellIdx)
{
RgUeUlHqCb *ulHqEnt;
Inst inst = cellCb->instIdx;
{
RgUeUlHqCb *ulHqEnt;
Inst inst = cellCb->instIdx;
@@
-1133,7
+995,7
@@
U8 sCellIdx;
RGSCHDBGERRNEW(inst, (rgSchPBuf(inst),"Serv Cell not added to this Ue Scell Idx %d\
ueId %d\n",
sCellIdx,ueCb->ueId));
RGSCHDBGERRNEW(inst, (rgSchPBuf(inst),"Serv Cell not added to this Ue Scell Idx %d\
ueId %d\n",
sCellIdx,ueCb->ueId));
-
RETVOID
;
+
return
;
}
rgSCHDbmDelUeCb(sCellInfo->cell, ueCb);
}
rgSCHDbmDelUeCb(sCellInfo->cell, ueCb);
@@
-1170,7
+1032,7
@@
U8 sCellIdx;
ueCb->cellInfo[sCellIdx] = NULLP;
ueCb->cellInfo[sCellIdx] = NULLP;
-
RETVOID
;
+
return
;
}
\f
/**
}
\f
/**
@@
-1192,20
+1054,11
@@
U8 sCellIdx;
* @return ROK/RFAILED
*
**/
* @return ROK/RFAILED
*
**/
-#ifdef ANSI
-S16 rgSCHSCellDelUe
-(
-RgSchCellCb *cellCb,
-RgSchUeCb *ueCb
-)
-#else
-S16 rgSCHSCellDelUe(cellCb,ueCb)
-RgSchCellCb *cellCb;
-RgSchUeCb *ueCb;
-#endif
+S16 rgSCHSCellDelUe(RgSchCellCb *cellCb,RgSchUeCb *ueCb)
{
{
- for(U8 idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++)
+
+ for(uint8_t idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++)
{
rgSCHSCellDelUeSCell(cellCb,ueCb,idx);
}
{
rgSCHSCellDelUeSCell(cellCb,ueCb,idx);
}
@@
-1245,7
+1098,6
@@
RgSchUeCb *ueCb;
* @return ROK/RFAILED
*
**/
* @return ROK/RFAILED
*
**/
-#ifdef ANSI
S16 rgSCHSCellPCqiCfg
(
RgSchCellCb *priCellCb,
S16 rgSCHSCellPCqiCfg
(
RgSchCellCb *priCellCb,
@@
-1253,20
+1105,11
@@
RgSchCellCb *secCellCb,
RgSchUeCb *ueCb,
RgrUePrdDlCqiCfg *cqiCfg,
CmLteUeCategory ueCat,
RgSchUeCb *ueCb,
RgrUePrdDlCqiCfg *cqiCfg,
CmLteUeCategory ueCat,
-
U8
sCellIdx
+
uint8_t
sCellIdx
)
)
-#else
-S16 rgSCHSCellPCqiCfg(priCellCb,secCellCb,ueCb,cqiCfg,ueCat,sCellIdx)
-RgSchCellCb *priCellCb;
-RgSchCellCb *secCellCb;
-RgSchUeCb *ueCb;
-RgrUePrdDlCqiCfg *cqiCfg;
-CmLteUeCategory ueCat;
-U8 sCellIdx;
-#endif
{
{
-
U8
j; /*Bandwidth Parts*/
-
U8
temp;
+
uint8_t
j; /*Bandwidth Parts*/
+
uint8_t
temp;
#ifdef DEBUGP
Inst inst = priCellCb->instIdx;
#endif
#ifdef DEBUGP
Inst inst = priCellCb->instIdx;
#endif
@@
-1314,7
+1157,7
@@
U8 sCellIdx;
if(RGR_UE_PCQI_SB_REP == cqiCfg->cqiSetup.cqiRepType)
{
if(RGR_UE_PCQI_SB_REP == cqiCfg->cqiSetup.cqiRepType)
{
-
U8
k; /*SubBand Size (RB) */
+
uint8_t
k; /*SubBand Size (RB) */
RG_SCH_GET_CQI_J_VAL(secCellCb->bwCfg.dlTotalBw, j);
RG_SCH_GET_CQI_K_VAL(secCellCb->bwCfg.dlTotalBw, k);
cqiCb->J = j; /*Number of Bandwidth Parts*/
RG_SCH_GET_CQI_J_VAL(secCellCb->bwCfg.dlTotalBw, j);
RG_SCH_GET_CQI_K_VAL(secCellCb->bwCfg.dlTotalBw, k);
cqiCb->J = j; /*Number of Bandwidth Parts*/
@@
-1407,21
+1250,11
@@
U8 sCellIdx;
* @return Void
*
**/
* @return Void
*
**/
-#ifdef ANSI
-Void rgSCHSCellDlUeReset
-(
-RgSchCellCb *cell,
-RgSchUeCb *ue
-)
-#else
-Void rgSCHSCellDlUeReset(cell, ue)
-RgSchCellCb *cell;
-RgSchUeCb *ue;
-#endif
+Void rgSCHSCellDlUeReset(RgSchCellCb *cell,RgSchUeCb *ue)
{
RgSchCmnCell *cellSch;
{
RgSchCmnCell *cellSch;
- for(
U8
idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++)
+ for(
uint8_t
idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++)
{
if(ue->cellInfo[idx] != NULLP)
{
{
if(ue->cellInfo[idx] != NULLP)
{
@@
-1431,7
+1264,7
@@
RgSchUeCb *ue;
ue->cellInfo[idx]->sCellState = RG_SCH_SCELL_INACTIVE;
}
}
ue->cellInfo[idx]->sCellState = RG_SCH_SCELL_INACTIVE;
}
}
-
RETVOID
;
+
return
;
}
}
@@
-1451,29
+1284,17
@@
RgSchUeCb *ue;
* @return Void
*
**/
* @return Void
*
**/
-#ifdef ANSI
-Void rgSCHSCellDlLcCfg
-(
-RgSchCellCb *cell,
-RgSchUeCb *ue,
-RgSchDlLcCb *svc
-)
-#else
-Void rgSCHSCellDlLcCfg(cell, ue, svc)
-RgSchCellCb *cell;
-RgSchUeCb *ue;
-RgSchDlLcCb *svc;
-#endif
+Void rgSCHSCellDlLcCfg(RgSchCellCb *cell,RgSchUeCb *ue,RgSchDlLcCb *svc)
{
RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);
{
RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);
- for(
U8
idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++)
+ for(
uint8_t
idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++)
{
if(ue->cellInfo[idx] != NULLP)
{
cellSch->apisDl->rgSCHRgrDlLcCfg(ue->cellInfo[idx]->cell, ue, svc,NULLP,NULLP);
}
}
{
if(ue->cellInfo[idx] != NULLP)
{
cellSch->apisDl->rgSCHRgrDlLcCfg(ue->cellInfo[idx]->cell, ue, svc,NULLP,NULLP);
}
}
-
RETVOID
;
+
return
;
}
/**
}
/**
@@
-1492,29
+1313,17
@@
RgSchDlLcCb *svc;
* @return Void
*
**/
* @return Void
*
**/
-#ifdef ANSI
-Void rgSCHSCellDlLcDel
-(
-RgSchCellCb *cell,
-RgSchUeCb *ue,
-RgSchDlLcCb *svc
-)
-#else
-Void rgSCHSCellDlLcDel(cell, ue, svc)
-RgSchCellCb *cell;
-RgSchUeCb *ue;
-RgSchDlLcCb *svc;
-#endif
+Void rgSCHSCellDlLcDel(RgSchCellCb *cell,RgSchUeCb *ue,RgSchDlLcCb *svc)
{
RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);
{
RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);
- for(
U8
idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++)
+ for(
uint8_t
idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++)
{
if(ue->cellInfo[idx] != NULLP)
{
cellSch->apisDl->rgSCHFreeDlLc(ue->cellInfo[idx]->cell, ue, svc);
}
}
{
if(ue->cellInfo[idx] != NULLP)
{
cellSch->apisDl->rgSCHFreeDlLc(ue->cellInfo[idx]->cell, ue, svc);
}
}
-
RETVOID
;
+
return
;
}
/**
}
/**
@@
-1533,19
+1342,7
@@
RgSchDlLcCb *svc;
* @return Void
*
**/
* @return Void
*
**/
-#ifdef ANSI
-Void rgSCHSCellDlDedBoUpd
-(
-RgSchCellCb *cell,
-RgSchUeCb *ue,
-RgSchDlLcCb *svc
-)
-#else
-Void rgSCHSCellDlDedBoUpd(cell, ue, svc)
-RgSchCellCb *cell;
-RgSchUeCb *ue;
-RgSchDlLcCb *svc;
-#endif
+Void rgSCHSCellDlDedBoUpd(RgSchCellCb *cell,RgSchUeCb *ue,RgSchDlLcCb *svc)
{
RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);
{
RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);
@@
-1556,7
+1353,7
@@
RgSchDlLcCb *svc;
{
cellSch->apisDl->rgSCHDlDedBoUpd(ue->cell, ue, svc);
}
{
cellSch->apisDl->rgSCHDlDedBoUpd(ue->cell, ue, svc);
}
- for(
U8
idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++)
+ for(
uint8_t
idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++)
{
if((ue->cellInfo[idx] != NULLP) &&
(ue->cellInfo[idx]->sCellState == RG_SCH_SCELL_ACTIVE) &&
{
if((ue->cellInfo[idx] != NULLP) &&
(ue->cellInfo[idx]->sCellState == RG_SCH_SCELL_ACTIVE) &&
@@
-1565,7
+1362,7
@@
RgSchDlLcCb *svc;
cellSch->apisDl->rgSCHDlDedBoUpd(ue->cellInfo[idx]->cell, ue, svc);
}
}
cellSch->apisDl->rgSCHDlDedBoUpd(ue->cellInfo[idx]->cell, ue, svc);
}
}
-
RETVOID
;
+
return
;
}
#ifdef TFU_UPGRADE
/**
}
#ifdef TFU_UPGRADE
/**
@@
-1581,20
+1378,10
@@
RgSchDlLcCb *svc;
*
* @param[in] RgSchUePCqiCb *cqiCb1
* @param[in] RgSchUePCqiCb *cqiCb2
*
* @param[in] RgSchUePCqiCb *cqiCb1
* @param[in] RgSchUePCqiCb *cqiCb2
- * @return
U8
cqiCb cell idx which has the higher priority
+ * @return
uint8_t
cqiCb cell idx which has the higher priority
*
**/
*
**/
-#ifdef ANSI
-PRIVATE U8 rgSCHUtlSCellCmpCqiCfg
-(
-RgSchUePCqiCb *cqiCb1,
-RgSchUePCqiCb *cqiCb2
-)
-#else
-PRIVATE U8 rgSCHUtlSCellCmpCqiCfg(cqiCb1, cqiCb2)
-RgSchUePCqiCb *cqiCb1;
-RgSchUePCqiCb *cqiCb2;
-#endif
+static uint8_t rgSCHUtlSCellCmpCqiCfg(RgSchUePCqiCb *cqiCb1,RgSchUePCqiCb *cqiCb2)
{
RgSchUePCqiCb *retCqiCb;
/* Collision rules are defined in TS 36.213,7.2.2 */
{
RgSchUePCqiCb *retCqiCb;
/* Collision rules are defined in TS 36.213,7.2.2 */
@@
-1647,27
+1434,19
@@
RgSchUePCqiCb *cqiCb2;
* @return ROK/RFAILED
*
**/
* @return ROK/RFAILED
*
**/
-#ifdef ANSI
-S16 rgSCHUtlSCellHndlCqiCollsn
-(
-RgSchUePCqiCb *cqiCb
-)
-#else
-S16 rgSCHUtlSCellHndlCqiCollsn(cqiCb)
-RgSchUePCqiCb *cqiCb;
-#endif
+S16 rgSCHUtlSCellHndlCqiCollsn(RgSchUePCqiCb *cqiCb)
{
{
-
U32
nPCqiServCellIdx;
-
U32
minPCqiTrIdx;
-
U32
scellPCqiTrIdx;
-
U32
pCqiTrIdx;
+
uint32_t
nPCqiServCellIdx;
+
uint32_t
minPCqiTrIdx;
+
uint32_t
scellPCqiTrIdx;
+
uint32_t
pCqiTrIdx;
RgSchCellCb *priCellCb = cqiCb->servCellInfo->ue->cell;
RgSchUeCb *ueCb = cqiCb->servCellInfo->ue;
RgSchCellCb *priCellCb = cqiCb->servCellInfo->ue->cell;
RgSchUeCb *ueCb = cqiCb->servCellInfo->ue;
-
U16
crntSfIdx;
-
U32
cellIdx;
-
U32
sCellCnt = 0;
+
uint16_t
crntSfIdx;
+
uint32_t
cellIdx;
+
uint32_t
sCellCnt = 0;
CmLteTimingInfo timingInfo;
CmLteTimingInfo timingInfo;
-
U8
idx = 0;
+
uint8_t
idx = 0;
#ifdef xLTE_TDD
RG_SCH_ADD_TO_CRNT_TIME(priCellCb->crntTime, timingInfo, TFU_DELTA);
#ifdef xLTE_TDD
RG_SCH_ADD_TO_CRNT_TIME(priCellCb->crntTime, timingInfo, TFU_DELTA);
@@
-1757,25
+1536,17
@@
RgSchUePCqiCb *cqiCb;
* @return ROK/RFAILED
*
**/
* @return ROK/RFAILED
*
**/
-#ifdef ANSI
-S16 rgSCHUtlSCellHndlRiCollsn
-(
-RgSchUePCqiCb *cqiCb
-)
-#else
-S16 rgSCHUtlSCellHndlRiCollsn(cqiCb)
-RgSchUePCqiCb *cqiCb;
-#endif
+S16 rgSCHUtlSCellHndlRiCollsn(RgSchUePCqiCb *cqiCb)
{
{
-
U32
nPRiServCellIdx;
-
U32
minPRiTrIdx;
-
U32
scellPRiTrIdx;
-
U32
pRiTrIdx;
+
uint32_t
nPRiServCellIdx;
+
uint32_t
minPRiTrIdx;
+
uint32_t
scellPRiTrIdx;
+
uint32_t
pRiTrIdx;
RgSchCellCb *priCellCb = cqiCb->servCellInfo->ue->cell;
RgSchUeCb *ueCb = cqiCb->servCellInfo->ue;
RgSchCellCb *priCellCb = cqiCb->servCellInfo->ue->cell;
RgSchUeCb *ueCb = cqiCb->servCellInfo->ue;
-
U16
crntSfIdx;
-
U32
cellIdx;
-
U32
sCellCnt = 0;
+
uint16_t
crntSfIdx;
+
uint32_t
cellIdx;
+
uint32_t
sCellCnt = 0;
CmLteTimingInfo timingInfo;
#ifdef xLTE_TDD
CmLteTimingInfo timingInfo;
#ifdef xLTE_TDD
@@
-1875,21
+1646,11
@@
RgSchUePCqiCb *cqiCb;
* @return Void
*
**/
* @return Void
*
**/
-#ifdef ANSI
-S16 rgSCHSCellIsActive
-(
-RgSchCellCb *cell,
-RgSchUeCb *ue
-)
-#else
-S16 rgSCHSCellIsActive(cell, ue)
-RgSchCellCb *cell;
-RgSchUeCb *ue;
-#endif
+S16 rgSCHSCellIsActive(RgSchCellCb *cell,RgSchUeCb *ue)
{
S16 retVal = RFAILED;
{
S16 retVal = RFAILED;
- for(
U8
idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++)
+ for(
uint8_t
idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++)
{
if((ue->cellInfo[idx] != NULLP) &&
(ue->cellInfo[idx]->cell->cellId == cell->cellId)&&
{
if((ue->cellInfo[idx] != NULLP) &&
(ue->cellInfo[idx]->cell->cellId == cell->cellId)&&
@@
-1916,17
+1677,7
@@
RgSchUeCb *ue;
* @return BOOL
* -# TRUE
**/
* @return BOOL
* -# TRUE
**/
-#ifdef ANSI
-Bool rgSCHIsActvReqd
-(
-RgSchCellCb *cell,
-RgSchUeCb *ue
-)
-#else
-Bool rgSCHIsActvReqd(cell, ue)
-RgSchCellCb *cell;
-RgSchUeCb *ue
-#endif
+Bool rgSCHIsActvReqd(RgSchCellCb *cell,RgSchUeCb *ue)
{
/* Check if remBoCnt in this UE is greater than ZERO for sufficient number of
* Scheduling TTIs. If yes then We should activate a secondary cell to handle
{
/* Check if remBoCnt in this UE is greater than ZERO for sufficient number of
* Scheduling TTIs. If yes then We should activate a secondary cell to handle