X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Frg_sch_dhm.c;h=377e6b190d25fe51be8f12342d8232dcf77388d7;hb=ba78fa13b01e0729fe0a6a7a18cbf1d52cdcda1c;hp=f6c8c59a753a98f7f40a271bbca8605290fd36fd;hpb=3235ecfc7414aa0b72d0ad50db63ae8b5626045b;p=o-du%2Fl2.git diff --git a/src/5gnrsch/rg_sch_dhm.c b/src/5gnrsch/rg_sch_dhm.c index f6c8c59a7..377e6b190 100755 --- a/src/5gnrsch/rg_sch_dhm.c +++ b/src/5gnrsch/rg_sch_dhm.c @@ -37,17 +37,7 @@ static int RLOG_FILE_ID=242; static int RLOG_MODULE_ID=4096; /* 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_mblk.h" /* common memory link list library */ -#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 +51,6 @@ static int RLOG_MODULE_ID=4096; #include "rl_common.h" /* header/extern include files (.x) */ -#include "gen.x" /* general layer */ -#include "ssi.x" /* system service interface */ -#include "cm5.x" /* common timers */ -#include "cm_lib.x" /* common library */ -#include "cm_hash.x" /* common hash list */ -#include "cm_llist.x" /* common linked list library */ -#include "cm_mblk.x" /* memory management */ -#include "cm_tkns.x" /* common tokens */ -#include "cm_lte.x" /* common LTE */ #include "lrg.x" #include "rgr.x" #include "rgm.x" @@ -79,20 +60,20 @@ static int RLOG_MODULE_ID=4096; #include "rg_sch_cmn.x" #ifdef RGSCH_SPS_STATS -extern U32 rgNumSPSSchedDropMaxRetx; -extern U32 rgNumActDtx; +uint32_t rgNumSPSSchedDropMaxRetx; +uint32_t rgNumActDtx; #endif -PUBLIC U32 nackSf[10]; +uint32_t nackSf[10]; #ifdef MAC_SCH_STATS -PUBLIC RgSchNackAckStats hqFailStats; -PUBLIC RgSchHqRetxStats hqRetxStats; +RgSchNackAckStats hqFailStats; +RgSchHqRetxStats hqRetxStats; #endif /* MAC_SCH_STATS */ //Chandan Stats Collection #ifdef DLHQ_STATS -U32 statsCnt; +uint32_t statsCnt; RgSchDlHqStats dlHqStats[10000] = {{0,0,0}}; #endif @@ -103,7 +84,7 @@ RgSchDlHqStats dlHqStats[10000] = {{0,0,0}}; * The below table is based on Table 7.3-X from 36.213 and * table 79 from FAPIv1.1 doc */ -U8 rgSchNumOfAcksToAckNack[RG_SCH_MAX_NUM_EXPECTED_ACKS][RG_SCH_NUM_FDBK_VALUE] = { +uint8_t rgSchNumOfAcksToAckNack[RG_SCH_MAX_NUM_EXPECTED_ACKS][RG_SCH_NUM_FDBK_VALUE] = { {TFU_HQFDB_ACK, TFU_HQFDB_NACK, TFU_HQFDB_NACK}, {TFU_HQFDB_NACK, TFU_HQFDB_ACK, TFU_HQFDB_NACK}, {TFU_HQFDB_NACK, TFU_HQFDB_NACK, TFU_HQFDB_ACK}, @@ -120,48 +101,48 @@ U8 rgSchNumOfAcksToAckNack[RG_SCH_MAX_NUM_EXPECTED_ACKS][RG_SCH_NUM_FDBK_VALUE] /* local externs */ -PRIVATE Void rgSCHDhmFdbkIndHndlTa ARGS((RgSchDlHqProcCb *hqP, U8 tbIdx, U8 fdbk, +static Void rgSCHDhmFdbkIndHndlTa ARGS((RgSchDlHqProcCb *hqP, uint8_t tbIdx, uint8_t fdbk, Bool maxHqRetxReached)); -PUBLIC void rgEmtcsetNullSubFrm ARGS((RgSchDlHqProcCb *hqP)); +void rgEmtcsetNullSubFrm ARGS((RgSchDlHqProcCb *hqP)); #ifndef LTE_TDD -PRIVATE S16 rgSCHDhmProcHqFdbkAckNackRep ARGS(( +static S16 rgSCHDhmProcHqFdbkAckNackRep ARGS(( RgSchDlHqProcCb *hqP, RgSchDlSf *sf, -U8 tbCnt, -U8 *isAck +uint8_t tbCnt, +uint8_t *isAck )); #endif #ifdef DL_LA -PRIVATE S16 rgSCHDhmUpdateAckNackHistory ARGS(( +static S16 rgSCHDhmUpdateAckNackHistory ARGS(( RgSchCellCb *cell, RgSchUeCb *ueCb, - U8 hqfdbk, - U8 tbCnt + uint8_t hqfdbk, + uint8_t tbCnt )); #endif #ifdef LTE_TDD -PRIVATE Void rgSCHDhmPrcSplBundlFdbk ARGS(( +static Void rgSCHDhmPrcSplBundlFdbk ARGS(( RgSchCellCb *cell, TfuHqInfo *fdbk, - U8 hqCnt + uint8_t hqCnt )); #ifdef LTE_ADV -PRIVATE Void rgSchGetHqFdbkPosForM1 ARGS(( +static Void rgSchGetHqFdbkPosForM1 ARGS(( RgSchUeCb *ue, RgSchDlHqProcCb *hqP, - U8 *isAck, + uint8_t *isAck, RgTfuHqInfo *fdbk, - U8 tbIdx, + uint8_t tbIdx, RgSchTddANInfo *anInfo )); -PRIVATE Void rgSchGetHqFdbkPosForM234 ARGS(( +static Void rgSchGetHqFdbkPosForM234 ARGS(( RgSchUeCb *ue, RgSchDlHqProcCb *hqP, - U8 *isAck, + uint8_t *isAck, RgTfuHqInfo *fdbk, - U8 tbIdx, + uint8_t tbIdx, RgSchTddANInfo *anInfo, - U8 M, + uint8_t M, CmLteTimingInfo timeInfo )); #endif/*LTE_ADV*/ @@ -169,39 +150,39 @@ PRIVATE Void rgSchGetHqFdbkPosForM234 ARGS(( /* Freeing up the HARQ proc blocked for * indefinite time in case of Retx */ -PUBLIC S16 rgSCHDhmDlRetxAllocFail ARGS(( +S16 rgSCHDhmDlRetxAllocFail ARGS(( RgSchUeCb *ue, RgSchDlHqProcCb *proc )); #ifdef EMTC_ENABLE -EXTERN S16 rgSCHDhmEmtcRgrCellCfg ARGS(( +S16 rgSCHDhmEmtcRgrCellCfg ARGS(( RgSchCellCb *cell )); #endif #ifdef CA_DBG -extern U32 gPCellTb1AckCount,gPCellTb2AckCount,gPCellTb1NackCount,gPCellTb2NackCount; -extern U32 gSCellSchedCount,gPrimarySchedCount; -extern U32 gSCellTb1AckCount,gSCellTb2AckCount,gSCellTb1NackCount,gSCellTb2NackCount; -extern U32 gPCellTb1DtxCount, gPCellTb2DtxCount, gSCellTb1DtxCount, gSCellTb2DtxCount; -extern U32 gHqFdbkCount; +uint32_t gPCellTb1AckCount,gPCellTb2AckCount,gPCellTb1NackCount,gPCellTb2NackCount; +uint32_t gSCellSchedCount,gPrimarySchedCount; +uint32_t gSCellTb1AckCount,gSCellTb2AckCount,gSCellTb1NackCount,gSCellTb2NackCount; +uint32_t gPCellTb1DtxCount, gPCellTb2DtxCount, gSCellTb1DtxCount, gSCellTb2DtxCount; +uint32_t gHqFdbkCount; #endif #ifdef EMTC_ENABLE -EXTERN Void rgSCHEmtcUtlDlHqPTbRmvFrmTx +Void rgSCHEmtcUtlDlHqPTbRmvFrmTx ( RgSchEmtcDlSf *subFrm, RgSchDlHqProcCb *hqP, -U8 tbIdx, +uint8_t tbIdx, Bool isRepeting ); -EXTERN RgSchEmtcDlSf* rgSCHEmtcUtlSubFrmGet +RgSchEmtcDlSf* rgSCHEmtcUtlSubFrmGet ( RgSchCellCb *cell, CmLteTimingInfo frm ); -EXTERN Void rgSCHEmtcHqInfoAlloc ARGS((RgSchCellCb *cell, RgSchDlHqProcCb *hqP)); +Void rgSCHEmtcHqInfoAlloc ARGS((RgSchCellCb *cell, RgSchDlHqProcCb *hqP)); #endif /* forward references */ @@ -223,18 +204,17 @@ EXTERN Void rgSCHEmtcHqInfoAlloc ARGS((RgSchCellCb *cell, RgSchDlHqProcCb *hqP)) **/ /*MS_WORKAROUND for ccpu00122893*/ #ifdef ANSI -PUBLIC Void rgSCHDhmHqEntReset +Void rgSCHDhmHqEntReset ( RgSchDlHqEnt *hqE ) #else -PUBLIC Void rgSCHDhmHqEntReset(hqE) +Void rgSCHDhmHqEntReset(hqE) RgSchDlHqEnt *hqE; #endif { RgSchDlHqProcCb *hqP; - U8 i; - TRC2(rgSCHDhmHqEntReset) + uint8_t i; cmLListInit(&hqE->inUse); cmLListInit(&hqE->free); for (i=0; i < hqE->numHqPrcs; i++) @@ -276,7 +256,7 @@ PUBLIC Void rgSCHDhmHqEntReset(hqE) rgSCHLaaResetDlHqProcCb(hqP); #endif } - RETVOID; + return; } /* rgSCHDhmHqEntReset */ /** @@ -295,18 +275,17 @@ PUBLIC Void rgSCHDhmHqEntReset(hqE) * **/ #ifdef ANSI -PUBLIC Void rgSCHDhmAssgnUeHqEntFrmRaCb +Void rgSCHDhmAssgnUeHqEntFrmRaCb ( RgSchUeCb *ue, RgSchRaCb *raCb ) #else -PUBLIC Void rgSCHDhmAssgnUeHqEntFrmRaCb(ue, raCb) +Void rgSCHDhmAssgnUeHqEntFrmRaCb(ue, raCb) RgSchUeCb *ue; RgSchRaCb *raCb; #endif { - TRC2(rgSCHDhmAssgnUeHqEntFrmRaCb) ue->cellInfo[0]->hqEnt = raCb->dlHqE; ue->cellInfo[0]->hqEnt->ue = ue; @@ -318,7 +297,7 @@ RgSchRaCb *raCb; ue->ul.ulInactvMask &= ~(RG_HQENT_INACTIVE); rgSCHCmnDlInitHqEnt(ue->cell, ue->cellInfo[0]->hqEnt); - RETVOID; + return; } /** @@ -337,22 +316,21 @@ RgSchRaCb *raCb; * **/ #ifdef ANSI -PUBLIC Void rgSCHDhmDelHqEnt +Void rgSCHDhmDelHqEnt ( RgSchCellCb *cell, RgSchDlHqEnt **hqE ) #else -PUBLIC Void rgSCHDhmDelHqEnt(cell, hqE) +Void rgSCHDhmDelHqEnt(cell, hqE) RgSchCellCb *cell; RgSchDlHqEnt **hqE; #endif { - TRC2(rgSCHDhmDelHqEnt) if (!(*hqE)) { - RETVOID; + return; } rgSCHCmnDlDeInitHqEnt(cell, *hqE); @@ -360,30 +338,28 @@ RgSchDlHqEnt **hqE; rgSCHUtlFreeSBuf(cell->instIdx, (Data **)hqE, sizeof(RgSchDlHqEnt)); - RETVOID; + return; } #ifdef ANSI -PUBLIC RgSchDlHqEnt *rgSCHDhmHqEntInit +RgSchDlHqEnt *rgSCHDhmHqEntInit ( RgSchCellCb *cell ) #else -PUBLIC RgSchDlHqEnt *rgSCHDhmHqEntInit(cell) +RgSchDlHqEnt *rgSCHDhmHqEntInit(cell) RgSchCellCb *cell; #endif { RgSchDlHqEnt *hqE; Inst inst = cell->instIdx; - TRC2(rgSCHDhmHqEntInit) - /* Init the HARQ data structure */ if (rgSCHUtlAllocSBuf(inst, (Data **)&hqE, sizeof(RgSchDlHqEnt)) != ROK) { RLOG_ARG0(L_DEBUG,DBG_CELLID,cell->cellId, "rgSCHDhmHqEntInit hqE alloc fail"); - RETVALUE(NULLP); + return (NULLP); } #ifdef LTE_TDD /* Init the HARQ processes */ @@ -393,7 +369,7 @@ RgSchCellCb *cell; { RLOG_ARG0(L_DEBUG,DBG_CELLID,cell->cellId, "rgSCHDhmHqEntInit hqP alloc fail in hqE"); - RETVALUE(NULLP); + return (NULLP); } #else hqE->numHqPrcs = RGSCH_NUM_DL_HQ_PROC; @@ -413,7 +389,7 @@ RgSchCellCb *cell; hqE->cell = cell; /* CA Dev End*/ - RETVALUE(hqE); + return (hqE); } /* rgSCHDhmHqEntInit */ /** @@ -442,7 +418,7 @@ RgSchCellCb *cell; * **/ #ifdef ANSI -PUBLIC S16 rgSCHDhmGetAvlHqProc +S16 rgSCHDhmGetAvlHqProc ( RgSchCellCb *cell, RgSchUeCb *ue, @@ -450,7 +426,7 @@ CmLteTimingInfo timingInfo, RgSchDlHqProcCb **hqP ) #else -PUBLIC S16 rgSCHDhmGetAvlHqProc (cell, ue, timingInfo, hqP) +S16 rgSCHDhmGetAvlHqProc (cell, ue, timingInfo, hqP) RgSchCellCb *cell; RgSchUeCb *ue; CmLteTimingInfo timingInfo; @@ -460,7 +436,6 @@ RgSchDlHqProcCb **hqP; RgSchDlHqEnt *hqE = NULLP; RgSchDlHqProcCb *tmpHqProc; CmLList *tmp; - TRC2(rgSCHDhmGetAvlHqProc); hqE = RG_SCH_CMN_GET_UE_HQE(ue, cell); @@ -468,7 +443,7 @@ RgSchDlHqProcCb **hqP; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHDhmGetAvlHqProc hqE NULL ue %d" , ue->ueId); - RETVALUE(RFAILED); + return RFAILED; } @@ -480,7 +455,7 @@ RgSchDlHqProcCb **hqP; "rgSCHDhmGetAvlHqProc free %ld inUse %ld ue %d" , hqE->free.count, hqE->inUse.count, ue->ueId); /* No Harq Process available in the free queue. */ - RETVALUE(RFAILED); + return RFAILED; } tmpHqProc = (RgSchDlHqProcCb *)(tmp->node); @@ -502,7 +477,7 @@ RgSchDlHqProcCb **hqP; if (!tmp) { /* No Harq Process available in the free queue. */ - RETVALUE(RFAILED); + return RFAILED; } } #endif @@ -538,7 +513,7 @@ RgSchDlHqProcCb **hqP; tmpHqProc->itbsAtEstimate[1] = 0; tmpHqProc->prbAtEstimate = 0; - RETVALUE(ROK); + return ROK; } /* rgSCHDhmGetAvlHqProc */ @@ -562,34 +537,33 @@ RgSchDlHqProcCb **hqP; * @param[in] RgSchDlHqEnt *hqE * @param[in] CmLteTimingInfo timingInfo * @param[out] RgDlHqProc *hqP - * @param[in] U8 tbIdx + * @param[in] uint8_t tbIdx * @return Void * **/ #ifdef ANSI -PUBLIC Void rgSCHDhmHqTbRetx +Void rgSCHDhmHqTbRetx ( RgSchDlHqEnt *hqE, CmLteTimingInfo timingInfo, RgSchDlHqProcCb *hqP, -U8 tbIdx +uint8_t tbIdx ) #else -PUBLIC Void rgSCHDhmHqTbRetx(hqE, timingInfo, hqP, tbIdx) +Void rgSCHDhmHqTbRetx(hqE, timingInfo, hqP, tbIdx) RgSchDlHqEnt *hqE; CmLteTimingInfo timingInfo; RgSchDlHqProcCb *hqP; -U8 tbIdx; +uint8_t tbIdx; #endif { - U8 othrTbIdx = tbIdx ^ 1; - TRC2(rgSCHDhmHqTbRetx) + uint8_t othrTbIdx = tbIdx ^ 1; hqP->tbInfo[tbIdx].timingInfo = timingInfo; if (hqE->msg4Proc == hqP) { - RETVOID; + return; } /* fix for ccpu00118633 No Hq proc Avl end*/ @@ -607,7 +581,7 @@ U8 tbIdx; hqP->tbInfo[tbIdx].cntrRetxAllocFail = 0; - RETVOID; + return; } /* rgSCHDhmHqTbRetx */ /** @@ -635,23 +609,22 @@ U8 tbIdx; * **/ #ifdef ANSI -PUBLIC RgSchDlHqProcCb * rgSCHDhmLastSchedHqProc +RgSchDlHqProcCb * rgSCHDhmLastSchedHqProc ( RgSchDlHqEnt *hqE ) #else -PUBLIC RgSchDlHqProcCb * rgSCHDhmLastSchedHqProc(hqE) +RgSchDlHqProcCb * rgSCHDhmLastSchedHqProc(hqE) RgSchDlHqEnt *hqE; #endif { - TRC2(rgSCHDhmLastSchedHqProc); /* GRPPWR_CNTRL Fix: UE context will not hold a valid hqE, * until RACH procedure is completed */ if ((hqE == NULLP) || (hqE->inUse.last == NULLP)) { - RETVALUE(NULLP); + return (NULLP); } - RETVALUE((RgSchDlHqProcCb *)hqE->inUse.last->node); + return ((RgSchDlHqProcCb *)hqE->inUse.last->node); } /* rgSCHDhmLastSchedHqProc */ #ifdef RGR_V1 @@ -681,14 +654,14 @@ RgSchDlHqEnt *hqE; * **/ #ifdef ANSI -PUBLIC S16 rgSCHDhmGetCcchSduHqProc +S16 rgSCHDhmGetCcchSduHqProc ( RgSchUeCb *ueCb, CmLteTimingInfo timingInfo, RgSchDlHqProcCb **hqP ) #else -PUBLIC S16 rgSCHDhmGetCcchSduHqProc (ueCb, timingInfo, hqP) +S16 rgSCHDhmGetCcchSduHqProc (ueCb, timingInfo, hqP) RgSchUeCb *ueCb; CmLteTimingInfo timingInfo; RgSchDlHqProcCb **hqP; @@ -698,14 +671,12 @@ RgSchDlHqProcCb **hqP; CmLList *tmp; RgSchDlHqEnt *hqE; - TRC2(rgSCHDhmGetCcchSduHqProc) - hqE = ueCb->cellInfo[0]->hqEnt; CM_LLIST_FIRST_NODE(&(hqE->free), tmp); if (NULLP == tmp) { /* No Harq Process available in the free queue. */ - RETVALUE(RFAILED); + return RFAILED; } /* Remove the element from the free Queue and */ @@ -725,7 +696,7 @@ RgSchDlHqProcCb **hqP; //cmLListAdd2Tail(&hqE->inUse, &tmpHqProc->lnk); rgSCHDhmHqPAdd2InUseLst(tmpHqProc); - RETVALUE(ROK); + return ROK; } /* rgSCHDhmGetCcchSduHqProc */ #endif @@ -755,13 +726,13 @@ RgSchDlHqProcCb **hqP; * **/ #ifdef ANSI -PUBLIC S16 rgSCHDhmGetMsg4HqProc +S16 rgSCHDhmGetMsg4HqProc ( RgSchRaCb *raCb, CmLteTimingInfo timingInfo ) #else -PUBLIC S16 rgSCHDhmGetMsg4HqProc (raCb, timingInfo) +S16 rgSCHDhmGetMsg4HqProc (raCb, timingInfo) RgSchRaCb *raCb; CmLteTimingInfo timingInfo; #endif @@ -770,14 +741,12 @@ CmLteTimingInfo timingInfo; CmLList *tmp; RgSchDlHqEnt *hqE; - TRC2(rgSCHDhmGetMsg4HqProc) - hqE = raCb->dlHqE; CM_LLIST_FIRST_NODE(&(hqE->free), tmp); if (NULLP == tmp) { /* No Harq Process available in the free queue. */ - RETVALUE(RFAILED); + return RFAILED; } /* Remove the element from the free Queue and */ @@ -788,7 +757,7 @@ CmLteTimingInfo timingInfo; tmpHqProc->tbInfo[0].timingInfo = timingInfo; hqE->msg4Proc = tmpHqProc; - RETVALUE(ROK); + return ROK; } /* rgSCHDhmGetMsg4HqProc */ /** @@ -805,38 +774,36 @@ CmLteTimingInfo timingInfo; * Invoked by: scheduler and HARQ processing * * @param[in] RgDlHqProc *hqP - * @param[in] U8 tbIdx + * @param[in] uint8_t tbIdx * @param[in] Bool togNdi * @return Void * **/ #ifdef ANSI -PUBLIC Void rgSCHDhmRlsHqpTb +Void rgSCHDhmRlsHqpTb ( RgSchDlHqProcCb *hqP, -U8 tbIdx, +uint8_t tbIdx, Bool togNdi ) #else -PUBLIC Void rgSCHDhmRlsHqpTb(hqP, tbIdx, togNdi) +Void rgSCHDhmRlsHqpTb(hqP, tbIdx, togNdi) RgSchDlHqProcCb *hqP; -U8 tbIdx; +uint8_t tbIdx; Bool togNdi; #endif { RgSchDlHqEnt *hqE; - U8 othrTbIdx = tbIdx ^ 1; + uint8_t othrTbIdx = tbIdx ^ 1; #ifdef LTEMAC_SPS RgSchCmnDlHqProc *cmnHqDl; #endif /* L2_COUNTERS */ #ifdef LTE_L2_MEAS RgSchDlLcCb* lcCb = NULLP; - U8 numLch = 0; + uint8_t numLch = 0; #endif - TRC2(rgSCHDhmRlsHqpTb) - /* Reset all tbInfo values */ hqE = hqP->hqE; @@ -847,11 +814,11 @@ Bool togNdi; RgSchUeCb *ueCb = hqP->hqE->ue; RgSchCmnUe *cmnUe = (RgSchCmnUe*)ueCb->sch; RgSchCmnDlUe *dlUe = RG_SCH_CMN_GET_DL_UE(ueCb,hqE->cell);/*CA dev*/ - U8 cqi = dlUe->mimoInfo.cwInfo[0].cqi; + uint8_t cqi = dlUe->mimoInfo.cwInfo[0].cqi; /* to get retransmission, decreasing transmission counter */ - U16 numDlRetx = hqP->tbInfo[0].txCntr-1; - U8 tbs = dlUe->mimoInfo.cwInfo[0].iTbs[0]; - static U32 retxCnt1 = 0; + uint16_t numDlRetx = hqP->tbInfo[0].txCntr-1; + uint8_t tbs = dlUe->mimoInfo.cwInfo[0].iTbs[0]; + static uint32_t retxCnt1 = 0; RG_SCH_CMN_DL_TBS_TO_MCS(tbs, \ hqRetxStats.dlCqiStat[(cqi - 1)].mcs); @@ -940,7 +907,7 @@ Bool togNdi; /* Add the proc to the free list */ //cmLListAdd2Tail(&hqE->free, &hqP->lnk); rgSCHDhmHqPAdd2FreeLst(hqP); - RETVOID; + return; } #ifdef RGR_V1 /* MS_WORKAROUND : syed The check (hqE->ccchSduProc != NULLP) @@ -971,7 +938,7 @@ Bool togNdi; /* Add the proc to the free list */ //cmLListAdd2Tail(&hqE->free, &hqP->lnk); rgSCHDhmHqPAdd2FreeLst(hqP); - RETVOID; + return; } #endif @@ -1032,7 +999,7 @@ rgEmtcsetNullSubFrm(hqP); hqP->tbInfo[tbIdx].cntrRetxAllocFail = 0; - RETVOID; + return; } /* rgSCHDhmRlsHqpTb */ /** @@ -1052,18 +1019,16 @@ rgEmtcsetNullSubFrm(hqP); * **/ #ifdef ANSI -PUBLIC Void rgSCHDhmRlsHqProc +Void rgSCHDhmRlsHqProc ( RgSchDlHqProcCb *hqP ) #else -PUBLIC Void rgSCHDhmRlsHqProc(hqP) +Void rgSCHDhmRlsHqProc(hqP) RgSchDlHqProcCb *hqP; #endif { - TRC2(rgSCHDhmRlsHqProc) - #ifdef MAC_SCH_STATS /* THIS FUNCTION IS NOT CALLED */ @@ -1072,10 +1037,10 @@ RgSchDlHqProcCb *hqP; RgSchUeCb *ueCb = hqP->hqE->ue; RgSchCmnUe *cmnUe = (RgSchCmnUe*)ueCb->sch; RgSchCmnDlUe *dlUe = RG_SCH_CMN_GET_DL_UE(ueCb,hqE->cell);/*CA dev*/ - U8 cqi = dlUe->mimoInfo.cwInfo[0].cqi; + uint8_t cqi = dlUe->mimoInfo.cwInfo[0].cqi; /* to get retransmission, decreasing transmission counter */ - U16 numDlRetx = hqP->tbInfo[0].txCntr-1; - U8 tbs = dlUe->mimoInfo.cwInfo[0].iTbs[0]; + uint16_t numDlRetx = hqP->tbInfo[0].txCntr-1; + uint8_t tbs = dlUe->mimoInfo.cwInfo[0].iTbs[0]; RG_SCH_CMN_DL_TBS_TO_MCS(tbs, hqRetxStats.dlCqiStat[(cqi - 1)].mcs); @@ -1112,7 +1077,7 @@ rgEmtcsetNullSubFrm(hqP); hqP->tbCnt = 0; #endif - RETVOID; + return; } /* rgSCHDhmRlsHqProc */ #ifdef LTEMAC_SPS @@ -1126,7 +1091,7 @@ rgEmtcsetNullSubFrm(hqP); * Invoked by: ROM * * @param[in] RgSchUeCb *ue - * @param[in] U8 idx + * @param[in] uint8_t idx * @param[in] RgDlHqProc **hqP * @return S16 * -# ROK if successful @@ -1134,29 +1099,28 @@ rgEmtcsetNullSubFrm(hqP); * **/ #ifdef ANSI -PUBLIC S16 rgSCHDhmGetHqProcFrmId +S16 rgSCHDhmGetHqProcFrmId ( RgSchCellCb *cell, RgSchUeCb *ue, -U8 idx, +uint8_t idx, RgSchDlHqProcCb **hqP ) #else -PUBLIC S16 rgSCHDhmGetHqProcFrmId(cell, ue, idx, hqP) +S16 rgSCHDhmGetHqProcFrmId(cell, ue, idx, hqP) RgSchCellCb *cell; RgSchUeCb *ue; -U8 idx; +uint8_t idx; RgSchDlHqProcCb **hqP; #endif { RgSchDlHqEnt *hqE; - TRC2(rgSCHDhmGetHqProcFrmId) hqE = RG_SCH_CMN_GET_UE_HQE(ue, cell); /* Pick the proc based on the index provided */ *hqP = &(hqE->procs[idx]); - RETVALUE(ROK); + return ROK; } /* rgSCHDhmGetHqProcFrmId */ /** @@ -1173,26 +1137,24 @@ RgSchDlHqProcCb **hqP; * **/ #ifdef ANSI -PUBLIC RgSchDlHqProcCb* rgSCHDhmSpsDlGetHqProc +RgSchDlHqProcCb* rgSCHDhmSpsDlGetHqProc ( RgSchCellCb *cell, RgSchUeCb *ue, CmLteTimingInfo timingInfo ) #else -PUBLIC RgSchDlHqProcCb* rgSCHDhmSpsDlGetHqProc(cell, ue, timingInfo) +RgSchDlHqProcCb* rgSCHDhmSpsDlGetHqProc(cell, ue, timingInfo) RgSchCellCb *cell, RgSchUeCb *ue; CmLteTimingInfo timingInfo; #endif { RgSchDlHqEnt *hqE; - U8 idx; + uint8_t idx; RgSchDlHqProcCb *hqProc = NULLP; CmLList *tmp = NULLP; - TRC2(rgSCHDhmSpsDlGetHqProc); - hqE = RG_SCH_CMN_GET_UE_HQE(ue, cell); CM_LLIST_FIRST_NODE(&(hqE->free), tmp); @@ -1200,10 +1162,10 @@ CmLteTimingInfo timingInfo; if (NULLP == tmp) { /* No Harq Process available in the free queue. */ - RETVALUE(NULLP); + return (NULLP); } - idx = ((timingInfo.sfn * RGSCH_NUM_SUB_FRAMES_5G + timingInfo.subframe)/ + idx = ((timingInfo.sfn * RGSCH_NUM_SUB_FRAMES_5G + timingInfo.slot)/ ue->dl.dlSpsCfg.dlSpsPrdctyEnum) % ue->dl.dlSpsCfg.numSpsHqProc; @@ -1223,7 +1185,7 @@ CmLteTimingInfo timingInfo; if (!tmp) { /* No Harq Process available in the free queue. */ - RETVALUE(NULLP); + return (NULLP); } hqProc->tbInfo[0].timingInfo = timingInfo; @@ -1241,7 +1203,7 @@ CmLteTimingInfo timingInfo; rgSCHLaaResetDlHqProcCb(hqProc); #endif - RETVALUE(hqProc); + return (hqProc); } /* rgSCHDhmSpsDlGetHqProc */ #endif /* LTEMAC_SPS */ @@ -1256,32 +1218,30 @@ CmLteTimingInfo timingInfo; * feedback indication received. * * @param[in] RgSchDlHqProcCb *hqP - * @param[in] U8 tbIdx - * @param[in] U8 fdbk + * @param[in] uint8_t tbIdx + * @param[in] uint8_t fdbk * @return Void * -# None. **/ #ifdef ANSI -PRIVATE Void rgSCHDhmFdbkIndHndlTa +static Void rgSCHDhmFdbkIndHndlTa ( RgSchDlHqProcCb *hqP, -U8 tbIdx, -U8 fdbk, +uint8_t tbIdx, +uint8_t fdbk, Bool maxHqRetxReached ) #else -PRIVATE Void rgSCHDhmFdbkIndHndlTa(hqP, tbIdx, fdbk,maxHqRetxReached) +static Void rgSCHDhmFdbkIndHndlTa(hqP, tbIdx, fdbk,maxHqRetxReached) RgSchDlHqProcCb *hqP; -U8 tbIdx; -U8 fdbk; +uint8_t tbIdx; +uint8_t fdbk; Bool maxHqRetxReached; #endif { RgSchUeCb *ueCb; RgSchCellCb *cell; - TRC2(rgSCHDhmFdbkIndHndlTa) - ueCb = hqP->hqE->ue; cell = ueCb->cell; switch(fdbk) @@ -1336,7 +1296,7 @@ Bool maxHqRetxReached; break; } - RETVOID; + return; } /* rgSCHDhmFdbkIndHndlTa */ /* 3.1 MIMO: TA cmd details at TB level rather than Hq Level */ @@ -1355,26 +1315,24 @@ Bool maxHqRetxReached; * -# None. **/ #ifdef ANSI -PUBLIC Void rgSCHDhmSchdTa +Void rgSCHDhmSchdTa ( RgSchUeCb *ueCb, RgSchDlHqTbCb *tbInfo ) #else -PUBLIC Void rgSCHDhmSchdTa(ueCb, tbInfo) +Void rgSCHDhmSchdTa(ueCb, tbInfo) RgSchUeCb *ueCb; RgSchDlHqTbCb *tbInfo; #endif { - TRC2(rgSCHDhmSchdTa) - ueCb->dl.taCb.state = RGSCH_TA_SCHEDULED; ueCb->dl.taCb.numRemSf = 2; tbInfo->schdTa.pres = PRSNT_NODEF; tbInfo->schdTa.val = ueCb->dl.taCb.ta; - RETVOID; + return; } /* rgSCHDhmSchdTa */ #ifdef LTE_TDD @@ -1391,33 +1349,33 @@ RgSchDlHqTbCb *tbInfo; * @param[in] CmLteTimingInfo timeInfo * @param[in] Bool *isMsg4 * @param[out] RgSchDlHqProcCb **hqPrcs - * @param[out] U8 *numTbs + * @param[out] uint8_t *numTbs * @param[out] S8 *tbStrtIdx - * @param[out] U8 *cntHqPrcs + * @param[out] uint8_t *cntHqPrcs * @return S16 **/ #ifdef ANSI -PRIVATE S16 rgSCHDhmHqProcByFdbkTime +static S16 rgSCHDhmHqProcByFdbkTime ( RgSchDlHqEnt *hqE, CmLteTimingInfo timeInfo, Bool *isMsg4, RgSchDlHqProcCb **hqPrcs, -U8 *numTbs, +uint8_t *numTbs, S8 *tbStrtIdx, -U8 *cntHqPrcs, +uint8_t *cntHqPrcs, RgSchCellCb *cell ) #else -PRIVATE S16 rgSCHDhmHqProcByFdbkTime(hqE, timeInfo, isMsg4, hqPrcs, +static S16 rgSCHDhmHqProcByFdbkTime(hqE, timeInfo, isMsg4, hqPrcs, numTbs, tbStrtIdx, cntHqPrcs) RgSchDlHqEnt *hqE; CmLteTimingInfo timeInfo; Bool *isMsg4; RgSchDlHqProcCb **hqPrcs; -U8 *numTbs; +uint8_t *numTbs; S8 *tbStrtIdx; -U8 *cntHqPrcs; +uint8_t *cntHqPrcs; RgSchCellCb *cell; #endif { @@ -1425,10 +1383,10 @@ RgSchCellCb *cell; RgSchDlHqProcCb *hqP; CmLteTimingInfo schdSfTime; RgSchTddDlAscSetIdxK ascIdx; - U8 noFdbks; - U8 i; - U8 idx; - U8 dlIdx; + uint8_t noFdbks; + uint8_t i; + uint8_t idx; + uint8_t dlIdx; CmLListCp *lnk; CmLList *node; @@ -1442,10 +1400,10 @@ RgSchCellCb *cell; tbStrtIdx[*cntHqPrcs] = 0; numTbs[*cntHqPrcs] = 1; (*cntHqPrcs)++; - RETVALUE(ROK); + return ROK; } } - ascIdx = rgSchTddDlAscSetIdxKTbl[cell->ulDlCfgIdx][timeInfo.subframe]; + ascIdx = rgSchTddDlAscSetIdxKTbl[cell->ulDlCfgIdx][timeInfo.slot]; noFdbks = ascIdx.numFdbkSubfrms; for(idx=0; idxmsg4Proc->tbInfo[0].timingInfo, timeInfo)) { *isMsg4 = TRUE; - RETVALUE(hqE->msg4Proc); + return (hqE->msg4Proc); } } - RETVALUE(NULLP); + return (NULLP); } #endif @@ -1581,32 +1539,30 @@ RgSchDlSf *sf; * * @param[in] RgSchCellCb *cell * @param[in] RgSchDlHqProcCb *hqP - * @param[in] U8 tbCnt + * @param[in] uint8_t tbCnt * @param[out] Bool *isMaxRetx * @return Void * -#None. * **/ #ifdef ANSI -PUBLIC Void rgSCHDhmHqTbTrnsFail +Void rgSCHDhmHqTbTrnsFail ( RgSchCellCb *cell, RgSchDlHqProcCb *hqP, -U8 tbCnt, +uint8_t tbCnt, Bool *isMaxRetx ) #else -PUBLIC Void rgSCHDhmHqTbTrnsFail(cell, hqP, tbCnt, isMaxRetx) +Void rgSCHDhmHqTbTrnsFail(cell, hqP, tbCnt, isMaxRetx) RgSchCellCb *cell; RgSchDlHqProcCb *hqP; -U8 tbCnt; +uint8_t tbCnt; Bool *isMaxRetx; #endif { RgSchDlHqEnt *hqE; - U8 maxHqTx; - - TRC2(rgSCHDhmHqTbTrnsFail) + uint8_t maxHqTx; hqE = hqP->hqE; @@ -1620,7 +1576,7 @@ Bool *isMaxRetx; "rgSCHDhmHqTbTrnsFail contRes exp(): tmpCRNTI = %u", hqP->hqE->raCb->tmpCrnti); rgSCHRamMsg4Done(cell, (RgSchRaCb *)hqP->hqE->raCb); - RETVOID; + return; } #endif maxHqTx = cell->dlHqCfg.maxMsg4HqTx; @@ -1636,8 +1592,8 @@ Bool *isMaxRetx; RgSchUeCb *ueCb = hqE->ue; RgSchCmnUe *cmnUe = (RgSchCmnUe*)ueCb->sch; RgSchCmnDlUe *dlUe = RG_SCH_CMN_GET_DL_UE(ueCb,hqE->cell);/*CA dev*/ - U8 tbs = dlUe->mimoInfo.cwInfo[0].iTbs[0]; - static U32 retxCnt = 0; + uint8_t tbs = dlUe->mimoInfo.cwInfo[0].iTbs[0]; + static uint32_t retxCnt = 0; { ++retxCnt; @@ -1702,7 +1658,7 @@ Bool *isMaxRetx; /* CA Dev End*/ break; } - RETVOID; + return; } /* extra:check if already removed as part of other TB processing * then donot remove from InUse Q */ @@ -1763,10 +1719,10 @@ Bool *isMaxRetx; *isMaxRetx = TRUE; } - RETVOID; + return; } /* rgSCHDhmHqTbTrnsFail */ -PUBLIC U32 rgHqRvStats[2][4][2] = {{{0, 0}, {0, 0}, {0, 0}, {0, 0}}, +uint32_t rgHqRvStats[2][4][2] = {{{0, 0}, {0, 0}, {0, 0}, {0, 0}}, {{0, 0}, {0, 0}, {0, 0}, {0, 0}}}; #ifdef LTE_TDD #ifdef LTE_ADV @@ -1778,29 +1734,29 @@ PUBLIC U32 rgHqRvStats[2][4][2] = {{{0, 0}, {0, 0}, {0, 0}, {0, 0}}, * * @param[in] RgSchUeCb *ue, * @param[in] RgSchDlHqProcCb *hqP, - * @param[in] U8 *isAck, + * @param[in] uint8_t *isAck, * @param[in] RgTfuHqInfo *fdbk, - * @param[in] U8 tbIdx, + * @param[in] uint8_t tbIdx, * @param[in] RgSchTddANInfo *anInfo; - * @return RETVOID + * @return void **/ #ifdef ANSI -PRIVATE Void rgSchGetHqFdbkPosForM1 +static Void rgSchGetHqFdbkPosForM1 ( RgSchUeCb *ue, RgSchDlHqProcCb *hqP, - U8 *isAck, + uint8_t *isAck, RgTfuHqInfo *fdbk, - U8 tbIdx, + uint8_t tbIdx, RgSchTddANInfo *anInfo ) #else -PRIVATE Void rgSchGetHqFdbkPosForM1(ue,hqP,isAck,fdbk,tbIdx,anInfo) +static Void rgSchGetHqFdbkPosForM1(ue,hqP,isAck,fdbk,tbIdx,anInfo) RgSchUeCb *ue; RgSchDlHqProcCb *hqP; - U8 *isAck; + uint8_t *isAck; RgTfuHqInfo *fdbk; - U8 tbIdx; + uint8_t tbIdx; RgSchTddANInfo *anInfo; #endif { @@ -1827,7 +1783,7 @@ PRIVATE Void rgSchGetHqFdbkPosForM1(ue,hqP,isAck,fdbk,tbIdx,anInfo) { if(RG_SCH_IS_CELL_SEC(ue,hqP->hqE->cell)) { - U8 cellIdx = rgSchUtlGetServCellIdx(hqP->hqE->cell->instIdx, + uint8_t cellIdx = rgSchUtlGetServCellIdx(hqP->hqE->cell->instIdx, hqP->hqE->cell->cellId, hqP->hqE->ue); @@ -1884,7 +1840,7 @@ PRIVATE Void rgSchGetHqFdbkPosForM1(ue,hqP,isAck,fdbk,tbIdx,anInfo) break; } } - RETVOID; + return; }/* End of rgSchGetHqFdbkPosForM1 */ /** * @brief Function to decode the position of HarqFb for M>=2 cases. @@ -1895,41 +1851,41 @@ PRIVATE Void rgSchGetHqFdbkPosForM1(ue,hqP,isAck,fdbk,tbIdx,anInfo) * * @param[in] RgSchUeCb *ue, * @param[in] RgSchDlHqProcCb *hqP, - * @param[in] U8 *isAck, + * @param[in] uint8_t *isAck, * @param[in] RgTfuHqInfo *fdbk, - * @param[in] U8 tbIdx, + * @param[in] uint8_t tbIdx, * @param[in] RgSchTddANInfo *anInfo; * @param[in] CmLteTimingInfo timeInfo; - * @return RETVOID + * @return void **/ #ifdef ANSI -PRIVATE Void rgSchGetHqFdbkPosForM234 +static Void rgSchGetHqFdbkPosForM234 ( RgSchUeCb *ue, RgSchDlHqProcCb *hqP, - U8 *isAck, + uint8_t *isAck, RgTfuHqInfo *fdbk, - U8 tbIdx, + uint8_t tbIdx, RgSchTddANInfo *anInfo, - U8 M, + uint8_t M, CmLteTimingInfo timeInfo ) #else -PRIVATE Void rgSchGetHqFdbkPosForM234(ue,hqP,isAck,fdbk,tbIdx,anInfo,M,timeInfo) +static Void rgSchGetHqFdbkPosForM234(ue,hqP,isAck,fdbk,tbIdx,anInfo,M,timeInfo) RgSchUeCb *ue; RgSchDlHqProcCb *hqP; - U8 *isAck; + uint8_t *isAck; RgTfuHqInfo *fdbk; - U8 tbIdx; + uint8_t tbIdx; RgSchTddANInfo *anInfo; - U8 M; + uint8_t M; CmLteTimingInfo timeInfo; #endif { - U8 fdbkIdx; + uint8_t fdbkIdx; Bool isSCell; RgSchTddANInfo *pCellAnInfo; - U8 incr = 0; + uint8_t incr = 0; if(NULLP != ue) { @@ -2019,10 +1975,10 @@ PRIVATE Void rgSchGetHqFdbkPosForM234(ue,hqP,isAck,fdbk,tbIdx,anInfo,M,timeInfo) statsCnt = statsCnt % 10000; dlHqStats[statsCnt].cellId = hqP->hqE->cell->cellId; dlHqStats[statsCnt].sfn = hqP->tbInfo[tbIdx].timingInfo.sfn; - dlHqStats[statsCnt].sf = hqP->tbInfo[tbIdx].timingInfo.subframe; + dlHqStats[statsCnt].sf = hqP->tbInfo[tbIdx].timingInfo.slot; dlHqStats[statsCnt].ack = *isAck; dlHqStats[statsCnt].fdbkIdx = fdbkIdx; - dlHqStats[statsCnt].ue = hqP->hqE->ue->ueId;; + dlHqStats[statsCnt].ue = hqP->hqE->ue->ueId; if (anInfo) dlHqStats[statsCnt].ulDai = incr; if(TRUE == fdbk->isPusch) @@ -2049,7 +2005,7 @@ PRIVATE Void rgSchGetHqFdbkPosForM234(ue,hqP,isAck,fdbk,tbIdx,anInfo,M,timeInfo) } #endif }/*ue*/ - RETVOID; + return; }/*rgSchGetHqFdbkPosForM234*/ #endif/*LTE_ADV*/ @@ -2066,7 +2022,7 @@ PRIVATE Void rgSchGetHqFdbkPosForM234(ue,hqP,isAck,fdbk,tbIdx,anInfo,M,timeInfo) * * * @param[in] Void *cb - * @param[in] U8 cbType + * @param[in] uint8_t cbType * @param[in] RgSchCellCb cellCb * @param[in] CmLteTimingInfo timeInfo * @param[in] TfuHqInfo *fdbk @@ -2077,10 +2033,10 @@ PRIVATE Void rgSchGetHqFdbkPosForM234(ue,hqP,isAck,fdbk,tbIdx,anInfo,M,timeInfo) * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHDhmHqFdbkInd +S16 rgSCHDhmHqFdbkInd ( Void *cb, -U8 cbType, +uint8_t cbType, RgSchCellCb *cellCb, CmLteTimingInfo timeInfo, TfuHqInfo *fdbk, @@ -2088,9 +2044,9 @@ RgInfRlsHqInfo *rlsHqBufs, RgSchErrInfo *err ) #else -PUBLIC S16 rgSCHDhmHqFdbkInd(cb, cbType, cellCb, timeInfo, fdbk, rlsHqBufs, err) +S16 rgSCHDhmHqFdbkInd(cb, cbType, cellCb, timeInfo, fdbk, rlsHqBufs, err) Void *cb; -U8 cbType; +uint8_t cbType; RgSchCellCb *cellCb; CmLteTimingInfo timeInfo; TfuHqInfo *fdbk; @@ -2105,21 +2061,21 @@ RgSchErrInfo *err; RgSchDlSf *sf; Bool isMsg4 = FALSE; RgSchRaCb *raCb = NULLP; - U16 rnti=0; + uint16_t rnti=0; /* Maximum possible HARQ processes in UL-DL configuration 5 that is * given feedback at a time */ RgSchDlHqProcCb *hqPrcs[(RGSCH_NUM_SUB_FRAMES-1)*5]; /*MAX 5 Cells*/ - U8 numTb[(RGSCH_NUM_SUB_FRAMES-1)*5]; + uint8_t numTb[(RGSCH_NUM_SUB_FRAMES-1)*5]; S8 tbStrtIdx[(RGSCH_NUM_SUB_FRAMES-1)*5]; - U8 hqCnt; - U8 idx; + uint8_t hqCnt; + uint8_t idx; RgSchTddANInfo *anInfo = NULLP; - U8 isAck = 0; - U8 tbCnt; + uint8_t isAck = 0; + uint8_t tbCnt; RgrTddAckNackMode ackNackMode; Bool hqRls = FALSE; RgSchDlSf *nxtDlsf = NULLP; - /* U8 rcvCnt = 0; */ + /* uint8_t rcvCnt = 0; */ CmLteTimingInfo nxtfrm = {0,0}; Bool anUpd = FALSE; Bool maxHqRetxReached; @@ -2129,13 +2085,13 @@ RgSchErrInfo *err; #if ((defined LTEMAC_SPS_AN_MUX) || (defined LTE_ADV)) RgSchTddDlAscSetIdxK ascIdx; - U8 noFdbks; + uint8_t noFdbks; #endif #ifdef LTEMAC_SPS_AN_MUX Bool isPusch = FALSE; - U8 tmpIdx; - U8 hIdx; + uint8_t tmpIdx; + uint8_t hIdx; /* Subframes in which transmissions are scheduled and whose feedback can come * in this subframe. Used only for Multiplexing mode */ CmLteTimingInfo schdSfTime[RGSCH_TDD_MAX_FDBK]; @@ -2144,11 +2100,10 @@ RgSchErrInfo *err; #endif #endif #ifdef LTE_ADV - U8 sCellActCePres = 0; + uint8_t sCellActCePres = 0; #endif /* LTEMAC_SPS_AN_MUX*/ RgrSchFrmt1b3TypEnum uciFrmtTyp = RG_SCH_UCI_FORMAT1A_1B; - TRC2(rgSCHDhmHqFdbkInd) if (cbType == RGSCH_HQ_FDB_IND_CB_TYPE_RA_CB) { @@ -2177,7 +2132,7 @@ RgSchErrInfo *err; } #if ((defined LTEMAC_SPS_AN_MUX) || (defined LTE_ADV)) - ascIdx = rgSchTddDlAscSetIdxKTbl[cellCb->ulDlCfgIdx][timeInfo.subframe]; + ascIdx = rgSchTddDlAscSetIdxKTbl[cellCb->ulDlCfgIdx][timeInfo.slot]; noFdbks = ascIdx.numFdbkSubfrms; #endif #ifdef LTEMAC_SPS_AN_MUX @@ -2205,7 +2160,7 @@ RgSchErrInfo *err; { err->errType = RGSCHERR_DHM_FDBK_IND; err->errCause = RGSCHERR_DHM_FDBK_IND_INVALID_CB; - RETVALUE(RFAILED); + return RFAILED; } /* ccpu00147469 : This code is moved below as here this code always try to @@ -2269,7 +2224,7 @@ RgSchErrInfo *err; if(ue) { #ifdef LTE_ADV - U8 servCellIdx = rgSchUtlGetServCellIdx(hqPrcs[idx]->hqE->cell->instIdx, + uint8_t servCellIdx = rgSchUtlGetServCellIdx(hqPrcs[idx]->hqE->cell->instIdx, hqPrcs[idx]->hqE->cell->cellId,ue); if(ue->cellInfo[servCellIdx]->sCellState != RG_SCH_SCELL_ACTIVE) @@ -2284,7 +2239,7 @@ RgSchErrInfo *err; { RGSCHDBGINFO(cellCb->instIdx,(rgSchPBuf(cellCb->instIdx), "Ack Rcvd. No Ack/Nack feedback available \n")); - RETVALUE(RFAILED); + return RFAILED; } } @@ -2640,14 +2595,14 @@ RgSchErrInfo *err; if(ackNackMode == RGR_TDD_ACKNACK_MODE_MULT) { CmLteTimingInfo txTime; - U8 ulDlCfgIdx = 0; - U8 maxFdbks = 0; - U8 itr = 0; + uint8_t ulDlCfgIdx = 0; + uint8_t maxFdbks = 0; + uint8_t itr = 0; ulDlCfgIdx = cellCb->ulDlCfgIdx; maxFdbks = rgSchTddDlAscSetIdxKTbl[ulDlCfgIdx] - [timeInfo.subframe]. + [timeInfo.slot]. numFdbkSubfrms; for(itr=0; itr< maxFdbks; itr++) @@ -2659,12 +2614,12 @@ RgSchErrInfo *err; if(ue->uciFrmtTyp == RG_SCH_UCI_FORMAT1B_CS) {/* Using the sorted K table */ RGSCHDECRFRMCRNTTIME (timeInfo, txTime, - rgSchTddDlHqPucchResCalTbl[ulDlCfgIdx][timeInfo.subframe].subfrmNum[itr]); + rgSchTddDlHqPucchResCalTbl[ulDlCfgIdx][timeInfo.slot].subfrmNum[itr]); }else #endif { RGSCHDECRFRMCRNTTIME (timeInfo, txTime, - rgSchTddDlAscSetIdxKTbl[ulDlCfgIdx][timeInfo.subframe].subfrmNum[itr]); + rgSchTddDlAscSetIdxKTbl[ulDlCfgIdx][timeInfo.slot].subfrmNum[itr]); } if (RGSCH_TIMEINFO_SAME (txTime, ue->relPdcchTxTime)) @@ -2719,11 +2674,11 @@ RgSchErrInfo *err; { RGSCH_NULL_CHECK(cellCb->instIdx, ue); RLOG_ARG3(L_ERROR,DBG_CELLID,cellCb->cellId,"CRNTI:%d" - " NO HARQ proc available for feedback:timeInfo:snf %d,subframe %d", - ue->ueId,timeInfo.sfn, timeInfo.subframe); + " NO HARQ proc available for feedback:timeInfo:snf %d,slot %d", + ue->ueId,timeInfo.sfn, timeInfo.slot); err->errType = RGSCHERR_DHM_FDBK_IND; err->errCause = RGSCHERR_DHM_FDBK_IND_INVALID_CB; - RETVALUE(RFAILED); + return RFAILED; } */ }/*if(hqCnt==0)*/ @@ -2755,7 +2710,7 @@ RgSchErrInfo *err; #endif } - RETVALUE(ROK); + return ROK; } //#endif /* LTEMAC_SPS */ @@ -2776,31 +2731,31 @@ RgSchErrInfo *err; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHDhmPrcFdbkForTb +S16 rgSCHDhmPrcFdbkForTb ( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlHqProcCb *hqP, RgSchDlSf *sf, Bool isMsg4, -U16 rnti, -U8 tbCnt, +uint16_t rnti, +uint8_t tbCnt, CmLteTimingInfo timingInfo, -U8 isAck, +uint8_t isAck, RgInfRlsHqInfo *rlsHqBufs, RgSchErrInfo *err ) #else -PUBLIC S16 rgSCHDhmPrcFdbkForTb(cell, ue, hqP, sf, isMsg4, rnti, tbCnt, timingInfo, isAck, rlsHqBufs, err) +S16 rgSCHDhmPrcFdbkForTb(cell, ue, hqP, sf, isMsg4, rnti, tbCnt, timingInfo, isAck, rlsHqBufs, err) RgSchCellCb *cell; RgSchUeCb *ue; RgSchDlHqProcCb *hqP; RgSchDlSf *sf; Bool isMsg4; -U16 rnti; -U8 tbCnt; +uint16_t rnti; +uint8_t tbCnt; CmLteTimingInfo timingInfo; -U8 isAck; +uint8_t isAck; RgInfRlsHqInfo *rlsHqBufs; RgSchErrInfo *err; #endif @@ -2823,7 +2778,6 @@ RgSchErrInfo *err; CmLteTimingInfo frm = timingInfo; #endif - TRC2(rgSCHDhmPrcFdbkForTb) if (ue) { ueDl = RG_SCH_CMN_GET_DL_UE(ue,cell); @@ -2924,7 +2878,7 @@ RgSchErrInfo *err; { if((rgSCHDhmProcHqFdbkAckNackRep(hqP,sf,tbCnt,&isAck)) != ROK) { - RETVALUE(ret); + return (ret); } } else @@ -3041,7 +2995,7 @@ RgSchErrInfo *err; { rgSCHDhmFdbkIndHndlTa(hqP, tbCnt, isAck, maxHqRetxReached); } - RETVALUE(ret); + return (ret); } /* rgSCHDhmPrcFdbkForTb */ /** * @brief Function to decode the position of HarqFb for eachCell. * @@ -3055,25 +3009,25 @@ RgSchErrInfo *err; * @param[in] RgrSchFrmt1b3TypEnum uciFrmtTyp, * @param[in] Bool *isAck, * @param[in] RgTfuHqInfo *fdbk, - * @return RETVOID + * @return void **/ #ifdef ANSI -PUBLIC Void rgSchGetHqFdbkPos +Void rgSchGetHqFdbkPos ( RgSchCellCb *cell, RgSchUeCb *ue, RgSchDlHqProcCb *hqP, RgrSchFrmt1b3TypEnum uciFrmtTyp, - U8 *isAck, + uint8_t *isAck, RgTfuHqInfo *fdbk ) #else -PUBLIC Void rgSchGetHqFdbkPos(cell,ue,hqP,uciFrmtTyp,isAck,fdbk) +Void rgSchGetHqFdbkPos(cell,ue,hqP,uciFrmtTyp,isAck,fdbk) RgSchCellCb *cell; RgSchUeCb *ue; RgSchDlHqProcCb *hqP; RgrSchFrmt1b3TypEnum uciFrmtTyp; - U8 *isAck; + uint8_t *isAck; RgTfuHqInfo *fdbk; #endif { @@ -3081,7 +3035,7 @@ PUBLIC Void rgSchGetHqFdbkPos(cell,ue,hqP,uciFrmtTyp,isAck,fdbk) { isAck[0] = fdbk->isAck[0]; isAck[1] = fdbk->isAck[1]; - RETVOID; + return; } #ifdef LTE_ADV /* LAA Making all ack for LAA CELL */ @@ -3090,7 +3044,7 @@ PUBLIC Void rgSchGetHqFdbkPos(cell,ue,hqP,uciFrmtTyp,isAck,fdbk) { isAck[0] = TRUE; isAck[1] = TRUE; - RETVOID; + return; } if((ue != NULLP)) @@ -3118,7 +3072,7 @@ PUBLIC Void rgSchGetHqFdbkPos(cell,ue,hqP,uciFrmtTyp,isAck,fdbk) if(RG_SCH_IS_CELL_SEC(ue,hqP->hqE->cell)) { #ifdef LTE_ADV - U8 servCellIdx = rgSchUtlGetServCellIdx(hqP->hqE->cell->instIdx, + uint8_t servCellIdx = rgSchUtlGetServCellIdx(hqP->hqE->cell->instIdx, hqP->hqE->cell->cellId, ue); @@ -3235,26 +3189,26 @@ PUBLIC Void rgSchGetHqFdbkPos(cell,ue,hqP,uciFrmtTyp,isAck,fdbk) } } #endif - RETVOID; + return; }/* End of rgSchGetHqFdbkPos */ #ifdef LTE_ADV #ifdef ANSI -PUBLIC Void rgSchGetHqFdbkPosFormat3 +Void rgSchGetHqFdbkPosFormat3 ( RgSchDlHqProcCb *hqP, - U8 *isAck, + uint8_t *isAck, TfuHqFdbk *fdbk ) #else -PUBLIC Void rgSchGetHqFdbkPosFormat3(hqP,isAck,fdbk) +Void rgSchGetHqFdbkPosFormat3(hqP,isAck,fdbk) RgSchDlHqProcCb *hqP; - U8 *isAck; + uint8_t *isAck; TfuHqFdbk *fdbk; #endif { - U8 cellIdx = RG_SCH_CMN_GET_CELL_IDX_FROM_HQP(hqP); - isAck[0] = (U8)fdbk[cellIdx]; - isAck[1] = (U8)fdbk[cellIdx + 1]; + uint8_t cellIdx = RG_SCH_CMN_GET_CELL_IDX_FROM_HQP(hqP); + isAck[0] = (uint8_t)fdbk[cellIdx]; + isAck[1] = (uint8_t)fdbk[cellIdx + 1]; } #endif /** * @brief Handler for HARQ feedback received for DL transmission. @@ -3269,7 +3223,7 @@ PUBLIC Void rgSchGetHqFdbkPosFormat3(hqP,isAck,fdbk) * * * @param[in] Void *cb - * @param[in] U8 cbType + * @param[in] uint8_t cbType * @param[in] RgSchCellCb *cell * @param[in] RgTfuHarqAckIndInfo *fdbk * @param[in] RgInfRlsHqInfo *rlsHqBufs @@ -3279,7 +3233,7 @@ PUBLIC Void rgSchGetHqFdbkPosFormat3(hqP,isAck,fdbk) * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHDhm5gtfHqFdbkInd +S16 rgSCHDhm5gtfHqFdbkInd ( RgSchUeCb *ue, RgSchCellCb *cell, @@ -3288,7 +3242,7 @@ TfuHqFdbk fdbk, RgSchErrInfo *err ) #else -PUBLIC S16 rgSCHDhm5gtfHqFdbkInd(ue, cell, timingInfo, fdbk, err) +S16 rgSCHDhm5gtfHqFdbkInd(ue, cell, timingInfo, fdbk, err) RgSchUeCb *ue; RgSchCellCb *cell; CmLteTimingInfo timingInfo; @@ -3302,13 +3256,11 @@ RgSchErrInfo *err; S16 ret = ROK; RgSchDlSf *sf; Bool isMsg4 = FALSE; - U16 rnti=0; - U16 procId=0; - U8 hqPCount = 0; + uint16_t rnti=0; + uint16_t procId=0; + uint8_t hqPCount = 0; RgInfRlsHqInfo *rlsHqBufs = NULLP; - TRC2(rgSCHDhm5gtfHqFdbkInd) - RGSCHDECRFRMCRNTTIME(timingInfo, timingInfo, 4); sf = rgSCHUtlSubFrmGet(cell, timingInfo); @@ -3336,13 +3288,13 @@ RgSchErrInfo *err; { rlsHqBufs->ueHqInfo[rlsHqBufs->numUes].rnti = rnti; rlsHqBufs->ueHqInfo[rlsHqBufs->numUes].hqProcId = - (U8)procId; + (uint8_t)procId; rlsHqBufs->numUes++; } hqPCount--; } - RETVALUE(ret); + return (ret); } /* rgSCHDhm5gtfHqFdbkInd */ /** * @brief Handler for HARQ feedback received for DL transmission. @@ -3357,7 +3309,7 @@ RgSchErrInfo *err; * * * @param[in] Void *cb - * @param[in] U8 cbType + * @param[in] uint8_t cbType * @param[in] RgSchCellCb *cell * @param[in] RgTfuHarqAckIndInfo *fdbk * @param[in] RgInfRlsHqInfo *rlsHqBufs @@ -3367,10 +3319,10 @@ RgSchErrInfo *err; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHDhmHqFdbkInd +S16 rgSCHDhmHqFdbkInd ( Void *cb, -U8 cbType, +uint8_t cbType, RgSchCellCb *cell, CmLteTimingInfo timingInfo, RgTfuHqInfo *fdbk, @@ -3378,9 +3330,9 @@ RgInfRlsHqInfo *rlsHqBufs, RgSchErrInfo *err ) #else -PUBLIC S16 rgSCHDhmHqFdbkInd(cb, cbType, cell, timingInfo, fdbk, rlsHqBufs, err) +S16 rgSCHDhmHqFdbkInd(cb, cbType, cell, timingInfo, fdbk, rlsHqBufs, err) Void *cb; -U8 cbType; +uint8_t cbType; RgSchCellCb *cell; CmLteTimingInfo timingInfo; RgTfuHqInfo *fdbk; @@ -3400,13 +3352,13 @@ RgSchErrInfo *err; RgSchDlSf *sf; Bool isMsg4 = FALSE; RgSchRaCb *raCb = NULLP; - U16 rnti=0; + uint16_t rnti=0; /* Added Insure Fixes Of UR.Initialized procId */ - U16 procId=0; - /* DTX Change: Bool is converted into U8*/ - U8 isAck[2]={0}; /*Changed to Array of 2*/ - U8 tbCnt; - U8 hqPCount = 0; + uint16_t procId=0; + /* DTX Change: Bool is converted into uint8_t*/ + uint8_t isAck[2]={0}; /*Changed to Array of 2*/ + uint8_t tbCnt; + uint8_t hqPCount = 0; #ifdef LTEMAC_SPS CmLteTimingInfo fdbkRcptTime = timingInfo; @@ -3419,8 +3371,6 @@ RgSchErrInfo *err; #endif RgrSchFrmt1b3TypEnum uciFrmtTyp = RG_SCH_UCI_FORMAT1A_1B; - TRC2(rgSCHDhmHqFdbkInd) - /* Get the subframe associated with the feedback */ /* ccpu00133109: Removed RGSCHSUBFRMCRNTTIME as it is not giving proper output * if diff is more than 10. Instead using RGSCHDECRFRMCRNTTIME() as it is @@ -3477,8 +3427,8 @@ RgSchErrInfo *err; RgSchUeCb *ueCb = hqE->ue; RgSchCmnUe *cmnUe = (RgSchCmnUe*)ueCb->sch; RgSchCmnDlUe *dlUe = RG_SCH_CMN_GET_DL_UE(ueCb,hqE->cell);/*CA dev*/ - U8 tbs = dlUe->mimoInfo.cwInfo[0].iTbs[0]; - static U32 retxCnt = 0; + uint8_t tbs = dlUe->mimoInfo.cwInfo[0].iTbs[0]; + static uint32_t retxCnt = 0; if (fdbk->isAck[0] == TFU_HQFDB_ACK) { @@ -3529,9 +3479,9 @@ RgSchErrInfo *err; { RLOG_ARG3(L_ERROR,DBG_CELLID,cell->cellId, "CRNTI:%d NO HARQ proc available for feedback: TimingInfo: " - "sfn %d subframe %d", ue->ueId, timingInfo.sfn, - timingInfo.subframe); - RETVALUE(RFAILED); + "sfn %d slot %d", ue->ueId, timingInfo.sfn, + timingInfo.slot); + return RFAILED; } isAck[0] = fdbk->isAck[0]; @@ -3542,7 +3492,7 @@ RgSchErrInfo *err; /* Remove release PDCCH from the subframe */ rgSCHUtlPdcchPut(cell, &sf->pdcchInfo, sf->relPdcch); sf->relPdcch = NULLP; - RETVALUE(ROK); + return ROK; } } } @@ -3597,7 +3547,7 @@ RgSchErrInfo *err; { rlsHqBufs->ueHqInfo[rlsHqBufs->numUes].rnti = rnti; rlsHqBufs->ueHqInfo[rlsHqBufs->numUes].hqProcId = - (U8)procId; + (uint8_t)procId; rlsHqBufs->numUes++; } hqPCount--; @@ -3623,14 +3573,14 @@ RgSchErrInfo *err; { rlsHqBufs->ueHqInfo[rlsHqBufs->numUes].rnti = rnti; rlsHqBufs->ueHqInfo[rlsHqBufs->numUes].hqProcId = - (U8)procId; + (uint8_t)procId; rlsHqBufs->numUes++; } hqPCount--; node = node->next; } - RETVALUE(ret); + return (ret); } /* rgSCHDhmHqFdbkInd */ #endif /* LTE_FDD */ @@ -3655,7 +3605,7 @@ RgSchErrInfo *err; * -# RFAILED **/ #ifdef ANSI -PUBLIC Void rgSCHDhmRgrUeCfg +Void rgSCHDhmRgrUeCfg ( RgSchCellCb *cell, RgSchUeCb *ueCb, @@ -3663,14 +3613,13 @@ RgrUeCfg *ueCfg, RgSchErrInfo *err ) #else -PUBLIC Void rgSCHDhmRgrUeCfg(cell, ueCb, ueCfg, err) +Void rgSCHDhmRgrUeCfg(cell, ueCb, ueCfg, err) RgSchCellCb *cell; RgSchUeCb *ueCb; RgrUeCfg *ueCfg; RgSchErrInfo *err; #endif { - TRC2(rgSCHDhmRgrUeCfg) UNUSED(err); @@ -3699,7 +3648,7 @@ RgSchErrInfo *err; } rgSCHTmrStartTmr (cell, ueCb, RG_SCH_TMR_TA, ueCb->dl.taCb.cfgTaTmr); } - RETVOID; + return; } /* rgSCHDhmRgrUeCfg */ @@ -3723,14 +3672,14 @@ RgSchErrInfo *err; * -# RFAILED **/ #ifdef ANSI -PUBLIC Void rgSCHDhmRgrCellCfg +Void rgSCHDhmRgrCellCfg ( RgSchCellCb *cell, RgrCellCfg *cellCfg, RgSchErrInfo *err ) #else -PUBLIC Void rgSCHDhmRgrCellCfg(cell, cellCfg, err) +Void rgSCHDhmRgrCellCfg(cell, cellCfg, err) RgSchCellCb *cell; RgrCellCfg *cellCfg; RgSchErrInfo *err; @@ -3740,9 +3689,7 @@ RgSchErrInfo *err; PTR pUeCb;/* previous UE Control block */ PTR nUeCb;/* next UE control block */ S16 ret; - U8 idx; - - TRC2(rgSCHDhmRgrCellCfg) + uint8_t idx; UNUSED(err); @@ -3787,7 +3734,7 @@ RgSchErrInfo *err; cell->tq[idx].first = NULLP; cell->tq[idx].tail = NULLP; } - RETVOID; + return; } /* rgSCHDhmRgrCellCfg */ /** @@ -3810,14 +3757,14 @@ RgSchErrInfo *err; * -# RFAILED **/ #ifdef ANSI -PUBLIC Void rgSCHDhmRgrCellRecfg +Void rgSCHDhmRgrCellRecfg ( RgSchCellCb *cell, RgrCellRecfg *cellRecfg, RgSchErrInfo *err ) #else -PUBLIC Void rgSCHDhmRgrCellRecfg(cell, cellRecfg, err) +Void rgSCHDhmRgrCellRecfg(cell, cellRecfg, err) RgSchCellCb *cell; RgrCellRecfg *cellRecfg; RgSchErrInfo *err; @@ -3828,8 +3775,6 @@ RgSchErrInfo *err; PTR nUeCb;/* next UE control block */ S16 ret; - TRC2(rgSCHDhmRgrCellRecfg) - UNUSED(err); pUeCb = NULLP; @@ -3855,7 +3800,7 @@ RgSchErrInfo *err; } } } - RETVOID; + return; } /* rgSCHDhmRgrCellRecfg */ /** @@ -3873,18 +3818,16 @@ RgSchErrInfo *err; * **/ #ifdef ANSI -PUBLIC Void rgSCHDhmFreeUe +Void rgSCHDhmFreeUe ( RgSchUeCb *ueCb ) #else -PUBLIC Void rgSCHDhmFreeUe(ueCb) +Void rgSCHDhmFreeUe(ueCb) RgSchUeCb *ueCb; #endif { - TRC2(rgSCHDhmFreeUe) - /* If TA Timer is running. Stop it */ if (ueCb->taTmr.tmrEvnt != TMR_NONE) { @@ -3922,7 +3865,7 @@ RgSchUeCb *ueCb; rgSCHCmnRmvFrmTaLst(ueCb->cell, ueCb); } - RETVOID; + return; } /* rgSCHDhmFreeUe */ @@ -3937,26 +3880,25 @@ RgSchUeCb *ueCb; * * @param[in] RgSchCellCb *cell * @param[in] RgSchUeCb *ueCb - * @param[in] U8 ta + * @param[in] uint8_t ta * * @return None. * **/ #ifdef ANSI -PUBLIC Void rgSCHDhmUpdTa +Void rgSCHDhmUpdTa ( RgSchCellCb *cell, RgSchUeCb *ueCb, -U8 ta +uint8_t ta ) #else -PUBLIC Void rgSCHDhmUpdTa(cell, ueCb, ta) +Void rgSCHDhmUpdTa(cell, ueCb, ta) RgSchCellCb *cell; RgSchUeCb *ueCb; -U8 ta; +uint8_t ta; #endif { - TRC2(rgSCHDhmUpdTa) if (ueCb->dl.taCb.state == RGSCH_TA_IDLE) { @@ -3987,7 +3929,7 @@ U8 ta; ueCb->dl.taCb.outStndngTaval = ta; } - RETVOID; + return; } /* rgSCHDhmUpdTa */ /** @brief This function handles the TA timer expiry. @@ -4006,21 +3948,19 @@ U8 ta; * -#None. */ #ifdef ANSI -PUBLIC Void rgSCHDhmProcTAExp +Void rgSCHDhmProcTAExp ( RgSchUeCb *ueCb ) #else -PUBLIC Void rgSCHDhmProcTAExp (ueCb) +Void rgSCHDhmProcTAExp (ueCb) RgSchUeCb *ueCb; #endif { - TRC2(rgSCHDhmProcTAExp); - /* Ask scheduler to schedule this UE */ ueCb->dl.taCb.state = RGSCH_TA_TOBE_SCHEDULED; rgSCHUtlDlTARpt(ueCb->cell, ueCb); - RETVOID; + return; } /* end of rgSCHDhmProcTAExp */ /* 3.1 MIMO: LC details at TB level rather than Hq Level */ @@ -4042,32 +3982,30 @@ PUBLIC Void rgSCHDhmProcTAExp (ueCb) * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHDhmAddLcData +S16 rgSCHDhmAddLcData ( Inst inst, RgSchLchAllocInfo *lchData, RgSchDlHqTbCb *tbInfo ) #else -PUBLIC S16 rgSCHDhmAddLcData(inst, lchData, tbInfo) +S16 rgSCHDhmAddLcData(inst, lchData, tbInfo) Inst inst; RgSchLchAllocInfo *lchData; RgSchDlHqTbCb *tbInfo; #endif { - TRC2(rgSCHDhmAddLcData) - if(tbInfo->numLch >= RGSCH_MAX_NUM_DED_LC) { - RETVALUE(RFAILED); + return RFAILED; } tbInfo->lchSchdDataArr[tbInfo->numLch] = *lchData; tbInfo->numLch++; - RETVALUE(ROK); + return ROK; } /* rgSCHDhmAddLcData */ @@ -4089,26 +4027,24 @@ RgSchDlHqTbCb *tbInfo; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHDhmTddRlsSubFrm +S16 rgSCHDhmTddRlsSubFrm ( RgSchCellCb *cellCb, CmLteTimingInfo uciTimingInfo ) #else -PUBLIC S16 rgSCHDhmTddRlsSubFrm(cellCb, uciTimingInfo) +S16 rgSCHDhmTddRlsSubFrm(cellCb, uciTimingInfo) RgSchCellCb *cellCb; CmLteTimingInfo uciTimingInfo; #endif { CmLteTimingInfo dlSfTime; RgSchTddDlAscSetIdxK ascIdx; - U8 noFdbks; - U8 i; - - TRC2(rgSCHDhmTddRlsSubFrm) + uint8_t noFdbks; + uint8_t i; ascIdx = - rgSchTddDlAscSetIdxKTbl[cellCb->ulDlCfgIdx][uciTimingInfo.subframe]; + rgSchTddDlAscSetIdxKTbl[cellCb->ulDlCfgIdx][uciTimingInfo.slot]; noFdbks = ascIdx.numFdbkSubfrms; for(i=0; i < noFdbks; i++) { @@ -4121,11 +4057,11 @@ CmLteTimingInfo uciTimingInfo; RGSCHDECRFRMCRNTTIME(uciTimingInfo, dlSfTime, ascIdx.subfrmNum[i]); rgSCHUtlDlRlsSubFrm(cellCb, dlSfTime); } - RETVALUE(ROK); + return ROK; }/* rgSCHDhmTddRlsSubFrm */ #ifdef TFU_TDD -U32 macDtx = 0; +uint32_t macDtx = 0; #endif /** * @brief Handler for Removing the HARQ process from a dlsf. @@ -4146,13 +4082,13 @@ U32 macDtx = 0; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHDhmRlsDlsfHqProc +S16 rgSCHDhmRlsDlsfHqProc ( RgSchCellCb *cellCb, CmLteTimingInfo uciTimingInfo ) #else -PUBLIC S16 rgSCHDhmRlsDlsfHqProc(cellCb, uciTimingInfo) +S16 rgSCHDhmRlsDlsfHqProc(cellCb, uciTimingInfo) RgSchCellCb *cellCb; CmLteTimingInfo uciTimingInfo; #endif @@ -4162,21 +4098,20 @@ CmLteTimingInfo uciTimingInfo; CmLteTimingInfo nxtfrm = {0,0}; RgSchDlHqProcCb *tmpHqProc; RgSchTddDlAscSetIdxK ascIdx; - U8 noFdbks; + uint8_t noFdbks; S16 i; RgSchDlSf *nxtDlsf = NULLP; CmLList *node; CmLList *hqPNode; - U8 idx; + uint8_t idx; /*ccpu00130018 -MOD -Initiatizing with FALSE*/ - U8 maxRetx=FALSE; + uint8_t maxRetx=FALSE; RgSchTddANInfo *anInfo = NULLP; RgSchDlHqTbCb *tbCb; RgSchUeCb *ue = NULLP; - TRC2(rgSCHDhmRlsDlsfHqProc) ascIdx = - rgSchTddDlAscSetIdxKTbl[cellCb->ulDlCfgIdx][uciTimingInfo.subframe]; + rgSchTddDlAscSetIdxKTbl[cellCb->ulDlCfgIdx][uciTimingInfo.slot]; noFdbks = ascIdx.numFdbkSubfrms; for(i=0; i < noFdbks; i++) { @@ -4266,7 +4201,7 @@ CmLteTimingInfo uciTimingInfo; /* Update feedback time for this process so that * next subframe its picked up */ #ifdef LTE_ADV - U8 servCellIdx = rgSchUtlGetServCellIdx( + uint8_t servCellIdx = rgSchUtlGetServCellIdx( tmpHqProc->hqE->cell->instIdx, tmpHqProc->hqE->cell->cellId, ue); @@ -4277,9 +4212,9 @@ CmLteTimingInfo uciTimingInfo; if(anInfo == NULLP) { RGSCHDBGERR(cellCb->instIdx, (rgSchPBuf(cellCb->instIdx), - "Ack/Nack Info is NULL, Processing %dth feedback subframe for DTX" + "Ack/Nack Info is NULL, Processing %dth feedback slot for DTX" "received on SFN [%d] and SF [%d]\n",i, uciTimingInfo.sfn, - uciTimingInfo.subframe)); + uciTimingInfo.slot)); } else if (tbCb->fbkRepCntr == 0) { @@ -4353,7 +4288,7 @@ CmLteTimingInfo uciTimingInfo; /* Update feedback time for this process so that * next subframe its picked up */ #ifdef LTE_ADV - U8 servCellIdx = rgSchUtlGetServCellIdx( + uint8_t servCellIdx = rgSchUtlGetServCellIdx( tmpHqProc->hqE->cell->instIdx, tmpHqProc->hqE->cell->cellId, ue); @@ -4363,7 +4298,7 @@ CmLteTimingInfo uciTimingInfo; #endif if(anInfo == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } RGSCH_NULL_CHECK(cellCb->instIdx, nxtDlsf); RGSCH_UPD_HQAN_FDBKTIME(tbCb, nxtDlsf, nxtfrm); @@ -4412,7 +4347,7 @@ CmLteTimingInfo uciTimingInfo; } } } - RETVALUE(ROK); + return ROK; }/* rgSCHDhmRlsDlsfHqProc */ #else /* ifdef LTE_TDD */ /** @@ -4433,13 +4368,13 @@ CmLteTimingInfo uciTimingInfo; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHDhmRlsDlsfHqProc +S16 rgSCHDhmRlsDlsfHqProc ( RgSchCellCb *cell, CmLteTimingInfo timingInfo ) #else -PUBLIC S16 rgSCHDhmRlsDlsfHqProc(cell, timingInfo) +S16 rgSCHDhmRlsDlsfHqProc(cell, timingInfo) RgSchCellCb *cell; CmLteTimingInfo timingInfo; #endif @@ -4450,12 +4385,10 @@ CmLteTimingInfo timingInfo; Bool maxRetx; CmLList *node; CmLList *hqPNode; - U8 idx; + uint8_t idx; RgSchDlHqTbCb *tbCb; RgSchUeCb *ue; - TRC2(rgSCHDhmRlsDlsfHqProc) - /* Fetch the current timing info. Modify it to Last sf to be rlsd.*/ /* ccpu00133109: Removed RGSCHSUBFRMCRNTTIME as it is not giving proper * output if diff is more than 10. Instead using RGSCHDECRFRMCRNTTIME() @@ -4573,7 +4506,7 @@ CmLteTimingInfo timingInfo; } /*CA Dev End*/ - RETVALUE(ROK); + return ROK; } /* rgSCHDhmRlsDlsfHqProc */ #endif #ifdef LTEMAC_SPS @@ -4592,31 +4525,30 @@ CmLteTimingInfo timingInfo; * - Set isSpsHqProc = TRUE * * @param[in] RgSchUeCb *ue - * @param[in] U8 idx + * @param[in] uint8_t idx * @return S16 * -# ROK if successful * -# RFAILED otherwise * **/ #ifdef ANSI -PUBLIC S16 rgSCHDhmMarkSpsHqProc +S16 rgSCHDhmMarkSpsHqProc ( RgSchUeCb *ue, -U8 idx +uint8_t idx ) #else -PUBLIC S16 rgSCHDhmMarkSpsHqProc(ue, idx) +S16 rgSCHDhmMarkSpsHqProc(ue, idx) RgSchUeCb *ue; -U8 idx; +uint8_t idx; #endif { RgSchDlHqProcCb *hqP; - TRC2(rgSCHDhmMarkSpsHqProc) /* Pick the proc based on the index provided */ rgSCHDhmGetHqProcFrmId(ue->cell, ue, idx, &hqP); - RETVALUE(ROK); + return ROK; } /* rgSCHDhmMarkSpsHqProc */ #endif /* RG_UNUSED */ #endif /* LTEMAC_SPS */ @@ -4634,29 +4566,28 @@ U8 idx; * * @param[in] RgSchDlHqProcCb *hqP * @param[in] RgSchDlSf *sf - * @param[in] U8 tbCnt - * @param[in] U8 *isAck + * @param[in] uint8_t tbCnt + * @param[in] uint8_t *isAck * @return S16 * -# ROK * -# RFAILED **/ #ifdef ANSI -PRIVATE S16 rgSCHDhmProcHqFdbkAckNackRep +static S16 rgSCHDhmProcHqFdbkAckNackRep ( RgSchDlHqProcCb *hqP, RgSchDlSf *sf, -U8 tbCnt, -U8 *isAck +uint8_t tbCnt, +uint8_t *isAck ) #else -PRIVATE S16 rgSCHDhmProcHqFdbkAckNackRep(hqP,sf,tbCnt,isAck) +static S16 rgSCHDhmProcHqFdbkAckNackRep(hqP,sf,tbCnt,isAck) RgSchDlHqProcCb *hqP; RgSchDlSf *sf; -U8 tbCnt; -U8 *isAck; +uint8_t tbCnt; +uint8_t *isAck; #endif { - TRC2(rgSCHDhmProcHqFdbkAckNackRep) /* Check if this is repeating UE */ rgSCHUtlDlHqPTbRmvFrmTx(sf, hqP, tbCnt, TRUE); /* Check if last repetition */ @@ -4665,7 +4596,7 @@ U8 *isAck; /* Update timingInfo for this hqP so that next subframe its picked up */ RG_SCH_ADD_TO_CRNT_TIME(hqP->tbInfo[tbCnt].timingInfo, \ hqP->tbInfo[tbCnt].timingInfo, 1); - RETVALUE(RFAILED); + return RFAILED; } /* Take decision here based on the number @@ -4690,7 +4621,7 @@ U8 *isAck; hqP->tbInfo[tbCnt].isAckNackDtx = *isAck; - RETVALUE(ROK); + return ROK; } #endif /* ifndef LTE_TDD */ @@ -4711,13 +4642,13 @@ U8 *isAck; * **/ #ifdef ANSI -PUBLIC S16 rgSCHDhmDlRetxAllocFail +S16 rgSCHDhmDlRetxAllocFail ( RgSchUeCb *ue, RgSchDlHqProcCb *hqP ) #else -PUBLIC S16 rgSCHDhmDlRetxAllocFail(ue, hqP) +S16 rgSCHDhmDlRetxAllocFail(ue, hqP) RgSchUeCb *ue; RgSchDlHqProcCb *hqP; #endif @@ -4728,8 +4659,6 @@ RgSchDlHqProcCb *hqP; Bool maxRetx = FALSE; RgSchCmnCell *cellSch; - TRC2(rgSCHDhmDlRetxAllocFail); - cell = hqP->hqE->cell; cellSch = RG_SCH_CMN_GET_CELL(cell); rlsHqInfo = &(cell->rlsHqArr[cell->crntHqIdx]); @@ -4826,25 +4755,25 @@ RgSchDlHqProcCb *hqP; RgSchMacRlsHq(&pst, rlsHqInfo); } - RETVALUE(ROK); + return ROK; } #ifdef DL_LA #ifdef ANSI -PRIVATE S16 rgSCHDhmUpdateAckNackHistory +static S16 rgSCHDhmUpdateAckNackHistory ( RgSchCellCb *cell, RgSchUeCb *ueCb, -U8 hqfdbk, -U8 tbCnt +uint8_t hqfdbk, +uint8_t tbCnt ) #else -PRIVATE S16 rgSCHDhmUpdateAckNackHistory(cell, ueCb, hqfdbk, tbCnt) +static S16 rgSCHDhmUpdateAckNackHistory(cell, ueCb, hqfdbk, tbCnt) ( RgSchCellCb *cell; RgSchUeCb *ueCb; -U8 hqfdbk; -U8 tbCnt; +uint8_t hqfdbk; +uint8_t tbCnt; ) #endif { @@ -4872,30 +4801,30 @@ U8 tbCnt; */ rgSCHDhmUpdBlerBasediTbsEff(cell, ueCb, tbCnt); - RETVALUE(ROK); + return ROK; } #ifdef ANSI -PUBLIC S16 rgSCHDhmUpdBlerBasediTbsEff +S16 rgSCHDhmUpdBlerBasediTbsEff ( RgSchCellCb *cell, RgSchUeCb *ueCb, -U8 tbCnt +uint8_t tbCnt ) #else -PUBLIC S16 rgSCHDhmUpdBlerBasediTbsEff(cell, ueCb, tbCnt) +S16 rgSCHDhmUpdBlerBasediTbsEff(cell, ueCb, tbCnt) ( RgSchCellCb *cell; RgSchUeCb *ueCb; -U8 tbCnt; +uint8_t tbCnt; ) #endif { S32 iTbs; RgSchCmnDlUe *ueDl; RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); - U8 cfi = cellSch->dl.currCfi; - U8 maxiTbs = (*(RgSchCmnCqiToTbs *)(cellSch->dl.cqiToTbsTbl[0][cfi]))[RG_SCH_CMN_MAX_CQI - 1]; + uint8_t cfi = cellSch->dl.currCfi; + uint8_t maxiTbs = (*(RgSchCmnCqiToTbs *)(cellSch->dl.cqiToTbsTbl[0][cfi]))[RG_SCH_CMN_MAX_CQI - 1]; maxiTbs = RG_SCH_DL_MAX_ITBS; ueDl = RG_SCH_CMN_GET_DL_UE(ueCb,cell); @@ -4932,7 +4861,7 @@ U8 tbCnt; (*(RgSchCmnTbSzEff *)(cellSch->dl.cqiToEffTbl[1][cfi]))\ [ueDl->mimoInfo.cwInfo[tbCnt].iTbs[1]]; - RETVALUE(ROK); + return ROK; } #endif @@ -4954,30 +4883,28 @@ U8 tbCnt; * 4 = DTX (UE did not transmit anything) * * @param[in] TfuHqInfo *fdbk - * @param[in] U8 hqCnt + * @param[in] uint8_t hqCnt * @return Void * **/ #ifdef ANSI -PRIVATE Void rgSCHDhmPrcSplBundlFdbk +static Void rgSCHDhmPrcSplBundlFdbk ( RgSchCellCb *cell, TfuHqInfo *fdbk, -U8 hqCnt +uint8_t hqCnt ) #else -PRIVATE Void rgSCHDhmPrcSplBundlFdbk(cell, fdbk, hqCnt) +static Void rgSCHDhmPrcSplBundlFdbk(cell, fdbk, hqCnt) ( RgSchCellCb *cell; TfuHqInfo *fdbk; -U8 hqCnt; +uint8_t hqCnt; ) #endif { - U8 numOfAcks; + uint8_t numOfAcks; - TRC2(rgSCHDhmPrcSplBundlFdbk); - /* Num of ACKs reported by UE */ numOfAcks = fdbk->isAck[0]; @@ -4998,7 +4925,7 @@ U8 hqCnt; the PDSCH trasnmission (spatial bundling). So we have to assume same feedback for both codewords */ #ifdef LTE_ADV - for(U8 idx = 1 ; idx < TFU_MAX_HARQ_FDBKS; idx++) + for(uint8_t idx = 1 ; idx < TFU_MAX_HARQ_FDBKS; idx++) { fdbk->isAck[idx] = fdbk->isAck[0]; } @@ -5006,7 +4933,7 @@ U8 hqCnt; fdbk->isAck[1] = fdbk->isAck[0]; #endif - RETVOID; + return; } #endif @@ -5025,16 +4952,15 @@ U8 hqCnt; * **/ #ifdef ANSI -PUBLIC Void rgSCHDhmHqPAdd2FreeLst +Void rgSCHDhmHqPAdd2FreeLst ( RgSchDlHqProcCb *hqP ) #else -PUBLIC Void rgSCHDhmHqPAdd2FreeLst(hqP) +Void rgSCHDhmHqPAdd2FreeLst(hqP) RgSchDlHqProcCb *hqP; #endif { - TRC2(rgSCHDhmHqPAdd2FreeLst) #ifdef LAA_DBG if (hqP->hqPLst) @@ -5063,7 +4989,7 @@ RgSchDlHqProcCb *hqP; rgSCHLaaHndlHqProcFree(hqP); #endif - RETVOID; + return; } /* rgSCHDhmHqPAdd2FreeLst */ @@ -5082,16 +5008,15 @@ RgSchDlHqProcCb *hqP; * **/ #ifdef ANSI -PUBLIC Void rgSCHDhmHqPAdd2InUseLst +Void rgSCHDhmHqPAdd2InUseLst ( RgSchDlHqProcCb *hqP ) #else -PUBLIC Void rgSCHDhmHqPAdd2InUseLst(hqP) +Void rgSCHDhmHqPAdd2InUseLst(hqP) RgSchDlHqProcCb *hqP; #endif { - TRC2(rgSCHDhmHqPAdd2InUseLst) #ifdef LAA_DBG if (hqP->hqPLst) @@ -5116,7 +5041,7 @@ RgSchDlHqProcCb *hqP; } #endif - RETVOID; + return; } /* rgSCHDhmHqPAdd2InUseLst */ /** @@ -5134,16 +5059,15 @@ RgSchDlHqProcCb *hqP; * **/ #ifdef ANSI -PUBLIC Void rgSCHDhmHqPDelFrmFreeLst +Void rgSCHDhmHqPDelFrmFreeLst ( RgSchDlHqProcCb *hqP ) #else -PUBLIC Void rgSCHDhmHqPDelFrmFreeLst(hqP) +Void rgSCHDhmHqPDelFrmFreeLst(hqP) RgSchDlHqProcCb *hqP; #endif { - TRC2(rgSCHDhmHqPDelFrmFreeLst) #ifdef LAA_DBG if (!hqP->hqPLst) @@ -5177,7 +5101,7 @@ RgSchDlHqProcCb *hqP; } #endif - RETVOID; + return; } /* rgSCHDhmHqPDelFrmFreeLst */ @@ -5197,16 +5121,15 @@ RgSchDlHqProcCb *hqP; * **/ #ifdef ANSI -PUBLIC Void rgSCHDhmHqPDelFrmInUseLst +Void rgSCHDhmHqPDelFrmInUseLst ( RgSchDlHqProcCb *hqP ) #else -PUBLIC Void rgSCHDhmHqPDelFrmInUseLst(hqP) +Void rgSCHDhmHqPDelFrmInUseLst(hqP) RgSchDlHqProcCb *hqP; #endif { - TRC2(rgSCHDhmHqPDelFrmInUseLst) #ifdef LAA_DBG if (!hqP->hqPLst) @@ -5241,7 +5164,7 @@ RgSchDlHqProcCb *hqP; } #endif - RETVOID; + return; } /* rgSCHDhmHqPDelFrmInUseLst */