X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Frg_sch_mga.c;h=8b363354c47070ba145fb46e6a28ac4a7199981e;hb=65443172dd60a6ea312bd3a15959dbf54ad7f045;hp=8667b8a1ce4d72ab0ed1bb935efc7d5bfa37aee0;hpb=5ea4c59cb4dd37164953218b0bd355284e11d22c;p=o-du%2Fl2.git diff --git a/src/5gnrsch/rg_sch_mga.c b/src/5gnrsch/rg_sch_mga.c index 8667b8a1c..8b363354c 100755 --- a/src/5gnrsch/rg_sch_mga.c +++ b/src/5gnrsch/rg_sch_mga.c @@ -36,15 +36,7 @@ static int RLOG_MODULE_ID=4096; static int RLOG_FILE_ID=169; /* 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 "cm_hash.h" /* common hash list */ -#include "cm_llist.h" /* common linked list library */ -#include "cm_err.h" /* common error */ -#include "cm_lte.h" /* common LTE */ +#include "common_def.h" #include "lrg.h" #include "rgr.h" #include "tfu.h" @@ -57,15 +49,6 @@ static int RLOG_FILE_ID=169; #include "rl_common.h" /* header/extern include files (.x) */ -#include "gen.x" /* general layer typedefs */ -#include "ssi.x" /* system services typedefs */ -#include "cm5.x" /* common timers */ -#include "cm_hash.x" /* common hash list */ -#include "cm_lib.x" /* common library */ -#include "cm_llist.x" /* common linked list */ -#include "cm_mblk.x" /* memory management */ -#include "cm_tkns.x" /* common tokens */ -#include "cm_lte.x" /* common tokens */ #include "tfu.x" /* RGU types */ #include "lrg.x" /* layer management typedefs for MAC */ #include "rgr.x" /* layer management typedefs for MAC */ @@ -73,36 +56,36 @@ static int RLOG_FILE_ID=169; #include "rg_sch.x" /* typedefs for Scheduler */ /* local defines */ -PRIVATE S16 rgSCHMeasGapANRepUtlAddUe ARGS(( +static S16 rgSCHMeasGapANRepUtlAddUe ARGS(( RgSchCellCb *cell, RgSchUeCb *ue, RgrUeMeasGapCfg *cfg)); -PRIVATE S16 rgSCHMeasGapANRepUtlRmvUe ARGS(( +static S16 rgSCHMeasGapANRepUtlRmvUe ARGS(( RgSchCellCb *cell, RgSchUeCb *ue)); -PRIVATE S16 rgSchAckNackRepUtlRmvUe ARGS(( +static S16 rgSchAckNackRepUtlRmvUe ARGS(( RgSchCellCb *cell, RgSchUeCb *ue)); -PRIVATE Void rgSchAckNackRepUtlHdlTti ARGS(( +static Void rgSchAckNackRepUtlHdlTti ARGS(( RgSchCellCb *cell, CmLListCp *ackNackRepQ)); -PRIVATE Void rgSCHMeasGapANRepUtlHdlTti ARGS(( +static Void rgSCHMeasGapANRepUtlHdlTti ARGS(( RgSchCellCb *cell, CmLListCp *measGapQ)); #ifdef LTE_TDD -PRIVATE U8 rgSCHAckNakRepFindUlDuration ARGS(( +static uint8_t rgSCHAckNakRepFindUlDuration ARGS(( RgSchCellCb *cell, RgSchDlSf *dlSf, CmLteTimingInfo repTime, -U8 repCnt)); -PRIVATE Void rgSCHAckNakRepGetUlOffsetFrmDl ARGS(( +uint8_t repCnt)); +static Void rgSCHAckNakRepGetUlOffsetFrmDl ARGS(( RgSchDlSf *dlSf, CmLteTimingInfo crntDlTime, -U8 *noSubfrms)); +uint8_t *noSubfrms)); #endif /** @@ -142,23 +125,20 @@ U8 *noSubfrms)); **/ #ifdef ANSI -PUBLIC S16 rgSCHMeasGapANRepUeCfg +S16 rgSCHMeasGapANRepUeCfg ( RgSchCellCb *cell, RgSchUeCb *ue, RgrUeCfg *ueCfg ) #else -PUBLIC S16 rgSCHMeasGapANRepUeCfg(cell, ue, ueCfg) +S16 rgSCHMeasGapANRepUeCfg(cell, ue, ueCfg) RgSchCellCb *cell; RgSchUeCb *ue; RgrUeCfg *ueCfg; #endif { - TRC2(rgSCHMeasGapANRepUeCfg); - - ue->measGapCb.isMesGapEnabled = ueCfg->ueMesGapCfg.isMesGapEnabled; if (ueCfg->ueMesGapCfg.isMesGapEnabled) @@ -182,7 +162,7 @@ RgrUeCfg *ueCfg; cmInitTimers (&ue->ackNakRepCb.ackNakRepDlInactvTmr, 1); cmInitTimers (&ue->ackNakRepCb.ackNakRepTmr, 1); } - RETVALUE(ROK); + return ROK; } /** @@ -218,14 +198,14 @@ RgrUeCfg *ueCfg; **/ #ifdef ANSI -PUBLIC S16 rgSCHMeasGapANRepUeRecfg +S16 rgSCHMeasGapANRepUeRecfg ( RgSchCellCb *cell, RgSchUeCb *ue, RgrUeRecfg *ueRecfg ) #else -PUBLIC S16 rgSCHMeasGapANRepUeRecfg(cell, ue, ueRecfg) +S16 rgSCHMeasGapANRepUeRecfg(cell, ue, ueRecfg) RgSchCellCb *cell; RgSchUeCb *ue; RgrUeRecfg *ueRecfg; @@ -236,9 +216,6 @@ RgrUeRecfg *ueRecfg; RgrUeAckNackRepCfg *ackNackReCfg = &(ueRecfg->ueAckNackRecfg); RgSchUeAckNakRepCb *ackNakRepCb = &(ue->ackNakRepCb); - TRC2(rgSCHMeasGapANRepUeRecfg); - - reCfg = &(ueRecfg->ueMeasGapRecfg); ueMeasCb = &(ue->measGapCb); @@ -306,7 +283,7 @@ RgrUeRecfg *ueRecfg; ackNakRepCb->isAckNackEnabled = FALSE; } /* repetition disabled in re configuration */ - RETVALUE(ROK); + return ROK; } /** @brief This function is a utility to add the UE to the correct Measurement @@ -325,22 +302,20 @@ RgrUeRecfg *ueRecfg; * @return */ #ifdef ANSI -PRIVATE S16 rgSCHMeasGapANRepUtlAddUe +static S16 rgSCHMeasGapANRepUtlAddUe ( RgSchCellCb *cell, RgSchUeCb *ue, RgrUeMeasGapCfg *cfg ) #else -PRIVATE S16 rgSCHMeasGapANRepUtlAddUe (cell, ue, cfg) +static S16 rgSCHMeasGapANRepUtlAddUe (cell, ue, cfg) RgSchCellCb *cell; RgSchUeCb *ue; RgrUeMeasGapCfg *cfg; #endif { - TRC2(rgSCHMeasGapANRepUtlAddUe); - switch (cfg->gapPrd) { case RG_MEAS_GAPPRD_40: @@ -358,9 +333,9 @@ RgrUeMeasGapCfg *cfg; RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHMeasGapANRepUeRecfg() Incorrect GAP Period" "CRNTI:%d",ue->ueId); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* end of rgSCHMeasGapANRepUtlAddUe */ @@ -379,20 +354,18 @@ RgrUeMeasGapCfg *cfg; * @return */ #ifdef ANSI -PRIVATE S16 rgSCHMeasGapANRepUtlRmvUe +static S16 rgSCHMeasGapANRepUtlRmvUe ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PRIVATE S16 rgSCHMeasGapANRepUtlRmvUe (cell, ue) +static S16 rgSCHMeasGapANRepUtlRmvUe (cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif { - TRC2(rgSCHMeasGapANRepUtlRmvUe); - switch (ue->measGapCb.gapPrd) { case RG_MEAS_GAPPRD_40: @@ -408,7 +381,7 @@ RgSchUeCb *ue; ue->measGapCb.measQLnk.node = NULLP; break; } - RETVALUE(ROK); + return ROK; } /* end of rgSCHMeasGapANRepUtlRmvUe */ /** @@ -441,23 +414,20 @@ RgSchUeCb *ue; **/ #ifdef ANSI -PUBLIC Void rgSCHMeasGapANRepUeDel +Void rgSCHMeasGapANRepUeDel ( RgSchCellCb *cell, RgSchUeCb *ue, Bool isUeDel ) #else -PUBLIC Void rgSCHMeasGapANRepUeDel(cell, ue, isUeDel) +Void rgSCHMeasGapANRepUeDel(cell, ue, isUeDel) RgSchCellCb *cell; RgSchUeCb *ue; Bool isUeDel; #endif { - - TRC2(rgSCHMeasGapANRepUeDel); - if (ue->measGapCb.isMesGapEnabled) { rgSCHMeasGapANRepUtlRmvUe (cell, ue); @@ -502,7 +472,7 @@ Bool isUeDel; rgSCHTmrStopTmr (cell, RG_SCH_TMR_ACKNACK_REP, ue); rgSchAckNackRepUtlRmvUe (cell, ue); } - RETVOID; + return; } /** @brief This function deletes the UEs information related to ACK NACK @@ -522,28 +492,26 @@ Bool isUeDel; * @return */ #ifdef ANSI -PRIVATE S16 rgSchAckNackRepUtlRmvUe +static S16 rgSchAckNackRepUtlRmvUe ( RgSchCellCb *cell, RgSchUeCb *ue ) #else -PRIVATE S16 rgSchAckNackRepUtlRmvUe (cell, ue) +static S16 rgSchAckNackRepUtlRmvUe (cell, ue) RgSchCellCb *cell; RgSchUeCb *ue; #endif { - U8 hqIdx; - U8 repIdx; + uint8_t hqIdx; + uint8_t repIdx; RgSchDlHqProcCb *hqP; - U8 tbCnt; + uint8_t tbCnt; RgSchDlHqEnt *hqEnt = RG_SCH_CMN_GET_UE_HQE(ue, cell); - TRC3(rgSchAckNackRepUtlRmvUe); - for (hqIdx = 0; hqIdx < hqEnt->numHqPrcs; hqIdx++) { hqP = &hqEnt->procs[hqIdx]; @@ -564,7 +532,7 @@ PRIVATE S16 rgSchAckNackRepUtlRmvUe (cell, ue) } } - RETVALUE(ROK); + return ROK; } /* end of */ @@ -635,22 +603,20 @@ PRIVATE S16 rgSchAckNackRepUtlRmvUe (cell, ue) **/ #ifdef ANSI -PUBLIC S16 rgSCHMeasGapANRepTtiHndl +S16 rgSCHMeasGapANRepTtiHndl ( RgSchCellCb *cell ) #else -PUBLIC S16 rgSCHMeasGapANRepTtiHndl(cell) +S16 rgSCHMeasGapANRepTtiHndl(cell) RgSchCellCb *cell; #endif { - U8 offset; + uint8_t offset; CmLListCp *queue; RgSchDlSf *dlSf; CmLteTimingInfo repTime; - TRC2(rgSCHMeasGapANRepTtiHndl); - /* Measurement GAP Starts at offSet - however at MAC we are concerned at * subframe + TFU_DELTA. */ @@ -696,7 +662,7 @@ RgSchCellCb *cell; queue = &(dlSf->ueLst); rgSchAckNackRepUtlHdlTti (cell, queue); - RETVALUE(ROK); + return ROK; } /** @brief This function Marks the UE as ackNakRep so that Reception request @@ -717,13 +683,13 @@ RgSchCellCb *cell; * @return Void */ #ifdef ANSI -PRIVATE Void rgSchAckNackRepUtlHdlTti +static Void rgSchAckNackRepUtlHdlTti ( RgSchCellCb *cell, CmLListCp *ackNackRepQ ) #else -PRIVATE Void rgSchAckNackRepUtlHdlTti (cell, ackNackRepQ) +static Void rgSchAckNackRepUtlHdlTti (cell, ackNackRepQ) RgSchCellCb *cell; CmLListCp *ackNackRepQ; #endif @@ -731,8 +697,6 @@ CmLListCp *ackNackRepQ; CmLList *node; RgSchUeCb *ue; - TRC2(rgSchAckNackRepUtlHdlTti); - node = ackNackRepQ->first; while (node) { @@ -745,7 +709,7 @@ CmLListCp *ackNackRepQ; } node = node->next; } /* end of while */ - RETVOID; + return; } /* end of */ @@ -764,13 +728,13 @@ CmLListCp *ackNackRepQ; * @return */ #ifdef ANSI -PRIVATE Void rgSCHMeasGapANRepUtlHdlTti +static Void rgSCHMeasGapANRepUtlHdlTti ( RgSchCellCb *cell, CmLListCp *measGapQ ) #else -PRIVATE Void rgSCHMeasGapANRepUtlHdlTti (cell, measGapQ) +static Void rgSCHMeasGapANRepUtlHdlTti (cell, measGapQ) RgSchCellCb *cell; CmLListCp *measGapQ; #endif @@ -778,8 +742,6 @@ CmLListCp *measGapQ; CmLList *node; RgSchUeCb *ue; - TRC2(rgSCHMeasGapANRepUtlHdlTti); - node = measGapQ->first; while (node) { @@ -788,7 +750,7 @@ CmLListCp *measGapQ; rgSCHTmrStartTmr (cell, ue, RG_SCH_TMR_MEASGAP, RG_SCH_MEAS_GAP_LEN); node = node->next; } /* end of while */ - RETVOID; + return; } /* end of */ @@ -839,34 +801,32 @@ CmLListCp *measGapQ; * -# ROK **/ #ifdef ANSI -PUBLIC S16 rgSCHMeasGapANRepGetDlInactvUe +S16 rgSCHMeasGapANRepGetDlInactvUe ( RgSchCellCb *cell, CmLListCp *dlInactvUeLst ) #else -PUBLIC S16 rgSCHMeasGapANRepGetDlInactvUe(cell, dlInactvUeLst) +S16 rgSCHMeasGapANRepGetDlInactvUe(cell, dlInactvUeLst) RgSchCellCb *cell; CmLListCp *dlInactvUeLst; #endif { - U8 offset; + uint8_t offset; CmLList *node; CmLList *hqNode; CmLListCp *queue; RgSchUeCb *ue; RgSchDlSf *dlSf; CmLteTimingInfo ackNakTime; - U16 schedTime; - U8 harqFdbkOffset; + uint16_t schedTime; + uint8_t harqFdbkOffset; #ifdef LTE_TDD - U8 repCntr; + uint8_t repCntr; #endif RgSchDlHqProcCb *hqP; RgSchDlHqTbCb *tbCb; - U32 i; - - TRC2(rgSCHMeasGapANRepGetDlInactvUe); + uint32_t i; schedTime = cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G + cell->crntTime.slot + RG_DL_DELTA; @@ -875,7 +835,7 @@ CmLListCp *dlInactvUeLst; if(rgSchTddUlDlSubfrmTbl[cell->ulDlCfgIdx][ackNakTime.subframe] != RG_SCH_TDD_DL_SUBFRAME) { - RETVALUE(ROK); + return ROK; } dlSf = rgSCHUtlSubFrmGet (cell, ackNakTime); @@ -938,7 +898,7 @@ CmLListCp *dlInactvUeLst; #ifdef LTE_TDD if(cell->ulDlCfgIdx == 5) { - RETVALUE(ROK); + return ROK; } rgSCHUtlGetPrevDlSfInfo(cell, ackNakTime, &ackNakTime, &repCntr); dlSf = rgSCHUtlSubFrmGet (cell, ackNakTime); @@ -987,7 +947,7 @@ CmLListCp *dlInactvUeLst; /* Start timer */ #ifdef LTE_TDD repCntr = rgSCHAckNakRepFindUlDuration(cell, dlSf, ackNakTime, - (U8)(ue->ackNakRepCb.repCntr - 1)); + (uint8_t)(ue->ackNakRepCb.repCntr - 1)); rgSCHTmrStartTmr (cell, ue, RG_SCH_TMR_DL_ACKNACK, repCntr); #else rgSCHTmrStartTmr (cell, ue, RG_SCH_TMR_DL_ACKNACK, @@ -997,7 +957,7 @@ CmLListCp *dlInactvUeLst; } } } - RETVALUE(ROK); + return ROK; } /** @@ -1046,36 +1006,34 @@ CmLListCp *dlInactvUeLst; **/ #ifdef ANSI -PUBLIC S16 rgSCHMeasGapANRepGetUlInactvUe +S16 rgSCHMeasGapANRepGetUlInactvUe ( RgSchCellCb *cell, CmLListCp *ulInactvUeLst ) #else -PUBLIC S16 rgSCHMeasGapANRepGetUlInactvUe(cell, ulInactvUeLst) +S16 rgSCHMeasGapANRepGetUlInactvUe(cell, ulInactvUeLst) RgSchCellCb *cell; CmLListCp *ulInactvUeLst; #endif { - U8 offset; + uint8_t offset; CmLList *node; CmLList *hqNode; CmLListCp *queue; RgSchUeCb *ue; CmLteTimingInfo ackNakTime; RgSchDlSf *dlSf; - U16 schedTime; - U8 pdcchToPuschGap; - U8 idx=0; + uint16_t schedTime; + uint8_t pdcchToPuschGap; + uint8_t idx=0; #ifdef LTE_TDD - U8 repCntr; + uint8_t repCntr; #endif RgSchDlHqProcCb *hqP; RgSchDlHqTbCb *tbCb; - U32 i; - - TRC2(rgSCHMeasGapANRepGetUlInactvUe); + uint32_t i; /*ccpu00139481- Meas Gap should be monitored in UL with TFU_ULCNTRL_DLDELTA*/ schedTime = cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G + cell->crntTime.slot + \ @@ -1143,13 +1101,13 @@ CmLListCp *ulInactvUeLst; #ifdef LTE_TDD if(cell->ulDlCfgIdx == 5) { - RETVALUE(ROK); + return ROK; } RG_SCH_ADD_TO_CRNT_TIME(cell->crntTime, ackNakTime, TFU_DELTA); if(rgSchTddUlDlSubfrmTbl[cell->ulDlCfgIdx][ackNakTime.subframe] != RG_SCH_TDD_DL_SUBFRAME) { - RETVALUE(ROK); + return ROK; } #else /* Introduced timing delta for DL control in FDD */ @@ -1194,7 +1152,7 @@ CmLListCp *ulInactvUeLst; } } } - RETVALUE(ROK); + return ROK; } /** @@ -1225,20 +1183,19 @@ CmLListCp *ulInactvUeLst; **/ #ifdef ANSI -PUBLIC Void rgSCHMeasGapANRepDlInactvTmrExpry +Void rgSCHMeasGapANRepDlInactvTmrExpry ( RgSchUeCb *ue, -U8 tmrEvnt +uint8_t tmrEvnt ) #else -PUBLIC Void rgSCHMeasGapANRepDlInactvTmrExpry(ue, tmrEvnt) +Void rgSCHMeasGapANRepDlInactvTmrExpry(ue, tmrEvnt) RgSchUeCb *ue; -U8 tmrEvnt; +uint8_t tmrEvnt; #endif { RgSchCellCb *cell = ue->cell; - TRC2(rgSCHMeasGapANRepDlInactvTmrExpry); switch (tmrEvnt) { @@ -1254,7 +1211,7 @@ U8 tmrEvnt; cmInitTimers (&ue->measGapCb.measGapDlInactvTmr, 1); cmInitTimers (&ue->ackNakRepCb.ackNakRepDlInactvTmr, 1); } - RETVOID; + return; } /** @@ -1285,19 +1242,18 @@ U8 tmrEvnt; **/ #ifdef ANSI -PUBLIC Void rgSCHMeasGapANRepUlInactvTmrExpry +Void rgSCHMeasGapANRepUlInactvTmrExpry ( RgSchUeCb *ue, -U8 tmrEvnt +uint8_t tmrEvnt ) #else -PUBLIC Void rgSCHMeasGapANRepUlInactvTmrExpry(ue, tmrEvnt) +Void rgSCHMeasGapANRepUlInactvTmrExpry(ue, tmrEvnt) RgSchUeCb *ue; -U8 tmrEvnt; +uint8_t tmrEvnt; #endif { RgSchCellCb *cell = ue->cell; - TRC2(rgSCHMeasGapANRepUlInactvTmrExpry); switch (tmrEvnt) { @@ -1313,7 +1269,7 @@ U8 tmrEvnt; cmInitTimers (&ue->measGapCb.measGapUlInactvTmr, 1); cmInitTimers (&ue->ackNakRepCb.ackNakRepUlInactvTmr, 1); } - RETVOID; + return; } /** @@ -1339,22 +1295,20 @@ U8 tmrEvnt; **/ #ifdef ANSI -PUBLIC Void rgSCHMeasGapANRepTmrExpry +Void rgSCHMeasGapANRepTmrExpry ( RgSchUeCb *ue ) #else -PUBLIC Void rgSCHMeasGapANRepTmrExpry(ue) +Void rgSCHMeasGapANRepTmrExpry(ue) RgSchUeCb *ue; #endif { - TRC2(rgSCHMeasGapANRepTmrExpry); - ue->measGapCb.isMeasuring = FALSE; cmInitTimers (&ue->measGapCb.measGapTmr, 1); - RETVOID; + return; } /** @@ -1380,22 +1334,20 @@ RgSchUeCb *ue; **/ #ifdef ANSI -PUBLIC Void rgSCHAckNakRepTmrExpry +Void rgSCHAckNakRepTmrExpry ( RgSchUeCb *ue ) #else -PUBLIC Void rgSCHAckNakRepTmrExpry(ue) +Void rgSCHAckNakRepTmrExpry(ue) RgSchUeCb *ue; #endif { - TRC2(rgSCHAckNakRepTmrExpry); - ue->ackNakRepCb.isAckNakRep = FALSE; cmInitTimers (&ue->ackNakRepCb.ackNakRepTmr, 1); - RETVOID; + return; } @@ -1431,13 +1383,13 @@ RgSchUeCb *ue; **/ #ifdef ANSI -PUBLIC Void rgSCHAckNakRepAddToQ +Void rgSCHAckNakRepAddToQ ( RgSchCellCb *cell, RgSchDlSf *crntDlSf ) #else -PUBLIC Void rgSCHAckNakRepAddToQ(cell, crntDlSf) +Void rgSCHAckNakRepAddToQ(cell, crntDlSf) RgSchCellCb *cell; RgSchDlSf *crntDlSf; #endif @@ -1447,9 +1399,7 @@ RgSchDlSf *crntDlSf; CmLList *hqNode; RgSchDlHqProcCb *hqP; RgSchDlHqTbCb *tbCb; - U32 i; - - TRC2(rgSCHAckNakRepAddToQ); + uint32_t i; node = crntDlSf->ueLst.first; while (node) @@ -1475,7 +1425,7 @@ RgSchDlSf *crntDlSf; } } } - RETVOID; + return; } @@ -1493,36 +1443,35 @@ RgSchDlSf *crntDlSf; * @param[in] RgSchCellCb *cell * @param[in] RgSchDlSf *dlSf * @param[in] CmLteTimingInfo repTime - * @param[in] U8 repCnt + * @param[in] uint8_t repCnt * - * @return U8 + * @return uint8_t * **/ #ifdef ANSI -PRIVATE U8 rgSCHAckNakRepFindUlDuration +static uint8_t rgSCHAckNakRepFindUlDuration ( RgSchCellCb *cell, RgSchDlSf *dlSf, CmLteTimingInfo repTime, -U8 repCnt +uint8_t repCnt ) #else -PRIVATE U8 rgSCHAckNakRepFindUlDuration(cell, dlSf, repTime, repCnt) +static uint8_t rgSCHAckNakRepFindUlDuration(cell, dlSf, repTime, repCnt) RgSchCellCb *cell; RgSchDlSf *dlSf; CmLteTimingInfo repTime; -U8 repCnt; +uint8_t repCnt; #endif { CmLteTimingInfo ulfrm; - U8 noSubfrms = 0; - U16 ulDlCfgIdx = cell->ulDlCfgIdx; + uint8_t noSubfrms = 0; + uint16_t ulDlCfgIdx = cell->ulDlCfgIdx; S16 rem = 0; S16 idx; S8 diff; - TRC2(rgSCHAckNakRepFindUlDuration) rgSCHAckNakRepGetUlOffsetFrmDl(dlSf, repTime, &noSubfrms); RG_SCH_ADD_TO_CRNT_TIME(repTime, ulfrm, noSubfrms); diff = repCnt-1; @@ -1539,7 +1488,7 @@ U8 repCnt; } noSubfrms += rem; - RETVALUE(noSubfrms); + return (noSubfrms); } /** @@ -1555,27 +1504,26 @@ U8 repCnt; * * @param[in] RgSchDlSf *dlSf * @param[in] CmLteTimingInfo crntDlTime - * @param[in] U8 *noSubfrms + * @param[in] uint8_t *noSubfrms * - * @return U8 + * @return uint8_t * **/ #ifdef ANSI -PRIVATE Void rgSCHAckNakRepGetUlOffsetFrmDl +static Void rgSCHAckNakRepGetUlOffsetFrmDl ( RgSchDlSf *dlSf, CmLteTimingInfo crntDlTime, -U8 *noSubfrms +uint8_t *noSubfrms ) #else -PRIVATE Void rgSCHAckNakRepGetUlOffsetFrmDl(dlSf, crntDlTime, noSubfrms) +static Void rgSCHAckNakRepGetUlOffsetFrmDl(dlSf, crntDlTime, noSubfrms) RgSchDlSf *dlSf; CmLteTimingInfo crntDlTime; -U8 *noSubfrms; +uint8_t *noSubfrms; #endif { - TRC2(rgSCHAckNakRepGetUlOffsetFrmDl) if(dlSf->dlFdbkInfo.sfnOffset != 0) { @@ -1587,7 +1535,7 @@ U8 *noSubfrms; { *noSubfrms = dlSf->dlFdbkInfo.subframe - crntDlTime.subframe; } - RETVOID; + return; } #endif