*/
/* header include files -- defines (.h) */
-#include "envopt.h" /* environment options */
-#include "envdep.h" /* environment dependent */
-#include "envind.h" /* environment independent */
-#include "gen.h" /* general layer */
-#include "ssi.h" /* system service interface */
-#include "cm5.h" /* common timers */
-#include "cm_hash.h" /* common hash list */
-#include "cm_llist.h" /* common linked list library */
-#include "cm_err.h" /* common error */
-#include "cm_lte.h" /* common LTE */
+#include "common_def.h"
#include "lrg.h"
#include "rgr.h"
#include "rgm.h"
#include "rg_sch_cmn.h"
/* header/extern include files (.x) */
-#include "gen.x" /* general layer typedefs */
-#include "ssi.x" /* system services typedefs */
-#include "cm5.x" /* common timers */
-#include "cm_hash.x" /* common hash list */
-#include "cm_lib.x" /* common library */
-#include "cm_llist.x" /* common linked list */
-#include "cm_mblk.x" /* memory management */
-#include "cm_tkns.x" /* common tokens */
-#include "cm_lte.x" /* common tokens */
#include "tfu.x" /* RGU types */
#include "lrg.x" /* layer management typedefs for MAC */
#include "rgr.x" /* layer management typedefs for MAC */
#ifdef LTE_ADV
-PUBLIC Void rgSCHSCellActivation ARGS((
+Void rgSCHSCellActivation ARGS((
RgSchUeCellInfo *sCell
));
-PUBLIC Void rgSCHSCellSchdActDeactCe ARGS((
+Void rgSCHSCellSchdActDeactCe ARGS((
RgSchUeCb *ueCb,
RgSchDlHqTbCb *tbInfo
));
-PUBLIC Void rgSCHSCellAddToActDeactLst ARGS((
+Void rgSCHSCellAddToActDeactLst ARGS((
RgSchCellCb *cell,
RgSchUeCb *ue
));
-PUBLIC Void rgSCHSCellRmvFrmActLst ARGS((
+Void rgSCHSCellRmvFrmActLst ARGS((
RgSchCellCb *cell,
RgSchUeCb *ue
));
-PUBLIC S16 rgSCHSCellIsActive ARGS((
+S16 rgSCHSCellIsActive ARGS((
RgSchCellCb *cell,
RgSchUeCb *ue
));
-PUBLIC Void rgSCHSCellHndlFdbkInd ARGS((
+Void rgSCHSCellHndlFdbkInd ARGS((
RgSchDlHqProcCb *hqP,
U8 tbIdx,
U8 fdbk,
));
#ifdef LTE_ADV
-PUBLIC Void rgSCHSCellDeactTmrExpry ARGS((
+Void rgSCHSCellDeactTmrExpry ARGS((
RgSchUeCellInfo *sCell
));
#endif
-PUBLIC Void rgSCHSCellDelUeSCell ARGS((
+Void rgSCHSCellDelUeSCell ARGS((
RgSchCellCb *cellCb,
RgSchUeCb *ueCb,
U8 sCellIdx
));
-PUBLIC S16 rgSCHSCellDelUe ARGS((
+S16 rgSCHSCellDelUe ARGS((
RgSchCellCb *cellCb,
RgSchUeCb *ueCb
));
#ifdef TFU_UPGRADE
-PUBLIC S16 rgSCHSCellPCqiCfg ARGS((
+S16 rgSCHSCellPCqiCfg ARGS((
RgSchCellCb *priCellCb,
RgSchCellCb *secCellCb,
RgSchUeCb *ueCb,
* -# None.
**/
#ifdef ANSI
-PUBLIC Void rgSCHSCellSchdActDeactCe
+Void rgSCHSCellSchdActDeactCe
(
RgSchUeCb *ueCb,
RgSchDlHqTbCb *tbInfo
)
#else
-PUBLIC Void rgSCHSCellSchdActDeactCe(ueCb, tbInfo)
+Void rgSCHSCellSchdActDeactCe(ueCb, tbInfo)
RgSchUeCb *ueCb;
RgSchDlHqTbCb *tbInfo;
#endif
U8 bitVal = 0;
U8 sCellActDeactBitMask = 0;
- TRC3(rgSCHSCellSchdActDeactCe);
/* Change the state of all Scells waiting for
* activation */
*
**/
#ifdef ANSI
-PUBLIC Void rgSCHSCellAddToActDeactLst
+Void rgSCHSCellAddToActDeactLst
(
RgSchCellCb *cell,
RgSchUeCb *ue
)
#else
-PUBLIC Void rgSCHSCellAddToActDeactLst(cell, ue)
+Void rgSCHSCellAddToActDeactLst(cell, ue)
RgSchCellCb *cell;
RgSchUeCb *ue;
#endif
{
RgSchCmnDlCell *cellCmnDl = RG_SCH_CMN_GET_DL_CELL(cell);
- TRC3(rgSCHSCellAddToActDeactLst);
if(NULLP == ue->sCellActLnk.node)
{/* Ue is not present in the list */
*
**/
#ifdef ANSI
-PUBLIC Void rgSCHSCellRmvFrmActLst
+Void rgSCHSCellRmvFrmActLst
(
RgSchCellCb *cell,
RgSchUeCb *ue
)
#else
-PUBLIC Void rgSCHSCellRmvFrmActLst(cell, ue)
+Void rgSCHSCellRmvFrmActLst(cell, ue)
RgSchCellCb *cell;
RgSchUeCb *ue;
#endif
{
RgSchCmnDlCell *cellCmnDl = RG_SCH_CMN_GET_DL_CELL(cell);
- TRC3(rgSCHSCellRmvFrmActLst);
if (NULLP != ue->sCellActLnk.node)
{
cmLListDelFrm(&cellCmnDl->secCellActCeLst, &ue->sCellActLnk);
*
**/
#ifdef ANSI
-PUBLIC Void rgSCHSCellActivation
+Void rgSCHSCellActivation
(
RgSchUeCellInfo *sCellInfo
)
#else
-PUBLIC Void rgSCHSCellActivation(sCellInfo)
+Void rgSCHSCellActivation(sCellInfo)
RgSchUeCellInfo *sCellInfo
#endif
{
U16 crntTime;
#endif
- TRC3(rgSCHSCellActivation);
sCellInfo->sCellState = RG_SCH_SCELL_ACTIVE;
#ifdef TENB_STATS
#endif
{
- TRC3(rgSCHCellClearScellLstOfCQI);
RgSchUePCqiCb *cqiRiCb = NULLP;
RgSchUeCb *ueCb;
ueCb = sCellInfo->ue;
RgSchUeCellInfo *sCellInfo
#endif
{
- RETVALUE(ROK);
+ return ROK;
RgSchCmnCell *cellSch;
Inst inst = sCellInfo->cell->instIdx;
- TRC3(rgSCHSCellDeActivation);
/* Stop the timer if running */
if(sCellInfo->deactTmr.tmrEvnt != TMR_NONE)
printf("SCELL DEATIVATED sCellInfo->ue->ueId =%d, sCellInfo->sCellId =%d\n", sCellInfo->ue->ueId, sCellInfo->sCellId);
//MSPD_DBG("SCELL DEATIVATED sCellInfo->ue->ueId =%d, sCellInfo->sCellId =%d\n", sCellInfo->ue->ueId, sCellInfo->sCellId);
#endif
- RETVALUE(ROK);
+ return ROK;
}
\f
if((secCellCb = (RgSchCellCb *)rgSchUtlGetCellCb(inst, secCellId)) == NULLP)
{
RGSCHDBGERRNEW(inst, (rgSchPBuf(inst), "SCell doesnt exists"));
- RETVALUE(RFAILED);
+ return RFAILED;
}
hqEntRstInfo.cellId = secCellId;
RgSchMacRstHqEnt(&pst, &hqEntRstInfo);
- RETVALUE(ROK);
+ return ROK;
}
/*removed endif*/
*
**/
#ifdef ANSI
-PUBLIC Void rgSCHSCellHndlFdbkInd
+Void rgSCHSCellHndlFdbkInd
(
RgSchDlHqProcCb *hqP,
U8 tbIdx,
Bool maxHqRetxReached
)
#else
-PUBLIC Void rgSCHSCellHndlFdbkInd(hqP, tbIdx, fdbk,maxHqRetxReached)
+Void rgSCHSCellHndlFdbkInd(hqP, tbIdx, fdbk,maxHqRetxReached)
RgSchDlHqProcCb *hqP;
U8 tbIdx;
U8 fdbk;
RgSchCellCb *cell;
RgSchUeCellInfo *sCellInfo;
- TRC3(rgSCHSCellHndlFdbkInd);
ueCb = hqP->hqE->ue;
cell = ueCb->cell;
*
**/
#ifdef ANSI
-PUBLIC Void rgSCHSCellDeactTmrExpry
+Void rgSCHSCellDeactTmrExpry
(
RgSchUeCellInfo *sCellInfo
)
#else
-PUBLIC Void rgSCHSCellDeactTmrExpry(sCellInfo)
+Void rgSCHSCellDeactTmrExpry(sCellInfo)
RgSchUeCellInfo *sCellInfo;
#endif
{
- TRC3(rgSCHSCellDeactTmrExpry);
if (sCellInfo->ue->isScellExplicitDeAct == TRUE)
{
/* Deactivation Timer is not configured (infinity), thus send deactivation CE explicitly */
*
**/
#ifdef ANSI
-PUBLIC S16 rgSCHSCellTrigActDeact
+S16 rgSCHSCellTrigActDeact
(
RgSchCellCb *cell,
RgSchUeCb *ueCb,
U8 action
)
#else
-PUBLIC S16 rgSCHSCellTrigActDeact(cell,ueCb,sCellIdx,action)
+S16 rgSCHSCellTrigActDeact(cell,ueCb,sCellIdx,action)
RgSchCellCb *cell,
RgSchUeCb *ueCb;
U8 sCellIdx;
Inst inst = cell->instIdx;
S16 ret = ROK;
- TRC3(rgSCHSCellTrigActDeact);
-
if((sCellIdx < 1) ||
(sCellIdx > RGR_MAX_SCELL_PER_UE))
{
RGSCHDBGERRNEW(inst, (rgSchPBuf(inst),"Invalid Serv Cell Idx %d\n", \
sCellIdx));
- RETVALUE(RFAILED);
+ return RFAILED;
}
if(ueCb->cellInfo[sCellIdx] == NULLP)
{
RGSCHDBGERRNEW(inst, (rgSchPBuf(inst),"Serv Cell not added to this Ue Scell Idx %d ueId %d\n", \
sCellIdx,ueCb->ueId));
- RETVALUE(RFAILED);
+ return RFAILED;
}
switch (action)
break;
}
}
- RETVALUE(ret);
+ return (ret);
}
\f
U8 *sCellIdx;
#endif
{
- TRC3(rgSCHSCellSelectAndAct);
for((*sCellIdx) = 1; (*sCellIdx) <= RG_SCH_MAX_SCELL; (*sCellIdx)++)
{
if((ueCb->cellInfo[(*sCellIdx)] != NULLP) &&
(ueCb->cellInfo[(*sCellIdx)]->sCellState == RG_SCH_SCELL_READY))
{
- RETVALUE(ROK);
+ return ROK;
}
}
- RETVALUE(RFAILED);
+ return RFAILED;
}
/**
*
**/
#ifdef ANSI
-PUBLIC Void rgSCHSCellSelectAndActDeAct
+Void rgSCHSCellSelectAndActDeAct
(
RgSchCellCb *pCell,
RgSchUeCb *ueCb,
U8 action
)
#else
-PUBLIC Void rgSCHSCellSelectAndActDeAct(pCell, ueCb, action)
+Void rgSCHSCellSelectAndActDeAct(pCell, ueCb, action)
RgSchCellCb *pCell;
RgSchUeCb *ueCb;
U8 action;
*
**/
#ifdef ANSI
-PUBLIC Void rgSCHSCellDelUeSCell
+Void rgSCHSCellDelUeSCell
(
RgSchCellCb *cellCb,
RgSchUeCb *ueCb,
U8 sCellIdx
)
#else
-PUBLIC Void rgSCHSCellDelUeSCell(cellCb,ueCb,sCellIdx)
+Void rgSCHSCellDelUeSCell(cellCb,ueCb,sCellIdx)
RgSchCellCb *cellCb;
RgSchUeCb *ueCb;
U8 sCellIdx;
RgSchUeCellInfo *sCellInfo;
RgSchCmnUlUe *ueUl;
- TRC3(rgSCHSCellDelUeSCell);
sCellInfo = ueCb->cellInfo[sCellIdx];
*
**/
#ifdef ANSI
-PUBLIC S16 rgSCHSCellDelUe
+S16 rgSCHSCellDelUe
(
RgSchCellCb *cellCb,
RgSchUeCb *ueCb
)
#else
-PUBLIC S16 rgSCHSCellDelUe(cellCb,ueCb)
+S16 rgSCHSCellDelUe(cellCb,ueCb)
RgSchCellCb *cellCb;
RgSchUeCb *ueCb;
#endif
{
- TRC3(rgSCHSCellDelUe);
-
for(U8 idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++)
{
rgSCHSCellDelUeSCell(cellCb,ueCb,idx);
}
- RETVALUE(ROK);
+ return ROK;
}
#ifdef TFU_UPGRADE
*
**/
#ifdef ANSI
-PUBLIC S16 rgSCHSCellPCqiCfg
+S16 rgSCHSCellPCqiCfg
(
RgSchCellCb *priCellCb,
RgSchCellCb *secCellCb,
U8 sCellIdx
)
#else
-PUBLIC S16 rgSCHSCellPCqiCfg(priCellCb,secCellCb,ueCb,cqiCfg,ueCat,sCellIdx)
+S16 rgSCHSCellPCqiCfg(priCellCb,secCellCb,ueCb,cqiCfg,ueCat,sCellIdx)
RgSchCellCb *priCellCb;
RgSchCellCb *secCellCb;
RgSchUeCb *ueCb;
RgSchUeCellInfo *sCellInfo;
RgSchUePCqiCb *cqiCb = NULLP;
- TRC3(rgSCHSCellPCqiCfg);
-
RGSCHDBGINFO(priCellCb->instIdx, (rgSchPBuf(priCellCb->instIdx),
"rgSCHSCellPCqiCfg cellId =%d, ueId = %d, CfgType =%d\n",
secCellCb->cellId, ueCb->ueId, cqiCfg->type));
{
RGSCHDBGERRNEW(inst, (rgSchPBuf(inst),"Invalid Serv Cell Idx %d\n",
sCellIdx));
- RETVALUE(RFAILED);
+ return RFAILED;
}
sCellInfo = ueCb->cellInfo[sCellIdx];
if (cqiCfg->type == RGR_SCH_PCQI_SETUP)
{
/* 1. Copy the Received CQI Cfg parameters to ueCb */
- cmMemcpy((U8 *)&cqiCb->cqiCfg, (U8 *)cqiCfg,
+ memcpy(&cqiCb->cqiCfg, cqiCfg,
sizeof(RgrUePrdDlCqiCfg));
/* 2. Compute Periodic CQI Periodicity and subframe offset */
cqiCb->riDist = RG_SCH_INVALID_IDX;
cqiCb->nCqiTrIdx = RG_SCH_INVALID_IDX;
- RETVALUE(ROK);
+ return ROK;
}
#endif
*
**/
#ifdef ANSI
-PUBLIC Void rgSCHSCellDlUeReset
+Void rgSCHSCellDlUeReset
(
RgSchCellCb *cell,
RgSchUeCb *ue
)
#else
-PUBLIC Void rgSCHSCellDlUeReset(cell, ue)
+Void rgSCHSCellDlUeReset(cell, ue)
RgSchCellCb *cell;
RgSchUeCb *ue;
#endif
{
RgSchCmnCell *cellSch;
- TRC3(rgSCHSCellDlUeReset);
for(U8 idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++)
{
*
**/
#ifdef ANSI
-PUBLIC Void rgSCHSCellDlLcCfg
+Void rgSCHSCellDlLcCfg
(
RgSchCellCb *cell,
RgSchUeCb *ue,
RgSchDlLcCb *svc
)
#else
-PUBLIC Void rgSCHSCellDlLcCfg(cell, ue, svc)
+Void rgSCHSCellDlLcCfg(cell, ue, svc)
RgSchCellCb *cell;
RgSchUeCb *ue;
RgSchDlLcCb *svc;
#endif
{
RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);
- TRC3(rgSCHSCellDlLcCfg);
for(U8 idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++)
{
if(ue->cellInfo[idx] != NULLP)
*
**/
#ifdef ANSI
-PUBLIC Void rgSCHSCellDlLcDel
+Void rgSCHSCellDlLcDel
(
RgSchCellCb *cell,
RgSchUeCb *ue,
RgSchDlLcCb *svc
)
#else
-PUBLIC Void rgSCHSCellDlLcDel(cell, ue, svc)
+Void rgSCHSCellDlLcDel(cell, ue, svc)
RgSchCellCb *cell;
RgSchUeCb *ue;
RgSchDlLcCb *svc;
#endif
{
RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);
- TRC3(rgSCHSCellDlLcDel);
for(U8 idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++)
{
if(ue->cellInfo[idx] != NULLP)
*
**/
#ifdef ANSI
-PUBLIC Void rgSCHSCellDlDedBoUpd
+Void rgSCHSCellDlDedBoUpd
(
RgSchCellCb *cell,
RgSchUeCb *ue,
RgSchDlLcCb *svc
)
#else
-PUBLIC Void rgSCHSCellDlDedBoUpd(cell, ue, svc)
+Void rgSCHSCellDlDedBoUpd(cell, ue, svc)
RgSchCellCb *cell;
RgSchUeCb *ue;
RgSchDlLcCb *svc;
#endif
{
RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell);
- TRC3(rgSCHSCellDlDedBoUpd);
/* If this is not invoked by PCell, then
invoke the call to PCell handler
#endif
{
RgSchUePCqiCb *retCqiCb;
- TRC3(rgSCHUtlSCellCmpCqiCfg);
/* Collision rules are defined in TS 36.213,7.2.2 */
/* RI, WB first PMI > WB CQI > SB CQI */
/* As of now only taking care of RI > WB CQI > SB CQI */
}
}
- RETVALUE(retCqiCb->servCellInfo->sCellIdx);
+ return (retCqiCb->servCellInfo->sCellIdx);
}
/**
*
**/
#ifdef ANSI
-PUBLIC S16 rgSCHUtlSCellHndlCqiCollsn
+S16 rgSCHUtlSCellHndlCqiCollsn
(
RgSchUePCqiCb *cqiCb
)
#else
-PUBLIC S16 rgSCHUtlSCellHndlCqiCollsn(cqiCb)
+S16 rgSCHUtlSCellHndlCqiCollsn(cqiCb)
RgSchUePCqiCb *cqiCb;
#endif
{
U32 sCellCnt = 0;
CmLteTimingInfo timingInfo;
U8 idx = 0;
- TRC3(rgSCHUtlSCellHndlCqiCollsn);
#ifdef xLTE_TDD
RG_SCH_ADD_TO_CRNT_TIME(priCellCb->crntTime, timingInfo, TFU_DELTA);
idx = ((nPCqiServCellIdx)& (CM_LTE_MAX_CELLS -1));
ueCb->nPCqiCb = &ueCb->cellInfo[idx]->cqiCb;
- RETVALUE(ROK);
+ return ROK;
}
*
**/
#ifdef ANSI
-PUBLIC S16 rgSCHUtlSCellHndlRiCollsn
+S16 rgSCHUtlSCellHndlRiCollsn
(
RgSchUePCqiCb *cqiCb
)
#else
-PUBLIC S16 rgSCHUtlSCellHndlRiCollsn(cqiCb)
+S16 rgSCHUtlSCellHndlRiCollsn(cqiCb)
RgSchUePCqiCb *cqiCb;
#endif
{
U32 cellIdx;
U32 sCellCnt = 0;
CmLteTimingInfo timingInfo;
- TRC3(rgSCHUtlSCellHndlRiCollsn);
#ifdef xLTE_TDD
RG_SCH_ADD_TO_CRNT_TIME(priCellCb->crntTime, timingInfo, TFU_DELTA);
/* Set the next expected Cqi into nPCqiCb */
ueCb->nPRiCb = &ueCb->cellInfo[nPRiServCellIdx]->cqiCb;
- RETVALUE(ROK);
+ return ROK;
}
#endif/*TFU_UPGRADE*/
*
**/
#ifdef ANSI
-PUBLIC S16 rgSCHSCellIsActive
+S16 rgSCHSCellIsActive
(
RgSchCellCb *cell,
RgSchUeCb *ue
)
#else
-PUBLIC S16 rgSCHSCellIsActive(cell, ue)
+S16 rgSCHSCellIsActive(cell, ue)
RgSchCellCb *cell;
RgSchUeCb *ue;
#endif
{
S16 retVal = RFAILED;
- TRC3(rgSCHSCellIsActive);
for(U8 idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++)
{
break;
}
}
- RETVALUE(retVal);
+ return (retVal);
}
/**
* -# TRUE
**/
#ifdef ANSI
-PUBLIC Bool rgSCHIsActvReqd
+Bool rgSCHIsActvReqd
(
RgSchCellCb *cell,
RgSchUeCb *ue
)
#else
-PUBLIC Bool rgSCHIsActvReqd(cell, ue)
+Bool rgSCHIsActvReqd(cell, ue)
RgSchCellCb *cell;
RgSchUeCb *ue
#endif
{
- TRC2(rgSCHIsActvReqd)
/* 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
* outstanding BO */
if(ue->remBoCnt == RG_SCH_ACTIVATION_COUNT)
{
- RETVALUE(TRUE);
+ return (TRUE);
}
- RETVALUE(FALSE);
+ return (FALSE);
}
#endif/*LTE_ADV*/
Code Review / o-du / l2.git / blobdiff