X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Frg_sch_dhm.c;h=bf93a4f22bf944808eb6fe190774f6cbdbf7e8c0;hb=3330932565e15a749fd5dd5039cdea2862ca51cc;hp=8ee476e0859588350f72d903adf2d5df2969d99e;hpb=694adde1a08c393a8443fd5bbd4f036f5cf85403;p=o-du%2Fl2.git diff --git a/src/5gnrsch/rg_sch_dhm.c b/src/5gnrsch/rg_sch_dhm.c index 8ee476e08..bf93a4f22 100755 --- a/src/5gnrsch/rg_sch_dhm.c +++ b/src/5gnrsch/rg_sch_dhm.c @@ -32,9 +32,6 @@ @brief APIs related to Downlink HARQ for the scheduler. */ -static const char* RLOG_MODULE_NAME="MAC"; -static int RLOG_FILE_ID=242; -static int RLOG_MODULE_ID=4096; /* header include files -- defines (.h) */ #include "common_def.h" @@ -47,8 +44,6 @@ static int RLOG_MODULE_ID=4096; #include "rg_sch_inf.h" /* typedefs for Scheduler */ #include "rg_sch.h" #include "rg_sch_cmn.h" -#include "rl_interface.h" -#include "rl_common.h" /* header/extern include files (.x) */ #include "lrg.x" @@ -60,10 +55,10 @@ 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 -U32 nackSf[10]; +uint32_t nackSf[10]; @@ -73,7 +68,7 @@ RgSchHqRetxStats hqRetxStats; #endif /* MAC_SCH_STATS */ //Chandan Stats Collection #ifdef DLHQ_STATS -U32 statsCnt; +uint32_t statsCnt; RgSchDlHqStats dlHqStats[10000] = {{0,0,0}}; #endif @@ -84,7 +79,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}, @@ -101,48 +96,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)); 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*/ @@ -156,33 +151,33 @@ 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 */ @@ -203,18 +198,10 @@ EXTERN Void rgSCHEmtcHqInfoAlloc ARGS((RgSchCellCb *cell, RgSchDlHqProcCb *hqP)) * **/ /*MS_WORKAROUND for ccpu00122893*/ -#ifdef ANSI -Void rgSCHDhmHqEntReset -( - RgSchDlHqEnt *hqE -) -#else -Void rgSCHDhmHqEntReset(hqE) - RgSchDlHqEnt *hqE; -#endif +Void rgSCHDhmHqEntReset(RgSchDlHqEnt *hqE) { RgSchDlHqProcCb *hqP; - U8 i; + uint8_t i; cmLListInit(&hqE->inUse); cmLListInit(&hqE->free); for (i=0; i < hqE->numHqPrcs; i++) @@ -256,7 +243,7 @@ Void rgSCHDhmHqEntReset(hqE) rgSCHLaaResetDlHqProcCb(hqP); #endif } - RETVOID; + return; } /* rgSCHDhmHqEntReset */ /** @@ -274,17 +261,7 @@ Void rgSCHDhmHqEntReset(hqE) * @return Void * **/ -#ifdef ANSI -Void rgSCHDhmAssgnUeHqEntFrmRaCb -( -RgSchUeCb *ue, -RgSchRaCb *raCb -) -#else -Void rgSCHDhmAssgnUeHqEntFrmRaCb(ue, raCb) -RgSchUeCb *ue; -RgSchRaCb *raCb; -#endif +Void rgSCHDhmAssgnUeHqEntFrmRaCb(RgSchUeCb *ue,RgSchRaCb *raCb) { ue->cellInfo[0]->hqEnt = raCb->dlHqE; @@ -297,7 +274,7 @@ RgSchRaCb *raCb; ue->ul.ulInactvMask &= ~(RG_HQENT_INACTIVE); rgSCHCmnDlInitHqEnt(ue->cell, ue->cellInfo[0]->hqEnt); - RETVOID; + return; } /** @@ -315,22 +292,12 @@ RgSchRaCb *raCb; * @return Void * **/ -#ifdef ANSI -Void rgSCHDhmDelHqEnt -( -RgSchCellCb *cell, -RgSchDlHqEnt **hqE -) -#else -Void rgSCHDhmDelHqEnt(cell, hqE) -RgSchCellCb *cell; -RgSchDlHqEnt **hqE; -#endif +Void rgSCHDhmDelHqEnt(RgSchCellCb *cell,RgSchDlHqEnt **hqE) { if (!(*hqE)) { - RETVOID; + return; } rgSCHCmnDlDeInitHqEnt(cell, *hqE); @@ -338,18 +305,10 @@ RgSchDlHqEnt **hqE; rgSCHUtlFreeSBuf(cell->instIdx, (Data **)hqE, sizeof(RgSchDlHqEnt)); - RETVOID; + return; } -#ifdef ANSI -RgSchDlHqEnt *rgSCHDhmHqEntInit -( -RgSchCellCb *cell -) -#else -RgSchDlHqEnt *rgSCHDhmHqEntInit(cell) -RgSchCellCb *cell; -#endif +RgSchDlHqEnt *rgSCHDhmHqEntInit(RgSchCellCb *cell) { RgSchDlHqEnt *hqE; Inst inst = cell->instIdx; @@ -357,8 +316,7 @@ RgSchCellCb *cell; /* 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"); + DU_LOG("\nERROR --> SCH: rgSCHDhmHqEntInit hqE alloc fail"); return (NULLP); } #ifdef LTE_TDD @@ -367,8 +325,7 @@ RgSchCellCb *cell; if (rgSCHUtlAllocSBuf(inst, (Data **)&hqE->procs, hqE->numHqPrcs * sizeof(RgSchDlHqProcCb)) != ROK) { - RLOG_ARG0(L_DEBUG,DBG_CELLID,cell->cellId, - "rgSCHDhmHqEntInit hqP alloc fail in hqE"); + DU_LOG("\nERROR --> SCH: rgSCHDhmHqEntInit hqP alloc fail in hqE"); return (NULLP); } #else @@ -417,23 +374,9 @@ RgSchCellCb *cell; * -#RFAILED otherwise * **/ -#ifdef ANSI -S16 rgSCHDhmGetAvlHqProc -( -RgSchCellCb *cell, -RgSchUeCb *ue, -CmLteTimingInfo timingInfo, -RgSchDlHqProcCb **hqP -) -#else -S16 rgSCHDhmGetAvlHqProc (cell, ue, timingInfo, hqP) -RgSchCellCb *cell; -RgSchUeCb *ue; -CmLteTimingInfo timingInfo; -RgSchDlHqProcCb **hqP; -#endif +S16 rgSCHDhmGetAvlHqProc(RgSchCellCb *cell,RgSchUeCb *ue,CmLteTimingInfo timingInfo,RgSchDlHqProcCb **hqP) { - RgSchDlHqEnt *hqE = NULLP; + RgSchDlHqEnt *hqE = NULLP; RgSchDlHqProcCb *tmpHqProc; CmLList *tmp; @@ -441,7 +384,7 @@ RgSchDlHqProcCb **hqP; if (hqE == NULLP) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHDhmGetAvlHqProc hqE NULL ue %d" + DU_LOG("\nERROR --> SCH : rgSCHDhmGetAvlHqProc hqE NULL ue %d" , ue->ueId); return RFAILED; } @@ -451,8 +394,7 @@ RgSchDlHqProcCb **hqP; if (NULLP == tmp) { - RLOG_ARG3(L_ERROR,DBG_CELLID,cell->cellId, - "rgSCHDhmGetAvlHqProc free %ld inUse %ld ue %d" + DU_LOG("\nERROR --> SCH : rgSCHDhmGetAvlHqProc free %d inUse %d ue %d" , hqE->free.count, hqE->inUse.count, ue->ueId); /* No Harq Process available in the free queue. */ return RFAILED; @@ -537,33 +479,19 @@ 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 -Void rgSCHDhmHqTbRetx -( -RgSchDlHqEnt *hqE, -CmLteTimingInfo timingInfo, -RgSchDlHqProcCb *hqP, -U8 tbIdx -) -#else -Void rgSCHDhmHqTbRetx(hqE, timingInfo, hqP, tbIdx) -RgSchDlHqEnt *hqE; -CmLteTimingInfo timingInfo; -RgSchDlHqProcCb *hqP; -U8 tbIdx; -#endif +Void rgSCHDhmHqTbRetx(RgSchDlHqEnt *hqE,CmLteTimingInfo timingInfo,RgSchDlHqProcCb *hqP,uint8_t tbIdx) { - U8 othrTbIdx = tbIdx ^ 1; + uint8_t othrTbIdx = tbIdx ^ 1; hqP->tbInfo[tbIdx].timingInfo = timingInfo; if (hqE->msg4Proc == hqP) { - RETVOID; + return; } /* fix for ccpu00118633 No Hq proc Avl end*/ @@ -581,7 +509,7 @@ U8 tbIdx; hqP->tbInfo[tbIdx].cntrRetxAllocFail = 0; - RETVOID; + return; } /* rgSCHDhmHqTbRetx */ /** @@ -608,15 +536,7 @@ U8 tbIdx; * @return RgSchDlHqProcCb * * **/ -#ifdef ANSI -RgSchDlHqProcCb * rgSCHDhmLastSchedHqProc -( -RgSchDlHqEnt *hqE -) -#else -RgSchDlHqProcCb * rgSCHDhmLastSchedHqProc(hqE) -RgSchDlHqEnt *hqE; -#endif +RgSchDlHqProcCb * rgSCHDhmLastSchedHqProc(RgSchDlHqEnt *hqE) { /* GRPPWR_CNTRL Fix: UE context will not hold a valid hqE, * until RACH procedure is completed */ @@ -653,19 +573,12 @@ RgSchDlHqEnt *hqE; * -#RFAILED otherwise * **/ -#ifdef ANSI S16 rgSCHDhmGetCcchSduHqProc ( RgSchUeCb *ueCb, CmLteTimingInfo timingInfo, RgSchDlHqProcCb **hqP ) -#else -S16 rgSCHDhmGetCcchSduHqProc (ueCb, timingInfo, hqP) -RgSchUeCb *ueCb; -CmLteTimingInfo timingInfo; -RgSchDlHqProcCb **hqP; -#endif { RgSchDlHqProcCb *tmpHqProc; CmLList *tmp; @@ -725,17 +638,7 @@ RgSchDlHqProcCb **hqP; * -#RFAILED otherwise * **/ -#ifdef ANSI -S16 rgSCHDhmGetMsg4HqProc -( -RgSchRaCb *raCb, -CmLteTimingInfo timingInfo -) -#else -S16 rgSCHDhmGetMsg4HqProc (raCb, timingInfo) -RgSchRaCb *raCb; -CmLteTimingInfo timingInfo; -#endif +S16 rgSCHDhmGetMsg4HqProc(RgSchRaCb *raCb,CmLteTimingInfo timingInfo) { RgSchDlHqProcCb *tmpHqProc; CmLList *tmp; @@ -774,34 +677,22 @@ 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 -Void rgSCHDhmRlsHqpTb -( -RgSchDlHqProcCb *hqP, -U8 tbIdx, -Bool togNdi -) -#else -Void rgSCHDhmRlsHqpTb(hqP, tbIdx, togNdi) -RgSchDlHqProcCb *hqP; -U8 tbIdx; -Bool togNdi; -#endif +Void rgSCHDhmRlsHqpTb(RgSchDlHqProcCb *hqP,uint8_t tbIdx,Bool togNdi) { RgSchDlHqEnt *hqE; - U8 othrTbIdx = tbIdx ^ 1; + uint8_t othrTbIdx = tbIdx ^ 1; #ifdef LTEMAC_SPS - RgSchCmnDlHqProc *cmnHqDl; + RgSchCmnDlHqProc *cmnHqDl; #endif /* L2_COUNTERS */ #ifdef LTE_L2_MEAS RgSchDlLcCb* lcCb = NULLP; - U8 numLch = 0; + uint8_t numLch = 0; #endif /* Reset all tbInfo values */ @@ -814,11 +705,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); @@ -907,7 +798,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) @@ -938,7 +829,7 @@ Bool togNdi; /* Add the proc to the free list */ //cmLListAdd2Tail(&hqE->free, &hqP->lnk); rgSCHDhmHqPAdd2FreeLst(hqP); - RETVOID; + return; } #endif @@ -967,8 +858,8 @@ rgEmtcsetNullSubFrm(hqP); if (hqE->free.count > 8) { int *p = NULL; - printf("Crashing invalid hq count after free \n"); - printf("Crashing %d \n", *p); + printf("\nDEBUG --> SCH: Crashing invalid hq count after free \n"); + printf("\nDEBUG --> SCH: Crashing %d \n", *p); *p = 10; } #endif @@ -999,7 +890,7 @@ rgEmtcsetNullSubFrm(hqP); hqP->tbInfo[tbIdx].cntrRetxAllocFail = 0; - RETVOID; + return; } /* rgSCHDhmRlsHqpTb */ /** @@ -1018,15 +909,7 @@ rgEmtcsetNullSubFrm(hqP); * @return Void * **/ -#ifdef ANSI -Void rgSCHDhmRlsHqProc -( -RgSchDlHqProcCb *hqP -) -#else -Void rgSCHDhmRlsHqProc(hqP) -RgSchDlHqProcCb *hqP; -#endif +Void rgSCHDhmRlsHqProc(RgSchDlHqProcCb *hqP) { @@ -1037,10 +920,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); @@ -1077,7 +960,7 @@ rgEmtcsetNullSubFrm(hqP); hqP->tbCnt = 0; #endif - RETVOID; + return; } /* rgSCHDhmRlsHqProc */ #ifdef LTEMAC_SPS @@ -1091,28 +974,14 @@ 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 * -# RFAILED otherwise * **/ -#ifdef ANSI -S16 rgSCHDhmGetHqProcFrmId -( -RgSchCellCb *cell, -RgSchUeCb *ue, -U8 idx, -RgSchDlHqProcCb **hqP -) -#else -S16 rgSCHDhmGetHqProcFrmId(cell, ue, idx, hqP) -RgSchCellCb *cell; -RgSchUeCb *ue; -U8 idx; -RgSchDlHqProcCb **hqP; -#endif +S16 rgSCHDhmGetHqProcFrmId(RgSchCellCb *cell,RgSchUeCb *ue,uint8_t idx,RgSchDlHqProcCb **hqP) { RgSchDlHqEnt *hqE; @@ -1136,24 +1005,12 @@ RgSchDlHqProcCb **hqP; * @return RgSchDlHqProcCb control block * **/ -#ifdef ANSI -RgSchDlHqProcCb* rgSCHDhmSpsDlGetHqProc -( -RgSchCellCb *cell, -RgSchUeCb *ue, -CmLteTimingInfo timingInfo -) -#else -RgSchDlHqProcCb* rgSCHDhmSpsDlGetHqProc(cell, ue, timingInfo) -RgSchCellCb *cell, -RgSchUeCb *ue; -CmLteTimingInfo timingInfo; -#endif +RgSchDlHqProcCb* rgSCHDhmSpsDlGetHqProc(RgSchCellCb *cell,RgSchUeCb *ue,CmLteTimingInfo timingInfo) { - RgSchDlHqEnt *hqE; - U8 idx; - RgSchDlHqProcCb *hqProc = NULLP; - CmLList *tmp = NULLP; + RgSchDlHqEnt *hqE; + uint8_t idx; + RgSchDlHqProcCb *hqProc = NULLP; + CmLList *tmp = NULLP; hqE = RG_SCH_CMN_GET_UE_HQE(ue, cell); @@ -1218,26 +1075,12 @@ 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 -( -RgSchDlHqProcCb *hqP, -U8 tbIdx, -U8 fdbk, -Bool maxHqRetxReached -) -#else -PRIVATE Void rgSCHDhmFdbkIndHndlTa(hqP, tbIdx, fdbk,maxHqRetxReached) -RgSchDlHqProcCb *hqP; -U8 tbIdx; -U8 fdbk; -Bool maxHqRetxReached; -#endif +static Void rgSCHDhmFdbkIndHndlTa(RgSchDlHqProcCb *hqP,uint8_t tbIdx,uint8_t fdbk,Bool maxHqRetxReached) { RgSchUeCb *ueCb; RgSchCellCb *cell; @@ -1258,7 +1101,7 @@ Bool maxHqRetxReached; else { #ifdef DEBUGP - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Trying to add CRNTI:%d into TA" + DU_LOG("\nERROR --> SCH : Trying to add CRNTI:%d into TA" "ACK List twice", ueCb->ueId); #endif } @@ -1274,8 +1117,7 @@ Bool maxHqRetxReached; hqP->hqE->ue->dl.taCb.state = RGSCH_TA_IDLE; rgSCHUtlReTxTa(cell, ueCb); - RLOG_ARG0(L_DEBUG,DBG_CELLID,cell->cellId, - "Nack Rcvd for TA. Max Tries Attempted"); + DU_LOG("\nERROR --> SCH : Nack Rcvd for TA. Max Tries Attempted"); } break; case TFU_HQFDB_DTX: @@ -1296,7 +1138,7 @@ Bool maxHqRetxReached; break; } - RETVOID; + return; } /* rgSCHDhmFdbkIndHndlTa */ /* 3.1 MIMO: TA cmd details at TB level rather than Hq Level */ @@ -1314,17 +1156,7 @@ Bool maxHqRetxReached; * @return Void * -# None. **/ -#ifdef ANSI -Void rgSCHDhmSchdTa -( -RgSchUeCb *ueCb, -RgSchDlHqTbCb *tbInfo -) -#else -Void rgSCHDhmSchdTa(ueCb, tbInfo) -RgSchUeCb *ueCb; -RgSchDlHqTbCb *tbInfo; -#endif +Void rgSCHDhmSchdTa(RgSchUeCb *ueCb,RgSchDlHqTbCb *tbInfo) { ueCb->dl.taCb.state = RGSCH_TA_SCHEDULED; @@ -1332,7 +1164,7 @@ RgSchDlHqTbCb *tbInfo; tbInfo->schdTa.pres = PRSNT_NODEF; tbInfo->schdTa.val = ueCb->dl.taCb.ta; - RETVOID; + return; } /* rgSCHDhmSchdTa */ #ifdef LTE_TDD @@ -1349,44 +1181,31 @@ 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, - numTbs, tbStrtIdx, cntHqPrcs) -RgSchDlHqEnt *hqE; -CmLteTimingInfo timeInfo; -Bool *isMsg4; -RgSchDlHqProcCb **hqPrcs; -U8 *numTbs; -S8 *tbStrtIdx; -U8 *cntHqPrcs; -RgSchCellCb *cell; -#endif { RgSchDlHqTbCb *tbCb; 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; @@ -1491,28 +1310,13 @@ RgSchCellCb *cell; * @param[in] RgSchDlHqEnt *hqE * @param[in] CmLteTimingInfo timeInfo * @param[in] Bool *isMsg4 - * @param[out] U8 *numTbs + * @param[out] uint8_t *numTbs * @param[out] S8 *tbStrtIdx * @return RgSchDlHqProcCb* * -# RgSchDlHqProcCb* * -# NULLP **/ -#ifdef ANSI -RgSchDlHqProcCb *rgSCHDhmHqProcByTime -( -RgSchDlHqEnt *hqE, -CmLteTimingInfo timeInfo, -Bool *isMsg4, -RgSchDlSf *sf -) -#else -RgSchDlHqProcCb *rgSCHDhmHqProcByTime(hqE, timeInfo, - isMsg4,sf) -RgSchDlHqEnt *hqE; -CmLteTimingInfo timeInfo; -Bool *isMsg4; -RgSchDlSf *sf; -#endif +RgSchDlHqProcCb *rgSCHDhmHqProcByTime(RgSchDlHqEnt *hqE,CmLteTimingInfo timeInfo,Bool *isMsg4,RgSchDlSf *sf) { if (hqE->msg4Proc) { @@ -1539,30 +1343,16 @@ 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 -Void rgSCHDhmHqTbTrnsFail -( -RgSchCellCb *cell, -RgSchDlHqProcCb *hqP, -U8 tbCnt, -Bool *isMaxRetx -) -#else -Void rgSCHDhmHqTbTrnsFail(cell, hqP, tbCnt, isMaxRetx) -RgSchCellCb *cell; -RgSchDlHqProcCb *hqP; -U8 tbCnt; -Bool *isMaxRetx; -#endif +Void rgSCHDhmHqTbTrnsFail(RgSchCellCb *cell,RgSchDlHqProcCb *hqP,uint8_t tbCnt,Bool *isMaxRetx) { - RgSchDlHqEnt *hqE; - U8 maxHqTx; + RgSchDlHqEnt *hqE; + uint8_t maxHqTx; hqE = hqP->hqE; @@ -1572,11 +1362,10 @@ Bool *isMaxRetx; #ifdef RGR_V1 if(hqP->hqE->raCb->expiryTime.sfn == RGSCH_CONTRES_EXP) { - RLOG_ARG1(L_DEBUG,DBG_CELLID,cell->cellId, - "rgSCHDhmHqTbTrnsFail contRes exp(): tmpCRNTI = %u", + DU_LOG("\nDEBUG --> SCH : rgSCHDhmHqTbTrnsFail contRes exp(): tmpCRNTI = %u", hqP->hqE->raCb->tmpCrnti); rgSCHRamMsg4Done(cell, (RgSchRaCb *)hqP->hqE->raCb); - RETVOID; + return; } #endif maxHqTx = cell->dlHqCfg.maxMsg4HqTx; @@ -1592,8 +1381,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; @@ -1658,7 +1447,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 */ @@ -1706,8 +1495,7 @@ Bool *isMaxRetx; #endif /* Perform RAM MSG4 done processing */ - RLOG_ARG1(L_DEBUG,DBG_CELLID,cell->cellId, - "rgSCHDhmHqTbTrnsFail(): hq max retx fail: tmpCRNTI = %u", + DU_LOG("\nDEBUG --> SCH : rgSCHDhmHqTbTrnsFail(): hq max retx fail: tmpCRNTI = %u", hqP->hqE->raCb->tmpCrnti); rgSCHRamMsg4Done(cell, (RgSchRaCb *)hqP->hqE->raCb); } @@ -1719,10 +1507,10 @@ Bool *isMaxRetx; *isMaxRetx = TRUE; } - RETVOID; + return; } /* rgSCHDhmHqTbTrnsFail */ -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 @@ -1734,31 +1522,21 @@ 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, - RgTfuHqInfo *fdbk, - U8 tbIdx, - RgSchTddANInfo *anInfo - ) -#else -PRIVATE Void rgSchGetHqFdbkPosForM1(ue,hqP,isAck,fdbk,tbIdx,anInfo) - RgSchUeCb *ue; - RgSchDlHqProcCb *hqP; - U8 *isAck; - RgTfuHqInfo *fdbk; - U8 tbIdx; - RgSchTddANInfo *anInfo; -#endif +RgSchUeCb *ue, +RgSchDlHqProcCb *hqP, +uint8_t *isAck, +RgTfuHqInfo *fdbk, +uint8_t tbIdx, +RgSchTddANInfo *anInfo +) { if((ue != NULLP)) { @@ -1783,7 +1561,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); @@ -1840,7 +1618,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. @@ -1851,41 +1629,29 @@ 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, - RgTfuHqInfo *fdbk, - U8 tbIdx, - RgSchTddANInfo *anInfo, - U8 M, - CmLteTimingInfo timeInfo - ) -#else -PRIVATE Void rgSchGetHqFdbkPosForM234(ue,hqP,isAck,fdbk,tbIdx,anInfo,M,timeInfo) - RgSchUeCb *ue; - RgSchDlHqProcCb *hqP; - U8 *isAck; - RgTfuHqInfo *fdbk; - U8 tbIdx; - RgSchTddANInfo *anInfo; - U8 M; - CmLteTimingInfo timeInfo; -#endif +RgSchUeCb *ue, +RgSchDlHqProcCb *hqP, +uint8_t *isAck, +RgTfuHqInfo *fdbk, +uint8_t tbIdx, +RgSchTddANInfo *anInfo, +uint8_t M, +CmLteTimingInfo timeInfo +) { - U8 fdbkIdx; - Bool isSCell; - RgSchTddANInfo *pCellAnInfo; - U8 incr = 0; + uint8_t fdbkIdx; + Bool isSCell; + RgSchTddANInfo *pCellAnInfo; + uint8_t incr = 0; if(NULLP != ue) { @@ -1978,7 +1744,7 @@ PRIVATE Void rgSchGetHqFdbkPosForM234(ue,hqP,isAck,fdbk,tbIdx,anInfo,M,timeInfo) 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) @@ -2005,7 +1771,7 @@ PRIVATE Void rgSchGetHqFdbkPosForM234(ue,hqP,isAck,fdbk,tbIdx,anInfo,M,timeInfo) } #endif }/*ue*/ - RETVOID; + return; }/*rgSchGetHqFdbkPosForM234*/ #endif/*LTE_ADV*/ @@ -2022,7 +1788,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 @@ -2032,27 +1798,16 @@ PRIVATE Void rgSchGetHqFdbkPosForM234(ue,hqP,isAck,fdbk,tbIdx,anInfo,M,timeInfo) * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHDhmHqFdbkInd ( Void *cb, -U8 cbType, +uint8_t cbType, RgSchCellCb *cellCb, CmLteTimingInfo timeInfo, TfuHqInfo *fdbk, RgInfRlsHqInfo *rlsHqBufs, RgSchErrInfo *err ) -#else -S16 rgSCHDhmHqFdbkInd(cb, cbType, cellCb, timeInfo, fdbk, rlsHqBufs, err) -Void *cb; -U8 cbType; -RgSchCellCb *cellCb; -CmLteTimingInfo timeInfo; -TfuHqInfo *fdbk; -RgInfRlsHqInfo *rlsHqBufs; -RgSchErrInfo *err; -#endif { RgSchCellCb *sCell = NULLP; RgSchDlHqEnt *hqE; @@ -2061,21 +1816,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; @@ -2085,13 +1840,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]; @@ -2100,7 +1855,7 @@ 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; @@ -2224,7 +1979,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) @@ -2595,9 +2350,9 @@ 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; @@ -2673,8 +2428,7 @@ RgSchErrInfo *err; if ( found == FALSE ) { 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,slot %d", + DU_LOG("\nERROR --> SCH : 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; @@ -2730,35 +2484,20 @@ RgSchErrInfo *err; * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHDhmPrcFdbkForTb ( -RgSchCellCb *cell, -RgSchUeCb *ue, -RgSchDlHqProcCb *hqP, -RgSchDlSf *sf, -Bool isMsg4, -U16 rnti, -U8 tbCnt, -CmLteTimingInfo timingInfo, -U8 isAck, -RgInfRlsHqInfo *rlsHqBufs, -RgSchErrInfo *err +RgSchCellCb *cell, +RgSchUeCb *ue, +RgSchDlHqProcCb *hqP, +RgSchDlSf *sf, +Bool isMsg4, +uint16_t rnti, +uint8_t tbCnt, +CmLteTimingInfo timingInfo, +uint8_t isAck, +RgInfRlsHqInfo *rlsHqBufs, +RgSchErrInfo *err ) -#else -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; -CmLteTimingInfo timingInfo; -U8 isAck; -RgInfRlsHqInfo *rlsHqBufs; -RgSchErrInfo *err; -#endif { #ifdef DEBUGP Inst inst = cell->instIdx; @@ -2902,20 +2641,19 @@ RgSchErrInfo *err; { raCb = rgSCHDbmGetRaCb(cell, rnti); } - RGSCHDBGINFO(cell->instIdx, - (rgSchPBuf(cell->instIdx), "Ack Rcvd. FdbkInd for Msg4Done\n")); + DU_LOG("\nDEBUG --> SCH: Ack Rcvd. FdbkInd for Msg4Done\n"); /* Inform Random Access Module regarding the ack received */ if (raCb != NULLP) { /*RRC Connection Setup failure issue where RRC connection * setup was not reaching UE due to message 4 HARQ failure */ - printf("\nMSG4 Ack ,calling rgSCHRamMsg4Done\n"); + printf("\nDEBUG --> SCH: MSG4 Ack ,calling rgSCHRamMsg4Done\n"); ret = rgSCHRamMsg4Done(cell, raCb); hqFreed = TRUE; } else { - printf("\nraCb is NULLP\n"); + printf("\nDEBUG --> SCH: raCb is NULLP\n"); } } else /*ccpu00114124- HARQ Release for Msg4 */ @@ -3009,33 +2747,23 @@ RgSchErrInfo *err; * @param[in] RgrSchFrmt1b3TypEnum uciFrmtTyp, * @param[in] Bool *isAck, * @param[in] RgTfuHqInfo *fdbk, - * @return RETVOID + * @return void **/ -#ifdef ANSI Void rgSchGetHqFdbkPos ( - RgSchCellCb *cell, - RgSchUeCb *ue, - RgSchDlHqProcCb *hqP, - RgrSchFrmt1b3TypEnum uciFrmtTyp, - U8 *isAck, - RgTfuHqInfo *fdbk - ) -#else -Void rgSchGetHqFdbkPos(cell,ue,hqP,uciFrmtTyp,isAck,fdbk) - RgSchCellCb *cell; - RgSchUeCb *ue; - RgSchDlHqProcCb *hqP; - RgrSchFrmt1b3TypEnum uciFrmtTyp; - U8 *isAck; - RgTfuHqInfo *fdbk; -#endif +RgSchCellCb *cell, +RgSchUeCb *ue, +RgSchDlHqProcCb *hqP, +RgrSchFrmt1b3TypEnum uciFrmtTyp, +uint8_t *isAck, +RgTfuHqInfo *fdbk +) { if(uciFrmtTyp != RG_SCH_UCI_FORMAT1B_CS) { isAck[0] = fdbk->isAck[0]; isAck[1] = fdbk->isAck[1]; - RETVOID; + return; } #ifdef LTE_ADV /* LAA Making all ack for LAA CELL */ @@ -3044,7 +2772,7 @@ Void rgSchGetHqFdbkPos(cell,ue,hqP,uciFrmtTyp,isAck,fdbk) { isAck[0] = TRUE; isAck[1] = TRUE; - RETVOID; + return; } if((ue != NULLP)) @@ -3072,7 +2800,7 @@ 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); @@ -3189,26 +2917,19 @@ Void rgSchGetHqFdbkPos(cell,ue,hqP,uciFrmtTyp,isAck,fdbk) } } #endif - RETVOID; + return; }/* End of rgSchGetHqFdbkPos */ #ifdef LTE_ADV -#ifdef ANSI Void rgSchGetHqFdbkPosFormat3 ( - RgSchDlHqProcCb *hqP, - U8 *isAck, - TfuHqFdbk *fdbk - ) -#else -Void rgSchGetHqFdbkPosFormat3(hqP,isAck,fdbk) - RgSchDlHqProcCb *hqP; - U8 *isAck; - TfuHqFdbk *fdbk; -#endif +RgSchDlHqProcCb *hqP, +uint8_t *isAck, +TfuHqFdbk *fdbk +) { - 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. @@ -3223,7 +2944,7 @@ 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 @@ -3232,7 +2953,6 @@ Void rgSchGetHqFdbkPosFormat3(hqP,isAck,fdbk) * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHDhm5gtfHqFdbkInd ( RgSchUeCb *ue, @@ -3241,25 +2961,17 @@ CmLteTimingInfo timingInfo, TfuHqFdbk fdbk, RgSchErrInfo *err ) -#else -S16 rgSCHDhm5gtfHqFdbkInd(ue, cell, timingInfo, fdbk, err) -RgSchUeCb *ue; -RgSchCellCb *cell; -CmLteTimingInfo timingInfo; -TfuHqFdbk fdbk; -RgSchErrInfo *err; -#endif { - RgSchDlHqProcCb *hqP = NULLP; - CmLList *node = NULLP; - CmLListCp *lnk; - S16 ret = ROK; - RgSchDlSf *sf; - Bool isMsg4 = FALSE; - U16 rnti=0; - U16 procId=0; - U8 hqPCount = 0; - RgInfRlsHqInfo *rlsHqBufs = NULLP; + RgSchDlHqProcCb *hqP = NULLP; + CmLList *node = NULLP; + CmLListCp *lnk; + S16 ret = ROK; + RgSchDlSf *sf; + Bool isMsg4 = FALSE; + uint16_t rnti=0; + uint16_t procId=0; + uint8_t hqPCount = 0; + RgInfRlsHqInfo *rlsHqBufs = NULLP; RGSCHDECRFRMCRNTTIME(timingInfo, timingInfo, 4); @@ -3288,7 +3000,7 @@ RgSchErrInfo *err; { rlsHqBufs->ueHqInfo[rlsHqBufs->numUes].rnti = rnti; rlsHqBufs->ueHqInfo[rlsHqBufs->numUes].hqProcId = - (U8)procId; + (uint8_t)procId; rlsHqBufs->numUes++; } hqPCount--; @@ -3309,7 +3021,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 @@ -3318,27 +3030,16 @@ RgSchErrInfo *err; * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHDhmHqFdbkInd ( Void *cb, -U8 cbType, +uint8_t cbType, RgSchCellCb *cell, CmLteTimingInfo timingInfo, RgTfuHqInfo *fdbk, RgInfRlsHqInfo *rlsHqBufs, RgSchErrInfo *err ) -#else -S16 rgSCHDhmHqFdbkInd(cb, cbType, cell, timingInfo, fdbk, rlsHqBufs, err) -Void *cb; -U8 cbType; -RgSchCellCb *cell; -CmLteTimingInfo timingInfo; -RgTfuHqInfo *fdbk; -RgInfRlsHqInfo *rlsHqBufs; -RgSchErrInfo *err; -#endif { RgSchDlHqTbCb *tbCb; RgSchDlHqEnt *hqE = NULLP; @@ -3352,13 +3053,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; @@ -3427,8 +3128,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) { @@ -3477,8 +3178,7 @@ RgSchErrInfo *err; { if (!sf->relPdcch) { - RLOG_ARG3(L_ERROR,DBG_CELLID,cell->cellId, - "CRNTI:%d NO HARQ proc available for feedback: TimingInfo: " + DU_LOG("\nERROR --> SCH : CRNTI:%d NO HARQ proc available for feedback: TimingInfo: " "sfn %d slot %d", ue->ueId, timingInfo.sfn, timingInfo.slot); return RFAILED; @@ -3547,7 +3247,7 @@ RgSchErrInfo *err; { rlsHqBufs->ueHqInfo[rlsHqBufs->numUes].rnti = rnti; rlsHqBufs->ueHqInfo[rlsHqBufs->numUes].hqProcId = - (U8)procId; + (uint8_t)procId; rlsHqBufs->numUes++; } hqPCount--; @@ -3573,7 +3273,7 @@ RgSchErrInfo *err; { rlsHqBufs->ueHqInfo[rlsHqBufs->numUes].rnti = rnti; rlsHqBufs->ueHqInfo[rlsHqBufs->numUes].hqProcId = - (U8)procId; + (uint8_t)procId; rlsHqBufs->numUes++; } hqPCount--; @@ -3604,21 +3304,7 @@ RgSchErrInfo *err; * -# ROK * -# RFAILED **/ -#ifdef ANSI -Void rgSCHDhmRgrUeCfg -( -RgSchCellCb *cell, -RgSchUeCb *ueCb, -RgrUeCfg *ueCfg, -RgSchErrInfo *err -) -#else -Void rgSCHDhmRgrUeCfg(cell, ueCb, ueCfg, err) -RgSchCellCb *cell; -RgSchUeCb *ueCb; -RgrUeCfg *ueCfg; -RgSchErrInfo *err; -#endif +Void rgSCHDhmRgrUeCfg(RgSchCellCb *cell,RgSchUeCb *ueCb,RgrUeCfg *ueCfg,RgSchErrInfo *err) { UNUSED(err); @@ -3648,7 +3334,7 @@ RgSchErrInfo *err; } rgSCHTmrStartTmr (cell, ueCb, RG_SCH_TMR_TA, ueCb->dl.taCb.cfgTaTmr); } - RETVOID; + return; } /* rgSCHDhmRgrUeCfg */ @@ -3671,25 +3357,13 @@ RgSchErrInfo *err; * -# ROK * -# RFAILED **/ -#ifdef ANSI -Void rgSCHDhmRgrCellCfg -( -RgSchCellCb *cell, -RgrCellCfg *cellCfg, -RgSchErrInfo *err -) -#else -Void rgSCHDhmRgrCellCfg(cell, cellCfg, err) -RgSchCellCb *cell; -RgrCellCfg *cellCfg; -RgSchErrInfo *err; -#endif +Void rgSCHDhmRgrCellCfg(RgSchCellCb *cell,RgrCellCfg *cellCfg,RgSchErrInfo *err) { - RgSchDlHqEnt *hqE; + RgSchDlHqEnt *hqE; PTR pUeCb;/* previous UE Control block */ PTR nUeCb;/* next UE control block */ S16 ret; - U8 idx; + uint8_t idx; UNUSED(err); @@ -3734,7 +3408,7 @@ RgSchErrInfo *err; cell->tq[idx].first = NULLP; cell->tq[idx].tail = NULLP; } - RETVOID; + return; } /* rgSCHDhmRgrCellCfg */ /** @@ -3756,19 +3430,7 @@ RgSchErrInfo *err; * -# ROK * -# RFAILED **/ -#ifdef ANSI -Void rgSCHDhmRgrCellRecfg -( -RgSchCellCb *cell, -RgrCellRecfg *cellRecfg, -RgSchErrInfo *err -) -#else -Void rgSCHDhmRgrCellRecfg(cell, cellRecfg, err) -RgSchCellCb *cell; -RgrCellRecfg *cellRecfg; -RgSchErrInfo *err; -#endif +Void rgSCHDhmRgrCellRecfg(RgSchCellCb *cell,RgrCellRecfg *cellRecfg,RgSchErrInfo *err) { RgSchDlHqEnt *hqE; PTR pUeCb;/* previous UE Control block */ @@ -3800,7 +3462,7 @@ RgSchErrInfo *err; } } } - RETVOID; + return; } /* rgSCHDhmRgrCellRecfg */ /** @@ -3817,15 +3479,7 @@ RgSchErrInfo *err; * @return None. * **/ -#ifdef ANSI -Void rgSCHDhmFreeUe -( -RgSchUeCb *ueCb -) -#else -Void rgSCHDhmFreeUe(ueCb) -RgSchUeCb *ueCb; -#endif +Void rgSCHDhmFreeUe(RgSchUeCb *ueCb) { /* If TA Timer is running. Stop it */ @@ -3865,7 +3519,7 @@ RgSchUeCb *ueCb; rgSCHCmnRmvFrmTaLst(ueCb->cell, ueCb); } - RETVOID; + return; } /* rgSCHDhmFreeUe */ @@ -3880,24 +3534,12 @@ RgSchUeCb *ueCb; * * @param[in] RgSchCellCb *cell * @param[in] RgSchUeCb *ueCb - * @param[in] U8 ta + * @param[in] uint8_t ta * * @return None. * **/ -#ifdef ANSI -Void rgSCHDhmUpdTa -( -RgSchCellCb *cell, -RgSchUeCb *ueCb, -U8 ta -) -#else -Void rgSCHDhmUpdTa(cell, ueCb, ta) -RgSchCellCb *cell; -RgSchUeCb *ueCb; -U8 ta; -#endif +Void rgSCHDhmUpdTa(RgSchCellCb *cell,RgSchUeCb *ueCb,uint8_t ta) { if (ueCb->dl.taCb.state == RGSCH_TA_IDLE) @@ -3929,7 +3571,7 @@ U8 ta; ueCb->dl.taCb.outStndngTaval = ta; } - RETVOID; + return; } /* rgSCHDhmUpdTa */ /** @brief This function handles the TA timer expiry. @@ -3947,20 +3589,12 @@ U8 ta; * @return Void * -#None. */ -#ifdef ANSI -Void rgSCHDhmProcTAExp -( - RgSchUeCb *ueCb - ) -#else -Void rgSCHDhmProcTAExp (ueCb) - RgSchUeCb *ueCb; -#endif +Void rgSCHDhmProcTAExp( RgSchUeCb *ueCb) { /* 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 */ @@ -3981,19 +3615,7 @@ Void rgSCHDhmProcTAExp (ueCb) * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 rgSCHDhmAddLcData -( -Inst inst, -RgSchLchAllocInfo *lchData, -RgSchDlHqTbCb *tbInfo -) -#else -S16 rgSCHDhmAddLcData(inst, lchData, tbInfo) -Inst inst; -RgSchLchAllocInfo *lchData; -RgSchDlHqTbCb *tbInfo; -#endif +S16 rgSCHDhmAddLcData(Inst inst,RgSchLchAllocInfo *lchData,RgSchDlHqTbCb *tbInfo) { if(tbInfo->numLch >= RGSCH_MAX_NUM_DED_LC) @@ -4026,22 +3648,12 @@ RgSchDlHqTbCb *tbInfo; * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 rgSCHDhmTddRlsSubFrm -( -RgSchCellCb *cellCb, -CmLteTimingInfo uciTimingInfo -) -#else -S16 rgSCHDhmTddRlsSubFrm(cellCb, uciTimingInfo) -RgSchCellCb *cellCb; -CmLteTimingInfo uciTimingInfo; -#endif +S16 rgSCHDhmTddRlsSubFrm(RgSchCellCb *cellCb,CmLteTimingInfo uciTimingInfo) { CmLteTimingInfo dlSfTime; RgSchTddDlAscSetIdxK ascIdx; - U8 noFdbks; - U8 i; + uint8_t noFdbks; + uint8_t i; ascIdx = rgSchTddDlAscSetIdxKTbl[cellCb->ulDlCfgIdx][uciTimingInfo.slot]; @@ -4061,7 +3673,7 @@ CmLteTimingInfo uciTimingInfo; }/* rgSCHDhmTddRlsSubFrm */ #ifdef TFU_TDD -U32 macDtx = 0; +uint32_t macDtx = 0; #endif /** * @brief Handler for Removing the HARQ process from a dlsf. @@ -4081,31 +3693,21 @@ U32 macDtx = 0; * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 rgSCHDhmRlsDlsfHqProc -( -RgSchCellCb *cellCb, -CmLteTimingInfo uciTimingInfo -) -#else -S16 rgSCHDhmRlsDlsfHqProc(cellCb, uciTimingInfo) -RgSchCellCb *cellCb; -CmLteTimingInfo uciTimingInfo; -#endif +S16 rgSCHDhmRlsDlsfHqProc(RgSchCellCb *cellCb,CmLteTimingInfo uciTimingInfo) { RgSchDlSf *dlSf; CmLteTimingInfo dlSfTime; 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; @@ -4201,7 +3803,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); @@ -4255,8 +3857,7 @@ CmLteTimingInfo uciTimingInfo; rgSCHUtlReTxTa(cellCb, ue); - RLOG_ARG0(L_DEBUG,DBG_CELLID,cellCb->cellId, - "Nack/DTX Rcvd for TA. Max Tries Attempted"); + DU_LOG("\nDEBUG --> SCH : Nack/DTX Rcvd for TA. Max Tries Attempted"); } } } @@ -4288,7 +3889,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); @@ -4340,8 +3941,7 @@ CmLteTimingInfo uciTimingInfo; ue->dl.taCb.state = RGSCH_TA_IDLE; rgSCHUtlReTxTa(cellCb, ue); - RLOG_ARG0(L_DEBUG,DBG_CELLID,cellCb->cellId, - "Nack/DTX Rcvd for TA. Max Tries Attempted"); + DU_LOG("\nDEBUG --> SCH : Nack/DTX Rcvd for TA. Max Tries Attempted"); } } @@ -4367,17 +3967,7 @@ CmLteTimingInfo uciTimingInfo; * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 rgSCHDhmRlsDlsfHqProc -( -RgSchCellCb *cell, -CmLteTimingInfo timingInfo -) -#else -S16 rgSCHDhmRlsDlsfHqProc(cell, timingInfo) -RgSchCellCb *cell; -CmLteTimingInfo timingInfo; -#endif +S16 rgSCHDhmRlsDlsfHqProc(RgSchCellCb *cell,CmLteTimingInfo timingInfo) { RgSchDlSf *sf; CmLteTimingInfo frm; @@ -4385,7 +3975,7 @@ CmLteTimingInfo timingInfo; Bool maxRetx; CmLList *node; CmLList *hqPNode; - U8 idx; + uint8_t idx; RgSchDlHqTbCb *tbCb; RgSchUeCb *ue; @@ -4525,23 +4115,13 @@ 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 -S16 rgSCHDhmMarkSpsHqProc -( -RgSchUeCb *ue, -U8 idx -) -#else -S16 rgSCHDhmMarkSpsHqProc(ue, idx) -RgSchUeCb *ue; -U8 idx; -#endif +S16 rgSCHDhmMarkSpsHqProc(RgSchUeCb *ue,uint8_t idx) { RgSchDlHqProcCb *hqP; @@ -4566,27 +4146,13 @@ 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 -( -RgSchDlHqProcCb *hqP, -RgSchDlSf *sf, -U8 tbCnt, -U8 *isAck -) -#else -PRIVATE S16 rgSCHDhmProcHqFdbkAckNackRep(hqP,sf,tbCnt,isAck) -RgSchDlHqProcCb *hqP; -RgSchDlSf *sf; -U8 tbCnt; -U8 *isAck; -#endif +static S16 rgSCHDhmProcHqFdbkAckNackRep(RgSchDlHqProcCb *hqP,RgSchDlSf *sf,uint8_t tbCnt,uint8_t *isAck) { /* Check if this is repeating UE */ rgSCHUtlDlHqPTbRmvFrmTx(sf, hqP, tbCnt, TRUE); @@ -4641,17 +4207,7 @@ U8 *isAck; * @return Void * **/ -#ifdef ANSI -S16 rgSCHDhmDlRetxAllocFail -( -RgSchUeCb *ue, -RgSchDlHqProcCb *hqP -) -#else -S16 rgSCHDhmDlRetxAllocFail(ue, hqP) -RgSchUeCb *ue; -RgSchDlHqProcCb *hqP; -#endif +S16 rgSCHDhmDlRetxAllocFail(RgSchUeCb *ue,RgSchDlHqProcCb *hqP) { RgSchCellCb *cell; RgInfRlsHqInfo *rlsHqInfo; @@ -4759,23 +4315,7 @@ RgSchDlHqProcCb *hqP; } #ifdef DL_LA -#ifdef ANSI -PRIVATE S16 rgSCHDhmUpdateAckNackHistory -( -RgSchCellCb *cell, -RgSchUeCb *ueCb, -U8 hqfdbk, -U8 tbCnt -) -#else -PRIVATE S16 rgSCHDhmUpdateAckNackHistory(cell, ueCb, hqfdbk, tbCnt) -( -RgSchCellCb *cell; -RgSchUeCb *ueCb; -U8 hqfdbk; -U8 tbCnt; -) -#endif +static S16 rgSCHDhmUpdateAckNackHistory(RgSchCellCb *cell,RgSchUeCb *ueCb,uint8_t hqfdbk,uint8_t tbCnt) { RgSchCmnDlUe *ueDl; @@ -4794,7 +4334,7 @@ U8 tbCnt; ueDl->laCb[tbCnt].deltaiTbs = ueDl->laCb[tbCnt].deltaiTbs - DL_LA_STEPDOWN; } /* - printf("deltaiTbs[%d] cqibasediTbs[%d] iTbs[%d] tbCnt[%d]\n", + printf("\nDEBUG --> SCH: deltaiTbs[%d] cqibasediTbs[%d] iTbs[%d] tbCnt[%d]\n", ueDl->laCb[tbCnt].deltaiTbs, ueDl->laCb[tbCnt].cqiBasediTbs, (ueDl->laCb[tbCnt].deltaiTbs + ueDl->laCb[tbCnt].cqiBasediTbs)/100, tbCnt); @@ -4804,28 +4344,14 @@ U8 tbCnt; return ROK; } -#ifdef ANSI -S16 rgSCHDhmUpdBlerBasediTbsEff -( -RgSchCellCb *cell, -RgSchUeCb *ueCb, -U8 tbCnt -) -#else -S16 rgSCHDhmUpdBlerBasediTbsEff(cell, ueCb, tbCnt) -( -RgSchCellCb *cell; -RgSchUeCb *ueCb; -U8 tbCnt; -) -#endif +S16 rgSCHDhmUpdBlerBasediTbsEff(RgSchCellCb *cell,RgSchUeCb *ueCb,uint8_t tbCnt) { 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]; - maxiTbs = RG_SCH_DL_MAX_ITBS; + 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); iTbs = (ueDl->laCb[tbCnt].deltaiTbs + ueDl->laCb[tbCnt].cqiBasediTbs)/100; @@ -4883,27 +4409,13 @@ 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 -( -RgSchCellCb *cell, -TfuHqInfo *fdbk, -U8 hqCnt -) -#else -PRIVATE Void rgSCHDhmPrcSplBundlFdbk(cell, fdbk, hqCnt) -( -RgSchCellCb *cell; -TfuHqInfo *fdbk; -U8 hqCnt; -) -#endif +static Void rgSCHDhmPrcSplBundlFdbk(RgSchCellCb *cell,TfuHqInfo *fdbk,uint8_t hqCnt) { - U8 numOfAcks; + uint8_t numOfAcks; /* Num of ACKs reported by UE */ numOfAcks = fdbk->isAck[0]; @@ -4925,7 +4437,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]; } @@ -4933,7 +4445,7 @@ U8 hqCnt; fdbk->isAck[1] = fdbk->isAck[0]; #endif - RETVOID; + return; } #endif @@ -4951,23 +4463,15 @@ U8 hqCnt; * @return Void * **/ -#ifdef ANSI -Void rgSCHDhmHqPAdd2FreeLst -( -RgSchDlHqProcCb *hqP -) -#else -Void rgSCHDhmHqPAdd2FreeLst(hqP) -RgSchDlHqProcCb *hqP; -#endif +Void rgSCHDhmHqPAdd2FreeLst(RgSchDlHqProcCb *hqP) { #ifdef LAA_DBG if (hqP->hqPLst) { int *p = NULL; - printf("Crashing already part of free lst\n"); - printf("Crashing %d \n", *p); + printf("\nDEBUG --> SCH: Crashing already part of free lst\n"); + printf("\nDEBUG --> SCH: Crashing %d \n", *p); *p = 10; } #endif @@ -4979,8 +4483,8 @@ RgSchDlHqProcCb *hqP; if (hqP->hqE->free.count > 8) { int *p = NULL; - printf("Crashing invalid hq count\n"); - printf("Crashing %d \n", *p); + printf("\nDEBUG --> SCH: Crashing invalid hq count\n"); + printf("\nDEBUG --> SCH: Crashing %d \n", *p); *p = 10; } #endif @@ -4989,7 +4493,7 @@ RgSchDlHqProcCb *hqP; rgSCHLaaHndlHqProcFree(hqP); #endif - RETVOID; + return; } /* rgSCHDhmHqPAdd2FreeLst */ @@ -5007,23 +4511,15 @@ RgSchDlHqProcCb *hqP; * @return Void * **/ -#ifdef ANSI -Void rgSCHDhmHqPAdd2InUseLst -( -RgSchDlHqProcCb *hqP -) -#else -Void rgSCHDhmHqPAdd2InUseLst(hqP) -RgSchDlHqProcCb *hqP; -#endif +Void rgSCHDhmHqPAdd2InUseLst(RgSchDlHqProcCb *hqP) { #ifdef LAA_DBG if (hqP->hqPLst) { int *p = NULL; - printf("Crashing already part of inuse lst\n"); - printf("Crashing %d \n", *p); + printf("\nDEBUG --> SCH: Crashing already part of inuse lst\n"); + printf("\nDEBUG --> SCH: Crashing %d \n", *p); *p = 10; } #endif @@ -5035,13 +4531,13 @@ RgSchDlHqProcCb *hqP; if (hqP->hqE->inUse.count > 8) { int *p = NULL; - printf("Crashing invalid hq count \n"); - printf("Crashing %d \n", *p); + printf("\nDEBUG --> SCH: Crashing invalid hq count \n"); + printf("\nDEBUG --> SCH: Crashing %d \n", *p); *p = 10; } #endif - RETVOID; + return; } /* rgSCHDhmHqPAdd2InUseLst */ /** @@ -5058,23 +4554,15 @@ RgSchDlHqProcCb *hqP; * @return Void * **/ -#ifdef ANSI -Void rgSCHDhmHqPDelFrmFreeLst -( -RgSchDlHqProcCb *hqP -) -#else -Void rgSCHDhmHqPDelFrmFreeLst(hqP) -RgSchDlHqProcCb *hqP; -#endif +Void rgSCHDhmHqPDelFrmFreeLst(RgSchDlHqProcCb *hqP) { #ifdef LAA_DBG if (!hqP->hqPLst) { int *p = NULL; - printf("Crashing not part of any lst\n"); - printf("Crashing %d \n", *p); + printf("\nDEBUG --> SCH: Crashing not part of any lst\n"); + printf("\nDEBUG --> SCH: Crashing %d \n", *p); *p = 10; } #endif @@ -5082,8 +4570,8 @@ RgSchDlHqProcCb *hqP; if (hqP->hqPLst != &hqP->hqE->free) { int *p = NULL; - printf("Crashing del from wrong lst\n"); - printf("Crashing %d \n", *p); + printf("\nDEBUG --> SCH: Crashing del from wrong lst\n"); + printf("\nDEBUG --> SCH: Crashing %d \n", *p); *p = 10; } #endif @@ -5095,13 +4583,13 @@ RgSchDlHqProcCb *hqP; if (hqP->hqE->free.count > 8) { int *p = NULL; - printf("Crashing invalid hq count\n"); - printf("Crashing %d \n", *p); + printf("\nDEBUG --> SCH: Crashing invalid hq count\n"); + printf("\nDEBUG --> SCH: Crashing %d \n", *p); *p = 10; } #endif - RETVOID; + return; } /* rgSCHDhmHqPDelFrmFreeLst */ @@ -5120,23 +4608,15 @@ RgSchDlHqProcCb *hqP; * @return Void * **/ -#ifdef ANSI -Void rgSCHDhmHqPDelFrmInUseLst -( -RgSchDlHqProcCb *hqP -) -#else -Void rgSCHDhmHqPDelFrmInUseLst(hqP) -RgSchDlHqProcCb *hqP; -#endif +Void rgSCHDhmHqPDelFrmInUseLst(RgSchDlHqProcCb *hqP) { #ifdef LAA_DBG if (!hqP->hqPLst) { int *p = NULL; - printf("Crashing not part of any lst\n"); - printf("Crashing %d \n", *p); + printf("\nDEBUG --> SCH: Crashing not part of any lst\n"); + printf("\nDEBUG --> SCH: Crashing %d \n", *p); *p = 10; } @@ -5145,8 +4625,8 @@ RgSchDlHqProcCb *hqP; if (hqP->hqPLst != &hqP->hqE->inUse) { int *p = NULL; - printf("Crashing del from wrong lst\n"); - printf("Crashing %d \n", *p); + printf("\nDEBUG --> SCH: Crashing del from wrong lst\n"); + printf("\nDEBUG --> SCH: Crashing %d \n", *p); *p = 10; } #endif @@ -5158,13 +4638,13 @@ RgSchDlHqProcCb *hqP; if (hqP->hqE->inUse.count > 8) { int *p = NULL; - printf("Crashing invalid hq count\n"); - printf("Crashing %d \n", *p); + printf("\nDEBUG --> SCH: Crashing invalid hq count\n"); + printf("\nDEBUG --> SCH: Crashing %d \n", *p); *p = 10; } #endif - RETVOID; + return; } /* rgSCHDhmHqPDelFrmInUseLst */