*/
/* 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 */
RgSchUeCellInfo *sCellInfo
#endif
{
- RETVALUE(ROK);
+ return ROK;
RgSchCmnCell *cellSch;
Inst inst = sCellInfo->cell->instIdx;
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*/
{
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
if((ueCb->cellInfo[(*sCellIdx)] != NULLP) &&
(ueCb->cellInfo[(*sCellIdx)]->sCellState == RG_SCH_SCELL_READY))
{
- RETVALUE(ROK);
+ return ROK;
}
}
- RETVALUE(RFAILED);
+ return RFAILED;
}
/**
rgSCHSCellDelUeSCell(cellCb,ueCb,idx);
}
- RETVALUE(ROK);
+ return ROK;
}
#ifdef TFU_UPGRADE
{
RGSCHDBGERRNEW(inst, (rgSchPBuf(inst),"Invalid Serv Cell Idx %d\n",
sCellIdx));
- RETVALUE(RFAILED);
+ return RFAILED;
}
sCellInfo = ueCb->cellInfo[sCellIdx];
cqiCb->riDist = RG_SCH_INVALID_IDX;
cqiCb->nCqiTrIdx = RG_SCH_INVALID_IDX;
- RETVALUE(ROK);
+ return ROK;
}
#endif
}
}
- RETVALUE(retCqiCb->servCellInfo->sCellIdx);
+ return (retCqiCb->servCellInfo->sCellIdx);
}
/**
idx = ((nPCqiServCellIdx)& (CM_LTE_MAX_CELLS -1));
ueCb->nPCqiCb = &ueCb->cellInfo[idx]->cqiCb;
- RETVALUE(ROK);
+ return ROK;
}
/* Set the next expected Cqi into nPCqiCb */
ueCb->nPRiCb = &ueCb->cellInfo[nPRiServCellIdx]->cqiCb;
- RETVALUE(ROK);
+ return ROK;
}
#endif/*TFU_UPGRADE*/
break;
}
}
- RETVALUE(retVal);
+ return (retVal);
}
/**
* outstanding BO */
if(ue->remBoCnt == RG_SCH_ACTIVATION_COUNT)
{
- RETVALUE(TRUE);
+ return (TRUE);
}
- RETVALUE(FALSE);
+ return (FALSE);
}
#endif/*LTE_ADV*/