X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Frg_sch_tom.c;h=bd1cbc6bfa0c35619b3b253a588fb4bf595a0e15;hb=2bd852089c3226f721d83b30f816b90f803237f6;hp=ef373dcd3a27f4330912c181c71c08c96801d96a;hpb=528b3d3a09d7486a0c549820bac601db60fde18e;p=o-du%2Fl2.git diff --git a/src/5gnrsch/rg_sch_tom.c b/src/5gnrsch/rg_sch_tom.c index ef373dcd3..bd1cbc6bf 100755 --- a/src/5gnrsch/rg_sch_tom.c +++ b/src/5gnrsch/rg_sch_tom.c @@ -32,9 +32,6 @@ @brief This module does processing related to handling of lower interface APIs invoked by PHY towards scheduler. */ -static const char* RLOG_MODULE_NAME="MAC"; -static int RLOG_FILE_ID=228; -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" /* defines and macros for MAC */ #include "rg_sch.h" /* defines and macros for MAC */ #include "rg_sch_cmn.h" /* typedefs for MAC */ -#include "rl_interface.h" -#include "rl_common.h" /* header/extern include files (.x) */ @@ -246,7 +241,7 @@ CmLteTimingInfo *timeInfo, Bool hqPres )); -void schFillCrntTime( SlotIndInfo slotInd,Inst schInst); +void schFillCrntTime( SlotTimingInfo slotInd,Inst schInst); #ifdef CA_DBG uint32_t delayedApiCnt; @@ -753,25 +748,18 @@ S8 rgSchCmnAper30n31DiffCqi[4] = {0, 1, 2, -1}; * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHGetDedPrmUe ( RgSchCellCb *cell, -uint16_t rapId, +uint16_t rapId, CmLteTimingInfo timingInfo, RgSchUeCb **ue ) -#else -S16 rgSCHGetDedPrmUe(cell, rapId, timingInfo, ue) -RgSchCellCb *cell; -uint16_t rapId; -CmLteTimingInfo timingInfo; -RgSchUeCb **ue; -#endif { RgSchCmnCell *cellSch = (RgSchCmnCell *)(cell->sc.sch); - printf("rapId[%d] cellSch->rachCfg.dedPrmStart[%d] cellSch->rachCfg.numDedPrm[%d]\n",rapId,cellSch->rachCfg.dedPrmStart,cellSch->rachCfg.numDedPrm); + DU_LOG("\nINFO --> SCH : rapId[%d] cellSch->rachCfg.dedPrmStart[%d] cellSch->rachCfg.numDedPrm[%d]\n",\ + rapId,cellSch->rachCfg.dedPrmStart,cellSch->rachCfg.numDedPrm); /* Finding UE in handOver List */ if ((rapId < cellSch->rachCfg.dedPrmStart) || (rapId > cellSch->rachCfg.dedPrmStart + @@ -779,13 +767,13 @@ RgSchUeCb **ue; { /* This ded Preamble corresponds to handover */ *ue = rgSCHCmnGetHoUe(cell, rapId); - printf(" his ded Preamble corresponds to hando\n"); + DU_LOG("\nDEBUG --> SCH : ded Preamble corresponds to handover\n"); } else/* Finding UE from PDCCH Order Mappings */ { /* Get the UE which has transmitted this RaReq */ *ue = rgSCHCmnGetPoUe(cell, rapId, timingInfo); - printf(" ==== inding UE from PDCCH Order Mapping\n"); + DU_LOG("\nDEBUG --> SCH : UE from PDCCH Order Mapping\n"); } return ROK; } @@ -812,32 +800,25 @@ RgSchUeCb **ue; * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHTomRaReqInd ( RgSchCellCb *cell, TfuRaReqIndInfo *raReqInd ) -#else -S16 rgSCHTomRaReqInd(cell, raReqInd) -RgSchCellCb *cell; -TfuRaReqIndInfo *raReqInd; -#endif { - S16 ret; - uint8_t raRntiCnt; - uint8_t raReqCnt; - RgSchErrInfo err; - Bool isEmtcUe = FALSE; - uint16_t rapId; - RgSchUeCb *ue = NULLP; + S16 ret; + uint8_t raRntiCnt; + uint8_t raReqCnt; + RgSchErrInfo err; + Bool isEmtcUe = FALSE; + uint16_t rapId; + RgSchUeCb *ue = NULLP; if(cell->cellId != raReqInd->cellId) { err.errType = RGSCHERR_TOM_RAREQIND; err.errCause = RGSCHERR_TOM_INV_CELL_ID; - RLOG_ARG3(L_ERROR,DBG_CELLID,cell->cellId, - "rgSCHTomRaReqInd(): No cell found with raReq cellId = (%d) errorType (%d)" + DU_LOG("\nERROR --> SCH : rgSCHTomRaReqInd(): No cell found with raReq cellId = (%d) errorType (%d)" " errorCause(%d)",raReqInd->cellId, err.errType, err.errCause); return RFAILED; } @@ -864,9 +845,7 @@ TfuRaReqIndInfo *raReqInd; #if (ERRCLASS & ERRCLS_DEBUG) if(raReqInd->rachInfoArr[raRntiCnt].raRnti > RGSCH_MAX_RA_RNTI) { - RGSCHLOGERROR(cell->instIdx, ERRCLS_INT_PAR, ERG013, - (ErrVal)raReqInd->rachInfoArr[raRntiCnt].raRnti, - ("rgSCHTomRaReqInd(): raRnti is out of range\n")); + DU_LOG("\nERROR --> SCH : rgSCHTomRaReqInd(): raRnti is out of range\n"); continue; } #endif @@ -876,8 +855,7 @@ TfuRaReqIndInfo *raReqInd; if(ret == RFAILED) { err.errType = RGSCHERR_TOM_RAREQIND; - RLOG_ARG3(L_ERROR,DBG_CELLID,cell->cellId, - "RARNTI:%d rgSCHTomRaReqInd(): RAM processing failed errType(%d) " + DU_LOG("\nERROR --> SCH : RARNTI:%d rgSCHTomRaReqInd(): RAM processing failed errType(%d) " "errCause(%d)", raReqInd->rachInfoArr[raRntiCnt].raRnti, err.errType, err.errCause); continue; @@ -910,17 +888,11 @@ TfuRaReqIndInfo *raReqInd; * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHTomUlCqiInd ( RgSchCellCb *cell, TfuUlCqiIndInfo *ulCqiInd ) -#else -S16 rgSCHTomUlCqiInd(cell, ulCqiInd) -RgSchCellCb *cell; -TfuUlCqiIndInfo *ulCqiInd; -#endif { RgSchUeCb *ue; CmLList *node; @@ -929,8 +901,7 @@ TfuUlCqiIndInfo *ulCqiInd; node = ulCqiInd->ulCqiRpt.first; if(cell->cellId != ulCqiInd->cellId) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, - "rgSCHTomUlCqiInd() Unable to get the ulCqiInd cell with id(%d)", + DU_LOG("\nERROR --> SCH : rgSCHTomUlCqiInd() Unable to get the ulCqiInd cell with id(%d)", ulCqiInd->cellId); return RFAILED; } @@ -941,7 +912,7 @@ TfuUlCqiIndInfo *ulCqiInd; #if (ERRCLASS & ERRCLS_DEBUG) if(ulCqiInfo->numSubband == 0) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Num Subband is" + DU_LOG("\nERROR --> SCH : Num Subband is" "out of range RNTI:%d",ulCqiInfo->rnti); continue; } @@ -952,8 +923,7 @@ TfuUlCqiIndInfo *ulCqiInd; if((ue = rgSCHDbmGetSpsUeCb(cell, ulCqiInfo->rnti)) == NULLP) #endif { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to get " - "the ue for RNTI:%d", ulCqiInfo->rnti); + DU_LOG("\nERROR --> SCH : Unable to get the ue for RNTI:%d", ulCqiInfo->rnti); continue; } } @@ -985,17 +955,11 @@ TfuUlCqiIndInfo *ulCqiInd; * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHTomPucchDeltaPwrInd ( RgSchCellCb *cell, TfuPucchDeltaPwrIndInfo *pucchDeltaPwr ) -#else -S16 rgSCHTomPucchDeltaPwrInd(cell, pucchDeltaPwr) -RgSchCellCb *cell; -TfuPucchDeltaPwrIndInfo *pucchDeltaPwr; -#endif { RgSchUeCb *ue; CmLList *node; @@ -1003,8 +967,7 @@ TfuPucchDeltaPwrIndInfo *pucchDeltaPwr; if(cell->cellId != pucchDeltaPwr->cellId) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, - "rgSCHTomPucchDeltaPwrInd() Unable to get the pucchDeltaPwr cell with id(%d)", + DU_LOG("\nERROR --> SCH : rgSCHTomPucchDeltaPwrInd() Unable to get the pucchDeltaPwr cell with id(%d)", pucchDeltaPwr->cellId); return RFAILED; } @@ -1019,7 +982,7 @@ TfuPucchDeltaPwrIndInfo *pucchDeltaPwr; if((ue = rgSCHDbmGetSpsUeCb(cell, ueElem->rnti)) == NULLP) #endif { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"RNTI:%d " + DU_LOG("\nERROR --> SCH : RNTI:%d " "rgSCHTomPucchDeltaPwrInd() Unable to get the ue ", ueElem->rnti); continue; @@ -1052,17 +1015,11 @@ TfuPucchDeltaPwrIndInfo *pucchDeltaPwr; * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHTomHarqAckInd ( RgSchCellCb *cell, TfuHqIndInfo *harqAckInd ) -#else -S16 rgSCHTomHarqAckInd(cell, harqAckInd) -RgSchCellCb *cell; -TfuHqIndInfo *harqAckInd; -#endif { RgSchErrInfo err; RgSchUeCb *ue; @@ -1078,7 +1035,7 @@ TfuHqIndInfo *harqAckInd; if(cell->cellId != harqAckInd->cellId) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"rgSCHTomHarqAckInd() Unable to get" + DU_LOG("\nERROR --> SCH : rgSCHTomHarqAckInd() Unable to get" " the cell for cellId (%d)", harqAckInd->cellId); err.errType = RGSCHERR_TOM_HARQACKIND; err.errCause = RGSCHERR_TOM_INV_CELL_ID; @@ -1099,7 +1056,7 @@ TfuHqIndInfo *harqAckInd; if ((rgSCHDhm5gtfHqFdbkInd (ue, cell, harqAckInd->timingInfo, fdbk, &err)) != ROK) { err.errType = RGSCHERR_TOM_HARQACKIND; - RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId,"rgSCHTomHarqAckInd() " + DU_LOG("\nERROR --> SCH : rgSCHTomHarqAckInd() " "HARQ feedback processing failed errType(%d)errCause(%d)n", err.errType, err.errCause); continue; @@ -1111,7 +1068,7 @@ TfuHqIndInfo *harqAckInd; if ((rgSCHDhmRlsDlsfHqProc (cell, harqAckInd->timingInfo)) != ROK) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to Release Downlink " + DU_LOG("\nERROR --> SCH : Unable to Release Downlink " "subframe for cellId (%d) ", cell->cellId); err.errType = RGSCHERR_TOM_HARQACKIND; } @@ -1152,7 +1109,7 @@ TfuHqIndInfo *harqAckInd; cell, harqAckInd->timingInfo, hqInfo, rlsHqBufs, &err)) != ROK) { err.errType = RGSCHERR_TOM_HARQACKIND; - RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId,"rgSCHTomHarqAckInd() HARQ" + DU_LOG("\nERROR --> SCH : rgSCHTomHarqAckInd() HARQ" " feedback processing failed errType(%d) errCause(%d)", err.errType, err.errCause); continue; @@ -1166,7 +1123,7 @@ TfuHqIndInfo *harqAckInd; cell, harqAckInd->timingInfo, hqInfo, rlsHqBufs, &err)) != ROK) { err.errType = RGSCHERR_TOM_HARQACKIND; - RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId,"rgSCHTomHarqAckInd() " + DU_LOG("\nERROR --> SCH : rgSCHTomHarqAckInd() " "HARQ feedback processing failed errType(%d)errCause(%d)n", err.errType, err.errCause); continue; @@ -1178,7 +1135,7 @@ TfuHqIndInfo *harqAckInd; cell, harqAckInd->timingInfo, hqInfo, rlsHqBufs, &err)) != ROK) { err.errType = RGSCHERR_TOM_HARQACKIND; - RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId,"rgSCHTomHarqAckInd() HARQ" + DU_LOG("\nERROR --> SCH : rgSCHTomHarqAckInd() HARQ" " feedback processing failed errType(%d) errCause(%d).", err.errType, err.errCause); continue; @@ -1186,7 +1143,7 @@ TfuHqIndInfo *harqAckInd; } else { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"RNTI:%d Unable to get the " + DU_LOG("\nERROR --> SCH : RNTI:%d Unable to get the " "UE CB or RA CB ", hqInfo->rnti); err.errType = RGSCHERR_TOM_HARQACKIND; continue; @@ -1196,7 +1153,7 @@ TfuHqIndInfo *harqAckInd; /* Check with TDD call DHM*/ if ((rgSCHDhmRlsDlsfHqProc (cell, harqAckInd->timingInfo)) != ROK) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to Release Downlink " + DU_LOG("\nERROR --> SCH : Unable to Release Downlink " "subframe for cellId (%d) ", harqAckInd->cellId); err.errType = RGSCHERR_TOM_HARQACKIND; } @@ -1243,17 +1200,11 @@ TfuHqIndInfo *harqAckInd; * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHTomSrInd ( RgSchCellCb *cell, TfuSrIndInfo *srInd ) -#else -S16 rgSCHTomSrInd(cell, srInd) -RgSchCellCb *cell; -TfuSrIndInfo *srInd; -#endif { S16 ret = RFAILED; RgSchErrInfo err; @@ -1263,7 +1214,7 @@ TfuSrIndInfo *srInd; if(cell->cellId != srInd->cellId) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to get the cell for srcInd cellId" + DU_LOG("\nERROR --> SCH : Unable to get the cell for srcInd cellId" ":%d ", srInd->cellId); err.errType = RGSCHERR_TOM_SRIND; err.errCause = RGSCHERR_TOM_INV_CELL_ID; @@ -1280,7 +1231,7 @@ TfuSrIndInfo *srInd; ue = rgSCHDbmGetUeCb (cell, srInfo->rnti); if (ue == NULLP) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"RNTI:%d Unable to get the UE CB", + DU_LOG("\nERROR --> SCH : RNTI:%d Unable to get the UE CB", srInfo->rnti); continue; } @@ -1294,7 +1245,7 @@ TfuSrIndInfo *srInd; if (ret != ROK) { err.errType = RGSCHERR_TOM_SRIND; - RLOG_ARG3(L_ERROR,DBG_CELLID,cell->cellId,"Scheduler processing failed " + DU_LOG("\nERROR --> SCH : Scheduler processing failed " "errType(%d) errCause(%d) RNTI:%d", err.errType, err.errCause,srInfo->rnti); continue; } @@ -1324,17 +1275,11 @@ TfuSrIndInfo *srInd; * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHTomDoaInd ( RgSchCellCb *cell, TfuDoaIndInfo *doaInd ) -#else -S16 rgSCHTomDoaInd(cell, doaInd ) -RgSchCellCb *cell; -TfuDoaIndInfo *doaInd; -#endif { RgSchUeCb *ue; CmLList *node; @@ -1342,7 +1287,7 @@ TfuDoaIndInfo *doaInd; if(cell->cellId != doaInd->cellId) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to get the cell for doaInd cellId" + DU_LOG("\nERROR --> SCH : Unable to get the cell for doaInd cellId" ":%d", doaInd->cellId); return RFAILED; } @@ -1355,7 +1300,7 @@ TfuDoaIndInfo *doaInd; ue = rgSCHDbmGetUeCb (cell, doaInfo->rnti); if (ue == NULLP) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"RNTI:%d Unable to get the UE CB", + DU_LOG("\nERROR --> SCH : RNTI:%d Unable to get the UE CB", doaInfo->rnti); continue; } @@ -1385,17 +1330,11 @@ TfuDoaIndInfo *doaInd; * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHTomDlCqiInd ( RgSchCellCb *cell, TfuDlCqiIndInfo *dlCqiInd ) -#else -S16 rgSCHTomDlCqiInd(cell, dlCqiInd) -RgSchCellCb *cell; -TfuDlCqiIndInfo *dlCqiInd; -#endif { RgSchUeCb *ue; CmLList *node; @@ -1403,7 +1342,7 @@ TfuDlCqiIndInfo *dlCqiInd; if(cell->cellId != dlCqiInd->cellId) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to get the cell for cellId" + DU_LOG("\nERROR --> SCH : Unable to get the cell for cellId" ":%d", dlCqiInd->cellId); return RFAILED; } @@ -1416,7 +1355,7 @@ TfuDlCqiIndInfo *dlCqiInd; ue = rgSCHDbmGetUeCb (cell, dlCqiInfo->rnti); if (ue == NULLP) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"RNTI:%dUnable to get the UE CB", + DU_LOG("\nERROR --> SCH : RNTI:%dUnable to get the UE CB", dlCqiInfo->rnti); continue; } @@ -1449,19 +1388,12 @@ TfuDlCqiIndInfo *dlCqiInd; * -# ROK * -# RFAILED **/ -#ifdef ANSI static S16 rgSCHTomUtlMovePcqiNxtOccasion ( - RgSchCellCb *cell, - RgSchUeCb *ue, - RgSchUePCqiCb *cqiCb - ) -#else -static S16 rgSCHTomUtlMovePcqiNxtOccasion(cell, ue, cqiCb) - RgSchCellCb *cell; - RgSchUeCb *ue; - RgSchUePCqiCb *cqiCb; -#endif +RgSchCellCb *cell, +RgSchUeCb *ue, +RgSchUePCqiCb *cqiCb +) { uint16_t cqiIdx = 0; @@ -1485,7 +1417,7 @@ static S16 rgSCHTomUtlMovePcqiNxtOccasion(cell, ue, cqiCb) if (NULLP == cmLListDelFrm(&cell->pCqiSrsSrLst[cqiCb->nCqiTrIdx].cqiLst, &cqiCb->cqiLstEnt)) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"RNTI:%d Unable to remove node", + DU_LOG("\nERROR --> SCH : RNTI:%d Unable to remove node", ue->ueId); } cqiCb->nCqiTrIdx = cqiIdx; @@ -1521,19 +1453,12 @@ static S16 rgSCHTomUtlMovePcqiNxtOccasion(cell, ue, cqiCb) * -# ROK * -# RFAILED **/ -#ifdef ANSI static S16 rgSCHTomUtlMovePriNxtOccasion ( - RgSchCellCb *cell, - RgSchUeCb *ue, - RgSchUePCqiCb *riCb - ) -#else -static S16 rgSCHTomUtlMovePriNxtOccasion(cell, ue, riCb) - RgSchCellCb *cell; - RgSchUeCb *ue; - RgSchUePCqiCb *riCb; -#endif +RgSchCellCb *cell, +RgSchUeCb *ue, +RgSchUePCqiCb *riCb +) { uint16_t riIdx; uint16_t riDist=0; @@ -1596,7 +1521,7 @@ static S16 rgSCHTomUtlMovePriNxtOccasion(cell, ue, riCb) if (NULLP == cmLListDelFrm(&cell->pCqiSrsSrLst[riCb->nRiTrIdx].riLst, &riCb->riLstEnt)) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"[%d]UEID:Unable to remove node", + DU_LOG("\nERROR --> SCH : [%d]UEID:Unable to remove node", ue->ueId); } RG_SCH_RECORD(&riCb->histElem,RGSCH_ACTION_DEL, &cell->pCqiSrsSrLst[riCb->nRiTrIdx].riLst); @@ -1643,17 +1568,11 @@ static S16 rgSCHTomUtlMovePriNxtOccasion(cell, ue, riCb) * -# ROK * -# RFAILED **/ -#ifdef ANSI static S16 rgSCHTomUtlMoveSrNxtOccasion ( - RgSchCellCb *cell, - RgSchUeCb *ue - ) -#else -static S16 rgSCHTomUtlMoveSrNxtOccasion(cell, ue) - RgSchCellCb *cell; - RgSchUeCb *ue; -#endif +RgSchCellCb *cell, +RgSchUeCb *ue +) { uint16_t srIdx = 0; @@ -1664,7 +1583,7 @@ static S16 rgSCHTomUtlMoveSrNxtOccasion(cell, ue) if (NULLP == cmLListDelFrm(&cell->pCqiSrsSrLst[ue->srCb.nSrTrIdx].srLst, &ue->srCb.srLstEnt)) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"RNTI:%d Unable to remove node", + DU_LOG("\nERROR --> SCH : RNTI:%d Unable to remove node", ue->ueId); } ue->srCb.nSrTrIdx = srIdx; @@ -1697,17 +1616,11 @@ static S16 rgSCHTomUtlMoveSrNxtOccasion(cell, ue) * -# ROK * -# RFAILED **/ -#ifdef ANSI static S16 rgSCHTomUtlMoveSrsNxtOccasion ( - RgSchCellCb *cell, - RgSchUeCb *ue - ) -#else -static S16 rgSCHTomUtlMoveSrsNxtOccasion(cell, ue) - RgSchCellCb *cell; - RgSchUeCb *ue; -#endif +RgSchCellCb *cell, +RgSchUeCb *ue +) { uint16_t srsIdx; uint16_t srsDist; @@ -1741,7 +1654,7 @@ static S16 rgSCHTomUtlMoveSrsNxtOccasion(cell, ue) if (NULLP == cmLListDelFrm(&cell->pCqiSrsSrLst[ue->srsCb.nSrsTrIdx].srsLst, &ue->srsCb.srsLstEnt)) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"RNTI:%d Unable to remove node", + DU_LOG("\nERROR --> SCH : RNTI:%d Unable to remove node", ue->ueId); } cmLListAdd2Tail(&cell->pCqiSrsSrLst[srsIdx].srsLst, @@ -1782,39 +1695,33 @@ static S16 rgSCHTomUtlMoveSrsNxtOccasion(cell, ue) * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHTomRawCqiInd ( - RgSchCellCb *cell, - TfuRawCqiIndInfo *rawCqiInd +RgSchCellCb *cell, +TfuRawCqiIndInfo *rawCqiInd ) -#else -S16 rgSCHTomRawCqiInd(cell, rawCqiInd) - RgSchCellCb *cell; - TfuRawCqiIndInfo *rawCqiInd; -#endif { RgSchUeCb *ue; CmLList *node; TfuRawCqiRpt* rawCqiInfo; RgSchErrInfo err; - uint32_t cellIdx; + uint32_t cellIdx; RgInfRlsHqInfo *rlsHqBufs = &(cell->rlsHqArr[cell->crntHqIdx]); RgSchCellCb *iterCellP; #if DL_LA RgSchCmnDlUe *ueDl; #endif - uint8_t cqi; - uint8_t ri; - uint8_t hqAck; - Pst pst; - RgSchRaCb *raCb; - TfuHqInfo hqInfo; + uint8_t cqi; + uint8_t ri; + uint8_t hqAck; + Pst pst; + RgSchRaCb *raCb; + TfuHqInfo hqInfo; if(cell->cellId != rawCqiInd->cellId) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to get the cell for cellId" + DU_LOG("\nERROR --> SCH : Unable to get the cell for cellId" ":%d", rawCqiInd->cellId); return RFAILED; } @@ -1829,7 +1736,7 @@ S16 rgSCHTomRawCqiInd(cell, rawCqiInd) /* if (ue == NULLP) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"CRNTI:%d Unable to get the UECB", + DU_LOG("\nERROR --> SCH : CRNTI:%d Unable to get the UECB", rawCqiInfo->crnti); continue; } @@ -1837,7 +1744,7 @@ S16 rgSCHTomRawCqiInd(cell, rawCqiInd) #ifdef RG_5GTF /* if (rawCqiInfo->numBits >= 5) - printf("cellId [%d] crnti [%d] numBits [%d] uciPayload [0x%08x] sfn/sf [%d:%d]\n", + DU_LOG("\nINFO --> SCH : cellId [%d] crnti [%d] numBits [%d] uciPayload [0x%08x] sfn/sf [%d:%d]\n", cell->cellId, rawCqiInfo->crnti, rawCqiInfo->numBits, rawCqiInfo->uciPayload, rawCqiInd->timingInfo.sfn, rawCqiInd->timingInfo.slot); */ @@ -1857,7 +1764,7 @@ S16 rgSCHTomRawCqiInd(cell, rawCqiInd) if ((rgSCHDhm5gtfHqFdbkInd (ue, cell, rawCqiInd->timingInfo, fdbk, &err)) != ROK) { err.errType = RGSCHERR_TOM_HARQACKIND; - RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId,"rgSCHTomHarqAckInd() " + DU_LOG("\nERROR --> SCH : rgSCHTomHarqAckInd() " "HARQ feedback processing failed errType(%d)errCause(%d)n", err.errType, err.errCause); continue; @@ -1869,7 +1776,7 @@ S16 rgSCHTomRawCqiInd(cell, rawCqiInd) cell, rawCqiInd->timingInfo, &hqInfo, rlsHqBufs, &err)) != ROK) { err.errType = RGSCHERR_TOM_HARQACKIND; - RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId,"rgSCHTomHarqAckInd() HARQ" + DU_LOG("\nERROR --> SCH : rgSCHTomHarqAckInd() HARQ" " feedback processing failed errType(%d) errCause(%d)", err.errType, err.errCause); continue; @@ -1882,7 +1789,7 @@ S16 rgSCHTomRawCqiInd(cell, rawCqiInd) cell, rawCqiInd->timingInfo, &hqInfo, rlsHqBufs, &err)) != ROK) { err.errType = RGSCHERR_TOM_HARQACKIND; - RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId,"rgSCHTomHarqAckInd() HARQ" + DU_LOG("\nERROR --> SCH : rgSCHTomHarqAckInd() HARQ" " feedback processing failed errType(%d) errCause(%d).", err.errType, err.errCause); continue; @@ -1890,13 +1797,13 @@ S16 rgSCHTomRawCqiInd(cell, rawCqiInd) } else { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"RNTI:%d Unable to get the " + DU_LOG("\nERROR --> SCH : RNTI:%d Unable to get the " "UE CB or RA CB ", rawCqiInfo->crnti); err.errType = RGSCHERR_TOM_HARQACKIND; continue; } /* - printf("rawCqiInfo->numBits [%d] uciPayload [0x%08x] sfn/sf [%d:%d]\n", rawCqiInfo->numBits, + DU_LOG("rawCqiInfo->numBits [%d] uciPayload [0x%08x] sfn/sf [%d:%d]\n", rawCqiInfo->numBits, rawCqiInfo->uciPayload, rawCqiInd->timingInfo.sfn, rawCqiInd->timingInfo.slot); */ } @@ -1908,7 +1815,7 @@ S16 rgSCHTomRawCqiInd(cell, rawCqiInd) if(ue) { if (cqi == 0) { - printf("\n UE[%d] CQI[%d] Invalid\n", ue->ueId, cqi); + DU_LOG("\nERROR --> SCH : UE[%d] CQI[%d] Invalid\n", ue->ueId, cqi); cqi = 15; } ue->ue5gtfCb.mcs = rgSch5gtfCqi2Mcs[cqi - 1]; @@ -1925,7 +1832,7 @@ S16 rgSCHTomRawCqiInd(cell, rawCqiInd) #endif } /* - printf("UE[%d] CQI[%d] MCS[%d] RI[%d]\n", ue->ueId, cqi, ue->ue5gtfCb.mcs, ri); + DU_LOG("\nERROR --> SCH : UE[%d] CQI[%d] MCS[%d] RI[%d]\n", ue->ueId, cqi, ue->ue5gtfCb.mcs, ri); */ } else if (rawCqiInfo->numBits == 6) @@ -1938,7 +1845,7 @@ S16 rgSCHTomRawCqiInd(cell, rawCqiInd) hqAck = (rawCqiInfo->uciPayload >> 31) & 0x1; if (cqi == 0) { - printf("UE[%d] CQI[%d] Invalid\n", ue->ueId, cqi); + DU_LOG("\nERROR --> SCH : UE[%d] CQI[%d] Invalid\n", ue->ueId, cqi); cqi = 13; } ue->ue5gtfCb.mcs = rgSch5gtfCqi2Mcs[cqi - 1]; @@ -1963,7 +1870,7 @@ S16 rgSCHTomRawCqiInd(cell, rawCqiInd) if ((rgSCHDhm5gtfHqFdbkInd (ue, cell, rawCqiInd->timingInfo, fdbk, &err)) != ROK) { err.errType = RGSCHERR_TOM_HARQACKIND; - RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId,"rgSCHTomHarqAckInd() " + DU_LOG("\nERROR --> SCH : rgSCHTomHarqAckInd() " "HARQ feedback processing failed errType(%d)errCause(%d)n", err.errType, err.errCause); continue; @@ -1975,7 +1882,7 @@ S16 rgSCHTomRawCqiInd(cell, rawCqiInd) cell, rawCqiInd->timingInfo, &hqInfo, rlsHqBufs, &err)) != ROK) { err.errType = RGSCHERR_TOM_HARQACKIND; - RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId,"rgSCHTomHarqAckInd() HARQ" + DU_LOG("\nERROR --> SCH : rgSCHTomHarqAckInd() HARQ" " feedback processing failed errType(%d) errCause(%d)", err.errType, err.errCause); continue; @@ -1988,7 +1895,7 @@ S16 rgSCHTomRawCqiInd(cell, rawCqiInd) cell, rawCqiInd->timingInfo, &hqInfo, rlsHqBufs, &err)) != ROK) { err.errType = RGSCHERR_TOM_HARQACKIND; - RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId,"rgSCHTomHarqAckInd() HARQ" + DU_LOG("\nERROR --> SCH : rgSCHTomHarqAckInd() HARQ" " feedback processing failed errType(%d) errCause(%d).", err.errType, err.errCause); continue; @@ -1996,21 +1903,21 @@ S16 rgSCHTomRawCqiInd(cell, rawCqiInd) } else { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"RNTI:%d Unable to get the " + DU_LOG("\nERROR --> SCH : RNTI:%d Unable to get the " "UE CB or RA CB ", rawCqiInfo->crnti); err.errType = RGSCHERR_TOM_HARQACKIND; continue; } /* - printf("\nUE[%u] CQI[%u] MCS[%u] RI[%u] HQ[%u]\n", ue->ueId, cqi, ue->ue5gtfCb.mcs, ri, hqAck); + DU_LOG("\nERROR --> SCH : UE[%u] CQI[%u] MCS[%u] RI[%u] HQ[%u]\n", ue->ueId, cqi, ue->ue5gtfCb.mcs, ri, hqAck); */ } } if ((rgSCHDhmRlsDlsfHqProc (cell, rawCqiInd->timingInfo)) != ROK) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to Release Downlink " + DU_LOG("\nERROR --> SCH : Unable to Release Downlink " "subframe for cellId (%d) ", cell->cellId); err.errType = RGSCHERR_TOM_HARQACKIND; } @@ -2055,17 +1962,11 @@ S16 rgSCHTomRawCqiInd(cell, rawCqiInd) * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHTomSrsInd ( - RgSchCellCb *cell, - TfuSrsIndInfo *srsInd - ) -#else -S16 rgSCHTomSrsInd(cell, srsInd) - RgSchCellCb *cell; - TfuSrsIndInfo *srsInd; -#endif +RgSchCellCb *cell, +TfuSrsIndInfo *srsInd +) { RgSchUeCb *ue; CmLList *node; @@ -2073,7 +1974,7 @@ S16 rgSCHTomSrsInd(cell, srsInd) if(cell->cellId != srsInd->cellId) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to get the cell for cellId" + DU_LOG("\nERROR --> SCH : Unable to get the cell for cellId" ":%d", srsInd->cellId); return RFAILED; } @@ -2085,7 +1986,7 @@ S16 rgSCHTomSrsInd(cell, srsInd) ue = rgSCHDbmGetUeCb (cell, srsInfo->ueId); if (ue == NULLP) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"RNTI:%d Unable to get the " + DU_LOG("\nERROR --> SCH : RNTI:%d Unable to get the " "UE CB", srsInfo->ueId); continue; } @@ -2113,23 +2014,14 @@ S16 rgSCHTomSrsInd(cell, srsInd) * */ #ifdef UNUSED_FUNC -#ifdef ANSI static S16 rgSCHTomUtlGenIndices ( - uint32_t label, - uint8_t posM, - uint8_t valN, - uint8_t valK, - TfuSubbandInfo* sbInfo - ) -#else -static S16 rgSCHTomUtlGenIndices(label, posM, valN, valK, sbInfo) - uint32_t label; - uint8_t posM; - uint8_t valN; - uint8_t valK; - TfuSubbandInfo* sbInfo; -#endif +uint32_t label, +uint8_t posM, +uint8_t valN, +uint8_t valK, +TfuSubbandInfo* sbInfo +) { uint8_t idx, kval, xval, xmin; uint32_t binCoe; @@ -2178,17 +2070,11 @@ static S16 rgSCHTomUtlGenIndices(label, posM, valN, valK, sbInfo) * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHTomCrcInd ( RgSchCellCb *cell, TfuCrcIndInfo *crcInd ) -#else -S16 rgSCHTomCrcInd(cell, crcInd) -RgSchCellCb *cell; -TfuCrcIndInfo *crcInd; -#endif { RgSchUeCb *ue = NULLP; RgSchRaCb *raCb = NULLP; @@ -2217,7 +2103,7 @@ TfuCrcIndInfo *crcInd; if(cell->cellId != crcInd->cellId) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to get the cell for cellId" + DU_LOG("\nERROR --> SCH : Unable to get the cell for cellId" ":%d", crcInd->cellId); return RFAILED; } @@ -2229,7 +2115,7 @@ TfuCrcIndInfo *crcInd; if (RGSCH_TIMEINFO_SAME(lastCrc, crntCrc)) { /*Removed the WA to drop 2nd CRC*/ - RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId,"Recieved CRC " + DU_LOG("\nINFO --> SCH : Recieved CRC " "twice per TTI @(%u,%u)", cell->crntTime.sfn, cell->crntTime.slot); } @@ -2394,7 +2280,7 @@ TfuCrcIndInfo *crcInd; if ((ret = rgSCHUtlAllocEventMem(inst, (Ptr *)&cntrlInfo, sizeof(TfuCntrlReqInfo))) != ROK) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Unable to Allocate TfuCntrlReqInfo " + DU_LOG("\nERROR --> SCH : Unable to Allocate TfuCntrlReqInfo " "for cell"); return ret; } @@ -2407,7 +2293,7 @@ TfuCrcIndInfo *crcInd; if ((rgSCHTomUtlProcDlSfAtCrc (ulSf, crntHiDci0Frm, cell, cntrlInfo, &err)) != ROK) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"rgSCHTomCrcInd() Unable to process" + DU_LOG("\nERROR --> SCH : rgSCHTomCrcInd() Unable to process" " downlink subframe for cellId %d", crcInd->cellId); err.errType = RGSCHERR_TOM_TTIIND; return RFAILED; @@ -2438,17 +2324,11 @@ TfuCrcIndInfo *crcInd; * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHTomTimingAdvInd ( RgSchCellCb *cell, TfuTimingAdvIndInfo *timingAdvInd - ) -#else -S16 rgSCHTomTimingAdvInd(cell, timingAdvInd) -RgSchCellCb *cell; -TfuTimingAdvIndInfo *timingAdvInd; -#endif +) { RgSchUeCb *ue; CmLList *node; @@ -2456,7 +2336,7 @@ TfuTimingAdvIndInfo *timingAdvInd; if(cell->cellId != timingAdvInd->cellId) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to get the cell for cellId" + DU_LOG("\nERROR --> SCH : Unable to get the cell for cellId" "=(%d)", timingAdvInd->cellId); return RFAILED; } @@ -2469,7 +2349,7 @@ TfuTimingAdvIndInfo *timingAdvInd; ue = rgSCHDbmGetUeCb (cell, timingAdvInfo->rnti); if (ue == NULLP) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"RNTI:%d Unable to get the UE CB", + DU_LOG("\nERROR --> SCH : RNTI:%d Unable to get the UE CB", timingAdvInfo->rnti); continue; } @@ -2495,27 +2375,21 @@ TfuTimingAdvIndInfo *timingAdvInd; * 4: Fill the Tfu structures for DL and UL Config requests * 5: Handle the RGR Config messages per Cell * - * @param[in] SlotIndInfo *slotInd + * @param[in] SlotTimingInfo *slotInd * @param[in] Inst schInst * @return Void **/ -#ifdef ANSI Void rgSCHTomTtiInd ( -SlotIndInfo *slotInd, +SlotTimingInfo *slotInd, Inst schInst ) -#else -Void rgSCHTomTtiInd(slotInd, schInst) -SlotIndInfo *slotInd; -Inst schInst; -#endif { RgInfSfAlloc *subfrmAlloc; RgTfuCntrlReqInfo *cntrlInfo = NULLP; S16 ret = ROK; - uint8_t i; - uint8_t nCell = 0; + uint8_t i; + uint8_t nCell = 0; RgSchCellCb *cell[CM_LTE_MAX_CELLS]; RgSchCellCb *cellLst[CM_LTE_MAX_CELLS]; @@ -2601,7 +2475,7 @@ Inst schInst; if ((ret = rgSCHUtlAllocEventMem((cell[i]->instIdx), (Ptr *)&cntrlInfo, sizeof(RgTfuCntrlReqInfo))) != ROK) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cell[i]->cellId,"Unable to Allocate TfuCntrlReqInfo" + DU_LOG("\nERROR --> SCH : Unable to Allocate TfuCntrlReqInfo" " for cell"); return; } @@ -2639,10 +2513,10 @@ Inst schInst; if(gTtiCount == 3000) { #ifdef XEON_SPECIFIC_CHANGES - printf("SChed:: (P/S)::(%u/%u) \n", + DU_LOG("\nINFO --> SCH : SChed:: (P/S)::(%u/%u) \n", gPrimarySchedCount,gSCellSchedCount); - printf("\n HQFDBK :: %u\n",gHqFdbkCount); + DU_LOG("\nINFO --> SCH : HQFDBK :: %u\n",gHqFdbkCount); long int total; long int total2 ; @@ -2650,12 +2524,12 @@ Inst schInst; total = gPCellTb1AckCount + gPCellTb1NackCount + gPCellTb1DtxCount; total2 = gPCellTb2AckCount + gPCellTb2NackCount + gPCellTb2DtxCount; - printf("\n PCell:: TB1:: (A/N/D)::(%u/%u/%u) TB2:: (A/N/D)::(%u/%u/%u)\n", + DU_LOG("\nINFO --> SCH : PCell:: TB1:: (A/N/D)::(%u/%u/%u) TB2:: (A/N/D)::(%u/%u/%u)\n", gPCellTb1AckCount,gPCellTb1NackCount,gPCellTb1DtxCount, gPCellTb2AckCount,gPCellTb2NackCount,gPCellTb2DtxCount); if ((total != 0 ) && total2 != 0) { - printf("\n PCell:: TB1:: (AP/NP/DP)::(%.2f/%.2f/%.2f) TB2:: (AP/NP/DP)::(%.2f/%.2f/%.2f)\n", + DU_LOG("\nINFO --> SCH : PCell:: TB1:: (AP/NP/DP)::(%.2f/%.2f/%.2f) TB2:: (AP/NP/DP)::(%.2f/%.2f/%.2f)\n", (float)gPCellTb1AckCount/total * 100,(float)gPCellTb1NackCount/total * 100,(float)gPCellTb1DtxCount/total * 100, (float)gPCellTb2AckCount/total2 *100 ,(float)gPCellTb2NackCount/total2 *100 ,(float)gPCellTb2DtxCount/total2 *2); } @@ -2664,25 +2538,25 @@ Inst schInst; total2 = gSCellTb2AckCount + gSCellTb2NackCount + gSCellTb2DtxCount; - printf("\n SCell:: TB1:: (A/N/D)::(%u/%u/%u) TB2:: (A/N/D)::(%u/%u/%u)\n", + DU_LOG("\nINFO --> SCH : SCell:: TB1:: (A/N/D)::(%u/%u/%u) TB2:: (A/N/D)::(%u/%u/%u)\n", gSCellTb1AckCount,gSCellTb1NackCount,gSCellTb1DtxCount, gSCellTb2AckCount,gSCellTb2NackCount,gSCellTb2DtxCount); if ((total != 0 ) && total2 != 0) { - printf("\n SCell:: TB1:: (AP/NP/DP)::(%.2f/%.2f/%.2f) TB2:: (AP/NP/DP)::(%.2f/%.2f/%.2f)\n", + DU_LOG("\nINFO --> SCH : SCell:: TB1:: (AP/NP/DP)::(%.2f/%.2f/%.2f) TB2:: (AP/NP/DP)::(%.2f/%.2f/%.2f)\n", (float)gSCellTb1AckCount/total * 100,(float)gSCellTb1NackCount/total * 100,(float)gSCellTb1DtxCount/total * 100, (float)gSCellTb2AckCount/total2 *100 ,(float)gSCellTb2NackCount/total2 *100 ,(float)gSCellTb2DtxCount/total2 *2); } - printf("\n CQI:: Recp(Pucch/Pusch):Rcvd(pcqi/rawacqireport/apcqi/AppReprt)::(%u/%u):(%u/%u/%u/%u)\n", + DU_LOG("\nINFO --> SCH : CQI:: Recp(Pucch/Pusch):Rcvd(pcqi/rawacqireport/apcqi/AppReprt)::(%u/%u):(%u/%u/%u/%u)\n", gCqiRecpCount,gCqiRecpPuschCount,gCqiRcvdCount,gRawACqiCount, gACqiRcvdCount,gCqiReptToAppCount); - printf("\n (F1BCS Count/Cqi/Ri/CqiDrop/PucchDrop/PuschCqiDrop)::(%u/%u/%u/%u/%u/%u)\n", + DU_LOG("\nINFO --> SCH : (F1BCS Count/Cqi/Ri/CqiDrop/PucchDrop/PuschCqiDrop)::(%u/%u/%u/%u/%u/%u)\n", gF1bCsCount,gCqiReqCount,gRiReqCount,gCqiDropCount,gPucchDropCount,gPuschCqiDropCount); - printf("UL::(DCI0/CrcPass/CrcFail)::(%u/%u/%u)\n" + DU_LOG("\nINFO --> SCH : UL::(DCI0/CrcPass/CrcFail)::(%u/%u/%u)\n" "gPcellZeroBoOcc:%u\t gScellZeroBoOcc:%u dbgUeIdChngAndDatReqInClCnt: %u\n" "DelayedDatReqInMac: %u DelayedDatReqInCl : %u gIccPktRcvrMemDropCnt :%u\n", gDci0Count, @@ -2694,28 +2568,31 @@ Inst schInst; dbgDelayedDatReqInMac, gDropDatReqCnt, gIccPktRcvrMemDropCnt); #else - printf("SChed:: (P/S)::(%ld/%ld) \n", + DU_LOG("\nINFO --> SCH : SChed:: (P/S)::(%ld/%ld) \n", gPrimarySchedCount,gSCellSchedCount); - printf("\n HQFDBK :: %ld\n",gHqFdbkCount); + DU_LOG("\nINFO --> SCH : HQFDBK :: %ld\n",gHqFdbkCount); + - printf("\n PCell:: TB1:: (A/N/D)::(%ld/%ld/%ld) TB2:: (A/N/D)::(%ld/%ld/%ld)\n", + DU_LOG("\nINFO --> SCH : PCell:: TB1:: (A/N/D)::(%ld/%ld/%ld) TB2:: (A/N/D)::(%ld/%ld/%ld)\n", gPCellTb1AckCount,gPCellTb1NackCount,gPCellTb1DtxCount, gPCellTb2AckCount,gPCellTb2NackCount,gPCellTb2DtxCount); - printf("\n SCell:: TB1:: (A/N/D)::(%ld/%ld/%ld) TB2:: (A/N/D)::(%ld/%ld/%ld)\n", + DU_LOG("\nINFO --> SCH : SCell:: TB1:: (A/N/D)::(%ld/%ld/%ld) TB2:: (A/N/D)::(%ld/%ld/%ld)\n", gSCellTb1AckCount,gSCellTb1NackCount,gSCellTb1DtxCount, gSCellTb2AckCount,gSCellTb2NackCount,gSCellTb2DtxCount); - printf("\n CQI:: Recp(Pucch/Pusch):Rcvd(pcqi/rawacqireport/apcqi/AppReprt)::(%ld/%ld):(%ld/%ld/%ld/%ld)\n", + DU_LOG("\nINFO --> SCH : CQI:: Recp(Pucch/Pusch):Rcvd(pcqi/rawacqireport/apcqi/AppReprt)::\ + (%ld/%ld):(%ld/%ld/%ld/%ld)\n", gCqiRecpCount,gCqiRecpPuschCount,gCqiRcvdCount,gRawACqiCount, gACqiRcvdCount,gCqiReptToAppCount); - printf("\n CQI:: PucchCqiSnrDropCnt/PucchCqiConfBitMaskDropCnt/PuschCqiConfMaskDropCount :: (%ld/%ld/%ld) \n",gCqiPucchLowSnrDropCount,gCqiPucchConfMaskDropCount,gCqiPuschConfMaskDropCount); + DU_LOG("\nINFO --> SCH : CQI:: PucchCqiSnrDropCnt/PucchCqiConfBitMaskDropCnt/PuschCqiConfMaskDropCount\ + :: (%ld/%ld/%ld) \n",gCqiPucchLowSnrDropCount,gCqiPucchConfMaskDropCount,gCqiPuschConfMaskDropCount); - printf("\n (F1BCS Count/Cqi/Ri/CqiDrop/PucchDrop/PuschCqiDrop)::(%ld/%ld/%ld/%ld/%ld/%ld)\n", + DU_LOG("\nINFO --> SCH : (F1BCS Count/Cqi/Ri/CqiDrop/PucchDrop/PuschCqiDrop)::(%ld/%ld/%ld/%ld/%ld/%ld)\n", gF1bCsCount,gCqiReqCount,gRiReqCount,gCqiDropCount,gPucchDropCount,gPuschCqiDropCount); - printf("UL::(DCI0/CrcPass/CrcFail)::(%ld/%ld/%ld)\n" + DU_LOG("\nINFO --> SCH : UL::(DCI0/CrcPass/CrcFail)::(%ld/%ld/%ld)\n" "gPcellZeroBoOcc:%ld\t gScellZeroBoOcc:%ld dbgUeIdChngAndDatReqInClCnt: %ld\n" "DelayedDatReqInMac: %ld DelayedDatReqInCl : %ld gIccPktRcvrMemDropCnt :%ld\n", gDci0Count, @@ -2726,7 +2603,7 @@ Inst schInst; dbgUeIdChngAndDatReqInClCnt, dbgDelayedDatReqInMac, gDropDatReqCnt, gIccPktRcvrMemDropCnt); - //printf ("\n delayedApiCnt:%ld",delayedApiCnt); + //DU_LOG("\nINFO --> SCH : delayedApiCnt:%ld",delayedApiCnt); #endif /*LAA STATS*/ @@ -2809,17 +2686,11 @@ Inst schInst; * -# RFAILED */ -#ifdef ANSI static S16 rgSCHTomUtlProcUlSf ( RgSchCellCb *cell, RgSchErrInfo *err ) -#else -static S16 rgSCHTomUtlProcUlSf (cell, err) -RgSchCellCb *cell; -RgSchErrInfo *err; -#endif { S16 ret; TfuRecpReqInfo *recpReqInfo; @@ -2831,7 +2702,7 @@ RgSchErrInfo *err; if ((ret = rgSCHUtlAllocEventMem(inst, (Ptr *)&recpReqInfo, sizeof(TfuRecpReqInfo))) != ROK) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Unable to Allocate TfuRecpReqInfo " + DU_LOG("\nERROR --> SCH : Unable to Allocate TfuRecpReqInfo " "for cell"); err->errCause = RGSCHERR_TOM_MEM_EXHAUST; return ret; @@ -2848,7 +2719,7 @@ RgSchErrInfo *err; err); if (ret != ROK) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Unable to fill Data recption " + DU_LOG("\nERROR --> SCH : Unable to fill Data recption " "requests for cell"); RGSCH_FREE_MEM(recpReqInfo); return ret; @@ -2857,7 +2728,7 @@ RgSchErrInfo *err; ret = rgSCHTomUtlFillHqFdbkRecpReq (recpReqInfo, cell, validIdx,err); if (ret != ROK) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Unable to fill Harq Feedback " + DU_LOG("\nERROR --> SCH : Unable to fill Harq Feedback " "reception requests for cell"); RGSCH_FREE_MEM(recpReqInfo); return ret; @@ -2865,7 +2736,7 @@ RgSchErrInfo *err; /* sending the RecpReq to Phy */ //if (rgSCHUtlTfuRecpReq(inst, cell->tfuSap->sapCfg.suId, recpReqInfo) != ROK) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Unable to send Cntrl info for cell"); + DU_LOG("\nERROR --> SCH : Unable to send Cntrl info for cell"); } return ROK; } /* end of rgSCHTomUtlProcUlSf */ @@ -2890,27 +2761,21 @@ RgSchErrInfo *err; * -# ROK * -# RFAILED */ -#ifdef ANSI static S16 rgSCHTomUtlPrcUlTddSpclSf ( -RgSchCellCb *cell, -RgSchErrInfo *err +RgSchCellCb *cell, +RgSchErrInfo *err ) -#else -static S16 rgSCHTomUtlPrcUlTddSpclSf (cell, err) -RgSchCellCb *cell; -RgSchErrInfo *err; -#endif { S16 ret; TfuRecpReqInfo *recpReqInfo; - uint16_t validIdx; /* Index computed from recreq's timing info*/ + uint16_t validIdx; /* Index computed from recreq's timing info*/ Inst inst = cell->instIdx; if ((ret = rgSCHUtlAllocEventMem(inst, (Ptr *)&recpReqInfo, sizeof(TfuRecpReqInfo))) != ROK) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"rgSCHTomUtlPrcUlTddSpclSf() Unable to " + DU_LOG("\nERROR --> SCH : rgSCHTomUtlPrcUlTddSpclSf() Unable to " "Allocate TfuRecpReqInfo for cell"); err->errCause = RGSCHERR_TOM_MEM_EXHAUST; return ret; @@ -2937,7 +2802,7 @@ RgSchErrInfo *err; ret = rgSCHTomUtlFillSrsRecpReq (recpReqInfo, cell, validIdx, err); if (ret != ROK) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"rgSCHTomUtlPrcUlTddSpclSf() Unable to fill" + DU_LOG("\nERROR --> SCH : rgSCHTomUtlPrcUlTddSpclSf() Unable to fill" " SRS recption requests for cell"); RGSCH_FREE_MEM(recpReqInfo); return ret; @@ -2945,7 +2810,7 @@ RgSchErrInfo *err; /* sending the RecpReq to Phy */ //if (rgSCHUtlTfuRecpReq(inst, cell->tfuSap->sapCfg.suId, recpReqInfo) != ROK) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"rgSCHTomUtlPrcUlTddSpclSf() Unable to send " + DU_LOG("\nERROR --> SCH : rgSCHTomUtlPrcUlTddSpclSf() Unable to send " "Cntrl info for cell"); } return ROK; @@ -2969,7 +2834,6 @@ RgSchErrInfo *err; * @param [out] RgSchErrInfo *err * @return S16 */ -#ifdef ANSI static S16 rgSCHTomUtlProcDlSf ( RgSchDlSf *dlSf, @@ -2978,18 +2842,9 @@ RgSchCellCb *cell, RgTfuCntrlReqInfo *cntrlInfo, RgSchErrInfo *err ) -#else -static S16 rgSCHTomUtlProcDlSf (dlSf, ulSf, cell, cntrlInfo, err) -RgSchDlSf *dlSf; -RgSchDlSf *ulSf; -RgSchCellCb *cell; -RgTfuCntrlReqInfo *cntrlInfo; -RgSchErrInfo *err; -#endif { - Inst inst = cell->instIdx; - S16 ret; - uint8_t sfTyp = 1; /* Dl Subframe */ + S16 ret; + uint8_t sfTyp = 1; /* Dl Subframe */ cmLListInit(&cntrlInfo->phichLst); cmLListInit(&cntrlInfo->dlPdcchLst); @@ -3003,7 +2858,8 @@ RgSchErrInfo *err; cntrlInfo->ulTiming = cell->hiDci0Time; if((0 == (cntrlInfo->dlTiming.sfn % 30)) && (0 == cntrlInfo->dlTiming.slot)) { - //printf("5GTF_CHECK rgSCHTomUtlProcDlSf Cntrl dl (%d : %d) ul (%d : %d)\n", cntrlInfo->dlTiming.sfn, cntrlInfo->dlTiming.subframe, cntrlInfo->ulTiming.sfn, cntrlInfo->ulTiming.subframe); + //DU_LOG("\nERROR --> SCH : 5GTF_CHECK rgSCHTomUtlProcDlSf Cntrl dl (%d : %d) ul (%d : %d)\n", \ + cntrlInfo->dlTiming.sfn, cntrlInfo->dlTiming.subframe, cntrlInfo->ulTiming.sfn, cntrlInfo->ulTiming.subframe); } /* Fill PCFICH info */ /* Fix for DCFI FLE issue: when DL delta is 1 and UL delta is 0 and CFI @@ -3026,16 +2882,16 @@ RgSchErrInfo *err; /* Fill PHICH info */ if ((ret = rgSCHTomUtlFillPhich (cell, cntrlInfo, ulSf, err)) != ROK) { - RGSCHDBGERRNEW(inst,(rgSchPBuf(inst),"Unable to send PHICH info " - "for cellId (%d)\n", cell->cellId)); + DU_LOG("\nERROR --> SCH : Unable to send PHICH info " + "for cellId (%d)\n", cell->cellId); RGSCH_FREE_MEM(cntrlInfo); return ret; } if ((ret = rgSCHTomUtlFillUlPdcch (cell, cntrlInfo, ulSf, err)) != ROK) { - RGSCHDBGERRNEW(inst,(rgSchPBuf(inst),"Unable to send PDCCH info " - "for cellId (%d)\n", cell->cellId)); + DU_LOG("\nERROR --> SCH : Unable to send PDCCH info " + "for cellId (%d)\n", cell->cellId); RGSCH_FREE_MEM(cntrlInfo); return ret; } @@ -3056,8 +2912,8 @@ RgSchErrInfo *err; /* Fill PDCCH info */ if ((ret = rgSCHTomUtlFillDlPdcch(cell,cntrlInfo, dlSf, err)) != ROK) { - RGSCHDBGERRNEW(inst,(rgSchPBuf(inst),"Unable to send PDCCH info " - "for cellId (%d)\n", cell->cellId)); + DU_LOG("\nERROR --> SCH : Unable to send PDCCH info " + "for cellId (%d)\n", cell->cellId); RGSCH_FREE_MEM(cntrlInfo); return ret; } @@ -3081,8 +2937,7 @@ if(0 == cntrlInfo->dlMpdcchLst.count) //if (rgSCHUtlTfuCntrlReq(inst, cell->tfuSap->sapCfg.suId, cntrlInfo) //!= ROK) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Unable to send Cntrl info " - "for cell"); + DU_LOG("\nERROR --> SCH : Unable to send Cntrl info for cell"); } return ROK; @@ -3107,21 +2962,13 @@ if(0 == cntrlInfo->dlMpdcchLst.count) * -# ROK * -# RFAILED */ -#ifdef ANSI static S16 rgSCHTomUtlFillPhich ( RgSchCellCb *cell, TfuCntrlReqInfo *cntrlInfo, RgSchDlSf *dlSf, RgSchErrInfo *err - ) -#else -static S16 rgSCHTomUtlFillPhich(cell, cntrlInfo, dlSf, err) -RgSchCellCb *cell; -TfuCntrlReqInfo *cntrlInfo; -RgSchDlSf *dlSf; -RgSchErrInfo *err; -#endif +) { S16 ret; CmLList *node; @@ -3183,18 +3030,11 @@ RgSchErrInfo *err; * @param[in] CmLteRnti rnti * @return Void */ -#ifdef ANSI static Void rgSCHTmrRestartScellDeactTmr ( - RgSchCellCb *cell, - RgSchUeCb *ueCb - ) -#else -static Void rgSCHTmrRestartScellDeactTmr (cell, ueCb) - RgSchCellCb *cell; - RgSchUeCb *ueCb; - -#endif +RgSchCellCb *cell, +RgSchUeCb *ueCb +) { RgSchUeCellInfo *sCellInfo = NULLP; @@ -3239,21 +3079,13 @@ static Void rgSCHTmrRestartScellDeactTmr (cell, ueCb) * -# RFAILED */ uint32_t numdlSpsRelSentToTf; -#ifdef ANSI static S16 rgSCHTomUtlFillDlPdcch ( RgSchCellCb *cell, TfuCntrlReqInfo *cntrlInfo, RgSchDlSf *dlSf, RgSchErrInfo *err - ) -#else -static S16 rgSCHTomUtlFillDlPdcch(cell,cntrlInfo, dlSf, err) -RgSchCellCb *cell; -TfuCntrlReqInfo *cntrlInfo; -RgSchDlSf *dlSf; -RgSchErrInfo *err; -#endif +) { S16 ret; CmLList *node; @@ -3381,21 +3213,13 @@ uint32_t rgSchSpsRelPdcchAllocd; * -# ROK * -# RFAILED */ -#ifdef ANSI static S16 rgSCHTomUtlFillUlPdcch ( RgSchCellCb *cell, TfuCntrlReqInfo *cntrlInfo, RgSchDlSf *dlSf, RgSchErrInfo *err - ) -#else -static S16 rgSCHTomUtlFillUlPdcch(cntrlInfo, dlSf, err) -RgSchCellCb *cell; -TfuCntrlReqInfo *cntrlInfo; -RgSchDlSf *dlSf; -RgSchErrInfo *err; -#endif +) { S16 ret; CmLList *node; @@ -3499,15 +3323,7 @@ RgSchErrInfo *err; * -# ROK * -# RFAILED */ -#ifdef ANSI -static S16 rgSCHTomUtlProcTA -( -RgSchCellCb *cell -) -#else -static S16 rgSCHTomUtlProcTA (cell) -RgSchCellCb *cell; -#endif +static S16 rgSCHTomUtlProcTA(RgSchCellCb *cell) { CmLList *node; RgSchUeCb *ue; @@ -3562,31 +3378,18 @@ RgSchCellCb *cell; * -# RFAILED */ #ifdef TFU_UPGRADE -#ifdef ANSI S16 rgSCHTomUtlFillHqFdbkInfo ( - TfuRecpReqInfo *recpReqInfo, - RgSchCellCb *cell, - uint16_t validIdx, - RgSchDlHqProcCb *hqCb, - RgSchDlSf *nxtDlsf, - TfuUeRecpReqInfo *pucchRecpInfo, - RgSchDlHqProcCb *prvHqCb, - RgSchErrInfo *err - ) -#else -S16 rgSCHTomUtlFillHqFdbkInfo (recpReqInfo, cell, validIdx, hqCb, nxtDlsf, pucchRecpInfo, prvHqCb, err) - TfuRecpReqInfo *recpReqInfo; - RgSchCellCb *cell; - uint16_t validIdx; - RgSchDlHqProcCb *hqCb; - RgSchDlSf *nxtDlsf; - TfuUeRecpReqInfo *pucchRecpInfo; - RgSchDlHqProcCb *prvHqCb; - RgSchErrInfo *err; -#endif +TfuRecpReqInfo *recpReqInfo, +RgSchCellCb *cell, +uint16_t validIdx, +RgSchDlHqProcCb *hqCb, +RgSchDlSf *nxtDlsf, +TfuUeRecpReqInfo *pucchRecpInfo, +RgSchDlHqProcCb *prvHqCb, +RgSchErrInfo *err +) #else -#ifdef ANSI S16 rgSCHTomUtlFillHqFdbkInfo ( TfuRecpReqInfo *recpReqInfo, @@ -3597,21 +3400,11 @@ TfuUeRecpReqInfo *pucchRecpInfo, RgSchDlHqProcCb *prvHqCb, RgSchErrInfo *err ) -#else -S16 rgSCHTomUtlFillHqFdbkInfo (recpReqInfo, cell, hqCb, nxtDlsf, pucchRecpInfo, prvHqCb, err) -TfuRecpReqInfo *recpReqInfo; -RgSchCellCb *cell; -RgSchDlHqProcCb *hqCb; -RgSchDlSf *nxtDlsf; -TfuUeRecpReqInfo *pucchRecpInfo; -RgSchDlHqProcCb *prvHqCb; -RgSchErrInfo *err; -#endif #endif { S16 ret; RgSchDlHqTbCb *tbCb; - uint32_t idx; + uint32_t idx; Bool isAddToLst = FALSE; for (idx = 0 ;idx < 2; idx++) @@ -3655,8 +3448,7 @@ RgSchErrInfo *err; sizeof(TfuUeRecpReqInfo), &(recpReqInfo->memCp)); if (ret != ROK) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Unable to Allocate " - "TfuUeRecpReqInfo for cell"); + DU_LOG("\nERROR --> SCH : Unable to Allocate TfuUeRecpReqInfo for cell"); err->errCause = RGSCHERR_TOM_MEM_EXHAUST; return ret; } @@ -3782,31 +3574,17 @@ RgSchErrInfo *err; * -# ROK * -# RFAILED */ -#ifdef ANSI static S16 rgSCHTomUtlFillHqFdbkFor5gtf ( - TfuRecpReqInfo *recpReqInfo, - RgSchCellCb *cell, - uint16_t validIdx, - RgSchDlHqInfo *dlSfHqInfo, - RgSchDlSf *dlSf, - TfuUeRecpReqInfo *pucchRecpInfo, - RgSchErrInfo *err - ) -#else -static S16 rgSCHTomUtlFillHqFdbkFor5gtf (recpReqInfo, cell, validIdx, hqCb, dlSf, pucchRecpInfo, err) - TfuRecpReqInfo *recpReqInfo; - RgSchCellCb *cell; - uint16_t validIdx; - RgSchDlHqInfo *dlSfHqInfo; - RgSchDlSf *dlSf; - TfuUeRecpReqInfo *pucchRecpInfo; - RgSchErrInfo *err; -#endif +TfuRecpReqInfo *recpReqInfo, +RgSchCellCb *cell, +uint16_t validIdx, +RgSchDlHqInfo *dlSfHqInfo, +RgSchDlSf *dlSf, +TfuUeRecpReqInfo *pucchRecpInfo, +RgSchErrInfo *err +) { -#ifdef DEBUGP - Inst inst = cell->instIdx; -#endif S16 ret; RgSchUeCb *ue; TfuUePucchRecpReq *pucchReqInfo = NULLP; @@ -3821,8 +3599,8 @@ static S16 rgSCHTomUtlFillHqFdbkFor5gtf (recpReqInfo, cell, validIdx, hqCb, dlSf sizeof(TfuUeRecpReqInfo), &(recpReqInfo->memCp)); if (ret != ROK) { - RGSCHDBGERRNEW(inst,(rgSchPBuf(inst),"Unable to Allocate " - "TfuUeRecpReqInfo for cellId=%d \n", cell->cellId)); + DU_LOG("\nERROR --> SCH : Unable to Allocate " + "TfuUeRecpReqInfo for cellId=%d \n", cell->cellId); err->errCause = RGSCHERR_TOM_MEM_EXHAUST; return ret; } @@ -3877,29 +3655,17 @@ static S16 rgSCHTomUtlFillHqFdbkFor5gtf (recpReqInfo, cell, validIdx, hqCb, dlSf * -# RFAILED */ #ifdef TFU_UPGRADE -#ifdef ANSI static S16 rgSCHTomUtlFillHqFdbkForFrmt1B ( - TfuRecpReqInfo *recpReqInfo, - RgSchCellCb *cell, - uint16_t validIdx, - RgSchDlHqInfo *dlSfHqInfo, - RgSchDlSf *dlSf, - TfuUeRecpReqInfo *pucchRecpInfo, - RgSchErrInfo *err - ) -#else -static S16 rgSCHTomUtlFillHqFdbkForFrmt1B (recpReqInfo, cell, validIdx, hqCb, dlSf, pucchRecpInfo, err) - TfuRecpReqInfo *recpReqInfo; - RgSchCellCb *cell; - uint16_t validIdx; - RgSchDlHqInfo *dlSfHqInfo; - RgSchDlSf *dlSf; - TfuUeRecpReqInfo *pucchRecpInfo; - RgSchErrInfo *err; -#endif +TfuRecpReqInfo *recpReqInfo, +RgSchCellCb *cell, +uint16_t validIdx, +RgSchDlHqInfo *dlSfHqInfo, +RgSchDlSf *dlSf, +TfuUeRecpReqInfo *pucchRecpInfo, +RgSchErrInfo *err +) #else -#ifdef ANSI static S16 rgSCHTomUtlFillHqFdbkForFrmt1B ( TfuRecpReqInfo *recpReqInfo, @@ -3909,15 +3675,6 @@ RgSchDlSf *dlSf, TfuUeRecpReqInfo *pucchRecpInfo, RgSchErrInfo *err ) -#else -static S16 rgSCHTomUtlFillHqFdbkForFrmt1B (recpReqInfo, cell, hqCb, dlSf, pucchRecpInfo, err) -TfuRecpReqInfo *recpReqInfo; -RgSchCellCb *cell; -RgSchDlHqInfo *dlSfHqInfo; -RgSchDlSf *dlSf; -TfuUeRecpReqInfo *pucchRecpInfo; -RgSchErrInfo *err; -#endif #endif { #ifdef DEBUGP @@ -3929,7 +3686,7 @@ RgSchErrInfo *err; RgSchUeCb *ue; TfuUePucchRecpReq *pucchReqInfo = NULLP; Bool isDatPresOnSecCell = FALSE; - uint8_t primCellTbCount = 0; + uint8_t primCellTbCount = 0; hqPNode = dlSfHqInfo->hqPLst.first; ue = (RgSchUeCb*)dlSfHqInfo->dlSfUeLnk.node; @@ -3942,8 +3699,7 @@ RgSchErrInfo *err; sizeof(TfuUeRecpReqInfo), &(recpReqInfo->memCp)); if (ret != ROK) { - RGSCHDBGERRNEW(inst,(rgSchPBuf(inst),"Unable to Allocate " - "TfuUeRecpReqInfo for cellId=%d \n", cell->cellId)); + DU_LOG("\nERROR --> SCH : Unable to Allocate TfuUeRecpReqInfo for cellId=%d \n", cell->cellId); err->errCause = RGSCHERR_TOM_MEM_EXHAUST; return ret; } @@ -4207,29 +3963,17 @@ RgSchErrInfo *err; * -# RFAILED */ #ifdef TFU_UPGRADE -#ifdef ANSI static S16 rgSCHTomUtlFillHqFdbkForFrmt3 ( - TfuRecpReqInfo *recpReqInfo, - RgSchCellCb *cell, - uint16_t validIdx, - RgSchDlHqInfo *dlSfHqInfo, - RgSchDlSf *dlSf, - TfuUeRecpReqInfo *pucchRecpInfo, - RgSchErrInfo *err - ) -#else -static S16 rgSCHTomUtlFillHqFdbkForFrmt3 (recpReqInfo, cell, validIdx, hqCb, dlSf, pucchRecpInfo, err) - TfuRecpReqInfo *recpReqInfo; - RgSchCellCb *cell; - uint16_t validIdx; - RgSchDlHqInfo *dlSfHqInfo; - RgSchDlSf *dlSf; - TfuUeRecpReqInfo *pucchRecpInfo; - RgSchErrInfo *err; -#endif +TfuRecpReqInfo *recpReqInfo, +RgSchCellCb *cell, +uint16_t validIdx, +RgSchDlHqInfo *dlSfHqInfo, +RgSchDlSf *dlSf, +TfuUeRecpReqInfo *pucchRecpInfo, +RgSchErrInfo *err +) #else -#ifdef ANSI static S16 rgSCHTomUtlFillHqFdbkForFrmt3 ( TfuRecpReqInfo *recpReqInfo, @@ -4239,15 +3983,6 @@ RgSchDlSf *dlSf, TfuUeRecpReqInfo *pucchRecpInfo, RgSchErrInfo *err ) -#else -static S16 rgSCHTomUtlFillHqFdbkForFrmt3 (recpReqInfo, cell, hqCb, dlSf, pucchRecpInfo, err) -TfuRecpReqInfo *recpReqInfo; -RgSchCellCb *cell; -RgSchDlHqInfo *dlSfHqInfo; -RgSchDlSf *dlSf; -TfuUeRecpReqInfo *pucchRecpInfo; -RgSchErrInfo *err; -#endif #endif { #ifdef DEBUGP @@ -4269,8 +4004,8 @@ RgSchErrInfo *err; sizeof(TfuUeRecpReqInfo), &(recpReqInfo->memCp)); if (ret != ROK) { - RGSCHDBGERRNEW(inst,(rgSchPBuf(inst),"Unable to Allocate " - "TfuUeRecpReqInfo for cellId=%d \n", cell->cellId)); + DU_LOG("\nERROR --> SCH : Unable to Allocate " + "TfuUeRecpReqInfo for cellId=%d \n", cell->cellId); err->errCause = RGSCHERR_TOM_MEM_EXHAUST; return ret; } @@ -4325,35 +4060,20 @@ RgSchErrInfo *err; * -# RFAILED */ #ifdef TFU_UPGRADE -#ifdef ANSI static S16 rgSCHTomUtlFillHqFdbkRecpReq ( - TfuRecpReqInfo *recpReqInfo, - RgSchCellCb *cell, - uint16_t validIdx, - RgSchErrInfo *err - ) -#else -static S16 rgSCHTomUtlFillHqFdbkRecpReq (recpReqInfo, cell, validIdx, err) - TfuRecpReqInfo *recpReqInfo; - RgSchCellCb *cell; - uint16_t validIdx; - RgSchErrInfo *err; -#endif +TfuRecpReqInfo *recpReqInfo, +RgSchCellCb *cell, +uint16_t validIdx, +RgSchErrInfo *err +) #else -#ifdef ANSI static S16 rgSCHTomUtlFillHqFdbkRecpReq ( -TfuRecpReqInfo *recpReqInfo, -RgSchCellCb *cell, -RgSchErrInfo *err +TfuRecpReqInfo *recpReqInfo, +RgSchCellCb *cell, +RgSchErrInfo *err ) -#else -static S16 rgSCHTomUtlFillHqFdbkRecpReq (recpReqInfo, cell, err) -TfuRecpReqInfo *recpReqInfo; -RgSchCellCb *cell; -RgSchErrInfo *err; -#endif #endif { CmLList *node; @@ -4436,21 +4156,13 @@ RgSchErrInfo *err; * -# RFAILED */ #ifdef UNUSED_FUNC -#ifdef ANSI static S16 rgSCHTomUtlFillSrRecpReq ( - TfuRecpReqInfo *recpReqInfo, - RgSchCellCb *cell, - uint16_t validIdx, - RgSchErrInfo *err - ) -#else -static S16 rgSCHTomUtlFillSrRecpReq (recpReqInfo, cell, validIdx, err) - TfuRecpReqInfo *recpReqInfo; - RgSchCellCb *cell; - uint16_t validIdx; - RgSchErrInfo *err; -#endif +TfuRecpReqInfo *recpReqInfo, +RgSchCellCb *cell, +uint16_t validIdx, +RgSchErrInfo *err +) { CmLList *node; TfuUeRecpReqInfo *pucchRecpInfo; @@ -4478,8 +4190,7 @@ static S16 rgSCHTomUtlFillSrRecpReq (recpReqInfo, cell, validIdx, err) if ((ret = rgSCHUtlGetEventMem((Ptr *)&pucchRecpInfo, sizeof(TfuUeRecpReqInfo),&(recpReqInfo->memCp))) != ROK) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to Allocate " - "TfuUeRecpReqInfo for cell RNTI:%d",ue->ueId); + DU_LOG("\nERROR --> SCH : Unable to Allocate TfuUeRecpReqInfo for cell RNTI:%d",ue->ueId); err->errCause = RGSCHERR_TOM_MEM_EXHAUST; return ret; } @@ -4540,17 +4251,11 @@ static S16 rgSCHTomUtlFillSrRecpReq (recpReqInfo, cell, validIdx, err) * -# RFAILED */ -#ifdef ANSI static S16 rgSCHTomUtlWillUeRprtCqiRi ( - RgSchUeCb *ue, - Bool *willueRprtCqiRi - ) -#else -static S16 rgSCHTomUtlWillUeRprtCqiRi ( ue, willueRprtCqiRi) - RgSchUeCb *ue; - Bool *willueRprtCqiRi; -#endif +RgSchUeCb *ue, +Bool *willueRprtCqiRi +) { /* Intialising Reporting probability as TRUE */ *willueRprtCqiRi = TRUE; @@ -4599,21 +4304,13 @@ static S16 rgSCHTomUtlWillUeRprtCqiRi ( ue, willueRprtCqiRi) * -# RFAILED */ #ifdef UNUSED_FUNC -#ifdef ANSI static S16 rgSCHTomUtlFillRiRecpReq ( - TfuRecpReqInfo *recpReqInfo, - RgSchCellCb *cell, - uint16_t validIdx, - RgSchErrInfo *err - ) -#else -static S16 rgSCHTomUtlFillRiRecpReq (recpReqInfo, cell, validIdx, err) - TfuRecpReqInfo *recpReqInfo; - RgSchCellCb *cell; - uint16_t validIdx; - RgSchErrInfo *err; -#endif +TfuRecpReqInfo *recpReqInfo, +RgSchCellCb *cell, +uint16_t validIdx, +RgSchErrInfo *err +) { CmLList *node; TfuUeRecpReqInfo *pucchRecpInfo; @@ -4661,7 +4358,7 @@ static S16 rgSCHTomUtlFillRiRecpReq (recpReqInfo, cell, validIdx, err) if ((ret = rgSCHUtlGetEventMem((Ptr *)&pucchRecpInfo, sizeof(TfuUeRecpReqInfo),&(recpReqInfo->memCp))) != ROK) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to Allocate " + DU_LOG("\nERROR --> SCH : Unable to Allocate " "TfuUeRecpReqInfo for cell RNTI:%d",ue->ueId); err->errCause = RGSCHERR_TOM_MEM_EXHAUST; return ret; @@ -4722,25 +4419,17 @@ static S16 rgSCHTomUtlFillRiRecpReq (recpReqInfo, cell, validIdx, err) */ #ifdef UNUSED_FUNC -#ifdef ANSI static S16 rgSCHTomUtlFillCqiRiRecpReq ( - TfuRecpReqInfo *recpReqInfo, - RgSchCellCb *cell, - uint16_t validIdx, - RgSchErrInfo *err - ) -#else -static S16 rgSCHTomUtlFillCqiRiRecpReq (recpReqInfo, cell, validIdx, err) - TfuRecpReqInfo *recpReqInfo; - RgSchCellCb *cell; - uint16_t validIdx; - RgSchErrInfo *err; -#endif +TfuRecpReqInfo *recpReqInfo, +RgSchCellCb *cell, +uint16_t validIdx, +RgSchErrInfo *err +) { - TfuUeRecpReqInfo *pucchRecpInfo; - RgSchUeCb *ue = NULLP; - uint16_t ret; + TfuUeRecpReqInfo *pucchRecpInfo; + RgSchUeCb *ue = NULLP; + uint16_t ret; while ((ue = rgSCHDbmGetNextUeCb(cell, ue)) != NULLP) { @@ -4749,8 +4438,7 @@ static S16 rgSCHTomUtlFillCqiRiRecpReq (recpReqInfo, cell, validIdx, err) if ((ret = rgSCHUtlGetEventMem((Ptr *)&pucchRecpInfo, sizeof(TfuUeRecpReqInfo),&(recpReqInfo->memCp))) != ROK) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to Allocate " - "TfuUeRecpReqInfo for cell RNTI:%d ", ue->ueId); + DU_LOG("\nERROR --> SCH : Unable to Allocate TfuUeRecpReqInfo for cell RNTI:%d ", ue->ueId); err->errCause = RGSCHERR_TOM_MEM_EXHAUST; return ret; } @@ -4791,31 +4479,21 @@ static S16 rgSCHTomUtlFillCqiRiRecpReq (recpReqInfo, cell, validIdx, err) * -# RFAILED */ #ifdef UNUSED_FUNC -#ifdef ANSI static S16 rgSCHTomUtlFillPcqiRecpReq ( - TfuRecpReqInfo *recpReqInfo, - RgSchCellCb *cell, - uint16_t validIdx, - RgSchErrInfo *err - ) -#else -static S16 rgSCHTomUtlFillPcqiRecpReq (recpReqInfo, cell, validIdx, err) - TfuRecpReqInfo *recpReqInfo; - RgSchCellCb *cell; - uint16_t validIdx; - RgSchErrInfo *err; -#endif +TfuRecpReqInfo *recpReqInfo, +RgSchCellCb *cell, +uint16_t validIdx, +RgSchErrInfo *err +) { CmLList *node; TfuUeRecpReqInfo *pucchRecpInfo; S16 ret; - RgSchUeCb *ue; - uint8_t ri; /*RI value*/ - Bool willUeRprtCqi; /* Flag set due to CQI Mask - and UE Inactive state (DRX)*/ - uint8_t cqiPmiSz; + uint8_t ri; /*RI value*/ + Bool willUeRprtCqi; /* Flag set due to CQI Mask and UE Inactive state (DRX)*/ + uint8_t cqiPmiSz; RgSchUePCqiCb *cqiCb = NULLP; Bool isAddToLst = FALSE; @@ -4846,16 +4524,14 @@ static S16 rgSCHTomUtlFillPcqiRecpReq (recpReqInfo, cell, validIdx, err) cqiPmiSz = rgSCHTomUtlFetchPcqiBitSz(ue, cell->numTxAntPorts, &ri); if(!cqiPmiSz) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"RNTI:%d Unable to Fill CqiPmi " - "size", ue->ueId); + DU_LOG("\nERROR --> SCH : RNTI:%d Unable to Fill CqiPmi size", ue->ueId); continue; } if ((ret = rgSCHUtlGetEventMem((Ptr *)&pucchRecpInfo, sizeof(TfuUeRecpReqInfo),&(recpReqInfo->memCp))) != ROK) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to Allocate " - "TfuUeRecpReqInfo for cell RNTI:%d ", ue->ueId); + DU_LOG("\nERROR --> SCH : Unable to Allocate TfuUeRecpReqInfo for cell RNTI:%d ", ue->ueId); err->errCause = RGSCHERR_TOM_MEM_EXHAUST; return ret; } @@ -4903,21 +4579,13 @@ static S16 rgSCHTomUtlFillPcqiRecpReq (recpReqInfo, cell, validIdx, err) * -# ROK * -# RFAILED */ -#ifdef ANSI static S16 rgSCHTomUtlFillSrsRecpReq ( - TfuRecpReqInfo *recpReqInfo, - RgSchCellCb *cell, - uint16_t validIdx, - RgSchErrInfo *err - ) -#else -static S16 rgSCHTomUtlFillSrsRecpReq (recpReqInfo, cell, validIdx, err) - TfuRecpReqInfo *recpReqInfo; - RgSchCellCb *cell; - uint16_t validIdx; - RgSchErrInfo *err; -#endif +TfuRecpReqInfo *recpReqInfo, +RgSchCellCb *cell, +uint16_t validIdx, +RgSchErrInfo *err +) { CmLList *node; TfuUeRecpReqInfo *pucchRecpInfo; @@ -4945,8 +4613,7 @@ static S16 rgSCHTomUtlFillSrsRecpReq (recpReqInfo, cell, validIdx, err) if ((ret = rgSCHUtlGetEventMem((Ptr *)&pucchRecpInfo, sizeof(TfuUeRecpReqInfo),&(recpReqInfo->memCp))) != ROK) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to Allocate " - "TfuUeRecpReqInfo for RNTI:%d ",ue->ueId); + DU_LOG("\nERROR --> SCH : Unable to Allocate TfuUeRecpReqInfo for RNTI:%d ",ue->ueId); err->errCause = RGSCHERR_TOM_MEM_EXHAUST; return ret; } @@ -5000,19 +4667,12 @@ static S16 rgSCHTomUtlFillSrsRecpReq (recpReqInfo, cell, validIdx, err) * -# ROK * -# RFAILED */ -#ifdef ANSI static S16 rgSCHTomUtlFillDatRecpReq ( TfuRecpReqInfo *recpReqInfo, RgSchCellCb *cell, RgSchErrInfo *err ) -#else -static S16 rgSCHTomUtlFillDatRecpReq (recpReqInfo, cell, err) -TfuRecpReqInfo *recpReqInfo; -RgSchCellCb *cell; -RgSchErrInfo *err; -#endif { S16 ret; RgSchUlAlloc *alloc; @@ -5042,8 +4702,7 @@ RgSchErrInfo *err; sizeof(TfuUeRecpReqInfo), &(recpReqInfo->memCp))) != ROK) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to Allocate " - "TfuUeRecpReqInfo for RNTI:%d ", alloc->ue->ueId); + DU_LOG("\nERROR --> SCH : Unable to Allocate TfuUeRecpReqInfo for RNTI:%d ", alloc->ue->ueId); err->errCause = RGSCHERR_TOM_MEM_EXHAUST; return ret; } @@ -5111,34 +4770,27 @@ RgSchErrInfo *err; * -# ROK * -# RFAILED */ -#ifdef ANSI static S16 rgSCHTomUtlFillDatRecpReq ( - TfuRecpReqInfo *recpReqInfo, - RgSchCellCb *cell, - uint16_t validIdx, - RgSchErrInfo *err - ) -#else -static S16 rgSCHTomUtlFillDatRecpReq (recpReqInfo, cell, validIdx, err) - TfuRecpReqInfo *recpReqInfo; - RgSchCellCb *cell; - uint16_t validIdx; - RgSchErrInfo *err; -#endif +TfuRecpReqInfo *recpReqInfo, +RgSchCellCb *cell, +uint16_t validIdx, +RgSchErrInfo *err +) { CmLteTimingInfo dci0Time; - uint8_t idx; + uint8_t idx; S16 ret; RgSchUlAlloc *alloc; TfuUeRecpReqInfo *datRecpInfo; Bool isAperiodic = FALSE; /*Set when Aperiodic CQI is expected */ - uint8_t numUePerTti = 0; + uint8_t numUePerTti = 0; if((0 == (recpReqInfo->timingInfo.sfn % 30)) && (0 == recpReqInfo->timingInfo.slot)) { - //printf("5GTF_CHECK rgSCHTomUtlFillDatRecpReq (%d : %d)\n", recpReqInfo->timingInfo.sfn, recpReqInfo->timingInfo.slot); + //DU_LOG("\nERROR --> SCH : 5GTF_CHECK rgSCHTomUtlFillDatRecpReq (%d : %d)\n",\ + recpReqInfo->timingInfo.sfn, recpReqInfo->timingInfo.slot); } /* processing steps are * - Run through the UL allocations going out in this subframe. @@ -5153,7 +4805,7 @@ static S16 rgSCHTomUtlFillDatRecpReq (recpReqInfo, cell, validIdx, err) sizeof(TfuUeRecpReqInfo), &(recpReqInfo->memCp)); if(ret != ROK) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to Allocate " + DU_LOG("\nERROR --> SCH : Unable to Allocate " "TfuUeRecpReqInfo for RNTI:%d ", alloc->rnti); err->errCause = RGSCHERR_TOM_MEM_EXHAUST; return ret; @@ -5242,15 +4894,10 @@ static S16 rgSCHTomUtlFillDatRecpReq (recpReqInfo, cell, validIdx, err) * File : * **********************************************************/ -#ifdef ANSI S16 rgSCHTomUtlFillRiBitWidthInfo ( - RgSchUeCb *ueCb - ) -#else -S16 rgSCHTomUtlFillRiBitWidthInfo(ueCb) - RgSchUeCb *ueCb; -#endif +RgSchUeCb *ueCb +) { RgSchUePCqiCb *riCb = ueCb->nPRiCb; @@ -5308,19 +4955,12 @@ S16 rgSCHTomUtlFillRiBitWidthInfo(ueCb) * File : * **********************************************************/ -#ifdef ANSI uint8_t rgSCHTomUtlFetchPcqiBitSz ( - RgSchUeCb *ueCb, - uint8_t numTxAnt, - uint8_t *ri - ) -#else -uint8_t rgSCHTomUtlFetchPcqiBitSz(ueCb, numTxAnt, ri) - RgSchUeCb *ueCb; - uint8_t numTxAnt; - uint8_t *ri; -#endif +RgSchUeCb *ueCb, +uint8_t numTxAnt, +uint8_t *ri +) { uint8_t confRepMode; uint8_t pcqiSz; @@ -5458,19 +5098,12 @@ uint8_t rgSCHTomUtlFetchPcqiBitSz(ueCb, numTxAnt, ri) * File : * **********************************************************/ -#ifdef ANSI S16 rgSCHTomUtlPcqiSbCalcBpIdx ( - CmLteTimingInfo crntTimInfo, - RgSchUeCb *ueCb, - RgSchUePCqiCb *cqiCb - ) -#else -S16 rgSCHTomUtlPcqiSbCalcBpIdx(crntTimInfo, ueCb, cqiCb) - CmLteTimingInfo crntTimInfo; - RgSchUeCb *ueCb; - RgSchUePCqiCb *cqiCb; -#endif +CmLteTimingInfo crntTimInfo, +RgSchUeCb *ueCb, +RgSchUePCqiCb *cqiCb +) { uint16_t tti = (crntTimInfo.sfn * RGSCH_NUM_SUB_FRAMES_5G + crntTimInfo.slot); uint16_t prdNum = tti/cqiCb->cqiPeri; @@ -5520,19 +5153,12 @@ S16 rgSCHTomUtlPcqiSbCalcBpIdx(crntTimInfo, ueCb, cqiCb) * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHTomUtlMoveNxtOccasion ( - RgSchCellCb *cell, - RgSchUeCb *ue, - uint16_t validIdx - ) -#else -S16 rgSCHTomUtlMoveNxtOccasion(cell, ue, validIdx) - RgSchCellCb *cell; - RgSchUeCb *ue; - uint16_t validIdx; -#endif +RgSchCellCb *cell, +RgSchUeCb *ue, +uint16_t validIdx +) { RgSchUePCqiCb *cqiCb = ue->nPCqiCb; RgSchUePCqiCb *riCb = ue->nPRiCb; @@ -5609,21 +5235,13 @@ S16 rgSCHTomUtlMoveNxtOccasion(cell, ue, validIdx) * File : * **********************************************************/ -#ifdef ANSI Void rgSCHTomPrepareAcqiRecp ( - RgSchUeCb *ueCb, - RgSchCellCb *cell, - TfuUePuschCqiRecpInfo *cqiRecpReqInfo, - uint8_t ccIdx - ) -#else - Void rgSCHTomPrepareAcqiRecp(ueCb, cell, cqiRecpReqInfo, ccIdx) - RgSchUeCb *ueCb; - RgSchCellCb *cell; - TfuUePuschCqiRecpInfo *cqiRecpReqInfo; - uint8_t ccIdx; -#endif +RgSchUeCb *ueCb, +RgSchCellCb *cell, +TfuUePuschCqiRecpInfo *cqiRecpReqInfo, +uint8_t ccIdx +) { uint8_t confRepMode; RgSchCqiRawPuschMode12 *mode12Info; @@ -5631,9 +5249,9 @@ Void rgSCHTomPrepareAcqiRecp RgSchCqiRawPuschMode22 *mode22Info; RgSchCqiRawPuschMode30 *mode30Info; RgSchCqiRawPuschMode31 *mode31Info; - uint8_t numTxAnt = cell->numTxAntPorts; - uint8_t sCellIdx = ueCb->cellIdToCellIdxMap[RG_SCH_CELLINDEX(cell)]; - uint8_t numOfCells = 0; + uint8_t numTxAnt = cell->numTxAntPorts; + uint8_t sCellIdx = ueCb->cellIdToCellIdxMap[RG_SCH_CELLINDEX(cell)]; + uint8_t numOfCells = 0; RgSchUeACqiCb *acqiCb = &ueCb->cellInfo[sCellIdx]->acqiCb; /* Fill TFU Recp */ @@ -5800,33 +5418,22 @@ Void rgSCHTomPrepareAcqiRecp * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHTomUtlFillDatAperRecpReq ( - RgSchCellCb *cell, - uint8_t cqiReq, - RgSchUlAlloc *alloc, - TfuUeRecpReqInfo *datRecpInfo, - CmLteTimingInfo *timeInfo, - Bool hqPres, - uint16_t validIdx - ) -#else -S16 rgSCHTomUtlFillDatAperRecpReq(cell, cqiReq, alloc, datRecpInfo, timeInfo, hqPres, validIdx) - RgSchCellCb *cell; - uint8_t cqiReq; - RgSchUlAlloc *alloc; - TfuUeRecpReqInfo *datRecpInfo; - CmLteTimingInfo *timeInfo; - Bool hqPres; - uint16_t validIdx; -#endif +RgSchCellCb *cell, +uint8_t cqiReq, +RgSchUlAlloc *alloc, +TfuUeRecpReqInfo *datRecpInfo, +CmLteTimingInfo *timeInfo, +Bool hqPres, +uint16_t validIdx +) { TfuUePuschCqiRecpInfo *cqiRecpReqInfo; - RgSchUeCb *ueCb = alloc->ue; + RgSchUeCb *ueCb = alloc->ue; #ifdef LTE_ADV - uint8_t triggerSet = 0; - uint8_t sIdx = 0; + uint8_t triggerSet = 0; + uint8_t sIdx = 0; #endif /*Fill RI Reception Params*/ @@ -5911,26 +5518,15 @@ S16 rgSCHTomUtlFillDatAperRecpReq(cell, cqiReq, alloc, datRecpInfo, timeInfo, hq * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHTomUtlFillDatPriRecpReq ( - RgSchCellCb *cell, - RgSchUlAlloc *alloc, - TfuUeRecpReqInfo *datRecpInfo, - CmLteTimingInfo *timeInfo, - Bool hqPres, - uint16_t validIdx - ) -#else -S16 rgSCHTomUtlFillDatPriRecpReq(cell, alloc, datRecpInfo, timeInfo, -hqPres, validIdx) - RgSchCellCb *cell; - RgSchUlAlloc *alloc; - TfuUeRecpReqInfo *datRecpInfo; - CmLteTimingInfo *timeInfo; - Bool hqPres; - uint16_t validIdx; -#endif +RgSchCellCb *cell, +RgSchUlAlloc *alloc, +TfuUeRecpReqInfo *datRecpInfo, +CmLteTimingInfo *timeInfo, +Bool hqPres, +uint16_t validIdx +) { TfuUePuschCqiRecpInfo *cqiRecpReqInfo; @@ -6006,30 +5602,19 @@ hqPres, validIdx) * -# RFAILED **/ -#ifdef ANSI S16 rgSCHTomUtlFillDatPCqiRecpReq ( - RgSchCellCb *cell, - RgSchUlAlloc *alloc, - TfuUeRecpReqInfo *datRecpInfo, - CmLteTimingInfo *timeInfo, - Bool hqPres, - uint16_t validIdx - ) -#else -S16 rgSCHTomUtlFillDatPCqiRecpReq(cell, alloc, datRecpInfo, - timeInfo, hqPres, validIdx) - RgSchCellCb *cell; - RgSchUlAlloc *alloc; - TfuUeRecpReqInfo *datRecpInfo; - CmLteTimingInfo *timeInfo; - Bool hqPres; - uint16_t validIdx; -#endif +RgSchCellCb *cell, +RgSchUlAlloc *alloc, +TfuUeRecpReqInfo *datRecpInfo, +CmLteTimingInfo *timeInfo, +Bool hqPres, +uint16_t validIdx +) { TfuUePuschCqiRecpInfo *cqiRecpReqInfo; - uint8_t cqiPmiSz; /*Raw CQI/PMI Size*/ - uint8_t ri; + uint8_t cqiPmiSz; /*Raw CQI/PMI Size*/ + uint8_t ri; /*Fill CQI Reception Params*/ cqiRecpReqInfo = &datRecpInfo->t.puschRecpReq.cqiRiInfo; @@ -6040,7 +5625,7 @@ S16 rgSCHTomUtlFillDatPCqiRecpReq(cell, alloc, datRecpInfo, cqiPmiSz = rgSCHTomUtlFetchPcqiBitSz(alloc->ue, cell->numTxAntPorts, &ri); if(0 == cqiPmiSz) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to Fill " + DU_LOG("\nERROR --> SCH : Unable to Fill " "CqiPmi size RNTI:%d",alloc->rnti); return RFAILED; } @@ -6118,24 +5703,14 @@ S16 rgSCHTomUtlFillDatPCqiRecpReq(cell, alloc, datRecpInfo, * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHTomUtlFillDatSrsRecpReq ( - RgSchCellCb *cell, - RgSchUlAlloc *alloc, - TfuUeRecpReqInfo *datRecpInfo, - CmLteTimingInfo *timeInfo, - Bool hqPres - ) -#else -S16 rgSCHTomUtlFillDatSrsRecpReq(cell, alloc, datRecpInfo, timeInfo, - hqPres) - RgSchCellCb *cell; - RgSchUlAlloc *alloc; - TfuUeRecpReqInfo *datRecpInfo; - CmLteTimingInfo *timeInfo; - Bool hqPres; -#endif +RgSchCellCb *cell, +RgSchUlAlloc *alloc, +TfuUeRecpReqInfo *datRecpInfo, +CmLteTimingInfo *timeInfo, +Bool hqPres +) { datRecpInfo->rnti = alloc->rnti; rgSCHTomFillOnlySrsRecpReq(cell,alloc, datRecpInfo); @@ -6177,19 +5752,12 @@ S16 rgSCHTomUtlFillDatSrsRecpReq(cell, alloc, datRecpInfo, timeInfo, * -# ROK * -# RFAILED **/ -#ifdef ANSI S16 rgSCHTomFillOnlySrsRecpReq ( - RgSchCellCb *cell, - RgSchUlAlloc *alloc, - TfuUeRecpReqInfo *datRecpInfo - ) -#else -S16 rgSCHTomFillOnlySrsRecpReq(cell, alloc, datRecpInfo) - RgSchCellCb *cell; - RgSchUlAlloc *alloc; - TfuUeRecpReqInfo *datRecpInfo; -#endif +RgSchCellCb *cell, +RgSchUlAlloc *alloc, +TfuUeRecpReqInfo *datRecpInfo +) { TfuUePuschSrsRecpInfo *srsRecpReqInfo; @@ -6238,37 +5806,25 @@ S16 rgSCHTomFillOnlySrsRecpReq(cell, alloc, datRecpInfo) * -# ROK * -# RFAILED **/ -#ifdef ANSI static S16 rgSCHTomUtlFillCqiSrSrsWithHq ( - RgSchCellCb *cell, - TfuRecpReqInfo *recpReqInfo, - RgSchUeCb *ue, - TfuUeRecpReqInfo *pucchRecpInfo, - uint16_t validIdx, - Bool isDatPresOnSecCell - ) -#else -static S16 rgSCHTomUtlFillCqiSrSrsWithHq(cell, recpReqInfo, ue, - pucchRecpInfo, validIdx,isDatPresOnSecCell) -RgSchCellCb *cell; -TfuRecpReqInfo *recpReqInfo; -RgSchUeCb *ue; -TfuUeRecpReqInfo *pucchRecpInfo; -uint16_t validIdx; -Bool isDatPresOnSecCell; -#endif +RgSchCellCb *cell, +TfuRecpReqInfo *recpReqInfo, +RgSchUeCb *ue, +TfuUeRecpReqInfo *pucchRecpInfo, +uint16_t validIdx, +Bool isDatPresOnSecCell +) { RgSchUePCqiCb *cqiCb; RgSchUePCqiCb *riCb; - uint8_t ri; /*To fetch RI value*/ - Bool willUeRprtCqi; /* Flag set due to CQI Mask and - UE Inactive state (DRX)*/ - Bool willUeRprtSr = TRUE; - TfuAckNackMode hqFdbkMode; - uint8_t numCqiBit; - uint8_t totalPucchBits; - Bool dropCqi = FALSE; + uint8_t ri; /*To fetch RI value*/ + Bool willUeRprtCqi; /* Flag set due to CQI Mask and UE Inactive state (DRX)*/ + Bool willUeRprtSr = TRUE; + TfuAckNackMode hqFdbkMode; + uint8_t numCqiBit; + uint8_t totalPucchBits; + Bool dropCqi = FALSE; #ifdef LTEMAC_SPS RgSchCmnUlUeSpsInfo *ulSpsUe = NULL; #endif @@ -6440,8 +5996,7 @@ Bool isDatPresOnSecCell; rgSCHTomUtlFetchPcqiBitSz(ue, cell->numTxAntPorts, &ri); if(0 == pucchRecpInfo->t.pucchRecpReq.cqiInfo.cqiPmiSz) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"RNTI:%d " - "Unable to Fill CqiPmi size", ue->ueId); + DU_LOG("\nERROR --> SCH : RNTI:%d Unable to Fill CqiPmi size", ue->ueId); return RFAILED; } if(pucchRecpInfo->t.pucchRecpReq.uciInfo == TFU_PUCCH_HARQ_SR) @@ -6559,29 +6114,19 @@ Bool isDatPresOnSecCell; * -# RFAILED **/ #ifdef UNUSED_FUNC -#ifdef ANSI static S16 rgSCHTomUtlFillCqiSrsWithSr ( - RgSchCellCb *cell, - RgSchUeCb *ue, - TfuRecpReqInfo *recpReqInfo, - TfuUeRecpReqInfo *pucchRecpInfo, - uint16_t validIdx - ) -#else -static S16 rgSCHTomUtlFillCqiSrsWithSr(cell, ue, recpReqInfo, - pucchRecpInfo, validIdx) -RgSchCellCb *cell; -RgSchUeCb *ue; -TfuRecpReqInfo *recpReqInfo; -TfuUeRecpReqInfo *pucchRecpInfo; -uint16_t validIdx; -#endif +RgSchCellCb *cell, +RgSchUeCb *ue, +TfuRecpReqInfo *recpReqInfo, +TfuUeRecpReqInfo *pucchRecpInfo, +uint16_t validIdx +) { - RgSchUePCqiCb *cqiCb; - RgSchUePCqiCb *riCb; - uint8_t ri; /*To fetch RI value*/ - Bool willUeRprtCqi; /* Flag set due to CQI Mask and + RgSchUePCqiCb *cqiCb; + RgSchUePCqiCb *riCb; + uint8_t ri; /*To fetch RI value*/ + Bool willUeRprtCqi; /* Flag set due to CQI Mask and UE Inactive state (DRX)*/ riCb = ue->nPRiCb; cqiCb = ue->nPCqiCb; @@ -6649,10 +6194,9 @@ uint16_t validIdx; rgSCHTomUtlFetchPcqiBitSz(ue, cell->numTxAntPorts, &ri); if(0 == pucchRecpInfo->t.pucchRecpReq.cqiInfo.cqiPmiSz) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"RNTI:%d" - " Unable to Fill CqiPmi size", ue->ueId); + DU_LOG("\nERROR --> SCH : RNTI:%d Unable to Fill CqiPmi size", ue->ueId); return RFAILED; - } + } pucchRecpInfo->t.pucchRecpReq.uciInfo = TFU_PUCCH_SR_CQI; } @@ -6742,57 +6286,30 @@ uint16_t validIdx; * -# RFAILED */ #ifdef TFU_UPGRADE -#ifdef ANSI static S16 rgSCHTomUtlFillSfRepHqFdbk ( - TfuRecpReqInfo *recpReqInfo, - RgSchCellCb *cellCb, - RgSchErrInfo *err, - RgSchDlSf *dlSf, - uint8_t noFdbks, - CmMemListCp *memCp, - uint8_t elemIdx, - RgSchDlSf *nxtDlsf, - uint16_t validIdx - ) -#else -static S16 rgSCHTomUtlFillSfRepHqFdbk (recpReqInfo, cellCb, err, dlSf, -noFdbks, memCp, elemIdx, nxtDlsf, validIdx) - TfuRecpReqInfo *recpReqInfo; - RgSchCellCb *cellCb; - RgSchErrInfo *err; - RgSchDlSf *dlSf; - uint8_t noFdbks; - CmMemListCp *memCp; - uint8_t elemIdx; - RgSchDlSf *nxtDlsf; - uint16_t validIdx; -#endif +TfuRecpReqInfo *recpReqInfo, +RgSchCellCb *cellCb, +RgSchErrInfo *err, +RgSchDlSf *dlSf, +uint8_t noFdbks, +CmMemListCp *memCp, +uint8_t elemIdx, +RgSchDlSf *nxtDlsf, +uint16_t validIdx +) #else -#ifdef ANSI static S16 rgSCHTomUtlFillSfRepHqFdbk ( -TfuRecpReqInfo *recpReqInfo, -RgSchCellCb *cellCb, -RgSchErrInfo *err, -RgSchDlSf *dlSf, -uint8_t noFdbks, -CmMemListCp *memCp, -uint8_t elemIdx, -RgSchDlSf *nxtDlsf +TfuRecpReqInfo *recpReqInfo, +RgSchCellCb *cellCb, +RgSchErrInfo *err, +RgSchDlSf *dlSf, +uint8_t noFdbks, +CmMemListCp *memCp, +uint8_t elemIdx, +RgSchDlSf *nxtDlsf ) -#else -static S16 rgSCHTomUtlFillSfRepHqFdbk (recpReqInfo, cellCb, err, dlSf, -noFdbks, memCp, elemIdx, nxtDlsf) - TfuRecpReqInfo *recpReqInfo; - RgSchCellCb *cellCb; - RgSchErrInfo *err; - RgSchDlSf *dlSf; - uint8_t noFdbks; - CmMemListCp *memCp; - uint8_t elemIdx; - RgSchDlSf *nxtDlsf; -#endif #endif { RgSchDlHqProcCb *hqCb; @@ -6844,7 +6361,7 @@ noFdbks, memCp, elemIdx, nxtDlsf) sizeof(TfuUeRecpReqInfo), &(recpReqInfo->memCp)); if (ret != ROK) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId,"Unable to" + DU_LOG("\nERROR --> SCH : Unable to" "Allocate TfuUeRecpReqInfo for RNTI:%d ", ueCb->ueId); err->errCause = RGSCHERR_TOM_MEM_EXHAUST; return ret; @@ -6923,73 +6440,38 @@ noFdbks, memCp, elemIdx, nxtDlsf) * -# RFAILED */ #ifdef TFU_UPGRADE -#ifdef ANSI static S16 rgSCHTomUtlFillSfHqFdbkInfo ( - TfuRecpReqInfo *recpReqInfo, - RgSchCellCb *cellCb, - RgSchErrInfo *err, - RgSchDlSf *dlSf, - uint8_t noFdbks, - CmMemListCp *memCp, - uint8_t elemIdx, - RgSchDlSf *nxtDlsf, - uint16_t validIdx, - RgSchDlHqProcCb *hqCb, - RgSchUePucchRecpInfo *pucchInfo, - Bool alloc, - RgSchDlHqProcCb *prvHqCb - ) -#else -static S16 rgSCHTomUtlFillSfHqFdbkInfo (recpReqInfo, cellCb, err, dlSf, - noFdbks, memCp, elemIdx, nxtDlsf, validIdx, hqCb, pucchInfo, alloc, prvHqCb) -TfuRecpReqInfo *recpReqInfo; -RgSchCellCb *cellCb; -RgSchErrInfo *err; -RgSchDlSf *dlSf; -uint8_t noFdbks; -CmMemListCp *memCp; -uint8_t elemIdx; -RgSchDlSf *nxtDlsf; -uint16_t validIdx; -RgSchDlHqProcCb *hqCb; -RgSchUePucchRecpInfo *pucchInfo; -Bool alloc; -RgSchDlHqProcCb *prvHqCb; -#endif +TfuRecpReqInfo *recpReqInfo, +RgSchCellCb *cellCb, +RgSchErrInfo *err, +RgSchDlSf *dlSf, +uint8_t noFdbks, +CmMemListCp *memCp, +uint8_t elemIdx, +RgSchDlSf *nxtDlsf, +uint16_t validIdx, +RgSchDlHqProcCb *hqCb, +RgSchUePucchRecpInfo *pucchInfo, +Bool alloc, +RgSchDlHqProcCb *prvHqCb +) #else -#ifdef ANSI static S16 rgSCHTomUtlFillSfHqFdbkInfo ( - TfuRecpReqInfo *recpReqInfo, - RgSchCellCb *cellCb, - RgSchErrInfo *err, - RgSchDlSf *dlSf, - uint8_t noFdbks, - CmMemListCp *memCp, - uint8_t elemIdx, - RgSchDlSf *nxtDlsf, - RgSchDlHqProcCb *hqCb, - RgSchUePucchRecpInfo *pucchInfo, - Bool alloc, - RgSchDlHqProcCb *prvHqCb - ) -#else -static S16 rgSCHTomUtlFillSfHqFdbkInfo (recpReqInfo, cellCb, err, dlSf, - noFdbks, memCp, elemIdx, nxtDlsf, hqCb, pucchInfo, alloc, prvHqCb) -TfuRecpReqInfo *recpReqInfo; -RgSchCellCb *cellCb; -RgSchErrInfo *err; -RgSchDlSf *dlSf; -uint8_t noFdbks; -CmMemListCp *memCp; -uint8_t elemIdx; -RgSchDlSf *nxtDlsf; -RgSchDlHqProcCb *hqCb; -RgSchUePucchRecpInfo *pucchInfo; -Bool alloc; -RgSchDlHqProcCb *prvHqCb; -#endif +TfuRecpReqInfo *recpReqInfo, +RgSchCellCb *cellCb, +RgSchErrInfo *err, +RgSchDlSf *dlSf, +uint8_t noFdbks, +CmMemListCp *memCp, +uint8_t elemIdx, +RgSchDlSf *nxtDlsf, +RgSchDlHqProcCb *hqCb, +RgSchUePucchRecpInfo *pucchInfo, +Bool alloc, +RgSchDlHqProcCb *prvHqCb +) #endif { S16 ret; @@ -7194,30 +6676,21 @@ RgSchDlHqProcCb *prvHqCb; * @param [out]uint16_t *hqRes * @return void */ -#ifdef ANSI static Void rgSCHTomUtlGethqRes ( -uint8_t noFdbks, -RgSchDlSf *dlSf, -RgSchPdcch *pdcch, -RgSchCellCb *cellCb, -uint16_t *hqRes +uint8_t noFdbks, +RgSchDlSf *dlSf, +RgSchPdcch *pdcch, +RgSchCellCb *cellCb, +uint16_t *hqRes ) -#else -static Void rgSCHTomUtlGethqRes(noFdbks,dlSf,pdcch,cellCb,hqRes) -uint8_t noFdbks; -RgSchDlSf *dlSf; -RgSchPdcch *pdcch; -RgSchCellCb *cellCb; -uint16_t *hqRes; -#endif { - uint8_t M; - uint8_t P; - uint8_t m; - uint8_t nP; - uint8_t nPlusOne; - uint8_t nCce; + uint8_t M; + uint8_t P; + uint8_t m; + uint8_t nP; + uint8_t nPlusOne; + uint8_t nCce; M = noFdbks; m = dlSf->dlFdbkInfo.m; @@ -7250,30 +6723,19 @@ uint16_t *hqRes; * @param [in] RgSchCellCb *cellCb * @return void */ -#ifdef ANSI static Void rgSCHTomUtlFillSfHqFdbkForFrmt1BCSForM1 ( - RgSchDlHqProcCb *hqCb, - TfuUePucchRecpReq *hqRecpReq, - uint8_t noFdbks, - RgSchDlSf *dlSf, - RgSchPdcch *pdcch, - RgSchCellCb *cellCb +RgSchDlHqProcCb *hqCb, +TfuUePucchRecpReq *hqRecpReq, +uint8_t noFdbks, +RgSchDlSf *dlSf, +RgSchPdcch *pdcch, +RgSchCellCb *cellCb ) -#else -static Void rgSCHTomUtlFillSfHqFdbkForFrmt1BCSForM1(hqCb, hqRecpReq, - noFdbks,dlSf,pdcch,cellCb) - RgSchDlHqProcCb *hqCb; - TfuUePucchRecpReq *hqRecpReq; - uint8_t noFdbks; - RgSchDlSf *dlSf; - RgSchPdcch *pdcch; - RgSchCellCb *cellCb; -#endif { - RgSchUeCb *ue = NULLP; - Bool isCellSec = FALSE; - uint16_t hqRes; + RgSchUeCb *ue = NULLP; + Bool isCellSec = FALSE; + uint16_t hqRes; /*ccpu00147920: UeCb is NULL for SPS activation*/ if(pdcch && pdcch->ue) @@ -7481,33 +6943,21 @@ static Void rgSCHTomUtlFillSfHqFdbkForFrmt1BCSForM1(hqCb, hqRecpReq, * @param [in] uint8_t elemIdx * @return void */ -#ifdef ANSI static Void rgSCHTomUtlFillSfHqFdbkForFrmt1BCSForM234 ( - RgSchDlHqProcCb *hqCb, - TfuUePucchRecpReq *hqRecpReq, - uint8_t noFdbks, - RgSchDlSf *dlSf, - RgSchPdcch *pdcch, - RgSchCellCb *cellCb, - uint8_t elemIdx +RgSchDlHqProcCb *hqCb, +TfuUePucchRecpReq *hqRecpReq, +uint8_t noFdbks, +RgSchDlSf *dlSf, +RgSchPdcch *pdcch, +RgSchCellCb *cellCb, +uint8_t elemIdx ) -#else -static Void rgSCHTomUtlFillSfHqFdbkForFrmt1BCSForM234( - hqCb,hqRecpReq,noFdbks,dlSf,pdcch,cellCb,elemIdx) - RgSchDlHqProcCb *hqCb; - TfuUePucchRecpReq *hqRecpReq; - uint8_t noFdbks; - RgSchDlSf *dlSf; - RgSchPdcch *pdcch; - RgSchCellCb *cellCb; - uint8_t elemIdx; -#endif { - RgSchUeCb *ue; - Bool isCellSec = FALSE; - uint16_t hqRes = 0; - uint8_t servCellIdx; + RgSchUeCb *ue; + Bool isCellSec = FALSE; + uint16_t hqRes = 0; + uint8_t servCellIdx; if(pdcch) {/* SPS Release pdcch or dynamic data */ @@ -7642,28 +7092,16 @@ static Void rgSCHTomUtlFillSfHqFdbkForFrmt1BCSForM234( * @param [out]TfuUePucchRecpReq *hqRecpReq * @return S16 */ -#ifdef ANSI static S16 rgSCHTomUtlFillSfHqFdbkForFrmt1BCS ( - RgSchDlHqProcCb *hqCb, - TfuUePucchRecpReq *hqRecpReq, - uint8_t noFdbks, - RgSchDlSf *dlSf, - RgSchPdcch *pdcch, - uint8_t elemIdx, - RgSchCellCb *cellCb +RgSchDlHqProcCb *hqCb, +TfuUePucchRecpReq *hqRecpReq, +uint8_t noFdbks, +RgSchDlSf *dlSf, +RgSchPdcch *pdcch, +uint8_t elemIdx, +RgSchCellCb *cellCb ) -#else -static S16 rgSCHTomUtlFillSfHqFdbkForFrmt1BCS(hqCb,hqRecpReq,noFdbks,dlSf,pdcch, - n1PucchTkn,elemIdx,cellCb) - RgSchDlHqProcCb *hqCb; - TfuUePucchRecpReq *hqRecpReq; - uint8_t noFdbks; - RgSchDlSf *dlSf; - RgSchPdcch *pdcch; - uint8_t elemIdx; - RgSchCellCb *cellCb; -#endif { /* Update teh fdbk mode if something different is present * in L1 API file for F1BS *//* 1 --> F1BCS */ @@ -7707,7 +7145,6 @@ static S16 rgSCHTomUtlFillSfHqFdbkForFrmt1BCS(hqCb,hqRecpReq,noFdbks,dlSf,pdcch, * File : * **********************************************************/ -#ifdef ANSI static S16 rgSCHTomUtlFillSfHqFdbkForOneUe ( RgSchDlHqProcCb *hqCb, @@ -7715,56 +7152,35 @@ TfuRecpReqInfo *recpReqInfo, RgSchCellCb *cellCb, RgSchErrInfo *err, RgSchDlSf *dlSf, -uint8_t noFdbks, +uint8_t noFdbks, CmMemListCp *memCp, -uint8_t elemIdx, +uint8_t elemIdx, RgSchDlSf *nxtDlsf, CmLteRnti rnti, RgrTddAckNackMode ackNackMode, RgSchUePucchRecpInfo **pucchInfoRef, RgSchPdcch *pdcch, -TknUInt16 n1PucchTkn, +TknUInt16 n1PucchTkn, Bool *allocRef, -uint8_t hqSz +uint8_t hqSz ) -#else -static S16 rgSCHTomUtlFillSfHqFdbkForOneUe(hqCb,recpReqInfo, cellCb, err, dlSf, - noFdbks, memCp, elemIdx, nxtDlsf, rnti, ackNackMode, pucchInfoRef, - pdcch, n1PucchTkn, allocRef, hqSz) -RgSchDlHqProcCb *hqCb; -TfuRecpReqInfo *recpReqInfo; -RgSchCellCb *cellCb; -RgSchErrInfo *err; -RgSchDlSf *dlSf; -uint8_t noFdbks; -CmMemListCp *memCp; -uint8_t elemIdx; -RgSchDlSf *nxtDlsf; -CmLteRnti rnti; -RgrTddAckNackMode ackNackMode; -RgSchUePucchRecpInfo **pucchInfoRef; -RgSchPdcch *pdcch; -TknUInt16 n1PucchTkn; -Bool *allocRef; -uint8_t hqSz; -#endif { RgSchUePucchRecpInfo *pucchInfo = *pucchInfoRef; Bool alloc = FALSE; S16 ret; TfuUePucchRecpReq *hqRecpReq; #ifdef TFU_UPGRADE - uint8_t M; - uint8_t P; - uint8_t m; - uint8_t nP; - uint8_t nPlusOne; - uint16_t pucchRes; - uint8_t resIdx; - uint8_t nCce; - uint8_t prevHqSize; + uint8_t M; + uint8_t P; + uint8_t m; + uint8_t nP; + uint8_t nPlusOne; + uint16_t pucchRes; + uint8_t resIdx; + uint8_t nCce; + uint8_t prevHqSize; #else - uint8_t multCnt; + uint8_t multCnt; #endif #ifdef LTEMAC_SPS Bool isFirstFdbk = FALSE; @@ -7774,7 +7190,7 @@ uint8_t hqSz; if ((ret = rgSCHUtlGetEventMem((Ptr *)&pucchInfo, sizeof(RgSchUePucchRecpInfo), memCp)) != ROK) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId,"Unable to " + DU_LOG("\nERROR --> SCH : Unable to " "Allocate TfuUeRecpReqInfo for cell RNTI:%d",rnti); err->errCause = RGSCHERR_TOM_MEM_EXHAUST; return ret; @@ -7789,7 +7205,7 @@ uint8_t hqSz; if ((ret = rgSCHUtlGetEventMem((Ptr *)&(pucchInfo->pucchRecpInfo), sizeof(TfuUeRecpReqInfo), &(recpReqInfo->memCp))) != ROK) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId,"Unable to " + DU_LOG("\nERROR --> SCH : Unable to " "Allocate TfuUeRecpReqInfo for cell RNTI:%d",rnti); err->errCause = RGSCHERR_TOM_MEM_EXHAUST; return ret; @@ -7855,8 +7271,7 @@ uint8_t hqSz; if(anInfo == NULL) {/* ANInfo must be there. adding block because of kworks*/ - RGSCHDBGERRNEW(cellCb->instIdx,(rgSchPBuf(cellCb->instIdx), - "ANInfo should not be NULL for cellId=%d \n", cellCb->cellId)); + DU_LOG("\nERROR --> SCH : ANInfo should not be NULL for cellId=%d \n", cellCb->cellId); return RFAILED; } #endif @@ -7865,7 +7280,7 @@ uint8_t hqSz; }else {/* This needs to be revisited while adding support for PUCCH format 3 */ - RGSCHDBGERRNEW(cellCb->instIdx,(rgSchPBuf(cellCb->instIdx),"Invalid Pucch format configured..")); + DU_LOG("\nERROR --> SCH : Invalid Pucch format configured.."); return RFAILED; } } @@ -8040,7 +7455,6 @@ uint8_t hqSz; * @param [out] RgSchErrInfo *err * @return S16 */ -#ifdef ANSI static S16 rgSCHTomUtlProcDlSfAtCrc ( RgSchDlSf *ulSf, @@ -8049,14 +7463,6 @@ RgSchCellCb *cell, TfuCntrlReqInfo *cntrlInfo, RgSchErrInfo *err ) -#else -static S16 rgSCHTomUtlProcDlSfAtCrc (ulSf, crntUlFrm, cell, cntrlInfo, err) -RgSchDlSf *ulSf; -CmLteTimingInfo crntUlFrm; -RgSchCellCb *cell; -TfuCntrlReqInfo *cntrlInfo; -RgSchErrInfo *err; -#endif { Inst inst = cell->instIdx; S16 ret; @@ -8077,8 +7483,7 @@ RgSchErrInfo *err; /* Fill PHICH info */ if ((ret = rgSCHTomUtlFillPhich (cell, cntrlInfo, ulSf, err)) != ROK) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Unable to send PHICH info for " - "cell"); + DU_LOG("\nERROR --> SCH : Unable to send PHICH info for cell"); RGSCH_FREE_MEM(cntrlInfo); return ret; } @@ -8086,8 +7491,7 @@ RgSchErrInfo *err; /* Fill UL Pdcch */ if ((ret = rgSCHTomUtlFillUlPdcch (cell, cntrlInfo, ulSf, err)) != ROK) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Unable to send PDCCH info for " - "cell"); + DU_LOG("\nERROR --> SCH : Unable to send PDCCH info for cell"); RGSCH_FREE_MEM(cntrlInfo); return ret; } @@ -8105,11 +7509,9 @@ RgSchErrInfo *err; if (cntrlInfo->ulPdcchLst.count || cntrlInfo->phichLst.count) #endif { - //if (rgSCHUtlTfuCntrlReq(inst, cell->tfuSap->sapCfg.suId, cntrlInfo) - != ROK) + //if (rgSCHUtlTfuCntrlReq(inst, cell->tfuSap->sapCfg.suId, cntrlInfo) != ROK) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Unable to send Cntrl info for" - " cell"); + DU_LOG("\nERROR --> SCH : Unable to send Cntrl info for cell"); } } else @@ -8130,15 +7532,10 @@ RgSchErrInfo *err; * * @param [in] RgSchCellCb *cell */ -#ifdef ANSI static Void rgSCHTomUtlSendSfnTick ( RgSchCellCb *cell ) -#else -static Void rgSCHTomUtlSendSfnTick (cell) -RgSchCellCb *cell; -#endif { RgrTtiIndInfo *rgrTtiInd; @@ -8152,9 +7549,8 @@ RgSchCellCb *cell; if (rgSCHUtlAllocSBuf (cell->instIdx, (Data**)&rgrTtiInd, sizeof(RgrTtiIndInfo)) != ROK) { - RGSCHDBGERRNEW(cell->instIdx,(rgSchPBuf(cell->instIdx), - "Mem alloc failed for RGR TTI ind, cellId (%d))\n", - cell->cellId)); + DU_LOG("\nERROR --> SCH : Mem alloc failed for RGR TTI ind, cellId (%d))\n", + cell->cellId); return; } rgrTtiInd->cellId = cell->cellId; @@ -8163,9 +7559,8 @@ RgSchCellCb *cell; if (rgSCHUtlRgrTtiInd (cell, rgrTtiInd) != ROK) { - RGSCHDBGERRNEW(cell->instIdx,(rgSchPBuf(cell->instIdx), - "Failed to send RGR TTI ind, cellId (%d))\n", - cell->cellId)); + DU_LOG("\nERROR --> SCH : Failed to send RGR TTI ind, cellId (%d))\n", + cell->cellId); rgSCHUtlFreeSBuf(cell->instIdx, (Data**)&rgrTtiInd, sizeof(RgrTtiIndInfo)); return; @@ -8187,15 +7582,7 @@ RgSchCellCb *cell; * @return None */ #ifdef UNUSED_FUNC -#ifdef ANSI -static Void rgSCHDynTDDMrkCrntSfIdx -( -Inst schInst -) -#else /* ANSI */ -static Void rgSCHDynTDDMrkCrntSfIdx(schInst) -Inst schInst; -#endif /* ANSI */ +static Void rgSCHDynTDDMrkCrntSfIdx(Inst schInst) { RgSchDynTddCb *rgSchDynTddInfo = &(rgSchCb[schInst].rgSchDynTdd); @@ -8205,7 +7592,7 @@ Inst schInst; rgSchDynTddInfo->crntDTddSfIdx = (rgSchDynTddInfo->crntDTddSfIdx + 1) % RG_SCH_DYNTDD_MAX_SFINFO; - //printf("Initializing Index %d \n", rgSchDynTddInfo->crntDTddSfIdx); + //DU_LOG("\nERROR --> SCH : Initializing Index %d \n", rgSchDynTddInfo->crntDTddSfIdx); return; } @@ -8226,27 +7613,19 @@ Inst schInst; * */ #ifdef UNUSED_FUNC -#ifdef ANSI static Void rgSchTomFillCellTtiInfo ( TfuTtiIndInfo *ttiInd, Inst schInst, -uint8_t *nCell, +uint8_t *nCell, RgSchCellCb *cells[] ) -#else -static Void rgSchTomFillCellTtiInfo (ttiInd, schInst, nCell, cells) -TfuTtiIndInfo *ttiInd; -Inst schInst; -uint8_t *nCell; -RgSchCellCb *cells[]; -#endif { - uint8_t i = 0; - uint8_t strtCellId; - TfuTtiCellInfo *cellInfo; - RgSchCellCb *cell; - uint32_t Idx1; + uint8_t i = 0; + uint8_t strtCellId; + TfuTtiCellInfo *cellInfo; + RgSchCellCb *cell; + uint32_t Idx1; CmLteTimingInfo frm; @@ -8269,8 +7648,7 @@ RgSchCellCb *cells[]; if (cell == NULLP) { /* Use SCH inst 0 print buff */ - RGSCHDBGERRNEW(schInst,(rgSchPBuf(schInst), - "RgLiTfuTtiInd()No cell exists for cellId %d\n", + DU_LOG("\nERROR --> SCH : RgLiTfuTtiInd()No cell exists for cellId %d\n", cellInfo->cellId)); continue; } @@ -8280,7 +7658,7 @@ RgSchCellCb *cells[]; /* 4UE_TTI_DELTA */ if(cell->schTickDelta != cellInfo->schTickDelta) { - printf("\nMukesh: Delta changed for cellId=%d: curr delta=%d new delta=%d\n" + DU_LOG("\nERROR --> SCH : Delta changed for cellId=%d: curr delta=%d new delta=%d\n" "dlblankSf=%d ulblankSf=%d dummyTti=%d \n", cell->cellId, cell->schTickDelta, cellInfo->schTickDelta, cellInfo->dlBlankSf,cellInfo->ulBlankSf, cellInfo->isDummyTti); @@ -8298,7 +7676,7 @@ RgSchCellCb *cells[]; } if((0 == (cellInfo->timingInfo.sfn % 30)) && (0 == cellInfo->timingInfo.slot)) { - //printf("5GTF_CHECK rgSCHTOMTtiInd (%d : %d)\n", cellInfo->timingInfo.sfn, cellInfo->timingInfo.slot); + //DU_LOG("5GTF_CHECK rgSCHTOMTtiInd (%d : %d)\n", cellInfo->timingInfo.sfn, cellInfo->timingInfo.slot); } #ifndef EMTC_ENABLE RGSCHCPYTIMEINFO(cellInfo->timingInfo, cell->crntTime); @@ -8365,7 +7743,7 @@ RgSchCellCb *cells[]; } #endif void schFillCrntTime( - SlotIndInfo slotInd, + SlotTimingInfo slotInd, Inst schInst) { uint8_t cellCount = 0; @@ -8407,15 +7785,10 @@ void schFillCrntTime( * Returns: Void * */ -#ifdef ANSI static Void rgSchTomTtiUlAndDlCmnChSch ( RgSchCellCb *cell ) -#else -static Void rgSchTomTtiUlAndDlCmnChSch (cell) -RgSchCellCb *cell; -#endif { cell->rlsHqArr[cell->crntHqIdx].numUes = 0; @@ -8484,15 +7857,10 @@ RgSchCellCb *cell; * Returns: Void * */ -#ifdef ANSI static Void rgSchTomTtiMiscFunctions ( -RgSchCellCb *cell +RgSchCellCb *cell ) -#else -static Void rgSchTomTtiMiscFunctions (cell) -RgSchCellCb *cell; -#endif { uint8_t suId = cell->tfuSap->sapCfg.suId; @@ -8525,8 +7893,8 @@ RgSchCellCb *cell; if(rgSCHUtlAllocSBuf (cell->instIdx,(Data**)&rgrLoadInf, sizeof(RgrLoadInfIndInfo)) != ROK) { - RGSCHDBGERRNEW(cell->instIdx,(rgSchPBuf(cell->instIdx),"Could not " - "allocate memory for sending LoadInfo\n")); + DU_LOG("\nERROR --> SCH : Could not "\ + "allocate memory for sending LoadInfo\n"); return; } cell->lteAdvCb.absLoadTtiCnt = 0; @@ -8576,15 +7944,10 @@ RgSchCellCb *cell; * Returns: Void * */ -#ifdef ANSI static Void rgSchTomTtiDlSch ( -RgSchCellCb *cell +RgSchCellCb *cell ) -#else -static Void rgSchTomTtiDlSch (cell) -RgSchCellCb *cell; -#endif { if (cell->isDlDataAllwd && (cell->stopDlSch == FALSE)) @@ -8607,15 +7970,10 @@ RgSchCellCb *cell; * Returns: Void * */ -#ifdef ANSI static Void rgSchTomTtiCnsldtSfAlloc ( -RgSchCellCb *cell +RgSchCellCb *cell ) -#else -static Void rgSchTomTtiCnsldtSfAlloc (cell) -RgSchCellCb *cell; -#endif { RgSchDlSf *dlSf; RgSchCmnCell *cellSch = RG_SCH_CMN_GET_CELL(cell); @@ -8645,17 +8003,11 @@ RgSchCellCb *cell; * Returns: Void * */ -#ifdef ANSI static Void rgSchTomTtiL1DlAndUlCfg ( RgSchCellCb *cell, RgTfuCntrlReqInfo *cntrlInfo ) -#else -static Void rgSchTomTtiL1DlAndUlCfg (cell, cntrlInfo) -RgSchCellCb *cell; -RgTfuCntrlReqInfo *cntrlInfo; -#endif { RgSchDlSf *dlSf = rgSCHUtlSubFrmGet (cell, cell->dlDciTime); RgSchDlSf *ulSf = rgSCHUtlSubFrmGet (cell, cell->hiDci0Time); @@ -8690,15 +8042,10 @@ RgTfuCntrlReqInfo *cntrlInfo; * Returns: Void * */ -#ifdef ANSI static Void rgSchTomUtlTddRlsSfAndHarq ( -RgSchCellCb *cell +RgSchCellCb *cell ) -#else -static Void rgSchTomUtlTddRlsSfAndHarq (cell) -RgSchCellCb *cell; -#endif { /* ccpu00132341-MOD- rgSchTddRlsDlSubfrmTbl is dependent on DELTA(=2). @@ -8730,15 +8077,7 @@ RgSchCellCb *cell; * Returns: Void * */ -#ifdef ANSI -static Void rgSCHTomUtlProcTddUlSf -( -RgSchCellCb *cell -) -#else -static Void rgSCHTomUtlProcTddUlSf (cell) -RgSchCellCb *cell; -#endif +static Void rgSCHTomUtlProcTddUlSf(RgSchCellCb *cell) { RgSchErrInfo err; @@ -8748,9 +8087,7 @@ RgSchCellCb *cell; if (rgSCHTomUtlProcUlSf (cell, &err) != ROK) { /* fill in err type and call sta ind */ - RGSCHDBGERRNEW(cell->instIdx, (rgSchPBuf(cell->instIdx), - "Unable to process Uplink subframe for cellId (%d))\n", - cell->cellId)); + DU_LOG("\nERROR --> SCH : Unable to process Uplink subframe for cellId (%d))\n", cell->cellId); } } /* TDD Fix , to allow Special SF SRS CFg */ @@ -8760,9 +8097,7 @@ RgSchCellCb *cell; if (rgSCHTomUtlPrcUlTddSpclSf(cell, &err) != ROK) { /* fill in err type and call sta ind */ - RGSCHDBGERRNEW(cell->instIdx, (rgSchPBuf(cell->instIdx), - "Unable to process Sipceial subframe for cellId (%d))\n", - cell->cellId)); + DU_LOG("\nERROR --> SCH : Unable to process Sipceial subframe for cellId (%d))\n", cell->cellId); } }