* @return
*/
#ifdef ANSI
-PUBLIC Void rgSCHDrxTtiInd
+Void rgSCHDrxTtiInd
(
RgSchCellCb *cell
)
#else
-PUBLIC Void rgSCHDrxTtiInd (cell)
+Void rgSCHDrxTtiInd (cell)
RgSchCellCb *cell;
#endif
{
U16 dlIndex;
U16 ulIndex;
- TRC2(rgSCHDrxTtiInd );
-
-
dlIndex = (cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G + cell->crntTime.slot +
RG_SCH_DRX_DL_DELTA) % RG_SCH_MAX_DRXQ_SIZE;
#endif
{
- TRC2(rgSCHDrxTtiHdlOnDur);
-
#if ( ERRCLASS & ERRCLS_INT_PAR )
if ( cell == (RgSchCellCb* )NULLP )
{
- RETVALUE(RFAILED);
+ return RFAILED;
}
#endif
rgSCHDrxTtiHdlOnDurUl(cell, ulIndex);
- RETVALUE(ROK);
+ return ROK;
}/*rgSCHDrxTtiHdlOnDur*/
*/
#ifdef ANSI
-PUBLIC S16 rgSCHDrxTtiHdlInActv
+S16 rgSCHDrxTtiHdlInActv
(
RgSchCellCb *cell,
U16 dlIndex,
U16 ulIndex
)
#else
-PUBLIC S16 rgSCHDrxTtiHdlInActv(cell, dlIndex, ulIndex)
+S16 rgSCHDrxTtiHdlInActv(cell, dlIndex, ulIndex)
RgSchCellCb *cell;
U16 dlIndex;
U16 ulIndex;
RgSchCmnCell *cellSch = NULLP;
Bool delInUlScan = FALSE;
- TRC2(rgSCHDrxTtiHdlInActv);
-
#if ( ERRCLASS & ERRCLS_INT_PAR )
if ( cell == (RgSchCellCb* )NULLP)
{
- RETVALUE(RFAILED);
+ return RFAILED;
}
#endif
cellSch = RG_SCH_CMN_GET_CELL(cell);
cellSch->apisDl->rgSCHDlInactvtUes(cell,&dlInactvLst);
- RETVALUE(ROK);
+ return ROK;
}/*rgSCHDrxTtiHdlInActv*/
/** @brief This function handles the per TTI processing for DRX short cycle
*/
#ifdef ANSI
-PUBLIC S16 rgSCHDrxTtiHdlShortCycle
+S16 rgSCHDrxTtiHdlShortCycle
(
RgSchCellCb *cell,
U16 dlIndex,
U16 ulIndex
)
#else
-PUBLIC S16 rgSCHDrxTtiHdlShortCycle (cell, dlIndex, ulIndex)
+S16 rgSCHDrxTtiHdlShortCycle (cell, dlIndex, ulIndex)
RgSchCellCb *cell;
U16 dlIndex;
U16 ulIndex;
RgSchUeCb *ue=NULLP;
RgSchDrxUeCb *drxUe=NULLP;
- TRC2(rgSCHDrxTtiHdlShortCycle );
-
#if ( ERRCLASS & ERRCLS_INT_PAR )
if ( cell == (RgSchCellCb* )NULLP )
{
- RETVALUE(RFAILED);
+ return RFAILED;
}
#endif
rgSCHDrxMvToNxtOnDurOcc(cell,ue,RG_SCH_DRX_DL_DELTA,TRUE);
}/*while(node)...*/
- RETVALUE(ROK);
+ return ROK;
}/*rgSCHDrxTtiHdlShortCycle*/
#if ( ERRCLASS & ERRCLS_INT_PAR)
if ( cell == (RgSchCellCb *)NULLP )
{
- RETVALUE(RFAILED);
+ return RFAILED;
}
#endif /*ERRCLASS & ERRCLS_INT_PAR*/
- TRC2(rgSCHDrxTtiHdlDlHarq );
-
rgSCHDrxTtiHdlDlHarqRTT(cell, dlIndex);
rgSCHDrxTtiHdlUlHarqRTT(cell, ulIndex);
- RETVALUE(ROK);
+ return ROK;
}
/** @brief This function is called by the common scheduler as part of
*/
#ifdef ANSI
-PUBLIC Void rgSCHDrxStrtInActvTmr
+Void rgSCHDrxStrtInActvTmr
(
RgSchCellCb *cell,
CmLListCp *ueLst,
U8 direction
)
#else
-PUBLIC Void rgSCHDrxStrtInActvTmr(cell, ueLst, direction)
+Void rgSCHDrxStrtInActvTmr(cell, ueLst, direction)
RgSchCellCb *cell;
CmLListCp *ueLst;
U8 direction;
RgSchCmnCell *cellSch = NULLP;
Bool delInUlScan = FALSE;
-
- TRC2(rgSCHDrxStrtInActvTmr);
-
-
if ( direction == RG_SCH_DRX_UL)
{
#ifndef LTE_TDD
* @return Void
*/
#ifdef ANSI
-PUBLIC Void rgSCHDrxStartHarqRTTTmr
+Void rgSCHDrxStartHarqRTTTmr
(
RgSchCellCb *cell,
RgSchDlHqProcCb *hqP,
U8 tbCnt
)
#else
-PUBLIC Void rgSCHDrxStartHarqRTTTmr(cell, hqP, tbCnt)
+Void rgSCHDrxStartHarqRTTTmr(cell, hqP, tbCnt)
RgSchCellCb *cell;
RgSchDlHqProcCb *hqP;
U8 tbCnt;
U8 firstDlTxOcassion;
U8 drxRetxTmrStartSf;
#endif
- TRC2(rgSCHDrxStartHarqRTTTmr);
-
drxCell = RG_SCH_DRX_GET_CELL(cell);
drxHq = RG_SCH_DRX_GET_DL_HQ(hqP);
* -# RFAILED
*/
#ifdef ANSI
-PUBLIC S16 rgSCHDrxUeCfg
+S16 rgSCHDrxUeCfg
(
RgSchCellCb *cell,
RgSchUeCb *ue,
RgrUeCfg *ueCfg
)
#else
-PUBLIC S16 rgSCHDrxUeCfg (cell, ue, ueCfg)
+S16 rgSCHDrxUeCfg (cell, ue, ueCfg)
RgSchCellCb *cell;
RgSchUeCb *ue;
RgrUeCfg *ueCfg;
U8 cellIdx;
- TRC2(rgSCHDrxUeCfg);
-
-
#if ( ERRCLASS & ERRCLS_INT_PAR )
if ( cell == (RgSchCellCb* )NULLP)
{
- RETVALUE(RFAILED);
+ return RFAILED;
}
if ((ue == (RgSchUeCb* )NULLP)
{
RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHDrxUeCfg():"
"Invalid params.cell or ue or ueCfg is NULL ");
- RETVALUE(RFAILED);
+ return RFAILED;
}
#endif
{
RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,
"Memory allocation FAILED for DRX UECB CRBTI:%d",ue->ueId);
- RETVALUE(ret);
+ return (ret);
}
ueDrxCb = ue->drxCb;
ueDrxCb->shortCycleEnt.node = (PTR)ue;
}
- RETVALUE(ret);
+ return (ret);
} /* end of rgSCHDrxUeCfg */
/** @brief This function gets the next occurance of onDurationTimer from the
U32 numOfCycles;
U32 nxtDist;
- TRC3(rgSCHDrxGetNxtOnDur);
#if ( ERRCLASS & ERRCLS_INT_PAR )
if ( cell == (RgSchCellCb* )NULLP )
{
- RETVALUE(RFAILED);
+ return RFAILED;
}
if( (drxCb == (RgSchDrxUeCb* )NULLP)
RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,
"rgSCHDrxGetNxOnDur():Invalid params."
"cell/drxCb/nxtOnDur is NULL");
- RETVALUE(RFAILED);
+ return RFAILED;
}
#endif
nxtOnDur->sfn = (U16)nxtDist / RGSCH_NUM_SUB_FRAMES_5G;
nxtOnDur->slot = (U16)nxtDist % RGSCH_NUM_SUB_FRAMES_5G;
}
- RETVALUE(ROK);
+ return ROK;
} /* end of rgSCHDrxGetNxtOnDur */
/** @brief This function is a utility function to copy the UE configuration from
RgrUeDrxCfg *drxCfg;
#endif
{
- TRC3(rgSCHDrxCpyUeCfg);
#if ( ERRCLASS & ERRCLS_INT_PAR )
if ( (ueCb == (RgSchDrxUeCb* )NULLP )
(drxCfg == (RgrUeDrxCfg* )NULLP)
)
{
- RETVALUE(RFAILED);
+ return RFAILED;
}
#endif
ueCb->shortDrxCycle = drxCfg->drxShortDrx.shortDrxCycle;
ueCb->shortCycleTmrLen = drxCfg->drxShortDrx.drxShortCycleTmr;
- RETVALUE(ROK);
+ return ROK;
} /* end of rgSCHDrxCpyUeCfg */
#ifdef RGR_V2
* @return ROK/RFAILED
*/
#ifdef ANSI
-PUBLIC S16 rgSCHDrxUeReCfg
+S16 rgSCHDrxUeReCfg
(
RgSchCellCb *cell,
RgSchUeCb *ue,
RgrUeRecfg *ueReCfg
)
#else
-PUBLIC S16 rgSCHDrxUeReCfg (cell, ue, ueReCfg)
+S16 rgSCHDrxUeReCfg (cell, ue, ueReCfg)
RgSchCellCb *cell;
RgSchUeCb *ue;
RgrUeRecfg *ueReCfg;
U16 curIndx;
U8 cellIdx;
- TRC2(rgSCHDrxUeReCfg);
-
/* drx was disabled but now enabled for this ue */
if ( (ue->isDrxEnabled == FALSE)
RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,
"rgSCHdrxUeReCfg():""Memory allocation FAILED for DRX UE Cb CRNTI:%d",
ue->ueId);
- RETVALUE(ret);
+ return (ret);
}
ue->isDrxEnabled = TRUE; /* sachin */
}
if( ue->drxCb == NULLP )
{
- RETVALUE(RFAILED);
+ return RFAILED;
}
ueDrxCb = ue->drxCb;
}
}
- RETVALUE(ROK);
+ return ROK;
} /* end of rgSCHDrxUeReCfg */
#endif
* @return ROK/RFAILED
*/
#ifdef ANSI
-PUBLIC Void rgSCHDrxUeHqReset
+Void rgSCHDrxUeHqReset
(
RgSchCellCb *cell,
RgSchUeCb *ue,
U8 cellIdx
)
#else
-PUBLIC Void rgSCHDrxUeHqReset(cell, ue, hqE, cellIdx)
+Void rgSCHDrxUeHqReset(cell, ue, hqE, cellIdx)
RgSchCellCb *cell;
RgSchUeCb *ue;
RgSchDlHqEnt *hqE;
RgSchDrxDlHqProcCb *drxHq =NULLP;
U8 i;
- TRC2(rgSCHDrxUeHqReset);
-
for(i=0; i < hqE->numHqPrcs; i++)
{
hqP = &hqE->procs[i];
* @return ROK/RFAILED
*/
#ifdef ANSI
-PUBLIC S16 rgSCHDrxUeDel
+S16 rgSCHDrxUeDel
(
RgSchCellCb *cell,
RgSchUeCb *ue
)
#else
-PUBLIC S16 rgSCHDrxUeDel (cell, ue)
+S16 rgSCHDrxUeDel (cell, ue)
RgSchCellCb *cell;
RgSchUeCb *ue;
#endif
#ifdef EMTC_ENABLE
RgSchCmnUlUe *ueUl = RG_SCH_CMN_GET_UL_UE(ue, cell);
#endif
- TRC2(rgSCHDrxUeDel);
/* ccpu00129899: Moved the drx-enabled check to the caller */
ueDrxCb->drxDlInactvMask = DRX_UE_INACTIVE;
ueDrxCb->drxUlInactvMask = DRX_UE_INACTIVE;
- RETVALUE(ROK);
+ return ROK;
}/*rgSCHDrxUeDel*/
/** @brief This function is called at the time of RGR cell configuration.
* Function: rgSCHDrxCellCfg
*
* Processing steps:
- * - Initializes the following drxQ (cmMemset would do).
+ * - Initializes the following drxQ (memset would do).
*
*
* @param RgSchCellCb *cell
* @return ROK/RFAILED
*/
#ifdef ANSI
-PUBLIC S16 rgSCHDrxCellCfg
+S16 rgSCHDrxCellCfg
(
RgSchCellCb *cell,
RgrCellCfg *cellCfg
)
#else
-PUBLIC S16 rgSCHDrxCellCfg (cell, cellCfg)
+S16 rgSCHDrxCellCfg (cell, cellCfg)
RgSchCellCb *cell;
RgrCellCfg *cellCfg;
#endif
S16 ret = ROK;
Inst instIdx = cell->instIdx;
- TRC2(rgSCHDrxCellCfg);
-
-
#if ( ERRCLASS & ERRCLS_INT_PAR )
/*KWORK_FIX :Removed check for cell being NULL*/
if( (cellCfg == (RgrCellCfg* )NULLP))
{
RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,
"rgSCHDrxCellCfg():Invalid Params. cell/cellCfg is NULL");
- RETVALUE(RFAILED);
+ return RFAILED;
}
#endif
{
RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"rgSCHDrxCellCfg():"
"Memory allocation FAILED for DRX cell Cb");
- RETVALUE(ret);
+ return (ret);
}
/* delInUlScan determines which index scans the queue last.
cell->drxCb->delInUlScan = TRUE;
}
- RETVALUE(ret);
+ return (ret);
} /* end of rgSchDrxCellCfg */
* @return Void
*/
#ifdef ANSI
-PUBLIC Void rgSCHDrxCellDel
+Void rgSCHDrxCellDel
(
RgSchCellCb *cell
)
#else
-PUBLIC Void rgSCHDrxCellDel (cell)
+Void rgSCHDrxCellDel (cell)
RgSchCellCb *cell;
#endif
{
Inst instIdx = cell->instIdx;
- TRC2(rgSCHCfgRgrCellDel);
-
-
if (cell->drxCb)
{
/* ccpu00117052 - MOD - Passing double pointer
* @return ROK/RFAILED
*/
#ifdef ANSI
-PUBLIC S16 rgSCHDrxSrInd
+S16 rgSCHDrxSrInd
(
RgSchCellCb *cell,
RgSchUeCb *ue
)
#else
-PUBLIC S16 rgSCHDrxSrInd (cell, ue)
+S16 rgSCHDrxSrInd (cell, ue)
RgSchCellCb *cell;
RgSchUeCb *ue;
#endif
{
RgSchDrxUeCb *drxCb;
- TRC2(rgSCHDrxSrInd);
-
-
#if ( ERRCLASS & ERRCLS_INT_PAR )
if ( cell == (RgSchCellCb* )NULLP)
{
- RETVALUE(ROK);
+ return ROK;
}
if( (ue == (RgSchUeCb* )NULLP))
{
RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,
"rgSCHDrxSrInd():Invalid Params. cell/ue is NULL");
- RETVALUE(RFAILED);
+ return RFAILED;
}
#endif
/* KWork fix - shifted this down */
/* Update UE's inactive mask and if required move UE to ACTIVE state */
RG_SCH_CMN_UL_UPDT_INACTV_MASK( cell, ue, RG_DRX_INACTIVE);
- RETVALUE(ROK);
+ return ROK;
} /* rgSCHDrxSrInd */
* @return Void
*/
#ifdef ANSI
-PUBLIC Void rgSCHDrxDedRa
+Void rgSCHDrxDedRa
(
RgSchCellCb *cellCb,
RgSchUeCb *ueCb
)
#else
-PUBLIC Void rgSCHDrxDedRa (cellCb, ueCb)
+Void rgSCHDrxDedRa (cellCb, ueCb)
RgSchCellCb *cellCb;
RgSchUeCb *ueCb;
#endif
{
RgSchDrxUeCb *drxCb;
- TRC2(rgSCHDrxDedRa);
-
-
drxCb = RG_SCH_DRX_GET_UE(ueCb);
/* Mark the UE as active for UL & DL */
drxCell = cell->drxCb;
drxUe = ueCb->drxCb;
- TRC2(rgSCHDrxMvToNxtOnDurOcc)
if(calcFrmOffst == FALSE)
{
CmLteTimingInfo crntTime; /*!< current SFN & sf */
- TRC2(rgSCHDrxGetNxtTmrExpry);
-
#if ( ERRCLASS & ERRCLS_INT_PAR )
if ( (cell == (RgSchCellCb* )NULLP)
||
(tmrExpryIdx == (CmLteTimingInfo* )NULLP)
)
{
- RETVALUE(RFAILED);
+ return RFAILED;
}
#endif
tmrExpryIdx->sfn = tmrExpryIdx->sfn - (RG_SCH_CMN_MAX_SFN_NUM + 1);
}
- RETVALUE(ROK);
+ return ROK;
}/*rgSCHDrxGetNxtTmrExpry*/
/** @brief This function calculates the next onDuration Occurence
CmLteTimingInfo tmrExpry;
U16 tmrExpryInSf; /*timer expry in no of subframes*/
- TRC2(rgSCHDrxCalcNxtTmrExpry)
-
curTimeInSf = cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G +
cell->crntTime.slot;
*
**********************************************************/
#ifdef ANSI
-PUBLIC S16 rgSCHCfgVldtTddDrxCycCfg
+S16 rgSCHCfgVldtTddDrxCycCfg
(
RgSchCellCb *cell,
U16 drxCycle,
U16 offSet
)
#else
-PUBLIC S16 rgSCHCfgVldtTddDrxCycCfg(cell, drxCycle, onDurTmr, offSet)
+S16 rgSCHCfgVldtTddDrxCycCfg(cell, drxCycle, onDurTmr, offSet)
RgSchCellCb *cell;
U16 drxCycle;
U8 onDurTmr;
U16 startTime;
U16 endTimeInSf;
CmLteTimingInfo endTime;
- TRC2(rgSCHCfgVldtTddDrxCycCfg)
startTime = offSet;
do
if(((RGSCH_MAX_SUBFRM_5G + endTimeInSf- startTime) % RGSCH_MAX_SUBFRM_5G) >=
drxCycle)
{
- RETVALUE(RFAILED);
+ return RFAILED;
}
startTime = (startTime + drxCycle);
}while((drxCycle % RGSCH_NUM_SUB_FRAMES) &&
(startTime < (drxCycle * RGSCH_NUM_SUB_FRAMES/2)));
- RETVALUE(ROK);
+ return ROK;
}
#endif /*LTE_TDD */
RgSchCmnCell *cellSch = NULLP;
Bool delInUlScan = FALSE;
- TRC2(rgSCHDrxTtiHdlOnDurUl)
-
drxCell = (cell->drxCb);
delInUlScan = drxCell->delInUlScan;
/***********************************************************
* in the onDurationTmrExprQ. If !delInUlScan, then calculate the next
* OnDuration occurence, q it there and remove it from the current location.
*/
- TRC2(rgSCHDrxTtiHdlOnDurDl)
/***********************************************************
* Scanning OnDurationQ in DL
***********************************************************/
U8 cellIdx;
U32 dlInactvMask;
- TRC2(rgSCHDrxTtiHdlDlHarqRTT);
-
drxCell = cell->drxCb;
delInUlScan = drxCell->delInUlScan;
U32 ulInactvMask;
- TRC2(rgSCHDrxTtiHdlUlHarqRTT);
-
drxCell = cell->drxCb;
delInUlScan = drxCell->delInUlScan;
Code Review / o-du / l2.git / blobdiff