X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Frg_sch_sc1.c;h=c06896ab1f82c14039f4c7a3397bb78bcd1abda7;hb=65443172dd60a6ea312bd3a15959dbf54ad7f045;hp=d2e56d89f9ee868dedbfb4610304ee5f4da8de87;hpb=5ea4c59cb4dd37164953218b0bd355284e11d22c;p=o-du%2Fl2.git diff --git a/src/5gnrsch/rg_sch_sc1.c b/src/5gnrsch/rg_sch_sc1.c index d2e56d89f..c06896ab1 100755 --- a/src/5gnrsch/rg_sch_sc1.c +++ b/src/5gnrsch/rg_sch_sc1.c @@ -37,16 +37,7 @@ static int RLOG_MODULE_ID=4096; static int RLOG_FILE_ID=173; /* 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" @@ -61,15 +52,6 @@ static int RLOG_FILE_ID=173; #include "rl_common.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 */ @@ -87,7 +69,7 @@ extern "C" { #endif /* __cplusplus */ /* Functions called from outside */ -PRIVATE S16 rgSCHSc1RgrDlCellRecfg ARGS(( +static S16 rgSCHSc1RgrDlCellRecfg ARGS(( RgSchCellCb *cell, RgrCellRecfg *recfg, RgSchErrInfo *err @@ -96,76 +78,76 @@ RgSchErrInfo *err /*--------------------------* * DL SCHED STATIC declarations START *---------------------------*/ -PRIVATE Void rgSCHSc1DlSvcAddToSchd ARGS(( +static Void rgSCHSc1DlSvcAddToSchd ARGS(( RgSchCellCb *cell, RgSchDlLcCb *svc )); -PRIVATE Void rgSCHSc1DlAdd2UeSchdSvcs ARGS(( +static Void rgSCHSc1DlAdd2UeSchdSvcs ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlLcCb *svc )); -PRIVATE Void rgSCHSc1DlRmvUeFrmPrioQs ARGS(( +static Void rgSCHSc1DlRmvUeFrmPrioQs ARGS(( RgSchCellCb *cell, RgSchUeCb *ue )); -PRIVATE Void rgSCHSc1DlSuspendUe ARGS(( +static Void rgSCHSc1DlSuspendUe ARGS(( RgSchCellCb *cell, RgSchUeCb *ue )); -PRIVATE Void rgSCHSc1DlInactvtUe ARGS(( +static Void rgSCHSc1DlInactvtUe ARGS(( RgSchCellCb *cell, RgSchUeCb *ue )); -PRIVATE Void rgSCHSc1DlProcRmvFrmCellRetx ARGS(( +static Void rgSCHSc1DlProcRmvFrmCellRetx ARGS(( RgSchCellCb *cell, RgSchDlHqProcCb *hqP )); -PRIVATE Void rgSCHSc1DlProcRmvFrmUeRetx ARGS(( +static Void rgSCHSc1DlProcRmvFrmUeRetx ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlHqProcCb *hqP )); -PRIVATE Void rgSCHSc1DlMngPrio0SvcPosn ARGS(( +static Void rgSCHSc1DlMngPrio0SvcPosn ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlLcCb *svc )); -PRIVATE Void rgSCHSc1DlMngGbrSvcPosn ARGS(( +static Void rgSCHSc1DlMngGbrSvcPosn ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlLcCb *svc )); -PRIVATE Void rgSCHSc1DlMngAmbrSvcPosn ARGS(( +static Void rgSCHSc1DlMngAmbrSvcPosn ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlLcCb *svc )); -PRIVATE Void rgSCHSc1DlMngSvcPosn ARGS(( +static Void rgSCHSc1DlMngSvcPosn ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlLcCb *svc )); -PRIVATE Void rgSCHSc1DlUeAddToSchd ARGS(( +static Void rgSCHSc1DlUeAddToSchd ARGS(( RgSchCellCb *cell, RgSchUeCb *ue )); -PRIVATE Void rgSCHSc1DlTaCmd ARGS(( +static Void rgSCHSc1DlTaCmd ARGS(( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo )); -PRIVATE Void rgSCHSc1DlInitQueues ARGS(( +static Void rgSCHSc1DlInitQueues ARGS(( RgSchSc1DlCell *cellDl )); -PRIVATE Void rgSCHSc1DlDeinitQueues ARGS(( +static Void rgSCHSc1DlDeinitQueues ARGS(( RgSchSc1DlCell *cellDl )); -PRIVATE Void rgSCHSc1DlAdd2UeLcsWithData ARGS(( +static Void rgSCHSc1DlAdd2UeLcsWithData ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlLcCb *svc )); -PRIVATE Void rgSCHSc1DlRmFrmUeLcsWithData ARGS(( +static Void rgSCHSc1DlRmFrmUeLcsWithData ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlLcCb *svc @@ -173,33 +155,33 @@ RgSchDlLcCb *svc /*--------------------------* * UL SCHED STATIC declarations START *---------------------------*/ -PRIVATE Void rgSCHSc1UlPosnUeInQ ARGS(( +static Void rgSCHSc1UlPosnUeInQ ARGS(( RgSchCellCb *cell, RgSchUeCb *ue )); -PRIVATE Void rgSCHSc1UlSchdUeTxLst ARGS(( +static Void rgSCHSc1UlSchdUeTxLst ARGS(( RgSchCellCb *cell, CmLListCp *ueTxLst, RgSchCmnUlRbAllocInfo *allocInfo, -U8 *remUe +uint8_t *remUe )); -PRIVATE Void rgSCHSc1DlProcRmvFrmRetx ARGS(( +static Void rgSCHSc1DlProcRmvFrmRetx ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlHqProcCb *hqP )); -PUBLIC Void rgSCHSc1DlScanUpdPdbPrio ARGS(( +Void rgSCHSc1DlScanUpdPdbPrio ARGS(( RgSchCellCb *cell )); -PUBLIC S16 rgSCHSc1DlFillFlowCntrlInfo ARGS(( +S16 rgSCHSc1DlFillFlowCntrlInfo ARGS(( RgSchCellCb *cell, RgInfSfAlloc *sfAlloc )); -PRIVATE Void rgSCHSc1DlPreSchd ARGS (( +static Void rgSCHSc1DlPreSchd ARGS (( RgSchCellCb *cell )); -PRIVATE Void rgSCHSc1DlPstSchd ARGS (( +static Void rgSCHSc1DlPstSchd ARGS (( Inst schInst )); #ifdef __cplusplus @@ -227,22 +209,21 @@ PRIVATE Void rgSCHSc1DlPstSchd ARGS (( * **********************************************************/ #ifdef ANSI -PUBLIC Void rgSCHSc1DlUeReset +Void rgSCHSc1DlUeReset ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PUBLIC Void rgSCHSc1DlUeReset(cell, ue) +Void rgSCHSc1DlUeReset(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif { - TRC2(rgSCHSc1DlUeReset); rgSCHSc1DlSuspendUe(cell, ue); - RETVOID; + return; } @@ -262,13 +243,13 @@ RgSchUeCb *ue; * **********************************************************/ #ifdef ANSI -PUBLIC Void rgSCHSc1DlActvtUe +Void rgSCHSc1DlActvtUe ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PUBLIC Void rgSCHSc1DlActvtUe(cell, ue) +Void rgSCHSc1DlActvtUe(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif @@ -278,8 +259,7 @@ RgSchUeCb *ue; CmLList *node; RgSchDlHqProcCb *hqP; RgSchDlLcCb *svc; - U8 idx; - TRC2(rgSCHSc1DlActvtUe); + uint8_t idx; /* Add UE's HqProcs From UERetxLst to CellRetxLst */ lst = &ueDl->retxHqProcs; @@ -309,7 +289,7 @@ RgSchUeCb *ue; rgSCHSc1DlUeAddToSchd(cell, ue); } - RETVOID; + return; } @@ -329,13 +309,13 @@ RgSchUeCb *ue; * **********************************************************/ #ifdef ANSI -PUBLIC Void rgSCHSc1DlUeRefresh +Void rgSCHSc1DlUeRefresh ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PUBLIC Void rgSCHSc1DlUeRefresh(cell, ue) +Void rgSCHSc1DlUeRefresh(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif @@ -347,7 +327,6 @@ RgSchUeCb *ue; CmLListCp *lst; CmLList *node; RgSchDlLcCb *svc; - TRC2(rgSCHSc1DlUeRefresh); if (ue->dl.ambrCfgd) { @@ -378,7 +357,7 @@ RgSchUeCb *ue; /* Update the SVC's positioning in the Queue */ rgSCHSc1DlMngGbrSvcPosn(cell, ue, svc); } - RETVOID; + return; } @@ -401,13 +380,13 @@ RgSchUeCb *ue; * **/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlProcRmvFrmCellRetx +static Void rgSCHSc1DlProcRmvFrmCellRetx ( RgSchCellCb *cell, RgSchDlHqProcCb *hqP ) #else -PRIVATE Void rgSCHSc1DlProcRmvFrmCellRetx(cell, hqP) +static Void rgSCHSc1DlProcRmvFrmCellRetx(cell, hqP) RgSchCellCb *cell; RgSchDlHqProcCb *hqP; #endif @@ -415,7 +394,6 @@ RgSchDlHqProcCb *hqP; RgSchSc1DlCell *cellDl = RG_GET_SC1_CELL_DL(cell); RgSchCmnDlHqProc *hqProcDl = RG_SCH_CMN_GET_DL_HQP(hqP); - TRC2(rgSCHSc1DlProcRmvFrmCellRetx); if (hqProcDl->retxLnk.node != NULLP) { @@ -423,7 +401,7 @@ RgSchDlHqProcCb *hqP; (hqProcDl->schSpfc))->prio], &(hqProcDl->retxLnk)); hqProcDl->retxLnk.node = NULLP; } - RETVOID; + return; } @@ -444,14 +422,14 @@ RgSchDlHqProcCb *hqP; * **/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlProcRmvFrmUeRetx +static Void rgSCHSc1DlProcRmvFrmUeRetx ( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlHqProcCb *hqP ) #else -PRIVATE Void rgSCHSc1DlProcRmvFrmUeRetx(cell, ue, hqP) +static Void rgSCHSc1DlProcRmvFrmUeRetx(cell, ue, hqP) RgSchCellCb *cell; RgSchUeCb *ue; RgSchDlHqProcCb *hqP; @@ -460,7 +438,6 @@ RgSchDlHqProcCb *hqP; RgSchSc1DlUe *sc1Ue = RG_GET_SC1_UE_DL(ue, cell); RgSchSc1DlHqProc *hqProcDl = RG_GET_SC1_HQP_DL(hqP); - TRC2(rgSCHSc1DlProcRmvFrmUeRetx); if (hqProcDl->retxLnkUe.node != NULLP) { @@ -468,7 +445,7 @@ RgSchDlHqProcCb *hqP; &(hqProcDl->retxLnkUe)); hqProcDl->retxLnkUe.node = NULLP; } - RETVOID; + return; } @@ -490,14 +467,14 @@ RgSchDlHqProcCb *hqP; * **/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlProcAddToUeRetx +static Void rgSCHSc1DlProcAddToUeRetx ( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlHqProcCb *hqP ) #else -PRIVATE Void rgSCHSc1DlProcAddToUeRetx(cell, ue, hqP) +static Void rgSCHSc1DlProcAddToUeRetx(cell, ue, hqP) RgSchCellCb *cell; RgSchUeCb *ue; RgSchDlHqProcCb *hqP; @@ -506,12 +483,11 @@ RgSchDlHqProcCb *hqP; RgSchSc1DlUe *sc1Ue = RG_GET_SC1_UE_DL(ue, cell); RgSchSc1DlHqProc *cmnHqDl = RG_GET_SC1_HQP_DL(hqP); - TRC2(rgSCHSc1DlProcAddToUeRetx); cmLListAdd2Tail(&sc1Ue->retxHqProcs, &(cmnHqDl->retxLnkUe)); cmnHqDl->retxLnkUe.node = (PTR)hqP; - RETVOID; + return; } @@ -533,13 +509,13 @@ RgSchDlHqProcCb *hqP; * **/ #ifdef ANSI -PUBLIC Void rgSCHSc1DlProcAddToCellRetx +Void rgSCHSc1DlProcAddToCellRetx ( RgSchCellCb *cell, RgSchDlHqProcCb *hqP ) #else -PUBLIC Void rgSCHSc1DlProcAddToCellRetx(cell, hqP) +Void rgSCHSc1DlProcAddToCellRetx(cell, hqP) RgSchCellCb *cell; RgSchDlHqProcCb *hqP; #endif @@ -547,17 +523,16 @@ RgSchDlHqProcCb *hqP; RgSchSc1DlCell *sc1CellDl = RG_GET_SC1_CELL_DL(cell); RgSchCmnDlHqProc *cmnHqDl = RG_SCH_CMN_GET_DL_HQP(hqP); - TRC2(rgSCHSc1DlProcAddToCellRetx); if (!RG_SCH_CMN_DL_IS_UE_ACTIVE(hqP->hqE->ue)) { rgSCHSc1DlProcAddToUeRetx(cell, hqP->hqE->ue, hqP); - RETVOID; + return; } cmLListAdd2Tail(&sc1CellDl->retxLst[((RgSchSc1DlHqProc *)\ (cmnHqDl->schSpfc))->prio], &(cmnHqDl->retxLnk)); cmnHqDl->retxLnk.node = (PTR)hqP; - RETVOID; + return; } @@ -579,20 +554,20 @@ RgSchDlHqProcCb *hqP; * **/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlRetxAlloc +static Void rgSCHSc1DlRetxAlloc ( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchCmnDlRbAllocInfo *allocInfo ) #else -PRIVATE Void rgSCHSc1DlRetxAlloc(cell, subFrm, allocInfo) +static Void rgSCHSc1DlRetxAlloc(cell, subFrm, allocInfo) RgSchCellCb *cell; RgSchDlSf *subFrm; RgSchCmnDlRbAllocInfo *allocInfo; #endif { - U8 i; + uint8_t i; CmLListCp *retxLst; CmLList *node; RgSchDlHqProcCb *hqP; @@ -602,13 +577,12 @@ RgSchCmnDlRbAllocInfo *allocInfo; #if (defined(LTEMAC_SPS) || (!defined(LTE_TDD))) CmLteTimingInfo schdTime; #endif - U32 effBo; + uint32_t effBo; RgSchUeCb *ue = NULLP; #ifdef LTEMAC_HDFDD Bool dlAllowed = FALSE; #endif RgSchDlRbAlloc *dlAllocCb; - TRC2(rgSCHSc1DlRetxAlloc); sc1CellDl = RG_GET_SC1_CELL_DL(cell); #if (defined(LTEMAC_SPS) || (!defined(LTE_TDD))) @@ -682,7 +656,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; ROK) { /* SF/RETX Bandwidth expired */ - RETVOID; + return; } if (effBo == 0) { @@ -693,7 +667,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; && (hqP->tbInfo[1].state == HQ_TB_ACKED)) { rgSCHSc1DlProcRmvFrmCellRetx(cell, hqP); - RETVOID; + return; } cmnUeDl->proc = hqP; @@ -701,7 +675,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; /*rgSCHCmnDlRbInfoAddUeRetx(allocInfo, ue);*/ } } - RETVOID; + return; } /*********************************************************** @@ -718,18 +692,17 @@ RgSchCmnDlRbAllocInfo *allocInfo; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHSc1RlsHqProc +static Void rgSCHSc1RlsHqProc ( RgSchDlHqProcCb *hqProc ) #else -PRIVATE Void rgSCHSc1RlsHqProc(hqProc) +static Void rgSCHSc1RlsHqProc(hqProc) RgSchDlHqProcCb *hqProc; #endif { - TRC2(rgSCHSc1RlsHqProc) rgSCHDhmRlsHqProc(hqProc); - RETVOID; + return; } /** @@ -746,33 +719,33 @@ RgSchDlHqProcCb *hqProc; * @param[in] RgSchCellCb *cell * @param[in] RgSchDlSf *subFrm * @param[in] RgSchDlLcCb *svc - * @param[in] U32 bo + * @param[in] uint32_t bo * @param[in] RgSchCmnDlRbAllocInfo *allocInfo * @return S16 * **/ #ifdef ANSI -PRIVATE S16 rgSCHSc1DlDedSvcAlloc +static S16 rgSCHSc1DlDedSvcAlloc ( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchDlLcCb *svc, -U32 bo, +uint32_t bo, RgSchCmnDlRbAllocInfo *allocInfo ) #else -PRIVATE S16 rgSCHSc1DlDedSvcAlloc(cell, subFrm, svc, bo, allocInfo) +static S16 rgSCHSc1DlDedSvcAlloc(cell, subFrm, svc, bo, allocInfo) RgSchCellCb *cell; RgSchDlSf *subFrm; RgSchDlLcCb *svc; -U32 bo; +uint32_t bo; RgSchCmnDlRbAllocInfo *allocInfo; #endif { RgSchUeCb *ue; RgSchDlHqProcCb *proc; - U16 rlcHdrEstmt; - U32 effBo; + uint16_t rlcHdrEstmt; + uint32_t effBo; RgSchCmnDlCell *cmnCellDl = RG_SCH_CMN_GET_DL_CELL(cell); RgSchCmnDlSvc *svcCmn = RG_SCH_CMN_GET_DL_SVC(svc); RgSchSc1DlSvc *svcSc1; @@ -787,7 +760,6 @@ RgSchCmnDlRbAllocInfo *allocInfo; #endif S16 ret; - TRC2(rgSCHSc1DlDedSvcAlloc); /* Get the UE to which this service belongs to */ ue = svc->ue; @@ -797,7 +769,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; rgSCHCmnHdFddChkDlAllow ( cell, ue, &dlAllowed); if (dlAllowed == FALSE) { - RETVALUE(ROK); + return ROK; } } #endif @@ -811,7 +783,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; RGSCH_INCR_SUB_FRAME(schdTime, RG_SCH_CMN_DL_DELTA); if (RG_SCH_CMN_IS_UE_SPS_SCHDLD(ue, cell, schdTime)) { - RETVALUE(ROK); + return ROK; } #endif if (RG_SCH_CMN_IS_UE_SCHDLD(ue, cell)) @@ -823,7 +795,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"CRNTI:%d rgSCHSc1DlDedSvcAlloc():" "Ue retransmitting",ue->ueId); - RETVALUE(ROK); + return ROK; } /* UE is scheduled for either other services or TA */ sc1HqDl = RG_GET_SC1_HQP_DL(proc); @@ -839,7 +811,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "CRNTI:%d rgSCHSc1DlDedSvcAlloc():" " No HARQ Proc available", ue->ueId); - RETVALUE(ROK); + return ROK; } sc1HqDl = RG_GET_SC1_HQP_DL(proc); cmnHqDl = RG_SCH_CMN_GET_DL_HQP(proc); @@ -872,7 +844,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; /* ccpu00126519: proc should be set to NULLP in UE's DL scratch pad info as well. */ ueDl->proc = NULLP; } - RETVALUE(ret); + return (ret); } svcSc1 = RG_GET_SC1_SVC_DL(ue,svc,cell); svcSc1->hdrEstimate = rlcHdrEstmt; @@ -883,7 +855,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; rgSCHSc1DlAdd2UeSchdSvcs(cell, ue, svc); /* 3.1 MIMO moving this call to cmn scheduler */ /*rgSCHCmnDlRbInfoAddUeTx(allocInfo, ue); */ - RETVALUE(ROK); + return ROK; } /** @@ -902,14 +874,14 @@ RgSchCmnDlRbAllocInfo *allocInfo; * **/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlAdd2UeSchdSvcs +static Void rgSCHSc1DlAdd2UeSchdSvcs ( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlLcCb *svc ) #else -PRIVATE Void rgSCHSc1DlAdd2UeSchdSvcs(cell, ue, svc) +static Void rgSCHSc1DlAdd2UeSchdSvcs(cell, ue, svc) RgSchCellCb *cell; RgSchUeCb *ue; RgSchDlLcCb *svc; @@ -917,12 +889,11 @@ RgSchDlLcCb *svc; { RgSchSc1DlSvc *svcSc1 = RG_GET_SC1_SVC_DL(ue,svc,cell); RgSchSc1DlUe *ueSc1 = RG_GET_SC1_UE_DL(ue, cell); - TRC2(rgSCHSc1DlAdd2UeSchdSvcs); /* checking SVC's presence in this lst is unnecessary */ cmLListAdd2Tail(&ueSc1->schdSvcs, &svcSc1->schdSvcLnk); svcSc1->schdSvcLnk.node = (PTR)svc; - RETVOID; + return; } @@ -952,14 +923,14 @@ RgSchDlLcCb *svc; * **/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlDedTx +static Void rgSCHSc1DlDedTx ( RgSchCellCb *cell, RgSchDlSf *subFrm, RgSchCmnDlRbAllocInfo *allocInfo ) #else -PRIVATE Void rgSCHSc1DlDedTx(cell, subFrm, allocInfo) +static Void rgSCHSc1DlDedTx(cell, subFrm, allocInfo) RgSchCellCb *cell; RgSchDlSf *subFrm; RgSchCmnDlRbAllocInfo *allocInfo; @@ -969,12 +940,11 @@ RgSchCmnDlRbAllocInfo *allocInfo; CmLList *node; RgSchUeCb *ue = NULLP; RgSchDlLcCb *svc; - U8 i; + uint8_t i; RgSchSc1DlSvc *svcSc1; RgSchSc1DlUe *ueDl; RgSchSc1DlCell *sc1CellDl = RG_GET_SC1_CELL_DL(cell); - TRC2(rgSCHSc1DlDedTx); /* Process the first queue that is for RRC signalling and is of */ /* highest priority. */ @@ -990,7 +960,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; if (rgSCHSc1DlDedSvcAlloc(cell, subFrm, svc, svcSc1->bo, allocInfo) != ROK) { /* sf bw expired */ - RETVOID; + return; } } @@ -1009,7 +979,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; if (rgSCHSc1DlDedSvcAlloc(cell, subFrm, svc, svcSc1->effMbr, allocInfo) != ROK) { /* sf bw expired */ - RETVOID; + return; } } } @@ -1029,11 +999,11 @@ RgSchCmnDlRbAllocInfo *allocInfo; if (rgSCHSc1DlDedSvcAlloc(cell, subFrm, svc, ueDl->effAmbr, allocInfo) != ROK) { /* sf bw expired */ - RETVOID; + return; } } } - RETVOID; + return; } /** @@ -1050,18 +1020,17 @@ RgSchCmnDlRbAllocInfo *allocInfo; * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlPreSchd +static Void rgSCHSc1DlPreSchd ( RgSchCellCb *cell ) #else -PUBLIC Void rgSCHSc1DlPreSchd(cell) +Void rgSCHSc1DlPreSchd(cell) RgSchCellCb *cell; #endif { - TRC2(rgSCHSc1DlPreSchd); - RETVOID; + return; } /** * @brief scheduling for a cell @@ -1077,18 +1046,17 @@ PUBLIC Void rgSCHSc1DlPreSchd(cell) * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlPstSchd +static Void rgSCHSc1DlPstSchd ( Inst schInst ) #else -PUBLIC Void rgSCHSc1DlPstSchd(schInst) +Void rgSCHSc1DlPstSchd(schInst) Inst schInst #endif { - TRC2(rgSCHSc1DlPstSchd); - RETVOID; + return; } @@ -1109,13 +1077,13 @@ PUBLIC Void rgSCHSc1DlPstSchd(schInst) * **/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlDedNewTx +static Void rgSCHSc1DlDedNewTx ( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo ) #else -PRIVATE Void rgSCHSc1DlDedNewTx(cell, allocInfo) +static Void rgSCHSc1DlDedNewTx(cell, allocInfo) RgSchCellCb *cell; RgSchCmnDlRbAllocInfo *allocInfo; #endif @@ -1124,14 +1092,13 @@ RgSchCmnDlRbAllocInfo *allocInfo; #ifdef DEBUGP Inst inst = cell->instIdx; #endif - TRC2(rgSCHSc1DlDedNewTx); RGSCHDBGPRM(inst, (rgSchPBuf(inst), "rgSCHSc1DlDedNewTx\n")); /* Now perform the new UE selections */ rgSCHSc1DlDedTx(cell, subFrm, allocInfo); /* Stack Crash problem for TRACE5 changes. Added the return below */ - RETVOID; + return; } /** @@ -1151,13 +1118,13 @@ RgSchCmnDlRbAllocInfo *allocInfo; * **/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlDedRetx +static Void rgSCHSc1DlDedRetx ( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo ) #else -PRIVATE Void rgSCHSc1DlDedRetx(cell, allocInfo) +static Void rgSCHSc1DlDedRetx(cell, allocInfo) RgSchCellCb *cell; RgSchCmnDlRbAllocInfo *allocInfo; #endif @@ -1166,12 +1133,11 @@ RgSchCmnDlRbAllocInfo *allocInfo; #ifdef DEBUGP Inst inst = cell->instIdx; #endif - TRC2(rgSCHSc1DlDedRetx); RGSCHDBGPRM(inst, (rgSchPBuf(inst), "rgSCHSc1DlDedRetx\n")); rgSCHSc1DlRetxAlloc(cell, subFrm, allocInfo); - RETVOID; + return; } @@ -1194,13 +1160,13 @@ RgSchCmnDlRbAllocInfo *allocInfo; * **/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlSvcAddToSchd +static Void rgSCHSc1DlSvcAddToSchd ( RgSchCellCb *cell, RgSchDlLcCb *svc ) #else -PRIVATE Void rgSCHSc1DlSvcAddToSchd(cell, svc) +static Void rgSCHSc1DlSvcAddToSchd(cell, svc) RgSchCellCb *cell; RgSchDlLcCb *svc; #endif @@ -1213,13 +1179,12 @@ RgSchDlLcCb *svc; RgSchSc1DlCell *sc1CellDl = RG_GET_SC1_CELL_DL(cell); RgSchCmnDlSvc *svcCmn = RG_SCH_CMN_GET_DL_SVC(svc); - TRC2(rgSCHSc1DlSvcAddToSchd); svcSc1 = RG_GET_SC1_SVC_DL(svc->ue,svc,cell); /* The service is already in the scheduler */ if (svcSc1->prioLnk.node != NULLP) { - RETVOID; + return; } /* If the priority = 0, it is the highest priority with infinite */ @@ -1233,7 +1198,7 @@ RgSchDlLcCb *svc; /* If a svc is put in to cell wide priority Qs * then add the same to UE's lcsWithData List */ rgSCHSc1DlAdd2UeLcsWithData(cell, svc->ue, svc); - RETVOID; + return; } /* Handle GBR services. We have them of next importance */ @@ -1241,7 +1206,7 @@ RgSchDlLcCb *svc; if (svcCmn->prio <= RG_SCH_SC1_DL_GBR_PRIO_END) { if (!RG_SC1_SVC_HAS_DATA(svc,cell)) - RETVOID; + return; lst = &(sc1CellDl->prioLst[svcCmn->prio]); node = lst->first; while(node) @@ -1274,7 +1239,7 @@ RgSchDlLcCb *svc; * then add the same to UE's lcsWithData List */ rgSCHSc1DlAdd2UeLcsWithData(cell, svc->ue, svc); } - RETVOID; + return; } @@ -1296,13 +1261,13 @@ RgSchDlLcCb *svc; * **/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlUeRmvFrmSchd +static Void rgSCHSc1DlUeRmvFrmSchd ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PRIVATE Void rgSCHSc1DlUeRmvFrmSchd(cell, ue) +static Void rgSCHSc1DlUeRmvFrmSchd(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif @@ -1311,7 +1276,6 @@ RgSchUeCb *ue; RgSchSc1DlUe *ueDl = RG_GET_SC1_UE_DL(ue, cell); CmLListCp *lst; - TRC2(rgSCHSc1DlUeRmvFrmSchd); lst = &cellDl->prioLst[ueDl->prio]; if (ueDl->prioLnk.node != NULLP) @@ -1322,7 +1286,7 @@ RgSchUeCb *ue; * then remove the same from UE's lcsWithData List */ rgSCHSc1DlRmFrmUeLcsWithData(cell, ue, ueDl->ambrSvc); } - RETVOID; + return; } @@ -1342,14 +1306,14 @@ RgSchUeCb *ue; * **/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlSvcRmvFrmUeAmbrLst +static Void rgSCHSc1DlSvcRmvFrmUeAmbrLst ( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlLcCb *svc ) #else -PRIVATE Void rgSCHSc1DlSvcRmvFrmUeAmbrLst(cell, ue, svc) +static Void rgSCHSc1DlSvcRmvFrmUeAmbrLst(cell, ue, svc) RgSchCellCb *cell; RgSchUeCb *ue; RgSchDlLcCb *svc; @@ -1359,15 +1323,13 @@ RgSchDlLcCb *svc; RgSchSc1DlSvc *svcSc1 = RG_GET_SC1_SVC_DL(ue,svc,cell); CmLListCp *lst; - TRC2(rgSCHSc1DlSvcRmvFrmUeAmbrLst); - lst = &ueDl->ambrLst; if (svcSc1->prioLnk.node != NULLP) { cmLListDelFrm(lst, &svcSc1->prioLnk); svcSc1->prioLnk.node = (PTR)NULLP; } - RETVOID; + return; } @@ -1387,14 +1349,14 @@ RgSchDlLcCb *svc; * **/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlSvcAddToUeAmbrLst +static Void rgSCHSc1DlSvcAddToUeAmbrLst ( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlLcCb *svc ) #else -PRIVATE Void rgSCHSc1DlSvcAddToUeAmbrLst(cell, ue, svc) +static Void rgSCHSc1DlSvcAddToUeAmbrLst(cell, ue, svc) RgSchCellCb *cell; RgSchUeCb *ue; RgSchDlLcCb *svc; @@ -1406,11 +1368,10 @@ RgSchDlLcCb *svc; RgSchSc1DlSvc *svcSc1 = RG_GET_SC1_SVC_DL(ue,svc,cell); RgSchCmnDlSvc *svcCmn = RG_SCH_CMN_GET_DL_SVC(svc); - TRC2(rgSCHSc1DlSvcAddToUeAmbrLst); /* If svc already present in AMBR List return */ if (svcSc1->prioLnk.node != NULLP) - RETVOID; + return; node = ueDl->ambrLst.first; while(node) @@ -1434,7 +1395,7 @@ RgSchDlLcCb *svc; svcSc1->prioLnk.node = (PTR)svc; } - RETVOID; + return; } @@ -1454,13 +1415,13 @@ RgSchDlLcCb *svc; * **/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlSvcRmvFrmSchd +static Void rgSCHSc1DlSvcRmvFrmSchd ( RgSchCellCb *cell, RgSchDlLcCb *svc ) #else -PRIVATE Void rgSCHSc1DlSvcRmvFrmSchd(cell, svc) +static Void rgSCHSc1DlSvcRmvFrmSchd(cell, svc) RgSchCellCb *cell; RgSchDlLcCb *svc; #endif @@ -1470,7 +1431,6 @@ RgSchDlLcCb *svc; RgSchCmnDlSvc *svcCmn = RG_SCH_CMN_GET_DL_SVC(svc); CmLListCp *lst; - TRC2(rgSCHSc1DlSvcRmvFrmSchd); lst = &(cellDl->prioLst[svcCmn->prio]); if (svcDl->prioLnk.node != NULLP) @@ -1481,7 +1441,7 @@ RgSchDlLcCb *svc; * then remove the same from UE's lcsWithData List */ rgSCHSc1DlRmFrmUeLcsWithData(cell, svc->ue, svc); } - RETVOID; + return; } @@ -1503,7 +1463,7 @@ RgSchDlLcCb *svc; * **/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlSvcAdd +static Void rgSCHSc1DlSvcAdd ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -1511,7 +1471,7 @@ RgSchDlLcCb *svc, RgrDlLchCfg *cfg ) #else -PRIVATE Void rgSCHSc1DlSvcAdd(cell, ue, svc, cfg) +static Void rgSCHSc1DlSvcAdd(cell, ue, svc, cfg) RgSchCellCb *cell; RgSchUeCb *ue; RgSchDlLcCb *svc; @@ -1521,7 +1481,6 @@ RgrDlLchCfg *cfg; RgSchSc1DlUe *ueDl = RG_GET_SC1_UE_DL(ue, cell); RgSchSc1DlSvc *svcSc1 = RG_GET_SC1_SVC_DL(ue,svc,cell); RgSchCmnDlSvc *svcCmn = RG_SCH_CMN_GET_DL_SVC(svc); - TRC2(rgSCHSc1DlSvcAdd); UNUSED(cfg); @@ -1532,7 +1491,7 @@ RgrDlLchCfg *cfg; cmLListAdd2Tail(&ueDl->gbrSvcs, &svcSc1->gbrLnk); svcSc1->gbrLnk.node = (PTR)svc; } - RETVOID; + return; } @@ -1554,14 +1513,14 @@ RgrDlLchCfg *cfg; * **/ #ifdef ANSI -PUBLIC Void rgSCHSc1DlLcRmv +Void rgSCHSc1DlLcRmv ( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlLcCb *svc ) #else -PUBLIC Void rgSCHSc1DlLcRmv(cell, ue, svc) +Void rgSCHSc1DlLcRmv(cell, ue, svc) RgSchCellCb *cell; RgSchUeCb *ue; RgSchDlLcCb *svc; @@ -1571,11 +1530,10 @@ RgSchDlLcCb *svc; RgSchSc1DlSvc *svcSc1 = RG_GET_SC1_SVC_DL(ue,svc,cell); RgSchCmnDlSvc *svcCmn = RG_SCH_CMN_GET_DL_SVC(svc); - TRC2(rgSCHSc1DlLcRmv); if (svcSc1 == NULLP) { - RETVOID; + return; } ueDl = RG_GET_SC1_UE_DL(ue, cell); @@ -1618,7 +1576,7 @@ RgSchDlLcCb *svc; for proper NULLP assignment*/ rgSCHUtlFreeSBuf(cell->instIdx, (Data**)(&(RG_SCH_CMN_GET_LC_SCH_SPFC(ue,svc,cell))), (sizeof(RgSchSc1DlSvc))); - RETVOID; + return; } /** @@ -1638,7 +1596,7 @@ RgSchDlLcCb *svc; * **/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlSvcMod +static Void rgSCHSc1DlSvcMod ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -1646,7 +1604,7 @@ RgSchDlLcCb *svc, RgrLchRecfg *recfg ) #else -PRIVATE Void rgSCHSc1DlSvcMod(cell,ue,svc, recfg) +static Void rgSCHSc1DlSvcMod(cell,ue,svc, recfg) RgSchCellCb *cell; RgSchUeCb *ue; RgSchDlLcCb *svc; @@ -1655,7 +1613,6 @@ RgrLchRecfg *recfg; { RgSchSc1DlSvc *svcSc1 = RG_GET_SC1_SVC_DL(ue,svc,cell); RgSchCmnDlSvc *svcCmn = RG_SCH_CMN_GET_DL_SVC(svc); - TRC2(rgSCHSc1DlSvcMod); if (RG_SCH_CMN_SVC_IS_GBR(svc)) { @@ -1663,7 +1620,7 @@ RgrLchRecfg *recfg; svcSc1->gbr = svcCmn->gbr; svcSc1->mbr = svcCmn->mbr; } - RETVOID; + return; } /** @@ -1683,13 +1640,13 @@ RgrLchRecfg *recfg; * **/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlUeAddToSchd +static Void rgSCHSc1DlUeAddToSchd ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PRIVATE Void rgSCHSc1DlUeAddToSchd(cell, ue) +static Void rgSCHSc1DlUeAddToSchd(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif @@ -1700,7 +1657,6 @@ RgSchUeCb *ue; CmLList *node; CmLListCp *lst; RgSchUeCb *nodeUe = NULLP; - TRC2(rgSCHSc1DlUeAddToSchd); ueDl->prio = ((RgSchCmnDlSvc *)(ueDl->ambrSvc->sch))->prio; lst = &cellDl->prioLst[ueDl->prio]; @@ -1737,7 +1693,7 @@ RgSchUeCb *ue; /* If a svc is put in to cell wide priority Qs * then add the same to UE's lcsWithData List */ rgSCHSc1DlAdd2UeLcsWithData(cell, ue, ueDl->ambrSvc); - RETVOID; + return; } @@ -1759,14 +1715,14 @@ RgSchUeCb *ue; * **/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlMngAmbrSvcPosn +static Void rgSCHSc1DlMngAmbrSvcPosn ( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlLcCb *svc ) #else -PRIVATE Void rgSCHSc1DlMngAmbrSvcPosn(cell, ue, svc) +static Void rgSCHSc1DlMngAmbrSvcPosn(cell, ue, svc) RgSchCellCb *cell; RgSchUeCb *ue; RgSchDlLcCb *svc; @@ -1775,8 +1731,6 @@ RgSchDlLcCb *svc; RgSchSc1DlUe *ueDl = RG_GET_SC1_UE_DL(ue, cell); RgSchSc1DlSvc *svcSc1 = RG_GET_SC1_SVC_DL(ue,svc,cell); - TRC2(rgSCHSc1DlMngAmbrSvcPosn); - if (svcSc1->bo == 0) { if (ueDl->ambrSvc == svc) @@ -1816,7 +1770,7 @@ RgSchDlLcCb *svc; rgSCHSc1DlUeRmvFrmSchd(cell, ue); } } - RETVOID; + return; } rgSCHSc1DlSvcAddToUeAmbrLst(cell, ue, svc); /* Current ambr svc is always the first node of ambrLst.*/ @@ -1837,7 +1791,7 @@ RgSchDlLcCb *svc; } } } - RETVOID; + return; } @@ -1859,35 +1813,34 @@ RgSchDlLcCb *svc; * **/ #ifdef ANSI -PUBLIC Void rgSCHSc1DlLcBoUpd +Void rgSCHSc1DlLcBoUpd ( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlLcCb *svc ) #else -PUBLIC Void rgSCHSc1DlLcBoUpd(cell, ue, svc) +Void rgSCHSc1DlLcBoUpd(cell, ue, svc) RgSchCellCb *cell; RgSchUeCb *ue; RgSchDlLcCb *svc; #endif { RgSchSc1DlSvc *svcSc1 = RG_GET_SC1_SVC_DL(ue,svc,cell); - TRC2(rgSCHSc1DlLcBoUpd); if (svcSc1->bo == svc->bo) { - RETVOID; + return; } svcSc1->bo = svc->bo; if (!RG_SCH_CMN_DL_IS_UE_ACTIVE(ue)) { - RETVOID; + return; } rgSCHSc1DlMngSvcPosn(cell, ue, svc); /* Stack Crash problem for TRACE5 changes. Added the return below */ - RETVOID; + return; } @@ -1912,21 +1865,20 @@ RgSchDlLcCb *svc; * **/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlMngPrio0SvcPosn +static Void rgSCHSc1DlMngPrio0SvcPosn ( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlLcCb *svc ) #else -PRIVATE Void rgSCHSc1DlMngPrio0SvcPosn(cell, ue, svc) +static Void rgSCHSc1DlMngPrio0SvcPosn(cell, ue, svc) RgSchCellCb *cell; RgSchUeCb *ue; RgSchDlLcCb *svc; #endif { RgSchSc1DlSvc *svcSc1 = RG_GET_SC1_SVC_DL(ue,svc,cell); - TRC2(rgSCHSc1DlMngPrio0SvcPosn); /* In this priority, we just add or remove to the queue */ if (svcSc1->bo > 0) @@ -1937,7 +1889,7 @@ RgSchDlLcCb *svc; { rgSCHSc1DlSvcRmvFrmSchd(cell, svc); } - RETVOID; + return; } @@ -1961,21 +1913,20 @@ RgSchDlLcCb *svc; * **/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlMngGbrSvcPosn +static Void rgSCHSc1DlMngGbrSvcPosn ( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlLcCb *svc ) #else -PRIVATE Void rgSCHSc1DlMngGbrSvcPosn(cell, ue, svc) +static Void rgSCHSc1DlMngGbrSvcPosn(cell, ue, svc) RgSchCellCb *cell; RgSchUeCb *ue; RgSchDlLcCb *svc; #endif { RgSchSc1DlSvc *svcSc1 = RG_GET_SC1_SVC_DL(ue,svc,cell); - TRC2(rgSCHSc1DlMngGbrSvcPosn); /* Handle a GBR service. */ svcSc1->effGbr = RGSCH_MIN(svcSc1->bo, svcSc1->gbr); @@ -1983,7 +1934,7 @@ RgSchDlLcCb *svc; /* Adjust the SVC priority within the queue */ rgSCHSc1DlSvcRmvFrmSchd(cell, svc); rgSCHSc1DlSvcAddToSchd(cell, svc); - RETVOID; + return; } @@ -2007,14 +1958,14 @@ RgSchDlLcCb *svc; * **/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlMngSvcPosn +static Void rgSCHSc1DlMngSvcPosn ( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlLcCb *svc ) #else -PRIVATE Void rgSCHSc1DlMngSvcPosn(cell, ue, svc) +static Void rgSCHSc1DlMngSvcPosn(cell, ue, svc) RgSchCellCb *cell; RgSchUeCb *ue; RgSchDlLcCb *svc; @@ -2022,10 +1973,9 @@ RgSchDlLcCb *svc; { RgSchCmnDlSvc *svcCmn = RG_SCH_CMN_GET_DL_SVC(svc); RgSchSc1DlCell *cellDl = RG_GET_SC1_CELL_DL(cell); - TRC2(rgSCHSc1DlMngSvcPosn); (cellDl->svcMngFunc[svcCmn->prio])(cell, ue, svc); - RETVOID; + return; } /*--------------------------* @@ -2053,14 +2003,14 @@ RgSchDlLcCb *svc; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHSc1RgrDlCellCfg +S16 rgSCHSc1RgrDlCellCfg ( RgSchCellCb *cell, RgrCellCfg *cellCfg, RgSchErrInfo *err ) #else -PUBLIC S16 rgSCHSc1RgrDlCellCfg(cell, cellCfg, err) +S16 rgSCHSc1RgrDlCellCfg(cell, cellCfg, err) RgSchCellCb *cell; RgrCellCfg *cellCfg; RgSchErrInfo *err; @@ -2069,7 +2019,6 @@ RgSchErrInfo *err; S16 ret; RgSchSc1DlCell *cellDl; - TRC2(rgSCHSc1RgrDlCellCfg); if((ret = rgSCHUtlAllocSBuf(cell->instIdx, (Data**)&(((RgSchCmnCell*)((cell)->sc.sch))->dl.schSpfc), \ @@ -2078,13 +2027,13 @@ RgSchErrInfo *err; RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "Memory allocation FAILED"); err->errCause = RGSCHERR_SCH_SC1_DL_CFG; - RETVALUE(ret); + return (ret); } cellDl = RG_GET_SC1_CELL_DL(cell); /* Now perform downlink Queues related initializations */ rgSCHSc1DlInitQueues(cellDl); - RETVALUE(ROK); + return ROK; } /* rgSCHSc1RgrDlCellCfg */ /*********************************************************** @@ -2101,24 +2050,23 @@ RgSchErrInfo *err; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlDeinitQueues +static Void rgSCHSc1DlDeinitQueues ( RgSchSc1DlCell *cellDl ) #else -PRIVATE Void rgSCHSc1DlDeinitQueues(cellDl) +static Void rgSCHSc1DlDeinitQueues(cellDl) RgSchSc1DlCell *cellDl; #endif { - U8 i; - TRC2(rgSCHSc1DlDeinitQueues); + uint8_t i; for (i = 0; i < RG_SC1_DL_NUM_Q; ++i) { cmLListInit(&cellDl->prioLst[i]); cmLListInit(&cellDl->retxLst[i]); } - RETVOID; + return; } @@ -2136,21 +2084,20 @@ RgSchSc1DlCell *cellDl; * @return Void **/ #ifdef ANSI -PUBLIC Void rgSCHSc1DlCellDel +Void rgSCHSc1DlCellDel ( RgSchCellCb *cell ) #else -PUBLIC Void rgSCHSc1DlCellDel(cell) +Void rgSCHSc1DlCellDel(cell) RgSchCellCb *cell; #endif { - TRC2(rgSCHSc1DlCellDel); if (((RgSchSc1DlCell *)((RgSchCmnCell*)((cell)->sc.sch))->dl.schSpfc) \ == NULLP) { - RETVOID; + return; } /* Perform the deinit for the DL scheduler */ @@ -2160,7 +2107,7 @@ RgSchCellCb *cell; rgSCHUtlFreeSBuf(cell->instIdx, (Data**)(&(((RgSchCmnCell*)((cell)->sc.sch))->dl.schSpfc)), (sizeof(RgSchSc1DlCell))); - RETVOID; + return; } /* rgSCHSc1DlCellDel */ /** @@ -2182,7 +2129,7 @@ RgSchCellCb *cell; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHSc1RgrDlUeCfg +S16 rgSCHSc1RgrDlUeCfg ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -2190,7 +2137,7 @@ RgrUeCfg *ueCfg, RgSchErrInfo *err ) #else -PUBLIC S16 rgSCHSc1RgrDlUeCfg(cell, ue, ueCfg, err) +S16 rgSCHSc1RgrDlUeCfg(cell, ue, ueCfg, err) RgSchCellCb *cell; RgSchUeCb *ue; RgrUeCfg *ueCfg; @@ -2201,7 +2148,6 @@ RgSchErrInfo *err; Inst inst = cell->instIdx; RgSchSc1DlUe *ueDl; - TRC2(rgSCHSc1RgrDlUeCfg); if((rgSCHUtlAllocSBuf(inst, (Data**)&(ueSchCmn->dl.schSpfc), (sizeof(RgSchSc1DlUe))) != ROK)) @@ -2209,7 +2155,7 @@ RgSchErrInfo *err; RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Memory allocation FAILED" "CRNTI:%d",ue->ueId); err->errCause = RGSCHERR_SCH_SC1_DL_CFG; - RETVALUE(RFAILED); + return RFAILED; } ueDl = (RgSchSc1DlUe *)ueSchCmn->dl.schSpfc; if (ue->dl.ambrCfgd) @@ -2225,7 +2171,7 @@ RgSchErrInfo *err; cmLListInit(&ueDl->ambrLst); cmLListInit(&ueDl->schdSvcs); cmLListInit(&ueDl->retxHqProcs); - RETVALUE(ROK); + return ROK; } /* rgSCHSc1RgrDlUeCfg */ @@ -2246,21 +2192,20 @@ RgSchErrInfo *err; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHSc1DlUeHqEntInit +S16 rgSCHSc1DlUeHqEntInit ( RgSchCellCb *cell, RgSchDlHqEnt *hqEnt ) #else -PUBLIC S16 rgSCHSc1DlUeHqEntInit(cell, hqEnt) +S16 rgSCHSc1DlUeHqEntInit(cell, hqEnt) RgSchCellCb *cell; RgSchDlHqEnt *hqEnt #endif { RgSchSc1DlHqProc *hqSpcSch; RgSchDlHqProcCb *hqP; - U8 cnt; - TRC2(rgSCHSc1DlUeHqEntInit); + uint8_t cnt; /* making use of hqE->sch for one shot allocation * of RgSchSc1DlHqProc structures */ if (rgSCHUtlAllocSBuf(cell->instIdx, @@ -2269,7 +2214,7 @@ PUBLIC S16 rgSCHSc1DlUeHqEntInit(cell, hqEnt) { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Memory allocation FAILED CRNTI:%d",hqEnt->ue->ueId); - RETVALUE(RFAILED); + return RFAILED; } hqSpcSch = (RgSchSc1DlHqProc *)(hqEnt->sch); for(cnt = 0; cnt < hqEnt->numHqPrcs; cnt++) @@ -2278,7 +2223,7 @@ PUBLIC S16 rgSCHSc1DlUeHqEntInit(cell, hqEnt) ((RgSchCmnDlHqProc *)((hqP)->sch))->schSpfc = \ hqSpcSch++; } - RETVALUE(ROK); + return ROK; } /** @@ -2296,18 +2241,17 @@ PUBLIC S16 rgSCHSc1DlUeHqEntInit(cell, hqEnt) * @return Void **/ #ifdef ANSI -PUBLIC S16 rgSCHSc1DlUeHqEntDeInit +S16 rgSCHSc1DlUeHqEntDeInit ( RgSchCellCb *cell, RgSchDlHqEnt *hqE ) #else -PUBLIC S16 rgSCHSc1DlUeHqEntDeInit(cell, hqE) +S16 rgSCHSc1DlUeHqEntDeInit(cell, hqE) RgSchCellCb *cell; RgSchDlHqEnt *hqE; #endif { - TRC2(rgSCHSc1DlUeHqEntDeInit); if(hqE->sch) { @@ -2317,9 +2261,9 @@ RgSchDlHqEnt *hqE; } else { - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /** * @brief UE reconfiguration for scheduler @@ -2340,7 +2284,7 @@ RgSchDlHqEnt *hqE; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHSc1RgrDlUeRecfg +S16 rgSCHSc1RgrDlUeRecfg ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -2348,7 +2292,7 @@ RgrUeRecfg *ueRecfg, RgSchErrInfo *err ) #else -PUBLIC S16 rgSCHSc1RgrDlUeRecfg(cell, ue, ueRecfg, err) +S16 rgSCHSc1RgrDlUeRecfg(cell, ue, ueRecfg, err) RgSchCellCb *cell; RgSchUeCb *ue; RgrUeRecfg *ueRecfg; @@ -2359,7 +2303,6 @@ RgSchErrInfo *err; RgSchCmnDlUe *ueCmnDl = RG_SCH_CMN_GET_DL_UE(ue,cell); /*cell added as part of CA dev*/ RgSchDlHqEnt *hqEnt = RG_SCH_CMN_GET_UE_HQE(ue, cell); - TRC2(rgSCHSc1RgrDlUeRecfg); if (ue->dl.ambrCfgd) { @@ -2385,7 +2328,7 @@ RgSchErrInfo *err; RgSchDlHqProcCb *hqP; Pst pst; RgInfRlsHqInfo *rlsHqBufs = &(cell->rlsHqArr[cell->crntHqIdx]); - U8 i; + uint8_t i; /* Prepare TB2 release information to be sent to MAC */ rlsHqBufs->numUes = 0; @@ -2416,7 +2359,7 @@ RgSchErrInfo *err; RgSchMacRlsHq (&pst, rlsHqBufs); } } - RETVALUE(ROK); + return ROK; } /* rgSCHSc1RgrDlUeRecfg */ /** @@ -2432,22 +2375,21 @@ RgSchErrInfo *err; * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlRmvUeFrmPrioQs +static Void rgSCHSc1DlRmvUeFrmPrioQs ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PRIVATE Void rgSCHSc1DlRmvUeFrmPrioQs(cell, ue) +static Void rgSCHSc1DlRmvUeFrmPrioQs(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif { RgSchSc1DlUe *sc1Ue; RgSchDlLcCb *svc; - U32 idx; + uint32_t idx; - TRC2(rgSCHSc1DlRmvUeFrmPrioQs); sc1Ue = RG_GET_SC1_UE_DL(ue, cell); @@ -2467,7 +2409,7 @@ RgSchUeCb *ue; rgSCHSc1DlSvcRmvFrmSchd(cell, svc); } - RETVOID; + return; } /* rgSCHSc1DlRmvUeFrmPrioQs */ /** @@ -2483,13 +2425,13 @@ RgSchUeCb *ue; * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlInactvtUe +static Void rgSCHSc1DlInactvtUe ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PRIVATE Void rgSCHSc1DlInactvtUe(cell, ue) +static Void rgSCHSc1DlInactvtUe(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif @@ -2497,10 +2439,9 @@ RgSchUeCb *ue; RgSchSc1DlCell *cellDl = RG_GET_SC1_CELL_DL(cell); RgSchDlHqProcCb *hqP; RgSchCmnDlHqProc *hqProcDl; - U8 i; + uint8_t i; RgSchDlHqEnt *hqEnt = RG_SCH_CMN_GET_UE_HQE(ue, cell); - TRC2(rgSCHSc1DlInactvtUe); /* ccpu00130170: UE related HARQ Procs are cleared only if UE's Re-establishment procedure is not in progress*/ @@ -2531,7 +2472,7 @@ RgSchUeCb *ue; rgSCHSc1DlRmvUeFrmPrioQs(cell, ue); - RETVOID; + return; } /* rgSCHSc1DlInactvtUe */ @@ -2550,23 +2491,22 @@ RgSchUeCb *ue; * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlSuspendUe +static Void rgSCHSc1DlSuspendUe ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PRIVATE Void rgSCHSc1DlSuspendUe(cell, ue) +static Void rgSCHSc1DlSuspendUe(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif { RgSchDlHqProcCb *hqP; - U8 i; - U8 j; + uint8_t i; + uint8_t j; RgSchDlHqEnt *hqEnt = RG_SCH_CMN_GET_UE_HQE(ue, cell); - TRC2(rgSCHSc1DlSuspendUe); /* remove all in use HARQ processes from the subframes. * Store them in UEs hqProc Lst. Add back to cell's @@ -2600,7 +2540,7 @@ RgSchUeCb *ue; } rgSCHSc1DlRmvUeFrmPrioQs(cell, ue); - RETVOID; + return; } /* rgSCHSc1DlSuspendUe */ /*********************************************************** @@ -2618,18 +2558,17 @@ RgSchUeCb *ue; * **********************************************************/ #ifdef ANSI -PUBLIC Void rgSCHSc1DlScanUpdPdbPrio +Void rgSCHSc1DlScanUpdPdbPrio ( RgSchCellCb *cell ) #else -PUBLIC Void rgSCHSc1DlScanUpdPdbPrio (cell) +Void rgSCHSc1DlScanUpdPdbPrio (cell) RgSchCellCb *cell; #endif { - TRC2(rgSCHSc1DlScanUpdPdbPrio); - RETVOID; + return; } /** @@ -2653,19 +2592,18 @@ RgSchCellCb *cell; * -# ROK **/ #ifdef ANSI -PUBLIC S16 rgSCHSc1DlFillFlowCntrlInfo +S16 rgSCHSc1DlFillFlowCntrlInfo ( RgSchCellCb *cell, RgInfSfAlloc *sfAlloc ) #else -PUBLIC S16 rgSCHSc1DlFillFlowCntrlInfo(cell,sfAlloc) +S16 rgSCHSc1DlFillFlowCntrlInfo(cell,sfAlloc) RgSchCellCb *cell; RgInfSfAlloc *sfAlloc; #endif { - TRC2(rgSCHSc1DlFillFlowCntrlInfo); - RETVALUE(ROK); + return ROK; } /** * @brief UE deletion for scheduler @@ -2682,13 +2620,13 @@ RgInfSfAlloc *sfAlloc; * @return Void **/ #ifdef ANSI -PUBLIC Void rgSCHSc1DlUeDel +Void rgSCHSc1DlUeDel ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PUBLIC Void rgSCHSc1DlUeDel(cell, ue) +Void rgSCHSc1DlUeDel(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif @@ -2696,11 +2634,10 @@ RgSchUeCb *ue; RgSchDlHqEnt *hqEnt = RG_SCH_CMN_GET_UE_HQE(ue, cell); RgSchSc1DlUe *sc1DlUe = RG_GET_SC1_UE_DL(ue, cell); - TRC2(rgSCHSc1DlUeDel); if (sc1DlUe == NULLP) { - RETVOID; + return; } if( hqEnt) { @@ -2722,7 +2659,7 @@ RgSchUeCb *ue; for proper NULLP assignment*/ rgSCHUtlFreeSBuf(cell->instIdx, (Data**)(&sc1DlUe), (sizeof(RgSchSc1DlUe))); - RETVOID; + return; } /* rgSCHSc1DlUeDel */ /** @@ -2745,7 +2682,7 @@ RgSchUeCb *ue; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHSc1RgrLcCfg +S16 rgSCHSc1RgrLcCfg ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -2754,7 +2691,7 @@ RgrLchCfg *lcCfg, RgSchErrInfo *err ) #else -PUBLIC S16 rgSCHSc1RgrLcCfg(cell, ue, dlLc, lcCfg, err) +S16 rgSCHSc1RgrLcCfg(cell, ue, dlLc, lcCfg, err) RgSchCellCb *cell; RgSchUeCb *ue; RgSchDlLcCb *dlLc; @@ -2763,7 +2700,6 @@ RgSchErrInfo *err; #endif { S16 ret; - TRC2(rgSCHSc1RgrLcCfg); ret = rgSCHUtlAllocSBuf(cell->instIdx, (Data**)&(RG_SCH_CMN_GET_LC_SCH_SPFC(ue,dlLc,cell)), \ @@ -2773,11 +2709,11 @@ RgSchErrInfo *err; RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHSc1CrgLcCfg():" "SCH struct alloc failed CRNTI:%d LCID:%d",ue->ueId,lcCfg->lcId); err->errCause = RGSCHERR_SCH_SC1_DL_CFG; - RETVALUE(ret); + return (ret); } rgSCHSc1DlSvcAdd(cell, ue, dlLc, &lcCfg->dlInfo); - RETVALUE(ROK); + return ROK; } /* rgSCHSc1RgrLcCfg */ @@ -2804,7 +2740,7 @@ RgSchErrInfo *err; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHSc1RgrLcRecfg +S16 rgSCHSc1RgrLcRecfg ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -2813,7 +2749,7 @@ RgrLchRecfg *lcRecfg, RgSchErrInfo *err ) #else -PUBLIC S16 rgSCHSc1RgrLcRecfg(cell, ue, dlLc, lcRecfg, err) +S16 rgSCHSc1RgrLcRecfg(cell, ue, dlLc, lcRecfg, err) RgSchCellCb *cell; RgSchUeCb *ue; RgSchDlLcCb *dlLc; @@ -2821,13 +2757,12 @@ RgrLchRecfg *lcRecfg; RgSchErrInfo *err; #endif { - TRC2(rgSCHSc1RgrLcRecfg); UNUSED(err); rgSCHSc1DlSvcMod(cell,ue,dlLc, lcRecfg); - RETVALUE(ROK); + return ROK; } /* rgSCHSc1RgrLcRecfg */ @@ -2846,21 +2781,20 @@ RgSchErrInfo *err; * **/ #ifdef ANSI -PRIVATE S16 rgSCHSc1RgrDlCellRecfg +static S16 rgSCHSc1RgrDlCellRecfg ( RgSchCellCb *cell, RgrCellRecfg *recfg, RgSchErrInfo *err ) #else -PRIVATE S16 rgSCHSc1RgrDlCellRecfg(cell, recfg, err) +static S16 rgSCHSc1RgrDlCellRecfg(cell, recfg, err) RgSchCellCb *cell; RgrCellRecfg *recfg; RgSchErrInfo *err; #endif { - TRC2(rgSCHSc1DlUeReset); - RETVALUE(ROK); + return ROK; } @@ -2883,13 +2817,13 @@ RgSchErrInfo *err; * **/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlTaCmd +static Void rgSCHSc1DlTaCmd ( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo ) #else -PRIVATE Void rgSCHSc1DlTaCmd(cell, allocInfo) +static Void rgSCHSc1DlTaCmd(cell, allocInfo) RgSchCellCb *cell; RgSchCmnDlRbAllocInfo *allocInfo; #endif @@ -2898,7 +2832,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; CmLList *node; RgSchDlHqProcCb *proc; RgSchUeCb *ue; - U32 effBo; + uint32_t effBo; RgSchCmnDlCell *cellCmnDl = RG_SCH_CMN_GET_DL_CELL(cell); RgSchCmnDlUe *cmnUeDl; RgSchSc1DlUe *ueDl; @@ -2907,7 +2841,6 @@ RgSchCmnDlRbAllocInfo *allocInfo; #ifdef LTEMAC_HDFDD Bool dlAllowed = FALSE; #endif - TRC2(rgSCHSc1DlTaCmd); lst = &cellCmnDl->taLst; node = lst->first; @@ -2970,7 +2903,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; /* 3.1 MIMO moving this call to cmn scheduler */ /*rgSCHCmnDlRbInfoAddUeTx(allocInfo, ue);*/ } - RETVOID; + return; } /** @@ -2989,13 +2922,13 @@ RgSchCmnDlRbAllocInfo *allocInfo; * @return Void **/ #ifdef ANSI -PUBLIC Void rgSCHSc1DlHndlInActUes +Void rgSCHSc1DlHndlInActUes ( RgSchCellCb *cell, CmLListCp *inactvLst ) #else -PUBLIC Void rgSCHSc1DlHndlInActUes(cell, inactvLst) +Void rgSCHSc1DlHndlInActUes(cell, inactvLst) RgSchCellCb *cell; CmLListCp *inactvLst; #endif @@ -3003,7 +2936,6 @@ CmLListCp *inactvLst; CmLList *node; RgSchUeCb *ue; - TRC2(rgSCHSc1DlHndlInActUes); node = inactvLst->first; while(node) @@ -3014,7 +2946,7 @@ CmLListCp *inactvLst; * till it is activated again. */ rgSCHSc1DlInactvtUe(cell, ue); } - RETVOID; + return; } /** @@ -3035,16 +2967,15 @@ CmLListCp *inactvLst; * **/ #ifdef ANSI -PUBLIC Void rgSCHSc1DlInit +Void rgSCHSc1DlInit ( RgDlSchdApis *rgSchDlApis ) #else -PUBLIC Void rgSCHSc1DlInit(rgSchDlApis) +Void rgSCHSc1DlInit(rgSchDlApis) RgDlSchdApis *rgSchDlApis; #endif { - TRC2(rgSCHSc1DlInit); /* Init the function pointers */ rgSchDlApis->rgSCHRgrDlUeCfg = rgSCHSc1RgrDlUeCfg; rgSchDlApis->rgSCHRgrDlUeRecfg = rgSCHSc1RgrDlUeRecfg; @@ -3074,7 +3005,7 @@ RgDlSchdApis *rgSchDlApis; rgSchDlApis->rgSCHDlTickForPdbTrkng = rgSCHSc1DlScanUpdPdbPrio; rgSchDlApis->rgSCHDlFillFlwCtrlInfo = rgSCHSc1DlFillFlowCntrlInfo; - RETVOID; + return; } @@ -3094,17 +3025,16 @@ RgDlSchdApis *rgSchDlApis; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlInitQueues +static Void rgSCHSc1DlInitQueues ( RgSchSc1DlCell *cellDl ) #else -PRIVATE Void rgSCHSc1DlInitQueues(cellDl) +static Void rgSCHSc1DlInitQueues(cellDl) RgSchSc1DlCell *cellDl; #endif { - U8 i; - TRC2(rgSCHSc1DlInitQueues); + uint8_t i; for (i = 0; i < RG_SC1_DL_NUM_Q; ++i) { @@ -3128,7 +3058,7 @@ RgSchSc1DlCell *cellDl; { cellDl->svcMngFunc[i] = rgSCHSc1DlMngAmbrSvcPosn; } - RETVOID; + return; } @@ -3156,13 +3086,13 @@ RgSchSc1DlCell *cellDl; * **/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlRetxAllocFnlz +static Void rgSCHSc1DlRetxAllocFnlz ( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo ) #else -PRIVATE Void rgSCHSc1DlRetxAllocFnlz(cell, allocInfo) +static Void rgSCHSc1DlRetxAllocFnlz(cell, allocInfo) RgSchCellCb *cell; RgSchCmnDlRbAllocInfo *allocInfo; #endif @@ -3171,7 +3101,6 @@ RgSchCmnDlRbAllocInfo *allocInfo; RgSchUeCb *ue; RgSchDlHqProcCb *hqP; RgSchDlRbAlloc *dlAllocCb = NULLP; - TRC2(rgSCHSc1DlRetxAllocFnlz); node = allocInfo->dedAlloc.schdRetxHqPLst.first; while(node) @@ -3212,7 +3141,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; /* reset the UE allocation Information */ rgSCHCmnDlUeResetTemp(ue, hqP); } - RETVOID; + return; } /* 3.1 MIMO Alloc distribution functions being performed @@ -3236,32 +3165,31 @@ RgSchCmnDlRbAllocInfo *allocInfo; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlSprTxTbDstn +static Void rgSCHSc1DlSprTxTbDstn ( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlHqTbCb *tbInfo, -U32 *effAlloc, +uint32_t *effAlloc, CmLList **node ) #else -PRIVATE Void rgSCHSc1DlSprTxTbDstn(cell, ue, tbInfo, effAlloc, node) +static Void rgSCHSc1DlSprTxTbDstn(cell, ue, tbInfo, effAlloc, node) RgSchCellCb *cell; RgSchUeCb *ue; RgSchDlHqTbCb *tbInfo; -U32 *effAlloc; +uint32_t *effAlloc; CmLList **node; #endif { RgSchDlLcCb *svc; RgSchSc1DlSvc *svcSc1; RgSchSc1DlUe *ueDl = RG_GET_SC1_UE_DL(ue, cell); - U32 bytes; + uint32_t bytes; RgSchLchAllocInfo lchSchdData; - U32 effBo; - U32 rlcHdrEstmt; + uint32_t effBo; + uint32_t rlcHdrEstmt; - TRC2(rgSCHSc1DlSprTxTbDstn); while((*node) && (*effAlloc > 0)) { @@ -3350,7 +3278,7 @@ CmLList **node; lchSchdData.schdData = bytes; rgSCHDhmAddLcData(cell->instIdx, &lchSchdData, tbInfo); } - RETVOID; + return; } @@ -3370,31 +3298,30 @@ CmLList **node; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlNewTxTbDstn +static Void rgSCHSc1DlNewTxTbDstn ( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlHqTbCb *tbInfo, -U32 *effAlloc, +uint32_t *effAlloc, CmLList **node ) #else -PRIVATE Void rgSCHSc1DlNewTxTbDstn(cell, ue, tbInfo, effAlloc, node) +static Void rgSCHSc1DlNewTxTbDstn(cell, ue, tbInfo, effAlloc, node) RgSchCellCb *cell; RgSchUeCb *ue; RgSchDlHqTbCb *tbInfo; -U32 *effAlloc; +uint32_t *effAlloc; CmLList **node; #endif { RgSchDlLcCb *svc; RgSchSc1DlSvc *svcSc1 = NULLP; RgSchSc1DlUe *ueDl = RG_GET_SC1_UE_DL(ue, cell); - U32 bytes; + uint32_t bytes; RgSchLchAllocInfo lchSchdData; CmLList *prev = NULLP; - TRC2(rgSCHSc1DlNewTxTbDstn); if (ueDl->taReqBytes) { @@ -3497,14 +3424,14 @@ CmLList **node; rgSCHSc1DlSprTxTbDstn(cell, ue, tbInfo, effAlloc, &ueDl->lcsWithData.first); *node = NULLP; - RETVOID; + return; } /* make sure node points to the svc not completely * satisfied. * make sure if not served completely then * the other TB allocation accomodates the same */ *node = prev; - RETVOID; + return; } @@ -3524,14 +3451,14 @@ CmLList **node; * **********************************************************/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlNewTxUeFnlz +static Void rgSCHSc1DlNewTxUeFnlz ( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo, RgSchUeCb *ue ) #else -PRIVATE Void rgSCHSc1DlNewTxUeFnlz(cell, allocInfo, ue) +static Void rgSCHSc1DlNewTxUeFnlz(cell, allocInfo, ue) RgSchCellCb *cell; RgSchCmnDlRbAllocInfo *allocInfo; RgSchUeCb *ue; @@ -3543,13 +3470,12 @@ RgSchUeCb *ue; /*cell added as part of CA dev*/ /* 3.1 MIMO Distribute data of each TB across services */ RgSchDlRbAlloc *dlAllocCb = RG_SCH_CMN_GET_ALLOCCB_FRM_UE(ue, cell); - U32 remTb1Bytes = dlAllocCb->tbInfo[0].bytesAlloc; - U32 remTb2Bytes = dlAllocCb->tbInfo[1].bytesAlloc; - U32 effAlloc = 0; + uint32_t remTb1Bytes = dlAllocCb->tbInfo[0].bytesAlloc; + uint32_t remTb2Bytes = dlAllocCb->tbInfo[1].bytesAlloc; + uint32_t effAlloc = 0; /*ccpu00120365-ADD-added to code to check if second TB is utilized */ - U32 tb2Bytes = 0; + uint32_t tb2Bytes = 0; - TRC2(rgSCHSc1DlNewTxUeFnlz); /* 3.1 MIMO Consider the allocation of New TX TB for distribution */ @@ -3598,13 +3524,13 @@ RgSchUeCb *ue; rgSCHUtlPdcchPut(cell, &dlAllocCb->dlSf->pdcchInfo, dlAllocCb->pdcch); rgSCHSc1RlsHqProc(cmnUeDl->proc); - RETVOID; + return; } /* Fill PDCCH and assign it to HqP */ rgSCHCmnFillHqPPdcch(cell, dlAllocCb, cmnUeDl->proc); - RETVOID; + return; } @@ -3628,13 +3554,13 @@ RgSchUeCb *ue; * **/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlNewTxAllocFnlz +static Void rgSCHSc1DlNewTxAllocFnlz ( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo ) #else -PRIVATE Void rgSCHSc1DlNewTxAllocFnlz(cell, allocInfo) +static Void rgSCHSc1DlNewTxAllocFnlz(cell, allocInfo) RgSchCellCb *cell; RgSchCmnDlRbAllocInfo *allocInfo; #endif @@ -3643,7 +3569,6 @@ RgSchCmnDlRbAllocInfo *allocInfo; RgSchUeCb *ue; RgSchCmnDlUe *cmnUeDl; RgSchDlHqProcCb *hqP; - TRC2(rgSCHSc1DlNewTxAllocFnlz); node = allocInfo->dedAlloc.schdTxHqPLst.first; while(node) @@ -3681,7 +3606,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; cmLListInit(&((RgSchSc1DlUe *)(cmnUeDl->schSpfc))->schdSvcs); rgSCHCmnDlUeResetTemp(ue, hqP); } - RETVOID; + return; } /* 3.1 Added new function to handle TX+RETX alloc fnlz'n */ @@ -3710,13 +3635,13 @@ RgSchCmnDlRbAllocInfo *allocInfo; * **/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlRetxNewTxAllocFnlz +static Void rgSCHSc1DlRetxNewTxAllocFnlz ( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *cellAllocInfo ) #else -PRIVATE Void rgSCHSc1DlRetxNewTxAllocFnlz(cell, cellAllocInfo) +static Void rgSCHSc1DlRetxNewTxAllocFnlz(cell, cellAllocInfo) RgSchCellCb *cell; RgSchCmnDlRbAllocInfo *cellAllocInfo; #endif @@ -3726,12 +3651,11 @@ RgSchCmnDlRbAllocInfo *cellAllocInfo; RgSchSc1DlUe *sc1DlUe; RgSchDlHqProcCb *hqP; RgSchDlHqTbCb *newTxTbInfo; - U32 effAlloc; - U32 remTbBytes; + uint32_t effAlloc; + uint32_t remTbBytes; RgSchDlRbAlloc *ueAllocInfo; RgSchDlRbAlloc *dlAllocCb; - TRC2(rgSCHSc1DlRetxNewTxAllocFnlz); node = cellAllocInfo->dedAlloc.schdTxRetxHqPLst.first; while(node) @@ -3808,18 +3732,17 @@ RgSchCmnDlRbAllocInfo *cellAllocInfo; * **/ #ifdef ANSI -PUBLIC Void rgSCHSc1DlAllocFnlz +Void rgSCHSc1DlAllocFnlz ( RgSchCellCb *cell, RgSchCmnDlRbAllocInfo *allocInfo ) #else -PUBLIC Void rgSCHSc1DlAllocFnlz(cell, allocInfo) +Void rgSCHSc1DlAllocFnlz(cell, allocInfo) RgSchCellCb *cell; RgSchCmnDlRbAllocInfo *allocInfo; #endif { - TRC2(rgSCHSc1DlAllocFnlz); rgSCHSc1DlRetxAllocFnlz(cell, allocInfo); @@ -3828,7 +3751,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; /*3.1 MIMO new Function added to handle TX+RETX * harq process scheduling finalization */ rgSCHSc1DlRetxNewTxAllocFnlz(cell, allocInfo); - RETVOID; + return; } @@ -3850,7 +3773,7 @@ RgSchCmnDlRbAllocInfo *allocInfo; * **/ #ifdef ANSI -PUBLIC Void rgSCHSc1DlCqiInd +Void rgSCHSc1DlCqiInd ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -3858,15 +3781,14 @@ Bool isPucchInfo, Void *dlCqi ) #else -PUBLIC Void rgSCHSc1DlCqiInd(cell, ue, isPucchInfo, dlCqi) +Void rgSCHSc1DlCqiInd(cell, ue, isPucchInfo, dlCqi) RgSchCellCb *cell; RgSchUeCb *ue; Bool isPucchInfo; Void *dlCqi; #endif { - TRC2(rgSCHSc1DlCqiInd); - RETVOID; + return; } @@ -3893,14 +3815,14 @@ Void *dlCqi; * **/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlAdd2UeLcsWithData +static Void rgSCHSc1DlAdd2UeLcsWithData ( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlLcCb *svc ) #else -PRIVATE Void rgSCHSc1DlAdd2UeLcsWithData(cell, ue, svc) +static Void rgSCHSc1DlAdd2UeLcsWithData(cell, ue, svc) RgSchCellCb *cell; RgSchUeCb *ue; RgSchDlLcCb *svc; @@ -3913,7 +3835,6 @@ RgSchDlLcCb *svc; RgSchSc1DlUe *sc1DlUe = RG_GET_SC1_UE_DL(ue, cell); RgSchCmnDlSvc *cmnDlLstSvc; - TRC2(rgSCHSc1DlAdd2UeLcsWithData); lst = &(sc1DlUe->lcsWithData); node = lst->first; @@ -3937,7 +3858,7 @@ RgSchDlLcCb *svc; cmLListInsCrnt(lst, &sc1DlSvc->lcWithDataLnk); sc1DlSvc->lcWithDataLnk.node = (PTR)svc; } - RETVOID; + return; } @@ -3964,14 +3885,14 @@ RgSchDlLcCb *svc; * **/ #ifdef ANSI -PRIVATE Void rgSCHSc1DlRmFrmUeLcsWithData +static Void rgSCHSc1DlRmFrmUeLcsWithData ( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlLcCb *svc ) #else -PRIVATE Void rgSCHSc1DlRmFrmUeLcsWithData(cell, ue, svc) +static Void rgSCHSc1DlRmFrmUeLcsWithData(cell, ue, svc) RgSchCellCb *cell; RgSchUeCb *ue; RgSchDlLcCb *svc; @@ -3980,11 +3901,10 @@ RgSchDlLcCb *svc; RgSchSc1DlSvc *sc1DlSvc = RG_GET_SC1_SVC_DL(ue,svc,cell); RgSchSc1DlUe *sc1DlUe = RG_GET_SC1_UE_DL(ue, cell); - TRC2(rgSCHSc1DlRmFrmUeLcsWithData); cmLListDelFrm(&(sc1DlUe->lcsWithData), &sc1DlSvc->lcWithDataLnk); sc1DlSvc->lcWithDataLnk.node = NULLP; - RETVOID; + return; } /***************** SC1 DL SCHEDULER FUNCTION DEFNs END HERE ****************/ @@ -4012,7 +3932,7 @@ RgSchDlLcCb *svc; * @return S16 * -# ROK **/ -PUBLIC S16 rgSCHSc1UlLchCfg +S16 rgSCHSc1UlLchCfg ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -4020,7 +3940,7 @@ RgrLchCfg *cfg, RgSchErrInfo *err ) { - RETVALUE(ROK); + return ROK; } /** * @brief UE Lc Reconfig for RR @@ -4038,7 +3958,7 @@ RgSchErrInfo *err * @return S16 * -# ROK **/ -PUBLIC S16 rgSCHSc1UlLchRecfg +S16 rgSCHSc1UlLchRecfg ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -4046,7 +3966,7 @@ RgrLchRecfg *recfg, RgSchErrInfo *err ) { - RETVALUE(ROK); + return ROK; } /** * @brief LC deletion for PFS @@ -4064,22 +3984,22 @@ RgSchErrInfo *err * -# ROK **/ #ifdef ANSI -PUBLIC S16 rgSCHSc1UlLchDel +S16 rgSCHSc1UlLchDel ( RgSchCellCb *cell, RgSchUeCb *ue, CmLteLcId lcId, -U8 lcgId +uint8_t lcgId ) #else -PUBLIC S16 rgSCHRrUlLchDel(cell, ue, lcId, lcgId) +S16 rgSCHRrUlLchDel(cell, ue, lcId, lcgId) RgSchCellCb *cell; RgSchUeCb *ue; CmLteLcId lcId; -U8 lcgId; +uint8_t lcgId; #endif { - RETVALUE (ROK); + return (ROK); } /** @@ -4100,16 +4020,15 @@ U8 lcgId; * **/ #ifdef ANSI -PUBLIC Void rgSCHSc1UlInit +Void rgSCHSc1UlInit ( RgUlSchdApis *rgSchUlApis ) #else -PUBLIC Void rgSCHSc1UlInit(rgSchUlApis) +Void rgSCHSc1UlInit(rgSchUlApis) RgUlSchdApis *rgSchUlApis; #endif { - TRC2(rgSCHSc1UlInit); /* Init the function pointers */ rgSchUlApis->rgSCHRgrUlUeCfg = rgSCHSc1RgrUlUeCfg; rgSchUlApis->rgSCHRgrUlUeRecfg = rgSCHSc1RgrUlUeRecfg; @@ -4136,7 +4055,7 @@ RgUlSchdApis *rgSchUlApis; rgSchUlApis->rgSCHUlActvtUe = rgSCHSc1UlActvtUe; rgSchUlApis->rgSCHUlUeReset = rgSCHSc1UlUeReset; rgSchUlApis->rgSCHRgrUlLcgUpd = rgSCHSc1UlLcgUpd; - RETVOID; + return; } /** @@ -4158,7 +4077,7 @@ RgUlSchdApis *rgSchUlApis; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHSc1RgrUlUeCfg +S16 rgSCHSc1RgrUlUeCfg ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -4166,7 +4085,7 @@ RgrUeCfg *ueCfg, RgSchErrInfo *err ) #else -PUBLIC S16 rgSCHSc1RgrUlUeCfg(cell, ue, ueCfg, err) +S16 rgSCHSc1RgrUlUeCfg(cell, ue, ueCfg, err) RgSchCellCb *cell; RgSchUeCb *ue; RgrUeCfg *ueCfg; @@ -4175,7 +4094,6 @@ RgSchErrInfo *err; { RgSchCmnUe *ueSchCmn = RG_SCH_CMN_GET_UE(ue, cell); - TRC2(rgSCHSc1RgrUlUeCfg); if(rgSCHUtlAllocSBuf(cell->instIdx, (Data**)&(ueSchCmn->ul.schSpfc), (sizeof(RgSchSc1UlUe))) != ROK) @@ -4183,10 +4101,10 @@ RgSchErrInfo *err; RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Memory allocation FAILED CRNTI:%d",ue->ueId); err->errCause = RGSCHERR_SCH_SC1_UL_CFG; - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* rgSCHSc1RgrUlUeCfg */ /** @@ -4208,7 +4126,7 @@ RgSchErrInfo *err; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHSc1RgrUlUeRecfg +S16 rgSCHSc1RgrUlUeRecfg ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -4216,15 +4134,14 @@ RgrUeRecfg *ueRecfg, RgSchErrInfo *err ) #else -PUBLIC S16 rgSCHSc1RgrUlUeRecfg(cell, ue, ueRecfg, err) +S16 rgSCHSc1RgrUlUeRecfg(cell, ue, ueRecfg, err) RgSchCellCb *cell; RgSchUeCb *ue; RgrUeRecfg *ueRecfg; RgSchErrInfo *err; #endif { - TRC2(rgSCHSc1RgrUlUeRecfg); - RETVALUE(ROK); + return ROK; } /* rgSCHSc1RgrUeRecfg */ /** @@ -4242,13 +4159,13 @@ RgSchErrInfo *err; * @return Void **/ #ifdef ANSI -PUBLIC Void rgSCHSc1UlUeDel +Void rgSCHSc1UlUeDel ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PUBLIC Void rgSCHSc1UlUeDel(cell, ue) +Void rgSCHSc1UlUeDel(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif @@ -4256,11 +4173,10 @@ RgSchUeCb *ue; RgSchSc1UlCell *cellUl = RG_GET_SC1_CELL_UL(cell); RgSchSc1UlUe *ueUl = RG_GET_SC1_UE_UL(ue, cell); - TRC2(rgSCHSc1UlUeDel); if (ueUl == NULLP) { - RETVOID; + return; } if(ueUl->txLnk.node) { @@ -4277,7 +4193,7 @@ RgSchUeCb *ue; rgSCHUtlFreeSBuf(cell->instIdx, (Data**)(&(ueUl)), (sizeof(RgSchSc1UlUe))); - RETVOID; + return; } /* rgSCHSc1UlUeDel */ /** @@ -4294,13 +4210,13 @@ RgSchUeCb *ue; * @return Void **/ #ifdef ANSI -PUBLIC Void rgSCHSc1UlUeReset +Void rgSCHSc1UlUeReset ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PUBLIC Void rgSCHSc1UlUeReset(cell, ue) +Void rgSCHSc1UlUeReset(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif @@ -4308,7 +4224,6 @@ RgSchUeCb *ue; RgSchSc1UlCell *cellUl = RG_GET_SC1_CELL_UL(cell); RgSchSc1UlUe *ueUl = RG_GET_SC1_UE_UL(ue, cell); - TRC2(rgSCHSc1UlUeReset); ueUl->srRcvd = FALSE; @@ -4322,7 +4237,7 @@ RgSchUeCb *ue; cmLListDelFrm(&(cellUl->contResLst), &(ueUl->contResLnk)); ueUl->contResLnk.node = NULLP; } - RETVOID; + return; } /* rgSCHSc1UlUeReset */ @@ -4345,14 +4260,14 @@ RgSchUeCb *ue; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHSc1RgrUlCellCfg +S16 rgSCHSc1RgrUlCellCfg ( RgSchCellCb *cell, RgrCellCfg *cellCfg, RgSchErrInfo *err ) #else -PUBLIC S16 rgSCHSc1RgrUlCellCfg(cell, cellCfg, err) +S16 rgSCHSc1RgrUlCellCfg(cell, cellCfg, err) RgSchCellCb *cell; RgrCellCfg *cellCfg; RgSchErrInfo *err; @@ -4360,7 +4275,6 @@ RgSchErrInfo *err; { RgSchSc1UlCell *cellUl; - TRC2(rgSCHSc1RgrUlCellCfg); if((rgSCHUtlAllocSBuf(cell->instIdx, (Data**)&(((RgSchCmnCell*)((cell)->sc.sch))->ul.schSpfc), \ @@ -4369,14 +4283,14 @@ RgSchErrInfo *err; RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "Memory allocation FAILED"); err->errCause = RGSCHERR_SCH_SC1_UL_CFG; - RETVALUE(RFAILED); + return RFAILED; } cellUl = RG_GET_SC1_CELL_UL(cell); cmLListInit(&cellUl->contResLst); cmLListInit(&cellUl->ueTxLst[0]); cmLListInit(&cellUl->ueTxLst[1]); - RETVALUE(ROK); + return ROK; } /* rgSCHSc1RgrUlCellCfg */ @@ -4395,21 +4309,20 @@ RgSchErrInfo *err; * **/ #ifdef ANSI -PUBLIC S16 rgSCHSc1RgrUlCellRecfg +S16 rgSCHSc1RgrUlCellRecfg ( RgSchCellCb *cell, RgrCellRecfg *recfg, RgSchErrInfo *err ) #else -PUBLIC S16 rgSCHSc1RgrUlCellRecfg(cell, recfg, err) +S16 rgSCHSc1RgrUlCellRecfg(cell, recfg, err) RgSchCellCb *cell; RgrCellRecfg *recfg; RgSchErrInfo *err; #endif { - TRC2(rgSCHSc1RgrUlCellRecfg); - RETVALUE(ROK); + return ROK; } /** @@ -4426,29 +4339,28 @@ RgSchErrInfo *err; * @return Void **/ #ifdef ANSI -PUBLIC Void rgSCHSc1UlCellDel +Void rgSCHSc1UlCellDel ( RgSchCellCb *cell ) #else -PUBLIC Void rgSCHSc1UlCellDel(cell) +Void rgSCHSc1UlCellDel(cell) RgSchCellCb *cell; #endif { RgSchSc1UlCell *cellUl = RG_GET_SC1_CELL_UL(cell); - TRC2(rgSCHSc1UlCellDel); if (cellUl == NULLP) { - RETVOID; + return; } /* ccpu00117052 - MOD - Passing double pointer for proper NULLP assignment*/ rgSCHUtlFreeSBuf(cell->instIdx, (Data**)(&(cellUl)), (sizeof(RgSchSc1UlCell))); - RETVOID; + return; } /* rgSCHSc1UlCellDel */ /** @@ -4472,7 +4384,7 @@ RgSchCellCb *cell; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHSc1RgrLcgCfg +S16 rgSCHSc1RgrLcgCfg ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -4481,7 +4393,7 @@ RgrLcgCfg *lcgCfg, RgSchErrInfo *err ) #else -PUBLIC S16 rgSCHSc1RgrLcgCfg(cell, ue, lcg, lcgCfg, err) +S16 rgSCHSc1RgrLcgCfg(cell, ue, lcg, lcgCfg, err) RgSchCellCb *cell; RgSchUeCb *ue; RgSchLcgCb *lcg; @@ -4489,8 +4401,7 @@ RgrLcgCfg *lcgCfg; RgSchErrInfo *err; #endif { - TRC2(rgSCHSc1RgrLcgCfg); - RETVALUE(ROK); + return ROK; } /* rgSCHSc1RgrLcgCfg */ /** @@ -4516,7 +4427,7 @@ RgSchErrInfo *err; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHSc1RgrLcgRecfg +S16 rgSCHSc1RgrLcgRecfg ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -4525,7 +4436,7 @@ RgrLcgRecfg *reCfg, RgSchErrInfo *err ) #else -PUBLIC S16 rgSCHSc1RgrLcgRecfg(cell, ue, lcg, reCfg, err) +S16 rgSCHSc1RgrLcgRecfg(cell, ue, lcg, reCfg, err) RgSchCellCb *cell; RgSchUeCb *ue; RgSchLcgCb *lcg; @@ -4533,8 +4444,7 @@ RgrLcgRecfg *reCfg; RgSchErrInfo *err; #endif { - TRC2(rgSCHSc1RgrLcgRecfg); - RETVALUE(ROK); + return ROK; } /* rgSCHSc1RgrLcgRecfg */ /*********************************************************** @@ -4552,22 +4462,21 @@ RgSchErrInfo *err; * **********************************************************/ #ifdef ANSI -PUBLIC Void rgSCHSc1LcgDel +Void rgSCHSc1LcgDel ( RgSchCellCb *cell, RgSchUeCb *ue, RgSchLcgCb *lcg ) #else -PUBLIC Void rgSCHSc1LcgDel(cell, ue, lcg) +Void rgSCHSc1LcgDel(cell, ue, lcg) RgSchCellCb *cell; RgSchUeCb *ue; RgSchLcgCb *lcg; #endif { - TRC2(rgSCHSc1LcgDel); rgSCHSc1UlPosnUeInQ(cell, ue); - RETVOID; + return; } /** @@ -4588,13 +4497,13 @@ RgSchLcgCb *lcg; * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHSc1UlSchdUe +static Void rgSCHSc1UlSchdUe ( RgSchUeCb *ue, RgSchCellCb *cell ) #else -PRIVATE Void rgSCHSc1UlSchdUe(ue,cell) +static Void rgSCHSc1UlSchdUe(ue,cell) RgSchUeCb *ue; RgSchCellCb *cell; #endif @@ -4603,18 +4512,17 @@ RgSchCellCb *cell; /*cell added as part of CA dev*/ RgSchSc1UlUe *ulUe = RG_GET_SC1_UE_UL(ue, cell); - TRC2(rgSCHSc1UlSchdUe); if(ulUe->srRcvd == TRUE) { cmnUlUe->alloc.reqBytes = RGSCH_MAX(RG_SCH_CMN_UL_SR_BYTES, \ ue->ul.effBsr); - RETVOID; + return; } cmnUlUe->alloc.reqBytes = ue->ul.effBsr; - RETVOID; + return; } /** @@ -4630,42 +4538,41 @@ RgSchCellCb *cell; * * @param[in] RgSchCellCb *cell * @param[out] RgSchCmnUlRbAllocInfo *allocInfo - * @param[in] U8 remUe + * @param[in] uint8_t remUe * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHSc1UlSchdForDataTrans +static Void rgSCHSc1UlSchdForDataTrans ( RgSchCellCb *cell, RgSchCmnUlRbAllocInfo *allocInfo, -U8 remUe +uint8_t remUe ) #else -PRIVATE Void rgSCHSc1UlSchdForDataTrans(cell, allocInfo, remUe) +static Void rgSCHSc1UlSchdForDataTrans(cell, allocInfo, remUe) RgSchCellCb *cell; RgSchCmnUlRbAllocInfo *allocInfo; -U8 remUe; +uint8_t remUe; #endif { RgSchSc1UlCell *sc1UlCell = RG_GET_SC1_CELL_UL(cell); - TRC2(rgSCHSc1UlSchdForDataTrans); if (remUe == 0) { - RETVOID; + return; } /* Allocate UEs with LCG0 data pending */ rgSCHSc1UlSchdUeTxLst(cell, &sc1UlCell->ueTxLst[0], allocInfo, &remUe); if (remUe == 0) { - RETVOID; + return; } /* Allocate UEs with other LCGs data pending */ rgSCHSc1UlSchdUeTxLst(cell, &sc1UlCell->ueTxLst[1], allocInfo, &remUe); - RETVOID; + return; } /** @@ -4681,23 +4588,23 @@ U8 remUe; * * @param[in] CmLListCp *ueTxLst * @param[out] RgSchCmnUlRbAllocInfo *allocInfo - * @param[in] U8 *remUe + * @param[in] uint8_t *remUe * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHSc1UlSchdUeTxLst +static Void rgSCHSc1UlSchdUeTxLst ( RgSchCellCb *cell, CmLListCp *ueTxLst, RgSchCmnUlRbAllocInfo *allocInfo, -U8 *remUe +uint8_t *remUe ) #else -PRIVATE Void rgSCHSc1UlSchdUeTxLst(cell, ueTxLst, allocInfo, remUe) +static Void rgSCHSc1UlSchdUeTxLst(cell, ueTxLst, allocInfo, remUe) RgSchCellCb *cell; CmLListCp *ueTxLst; RgSchCmnUlRbAllocInfo *allocInfo; -U8 *remUe; +uint8_t *remUe; #endif { RgSchUeCb *ue; @@ -4706,7 +4613,6 @@ U8 *remUe; Bool ulAllowed = FALSE; #endif - TRC2(rgSCHSc1UlSchdUeTxLst); node = ueTxLst->first; while ((node) && (*remUe)) @@ -4746,7 +4652,7 @@ U8 *remUe; --(*remUe); } - RETVOID; + return; } /** @@ -4762,21 +4668,21 @@ U8 *remUe; * * @param[in] RgSchCellCb *cell * @param[out] RgSchCmnUlRbAllocInfo *allocInfo - * @param[out] U8 *remUe + * @param[out] uint8_t *remUe * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHSc1UlSchdForContRes +static Void rgSCHSc1UlSchdForContRes ( RgSchCellCb *cell, RgSchCmnUlRbAllocInfo *allocInfo, -U8 *remUe +uint8_t *remUe ) #else -PRIVATE Void rgSCHSc1UlSchdForContRes(cell, allocInfo, remUe) +static Void rgSCHSc1UlSchdForContRes(cell, allocInfo, remUe) RgSchCellCb *cell; RgSchCmnUlRbAllocInfo *allocInfo; -U8 *remUe; +uint8_t *remUe; #endif { RgSchSc1UlCell *sc1UlCell = RG_GET_SC1_CELL_UL(cell); @@ -4787,7 +4693,6 @@ U8 *remUe; Bool ulAllowed = FALSE; #endif - TRC2(rgSCHSc1UlSchdForContRes); node = sc1UlCell->contResLst.first; while ((node) && (*remUe)) @@ -4818,7 +4723,7 @@ U8 *remUe; /* Node removal deferred to ULAllocFinalization */ } - RETVOID; + return; } /** @@ -4837,25 +4742,24 @@ U8 *remUe; * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHSc1UlNewTx +static Void rgSCHSc1UlNewTx ( RgSchCellCb *cell, RgSchCmnUlRbAllocInfo *allocInfo ) #else -PRIVATE Void rgSCHSc1UlNewTx(cell, allocInfo) +static Void rgSCHSc1UlNewTx(cell, allocInfo) RgSchCellCb *cell; RgSchCmnUlRbAllocInfo *allocInfo; #endif { RgSchCmnUlCell *cellUl = RG_SCH_CMN_GET_UL_CELL(cell); - U8 remUe = cellUl->maxUeNewTxPerTti; + uint8_t remUe = cellUl->maxUeNewTxPerTti; - TRC2(rgSCHSc1UlNewTx); rgSCHSc1UlSchdForContRes(cell, allocInfo, &remUe); rgSCHSc1UlSchdForDataTrans(cell, allocInfo, remUe); - RETVOID; + return; } /** @@ -4875,20 +4779,19 @@ RgSchCmnUlRbAllocInfo *allocInfo; * @return Void **/ #ifdef ANSI -PUBLIC Void rgSCHSc1UlSched +Void rgSCHSc1UlSched ( RgSchCellCb *cell, RgSchCmnUlRbAllocInfo *allocInfo ) #else -PUBLIC Void rgSCHSc1UlSched(cell, allocInfo) +Void rgSCHSc1UlSched(cell, allocInfo) RgSchCellCb *cell; RgSchCmnUlRbAllocInfo *allocInfo; #endif { - TRC2(rgSCHSc1UlSched); rgSCHSc1UlNewTx(cell, allocInfo); - RETVOID; + return; } /** @@ -4906,14 +4809,14 @@ RgSchCmnUlRbAllocInfo *allocInfo; * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHSc1UlInsUeInQ +static Void rgSCHSc1UlInsUeInQ ( CmLListCp *lst, RgSchUeCb *ue, RgSchCellCb *cell ) #else -PRIVATE Void rgSCHSc1UlInsUeInQ(lst, ue, cell) +static Void rgSCHSc1UlInsUeInQ(lst, ue, cell) CmLListCp *lst; RgSchUeCb *ue; RgSchCellCb *cell; @@ -4924,7 +4827,6 @@ RgSchCellCb *cell; RgSchUeCb *lUe; CmLList *node; - TRC2(rgSCHSc1UlInsUeInQ); node = lst->first; while(node) @@ -4949,7 +4851,7 @@ RgSchCellCb *cell; ueUl->txLnk.node = (PTR)ue; } - RETVOID; + return; } /** * @brief UEs Buffer Status Has changed so reposition it. @@ -4977,13 +4879,13 @@ RgSchCellCb *cell; * @return Void **/ #ifdef ANSI -PRIVATE Void rgSCHSc1UlPosnUeInQ +static Void rgSCHSc1UlPosnUeInQ ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PRIVATE Void rgSCHSc1UlPosnUeInQ(cell, ue) +static Void rgSCHSc1UlPosnUeInQ(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif @@ -4994,11 +4896,10 @@ RgSchUeCb *ue; RgSchCmnLcg *cmnLcg0 = RG_SCH_CMN_GET_UL_LCG(&ue->ul.lcgArr[0]); CmLListCp *lst; - TRC2(rgSCHSc1UlPosnUeInQ); if (!RG_SCH_CMN_UL_IS_UE_ACTIVE(ue)) { - RETVOID; + return; } /* Remove the UE from its existing position */ @@ -5040,7 +4941,7 @@ RgSchUeCb *ue; } #endif - RETVOID; + return; } /** @@ -5055,28 +4956,27 @@ RgSchUeCb *ue; * @param[in] RgSchCellCb *cell * @param[in] RgSchUeCb *ue * @param[in] RgSchLcgCb *lcg - * @param[in] U8 bsr + * @param[in] uint8_t bsr * @return Void **/ #ifdef ANSI -PUBLIC Void rgSCHSc1UpdBsrShort +Void rgSCHSc1UpdBsrShort ( RgSchCellCb *cell, RgSchUeCb *ue, RgSchLcgCb *lcg, -U8 bsr +uint8_t bsr ) #else -PUBLIC Void rgSCHSc1UpdBsrShort(cell, ue, lcg, bsr) +Void rgSCHSc1UpdBsrShort(cell, ue, lcg, bsr) RgSchCellCb *cell; RgSchUeCb *ue; RgSchLcgCb *lcg; -U8 bsr; +uint8_t bsr; #endif { - TRC2(rgSCHSc1UpdBsrShort); rgSCHSc1UlPosnUeInQ(cell, ue); - RETVOID; + return; } /* rgSCHSc1UpdBsrShort */ /** @@ -5092,28 +4992,27 @@ U8 bsr; * @param[in] RgSchCellCb *cell * @param[in] RgSchUeCb *ue * @param[in] RgSchLcgCb *lcg - * @param[in] U8 bsr + * @param[in] uint8_t bsr * @return Void **/ #ifdef ANSI -PUBLIC Void rgSCHSc1UpdBsrTrunc +Void rgSCHSc1UpdBsrTrunc ( RgSchCellCb *cell, RgSchUeCb *ue, RgSchLcgCb *lcg, -U8 bsr +uint8_t bsr ) #else -PUBLIC Void rgSCHSc1UpdBsrTrunc(cell, ue, lcg, bsr) +Void rgSCHSc1UpdBsrTrunc(cell, ue, lcg, bsr) RgSchCellCb *cell; RgSchUeCb *ue; RgSchLcgCb *lcg; -U8 bsr; +uint8_t bsr; #endif { - TRC2(rgSCHSc1UpdBsrTrunc); rgSCHSc1UlPosnUeInQ(cell, ue); - RETVOID; + return; } /* rgSCHSc1UpdBsrTrunc */ /** @@ -5128,26 +5027,25 @@ U8 bsr; * * @param[in] RgSchCellCb *cell * @param[in] RgSchUeCb *ue - * @param[in] U8 bsArr[] + * @param[in] uint8_t bsArr[] * @return Void **/ #ifdef ANSI -PUBLIC Void rgSCHSc1UpdBsrLong +Void rgSCHSc1UpdBsrLong ( RgSchCellCb *cell, RgSchUeCb *ue, -U8 *bsArr +uint8_t *bsArr ) #else -PUBLIC Void rgSCHSc1UpdBsrLong(cell, ue, bsArr) +Void rgSCHSc1UpdBsrLong(cell, ue, bsArr) RgSchCellCb *cell; RgSchUeCb *ue; -U8 *bsArr; +uint8_t *bsArr; #endif { - TRC2(rgSCHSc1UpdBsrLong); rgSCHSc1UlPosnUeInQ(cell, ue); - RETVOID; + return; } /* rgSCHSc1UpdBsrLong */ /** @@ -5166,13 +5064,13 @@ U8 *bsArr; * @return Void **/ #ifdef ANSI -PUBLIC Void rgSCHSc1ContResUlGrant +Void rgSCHSc1ContResUlGrant ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PUBLIC Void rgSCHSc1ContResUlGrant(cell, ue) +Void rgSCHSc1ContResUlGrant(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif @@ -5180,11 +5078,10 @@ RgSchUeCb *ue; RgSchSc1UlUe *ueUl = RG_GET_SC1_UE_UL(ue, cell); RgSchSc1UlCell *cellUl = RG_GET_SC1_CELL_UL(cell); - TRC2(rgSCHSc1ContResUlGrant); if (ueUl->contResLnk.node) { - RETVOID; + return; } /* Remove the UE from other Qs */ @@ -5196,7 +5093,7 @@ RgSchUeCb *ue; cmLListAdd2Tail(&cellUl->contResLst, &ueUl->contResLnk); ueUl->contResLnk.node = (PTR)ue; - RETVOID; + return; } /* rgSCHSc1ContResUlGrant */ /** @@ -5213,13 +5110,13 @@ RgSchUeCb *ue; * @return Void **/ #ifdef ANSI -PUBLIC Void rgSCHSc1SrRcvd +Void rgSCHSc1SrRcvd ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PUBLIC Void rgSCHSc1SrRcvd(cell, ue) +Void rgSCHSc1SrRcvd(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif @@ -5227,7 +5124,6 @@ RgSchUeCb *ue; RgSchSc1UlUe *ulUe = RG_GET_SC1_UE_UL(ue, cell); RgSchSc1UlCell *ulCell = RG_GET_SC1_CELL_UL(cell); - TRC2(rgSCHSc1SrRcvd); ulUe->srRcvd = TRUE; @@ -5236,7 +5132,7 @@ RgSchUeCb *ue; if (ulUe->qId == 0) { /* Already present in lcg0 Q */ - RETVOID; + return; } cmLListDelFrm(&(ulCell->ueTxLst[ulUe->qId]), &(ulUe->txLnk)); } @@ -5245,7 +5141,7 @@ RgSchUeCb *ue; ulUe->txLnk.node = (PTR)ue; ulUe->qId = 0; - RETVOID; + return; } /* rgSCHSc1SrRcvd */ /** @@ -5263,23 +5159,22 @@ RgSchUeCb *ue; * @return Void **/ #ifdef ANSI -PUBLIC Void rgSCHSc1UlCqiInd +Void rgSCHSc1UlCqiInd ( RgSchCellCb *cell, RgSchUeCb *ue, TfuUlCqiRpt *ulCqiInfo ) #else -PUBLIC Void rgSCHSc1UlCqiInd(cell, ue, ulCqiInfo) +Void rgSCHSc1UlCqiInd(cell, ue, ulCqiInfo) RgSchCellCb *cell; RgSchUeCb *ue; TfuUlCqiRpt *ulCqiInfo; #endif { - TRC2(rgSCHSc1UlCqiInd); /* Stack Crash problem for TRACE5 changes. Added the return below */ - RETVOID; + return; } @@ -5298,23 +5193,22 @@ TfuUlCqiRpt *ulCqiInfo; * @return S16 **/ #ifdef ANSI -PUBLIC S16 rgSCHSc1UlLcgUpd +S16 rgSCHSc1UlLcgUpd ( RgSchCellCb *cell, RgSchUeCb *ue, RgInfUeDatInd *datInd ) #else -PUBLIC S16 rgSCHSc1UlLcgUpd(cell, ue) +S16 rgSCHSc1UlLcgUpd(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; RgInfUeDatInd *datInd; #endif { - TRC2(rgSCHSc1UlLcgUpd); - RETVALUE(ROK); + return ROK; } @@ -5334,20 +5228,19 @@ RgInfUeDatInd *datInd; * **********************************************************/ #ifdef ANSI -PUBLIC Void rgSCHSc1UlUeRefresh +Void rgSCHSc1UlUeRefresh ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PUBLIC Void rgSCHSc1UlUeRefresh(cell, ue) +Void rgSCHSc1UlUeRefresh(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif { - TRC2(rgSCHSc1UlUeRefresh); rgSCHSc1UlPosnUeInQ(cell, ue); - RETVOID; + return; } /** @@ -5370,13 +5263,13 @@ RgSchUeCb *ue; * **/ #ifdef ANSI -PRIVATE Void rgSCHSc1UlDatTransAllocFnlz +static Void rgSCHSc1UlDatTransAllocFnlz ( RgSchCellCb *cell, RgSchCmnUlRbAllocInfo *allocInfo ) #else -PRIVATE Void rgSCHSc1UlDatTransAllocFnlz(cell, allocInfo) +static Void rgSCHSc1UlDatTransAllocFnlz(cell, allocInfo) RgSchCellCb *cell; RgSchCmnUlRbAllocInfo *allocInfo; #endif @@ -5386,7 +5279,6 @@ RgSchCmnUlRbAllocInfo *allocInfo; CmLList *node; RgSchDrxUeCb *drxUe = NULLP; CmLListCp ulInactvLst; /* list of UE's becoming UL-inactive */ - TRC2(rgSCHSc1UlDatTransAllocFnlz); cmLListInit(&ulInactvLst); node = allocInfo->schdUeLst.first; @@ -5436,7 +5328,7 @@ RgSchCmnUlRbAllocInfo *allocInfo; rgSCHCmnUlUeResetTemp(cell, ue); } - RETVOID; + return; } /** @@ -5459,13 +5351,13 @@ RgSchCmnUlRbAllocInfo *allocInfo; * **/ #ifdef ANSI -PRIVATE Void rgSCHSc1UlContResAllocFnlz +static Void rgSCHSc1UlContResAllocFnlz ( RgSchCellCb *cell, RgSchCmnUlRbAllocInfo *allocInfo ) #else -PRIVATE Void rgSCHSc1UlContResAllocFnlz(cell, allocInfo) +static Void rgSCHSc1UlContResAllocFnlz(cell, allocInfo) RgSchCellCb *cell; RgSchCmnUlRbAllocInfo *allocInfo; #endif @@ -5474,7 +5366,6 @@ RgSchCmnUlRbAllocInfo *allocInfo; RgSchSc1UlUe *ueUl; RgSchUeCb *ue; CmLList *node; - TRC2(rgSCHSc1UlContResAllocFnlz); node = allocInfo->schdContResLst.first; while(node) @@ -5506,7 +5397,7 @@ RgSchCmnUlRbAllocInfo *allocInfo; rgSCHCmnUlUeResetTemp(cell, ue); } - RETVOID; + return; } /** @@ -5527,23 +5418,22 @@ RgSchCmnUlRbAllocInfo *allocInfo; * **/ #ifdef ANSI -PUBLIC Void rgSCHSc1UlAllocFnlz +Void rgSCHSc1UlAllocFnlz ( RgSchCellCb *cell, RgSchCmnUlRbAllocInfo *allocInfo ) #else -PUBLIC Void rgSCHSc1UlAllocFnlz(cell, allocInfo) +Void rgSCHSc1UlAllocFnlz(cell, allocInfo) RgSchCellCb *cell; RgSchCmnUlRbAllocInfo *allocInfo; #endif { - TRC2(rgSCHSc1UlAllocFnlz); rgSCHSc1UlContResAllocFnlz(cell, allocInfo); rgSCHSc1UlDatTransAllocFnlz(cell, allocInfo); - RETVOID; + return; } @@ -5562,21 +5452,20 @@ RgSchCmnUlRbAllocInfo *allocInfo; * @return Void **/ #ifdef ANSI -PUBLIC Void rgSCHSc1UlActvtUe +Void rgSCHSc1UlActvtUe ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PUBLIC Void rgSCHSc1UlActvtUe(cell, ue) +Void rgSCHSc1UlActvtUe(cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif { - TRC2(rgSCHSc1UlActvtUe); rgSCHSc1UlPosnUeInQ(cell, ue); - RETVOID; + return; } /** @@ -5599,13 +5488,13 @@ RgSchUeCb *ue; * @return Void **/ #ifdef ANSI -PUBLIC Void rgSCHSc1UlHndlInActUes +Void rgSCHSc1UlHndlInActUes ( RgSchCellCb *cell, CmLListCp *inactvLst ) #else -PUBLIC Void rgSCHSc1UlHndlInActUes(cell, inactvLst) +Void rgSCHSc1UlHndlInActUes(cell, inactvLst) RgSchCellCb *cell; CmLListCp *inactvLst; #endif @@ -5615,7 +5504,6 @@ CmLListCp *inactvLst; RgSchSc1UlCell *cellUl = RG_GET_SC1_CELL_UL(cell); CmLList *node = inactvLst->first; - TRC2(rgSCHSc1UlHndlInActUes); while (node) { @@ -5632,7 +5520,7 @@ CmLListCp *inactvLst; } /* Do not remove UE from contResLst */ } - RETVOID; + return; } /** * @brief Scheduler invocation @@ -5652,24 +5540,24 @@ CmLListCp *inactvLst; **/ #ifdef ANSI -PUBLIC Void rgSCHSc1DlProcRmvFrmRetx( +Void rgSCHSc1DlProcRmvFrmRetx( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlHqProcCb *hqP ) #else -PUBLIC Void rgSCHSc1DlProcRmvFrmRetx(cell, ue, hqP) +Void rgSCHSc1DlProcRmvFrmRetx(cell, ue, hqP) RgSchCellCb *cell; RgSchUeCb *ue; RgSchDlHqProcCb *hqP; #endif { - TRC2(rgSCHSc1DlProcRmvFrmRetx); + /* Remove the HqP from retx Queue. Release HqP.*/ rgSCHSc1DlProcRmvFrmCellRetx(cell, hqP); rgSCHSc1DlProcRmvFrmUeRetx(cell, ue, hqP); - RETVOID; + return; }