X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Frg_sch_scell.c;h=49e5a523092baaf7176f6bf425cb70d1696a4d13;hb=ba78fa13b01e0729fe0a6a7a18cbf1d52cdcda1c;hp=db18f1a54d3dbfc0c6ebc1ea90c5c300e098a7eb;hpb=5ea4c59cb4dd37164953218b0bd355284e11d22c;p=o-du%2Fl2.git diff --git a/src/5gnrsch/rg_sch_scell.c b/src/5gnrsch/rg_sch_scell.c index db18f1a54..49e5a5230 100755 --- a/src/5gnrsch/rg_sch_scell.c +++ b/src/5gnrsch/rg_sch_scell.c @@ -33,16 +33,7 @@ */ /* 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" @@ -54,15 +45,6 @@ #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 */ @@ -73,65 +55,65 @@ #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, +uint8_t tbIdx, +uint8_t fdbk, Bool maxHqRetxReached )); #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 +uint8_t 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, RgrUePrdDlCqiCfg *cqiCfg, CmLteUeCategory ueCat, -U8 sCellIdx +uint8_t sCellIdx )); #endif -PRIVATE S16 rgSCHSCellTrgMacHqEReset ARGS(( +static S16 rgSCHSCellTrgMacHqEReset ARGS(( Inst inst, -U16 secCellId, -U16 rnti +uint16_t secCellId, +uint16_t rnti )); @@ -151,21 +133,20 @@ U16 rnti * -# 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); + uint8_t bitVal = 0; + uint8_t sCellActDeactBitMask = 0; /* Change the state of all Scells waiting for * activation */ @@ -177,7 +158,7 @@ RgSchDlHqTbCb *tbInfo; * 0 for deactivation * */ - for(U8 idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++) + for(uint8_t idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++) { if(ueCb->cellInfo[idx] != NULLP) { @@ -219,7 +200,7 @@ RgSchDlHqTbCb *tbInfo; tbInfo->schdSCellActCe.pres = PRSNT_NODEF; tbInfo->schdSCellActCe.val = sCellActDeactBitMask; - RETVOID; + return; } /* rgSCHSCellSchdActDeactCe */ @@ -239,19 +220,18 @@ RgSchDlHqTbCb *tbInfo; * **/ #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 */ @@ -264,7 +244,7 @@ RgSchUeCb *ue; "SCell is already added in the Act List: ueId(%u)\n", ue->ueId)); } - RETVOID; + return; } @@ -284,26 +264,25 @@ RgSchUeCb *ue; * **/ #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); } ue->sCellActLnk.node = (PTR)NULLP; - RETVOID; + return; } /** @@ -324,12 +303,12 @@ RgSchUeCb *ue; * **/ #ifdef ANSI -PUBLIC Void rgSCHSCellActivation +Void rgSCHSCellActivation ( RgSchUeCellInfo *sCellInfo ) #else -PUBLIC Void rgSCHSCellActivation(sCellInfo) +Void rgSCHSCellActivation(sCellInfo) RgSchUeCellInfo *sCellInfo #endif { @@ -340,18 +319,17 @@ RgSchUeCellInfo *sCellInfo #ifdef DEBUGP Inst inst = ueCb->cell->instIdx; #endif - U16 tempIdx; + uint16_t tempIdx; RgrUePrdDlCqiCfg *cqiCfg; - U8 j; /*Bandwidth Parts*/ - U16 riTrInsTime; - U16 periodicity; - U16 cqiTrInstTime; + uint8_t j; /*Bandwidth Parts*/ + uint16_t riTrInsTime; + uint16_t periodicity; + uint16_t cqiTrInstTime; RgSchUePCqiCb *cqiCb = NULLP; CmLteTimingInfo timingInfo; - U16 crntTime; + uint16_t crntTime; #endif - TRC3(rgSCHSCellActivation); sCellInfo->sCellState = RG_SCH_SCELL_ACTIVE; #ifdef TENB_STATS @@ -468,8 +446,8 @@ RgSchUeCellInfo *sCellInfo % RG_SCH_PCQI_SRS_SR_TRINS_SIZE; if(periodicity >= RG_SCH_PCQI_SRS_SR_TRINS_SIZE) { - cqiCb->riDist = rgSCHUtlFindDist((U16)(crntTime + TFU_RECPREQ_DLDELTA), - (U16) tempIdx); + cqiCb->riDist = rgSCHUtlFindDist((uint16_t)(crntTime + TFU_RECPREQ_DLDELTA), + (uint16_t) tempIdx); } else { @@ -512,7 +490,7 @@ RgSchUeCellInfo *sCellInfo cellSch = RG_SCH_CMN_GET_CELL(sCellInfo->cell); cellSch->apisDl->rgSCHDlSCellActv(sCellInfo->cell, sCellInfo->ue); - RETVOID; + return; } #ifdef TFU_UPGRADE @@ -533,17 +511,16 @@ RgSchUeCellInfo *sCellInfo * **/ #ifdef ANSI -PRIVATE Void rgSCHCellClearScellLstOfCQI +static Void rgSCHCellClearScellLstOfCQI ( RgSchUeCellInfo *sCellInfo ) #else -PRIVATE Void rgSCHCellClearScellLstOfCQI(sCellInfo) +static Void rgSCHCellClearScellLstOfCQI(sCellInfo) RgSchUeCellInfo *sCellInfo; #endif { - TRC3(rgSCHCellClearScellLstOfCQI); RgSchUePCqiCb *cqiRiCb = NULLP; RgSchUeCb *ueCb; ueCb = sCellInfo->ue; @@ -576,7 +553,7 @@ RgSchUeCellInfo *sCellInfo; } } - RETVOID; + return; } #endif/*TFU_UPGRADE*/ @@ -601,20 +578,19 @@ RgSchUeCellInfo *sCellInfo; * **/ #ifdef ANSI -PRIVATE S16 rgSCHSCellDeActivation +static S16 rgSCHSCellDeActivation ( RgSchUeCellInfo *sCellInfo ) #else -PRIVATE S16 rgSCHSCellDeActivation(sCellInfo) +static S16 rgSCHSCellDeActivation(sCellInfo) 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) @@ -661,7 +637,7 @@ RgSchUeCellInfo *sCellInfo 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; } @@ -679,23 +655,23 @@ RgSchUeCellInfo *sCellInfo * * Invoked by: CommonScheduler * - * @param[in] U16 sCellId - * @param[in] U16 rnti + * @param[in] uint16_t sCellId + * @param[in] uint16_t rnti * @return Void * **/ #ifdef ANSI -PRIVATE S16 rgSCHSCellTrgMacHqEReset +static S16 rgSCHSCellTrgMacHqEReset ( Inst inst, -U16 secCellId, -U16 rnti +uint16_t secCellId, +uint16_t rnti ) #else -PRIVATE S16 rgSCHSCellTrgMacHqEReset(inst,secCellId,rnti) +static S16 rgSCHSCellTrgMacHqEReset(inst,secCellId,rnti) Inst inst; -U16 secCellId; -U16 rnti; +uint16_t secCellId; +uint16_t rnti; #endif { Pst pst; @@ -705,7 +681,7 @@ U16 rnti; if((secCellCb = (RgSchCellCb *)rgSchUtlGetCellCb(inst, secCellId)) == NULLP) { RGSCHDBGERRNEW(inst, (rgSchPBuf(inst), "SCell doesnt exists")); - RETVALUE(RFAILED); + return RFAILED; } hqEntRstInfo.cellId = secCellId; @@ -715,7 +691,7 @@ U16 rnti; RgSchMacRstHqEnt(&pst, &hqEntRstInfo); - RETVALUE(ROK); + return ROK; } /*removed endif*/ @@ -742,18 +718,18 @@ U16 rnti; * **/ #ifdef ANSI -PUBLIC Void rgSCHSCellHndlFdbkInd +Void rgSCHSCellHndlFdbkInd ( RgSchDlHqProcCb *hqP, -U8 tbIdx, -U8 fdbk, +uint8_t tbIdx, +uint8_t fdbk, Bool maxHqRetxReached ) #else -PUBLIC Void rgSCHSCellHndlFdbkInd(hqP, tbIdx, fdbk,maxHqRetxReached) +Void rgSCHSCellHndlFdbkInd(hqP, tbIdx, fdbk,maxHqRetxReached) RgSchDlHqProcCb *hqP; -U8 tbIdx; -U8 fdbk; +uint8_t tbIdx; +uint8_t fdbk; Bool maxHqRetxReached; #endif { @@ -762,7 +738,6 @@ Bool maxHqRetxReached; RgSchCellCb *cell; RgSchUeCellInfo *sCellInfo; - TRC3(rgSCHSCellHndlFdbkInd); ueCb = hqP->hqE->ue; cell = ueCb->cell; @@ -772,7 +747,7 @@ Bool maxHqRetxReached; { hqP->tbInfo[tbIdx].schdSCellActCe.pres = FALSE; - for(U8 idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++) + for(uint8_t idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++) { if(ueCb->cellInfo[idx] != NULLP) { @@ -802,7 +777,7 @@ Bool maxHqRetxReached; if(TRUE == maxHqRetxReached) { hqP->tbInfo[tbIdx].schdSCellActCe.pres = FALSE; - for(U8 idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++) + for(uint8_t idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++) { if(ueCb->cellInfo[idx] != NULLP) { @@ -827,7 +802,7 @@ Bool maxHqRetxReached; default: break; } - RETVOID; + return; } #ifdef LTE_ADV @@ -851,17 +826,16 @@ Bool maxHqRetxReached; * **/ #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 */ @@ -882,7 +856,7 @@ RgSchUeCellInfo *sCellInfo; /* Deactivation Timer is configured, thus assume that UE has deactivated */ rgSCHSCellDeActivation(sCellInfo); } - RETVOID; + return; } #endif @@ -901,46 +875,44 @@ RgSchUeCellInfo *sCellInfo; * * @param[in] RgSchCellCb *cellCb * @param[in] RgSchUeCb *ueCb - * @param[in] U8 sCellIdx - * @param[in] U8 action + * @param[in] uint8_t sCellIdx + * @param[in] uint8_t action * * @return ROK/RFAILED * **/ #ifdef ANSI -PUBLIC S16 rgSCHSCellTrigActDeact +S16 rgSCHSCellTrigActDeact ( RgSchCellCb *cell, RgSchUeCb *ueCb, -U8 sCellIdx, -U8 action +uint8_t sCellIdx, +uint8_t action ) #else -PUBLIC S16 rgSCHSCellTrigActDeact(cell,ueCb,sCellIdx,action) +S16 rgSCHSCellTrigActDeact(cell,ueCb,sCellIdx,action) RgSchCellCb *cell, RgSchUeCb *ueCb; -U8 sCellIdx; -U8 action; +uint8_t sCellIdx; +uint8_t action; #endif { 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) @@ -1012,7 +984,7 @@ U8 action; break; } } - RETVALUE(ret); + return (ret); } @@ -1033,30 +1005,29 @@ U8 action; * **/ #ifdef ANSI -PRIVATE S16 rgSCHSCellSelectForAct +static S16 rgSCHSCellSelectForAct ( RgSchCellCb *cell, RgSchUeCb *ueCb, -U8 *sCellIdx +uint8_t *sCellIdx ) #else -PRIVATE S16 rgSCHSCellSelectForAct(cell, ueCb) +static S16 rgSCHSCellSelectForAct(cell, ueCb) RgSchCellCb *cell; RgSchUeCb *ueCb; -U8 *sCellIdx; +uint8_t *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; } /** @@ -1071,26 +1042,26 @@ U8 *sCellIdx; * * @param[in] RgSchCellCb *cellCb * @param[in] RgSchUeCb *ueCb - * @param[in] U8 action + * @param[in] uint8_t action * * @return Void * **/ #ifdef ANSI -PUBLIC Void rgSCHSCellSelectAndActDeAct +Void rgSCHSCellSelectAndActDeAct ( RgSchCellCb *pCell, RgSchUeCb *ueCb, -U8 action +uint8_t action ) #else -PUBLIC Void rgSCHSCellSelectAndActDeAct(pCell, ueCb, action) +Void rgSCHSCellSelectAndActDeAct(pCell, ueCb, action) RgSchCellCb *pCell; RgSchUeCb *ueCb; -U8 action; +uint8_t action; #endif { - U8 sCellIdx = 0; + uint8_t sCellIdx = 0; S16 ret = ROK; switch (action) @@ -1100,11 +1071,11 @@ U8 action; if(((ret = rgSCHSCellSelectForAct(pCell, ueCb, &sCellIdx)) == ROK) && (sCellIdx == 0)) - RETVOID; + return; break; } default: - RETVOID; + return; } if ((ret != ROK) || (ROK != (rgSCHSCellTrigActDeact(pCell, ueCb, sCellIdx, action)))) @@ -1112,7 +1083,7 @@ U8 action; RGSCHDBGERR(pCell->instIdx,(rgSchPBuf(pCell->instIdx), "SCell Actication failed" "for UE [%d] with SCellIdx [%d]\n", ueCb->ueId, sCellIdx)); } - RETVOID; + return; } @@ -1131,22 +1102,22 @@ U8 action; * * @param[in] RgSchCellCb *cellCb * @param[in] RgSchUeCb *ueCb - * @param[in] U8 idx + * @param[in] uint8_t idx * @return ROK/RFAILED * **/ #ifdef ANSI -PUBLIC Void rgSCHSCellDelUeSCell +Void rgSCHSCellDelUeSCell ( RgSchCellCb *cellCb, RgSchUeCb *ueCb, -U8 sCellIdx +uint8_t sCellIdx ) #else -PUBLIC Void rgSCHSCellDelUeSCell(cellCb,ueCb,sCellIdx) +Void rgSCHSCellDelUeSCell(cellCb,ueCb,sCellIdx) RgSchCellCb *cellCb; RgSchUeCb *ueCb; -U8 sCellIdx; +uint8_t sCellIdx; #endif { RgUeUlHqCb *ulHqEnt; @@ -1154,7 +1125,6 @@ U8 sCellIdx; RgSchUeCellInfo *sCellInfo; RgSchCmnUlUe *ueUl; - TRC3(rgSCHSCellDelUeSCell); sCellInfo = ueCb->cellInfo[sCellIdx]; @@ -1163,7 +1133,7 @@ U8 sCellIdx; RGSCHDBGERRNEW(inst, (rgSchPBuf(inst),"Serv Cell not added to this Ue Scell Idx %d\ ueId %d\n", sCellIdx,ueCb->ueId)); - RETVOID; + return; } rgSCHDbmDelUeCb(sCellInfo->cell, ueCb); @@ -1200,7 +1170,7 @@ U8 sCellIdx; ueCb->cellInfo[sCellIdx] = NULLP; - RETVOID; + return; } /** @@ -1223,26 +1193,25 @@ U8 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++) + for(uint8_t idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++) { rgSCHSCellDelUeSCell(cellCb,ueCb,idx); } - RETVALUE(ROK); + return ROK; } #ifdef TFU_UPGRADE @@ -1278,35 +1247,33 @@ RgSchUeCb *ueCb; * **/ #ifdef ANSI -PUBLIC S16 rgSCHSCellPCqiCfg +S16 rgSCHSCellPCqiCfg ( RgSchCellCb *priCellCb, RgSchCellCb *secCellCb, RgSchUeCb *ueCb, RgrUePrdDlCqiCfg *cqiCfg, CmLteUeCategory ueCat, -U8 sCellIdx +uint8_t 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; RgrUePrdDlCqiCfg *cqiCfg; CmLteUeCategory ueCat; -U8 sCellIdx; +uint8_t sCellIdx; #endif { - U8 j; /*Bandwidth Parts*/ - U8 temp; + uint8_t j; /*Bandwidth Parts*/ + uint8_t temp; #ifdef DEBUGP Inst inst = priCellCb->instIdx; #endif 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)); @@ -1316,7 +1283,7 @@ U8 sCellIdx; { RGSCHDBGERRNEW(inst, (rgSchPBuf(inst),"Invalid Serv Cell Idx %d\n", sCellIdx)); - RETVALUE(RFAILED); + return RFAILED; } sCellInfo = ueCb->cellInfo[sCellIdx]; @@ -1328,7 +1295,7 @@ U8 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 */ @@ -1348,7 +1315,7 @@ U8 sCellIdx; if(RGR_UE_PCQI_SB_REP == cqiCfg->cqiSetup.cqiRepType) { - U8 k; /*SubBand Size (RB) */ + uint8_t k; /*SubBand Size (RB) */ RG_SCH_GET_CQI_J_VAL(secCellCb->bwCfg.dlTotalBw, j); RG_SCH_GET_CQI_K_VAL(secCellCb->bwCfg.dlTotalBw, k); cqiCb->J = j; /*Number of Bandwidth Parts*/ @@ -1421,7 +1388,7 @@ U8 sCellIdx; cqiCb->riDist = RG_SCH_INVALID_IDX; cqiCb->nCqiTrIdx = RG_SCH_INVALID_IDX; - RETVALUE(ROK); + return ROK; } #endif @@ -1442,21 +1409,20 @@ U8 sCellIdx; * **/ #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++) + for(uint8_t idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++) { if(ue->cellInfo[idx] != NULLP) { @@ -1466,7 +1432,7 @@ RgSchUeCb *ue; ue->cellInfo[idx]->sCellState = RG_SCH_SCELL_INACTIVE; } } - RETVOID; + return; } @@ -1487,29 +1453,28 @@ RgSchUeCb *ue; * **/ #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++) + for(uint8_t idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++) { if(ue->cellInfo[idx] != NULLP) { cellSch->apisDl->rgSCHRgrDlLcCfg(ue->cellInfo[idx]->cell, ue, svc,NULLP,NULLP); } } - RETVOID; + return; } /** @@ -1529,29 +1494,28 @@ RgSchDlLcCb *svc; * **/ #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++) + for(uint8_t idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++) { if(ue->cellInfo[idx] != NULLP) { cellSch->apisDl->rgSCHFreeDlLc(ue->cellInfo[idx]->cell, ue, svc); } } - RETVOID; + return; } /** @@ -1571,21 +1535,20 @@ RgSchDlLcCb *svc; * **/ #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 @@ -1594,7 +1557,7 @@ RgSchDlLcCb *svc; { cellSch->apisDl->rgSCHDlDedBoUpd(ue->cell, ue, svc); } - for(U8 idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++) + for(uint8_t idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++) { if((ue->cellInfo[idx] != NULLP) && (ue->cellInfo[idx]->sCellState == RG_SCH_SCELL_ACTIVE) && @@ -1603,7 +1566,7 @@ RgSchDlLcCb *svc; cellSch->apisDl->rgSCHDlDedBoUpd(ue->cellInfo[idx]->cell, ue, svc); } } - RETVOID; + return; } #ifdef TFU_UPGRADE /** @@ -1619,23 +1582,22 @@ RgSchDlLcCb *svc; * * @param[in] RgSchUePCqiCb *cqiCb1 * @param[in] RgSchUePCqiCb *cqiCb2 - * @return U8 cqiCb cell idx which has the higher priority + * @return uint8_t cqiCb cell idx which has the higher priority * **/ #ifdef ANSI -PRIVATE U8 rgSCHUtlSCellCmpCqiCfg +static uint8_t rgSCHUtlSCellCmpCqiCfg ( RgSchUePCqiCb *cqiCb1, RgSchUePCqiCb *cqiCb2 ) #else -PRIVATE U8 rgSCHUtlSCellCmpCqiCfg(cqiCb1, cqiCb2) +static uint8_t rgSCHUtlSCellCmpCqiCfg(cqiCb1, cqiCb2) RgSchUePCqiCb *cqiCb1; RgSchUePCqiCb *cqiCb2; #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 */ @@ -1668,7 +1630,7 @@ RgSchUePCqiCb *cqiCb2; } } - RETVALUE(retCqiCb->servCellInfo->sCellIdx); + return (retCqiCb->servCellInfo->sCellIdx); } /** @@ -1687,27 +1649,26 @@ RgSchUePCqiCb *cqiCb2; * **/ #ifdef ANSI -PUBLIC S16 rgSCHUtlSCellHndlCqiCollsn +S16 rgSCHUtlSCellHndlCqiCollsn ( RgSchUePCqiCb *cqiCb ) #else -PUBLIC S16 rgSCHUtlSCellHndlCqiCollsn(cqiCb) +S16 rgSCHUtlSCellHndlCqiCollsn(cqiCb) RgSchUePCqiCb *cqiCb; #endif { - U32 nPCqiServCellIdx; - U32 minPCqiTrIdx; - U32 scellPCqiTrIdx; - U32 pCqiTrIdx; + uint32_t nPCqiServCellIdx; + uint32_t minPCqiTrIdx; + uint32_t scellPCqiTrIdx; + uint32_t pCqiTrIdx; RgSchCellCb *priCellCb = cqiCb->servCellInfo->ue->cell; RgSchUeCb *ueCb = cqiCb->servCellInfo->ue; - U16 crntSfIdx; - U32 cellIdx; - U32 sCellCnt = 0; + uint16_t crntSfIdx; + uint32_t cellIdx; + uint32_t sCellCnt = 0; CmLteTimingInfo timingInfo; - U8 idx = 0; - TRC3(rgSCHUtlSCellHndlCqiCollsn); + uint8_t idx = 0; #ifdef xLTE_TDD RG_SCH_ADD_TO_CRNT_TIME(priCellCb->crntTime, timingInfo, TFU_DELTA); @@ -1778,7 +1739,7 @@ RgSchUePCqiCb *cqiCb; idx = ((nPCqiServCellIdx)& (CM_LTE_MAX_CELLS -1)); ueCb->nPCqiCb = &ueCb->cellInfo[idx]->cqiCb; - RETVALUE(ROK); + return ROK; } @@ -1798,26 +1759,25 @@ RgSchUePCqiCb *cqiCb; * **/ #ifdef ANSI -PUBLIC S16 rgSCHUtlSCellHndlRiCollsn +S16 rgSCHUtlSCellHndlRiCollsn ( RgSchUePCqiCb *cqiCb ) #else -PUBLIC S16 rgSCHUtlSCellHndlRiCollsn(cqiCb) +S16 rgSCHUtlSCellHndlRiCollsn(cqiCb) RgSchUePCqiCb *cqiCb; #endif { - U32 nPRiServCellIdx; - U32 minPRiTrIdx; - U32 scellPRiTrIdx; - U32 pRiTrIdx; + uint32_t nPRiServCellIdx; + uint32_t minPRiTrIdx; + uint32_t scellPRiTrIdx; + uint32_t pRiTrIdx; RgSchCellCb *priCellCb = cqiCb->servCellInfo->ue->cell; RgSchUeCb *ueCb = cqiCb->servCellInfo->ue; - U16 crntSfIdx; - U32 cellIdx; - U32 sCellCnt = 0; + uint16_t crntSfIdx; + uint32_t cellIdx; + uint32_t sCellCnt = 0; CmLteTimingInfo timingInfo; - TRC3(rgSCHUtlSCellHndlRiCollsn); #ifdef xLTE_TDD RG_SCH_ADD_TO_CRNT_TIME(priCellCb->crntTime, timingInfo, TFU_DELTA); @@ -1896,7 +1856,7 @@ RgSchUePCqiCb *cqiCb; /* Set the next expected Cqi into nPCqiCb */ ueCb->nPRiCb = &ueCb->cellInfo[nPRiServCellIdx]->cqiCb; - RETVALUE(ROK); + return ROK; } #endif/*TFU_UPGRADE*/ @@ -1917,21 +1877,20 @@ RgSchUePCqiCb *cqiCb; * **/ #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++) + for(uint8_t idx = 1; idx <= RG_SCH_MAX_SCELL ; idx++) { if((ue->cellInfo[idx] != NULLP) && (ue->cellInfo[idx]->cell->cellId == cell->cellId)&& @@ -1941,7 +1900,7 @@ RgSchUeCb *ue; break; } } - RETVALUE(retVal); + return (retVal); } /** @@ -1959,26 +1918,25 @@ RgSchUeCb *ue; * -# 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*/