From 5ea544017d77ed6b2bcb3c60414b0de135c41484 Mon Sep 17 00:00:00 2001 From: sphoorthi Date: Thu, 4 Feb 2021 21:57:49 +0530 Subject: [PATCH] [JIRA ID - ODUHIGH-275] Part -1 classifying of logs of sch folder Change-Id: I1d88c7bea7ead3076a9e6e98bb970ba4a5c4ee2d Signed-off-by: sphoorthi --- src/5gnrsch/rg_sch.c | 220 ++++++++++++++++++----------------------------- src/5gnrsch/rg_sch_dhm.c | 90 ++++++++----------- src/5gnrsch/rg_sch_gom.c | 107 ++++++++++------------- src/5gnrsch/rg_sch_lmm.c | 30 +++---- src/5gnrsch/rg_sch_ram.c | 34 +++----- 5 files changed, 191 insertions(+), 290 deletions(-) diff --git a/src/5gnrsch/rg_sch.c b/src/5gnrsch/rg_sch.c index 5ad2fcc75..a6cf334f4 100755 --- a/src/5gnrsch/rg_sch.c +++ b/src/5gnrsch/rg_sch.c @@ -32,9 +32,6 @@ @brief This file implements the schedulers main access to MAC layer code. */ -static const char* RLOG_MODULE_NAME="MAC"; -static int RLOG_FILE_ID=185; -static int RLOG_MODULE_ID=4096; /* header include files -- defines (.h) */ #include "common_def.h" @@ -119,7 +116,7 @@ RgMngmt *cntrl /* control structure */ if (SGetSBuf(cfmPst.region, cfmPst.pool, (Data **)&cfm, sizeof(RgMngmt)) != ROK) { - RLOG_ARG0(L_ERROR,DBG_INSTID,inst, "Memory Unavailable for Confirmation"); + DU_LOG("\nERROR --> SCH : Memory Unavailable for Confirmation"); SPutSBuf(pst->region, pst->pool, (Data *)cntrl, sizeof(RgMngmt)); return ROK; } */ @@ -141,7 +138,7 @@ RgMngmt *cntrl /* control structure */ cfm.cfm.reason = LCM_REASON_GENCFG_NOT_DONE; cfm.hdr.elmId.elmnt = cntrl->hdr.elmId.elmnt; RgMiLrgSchCntrlCfm(&cfmPst, &cfm); - RLOG_ARG0(L_ERROR,DBG_INSTID,inst, "Gen Cfg not done."); + DU_LOG("\nERROR --> SCH : Gen Cfg not done."); /* SPutSBuf(pst->region, pst->pool, (Data *)cntrl, sizeof(RgMngmt)); */ return ROK; } @@ -160,7 +157,7 @@ RgMngmt *cntrl /* control structure */ cfm.cfm.status = LCM_PRIM_NOK; cfm.cfm.reason = LCM_REASON_INVALID_PAR_VAL; RgMiLrgSchCntrlCfm(&cfmPst, &cfm); - RLOG_ARG1(L_ERROR,DBG_INSTID,inst, "invalid elmnt=%d", + DU_LOG("\nERROR --> SCH : invalid elmnt=%d", cntrl->hdr.elmId.elmnt); break; } @@ -226,8 +223,7 @@ LrgSchMeasReqInfo *measInfo /* Meas Req Info */ rgSchL2mFillCfmPst(pst, &cfmPst, measInfo); RGSCHFILLERR(err, RGSCHERR_L2M_MEASREQ, RGSCHERR_SCH_INVALID_CELLID); rgSchL2mSndCfm(&cfmPst, NULLP, measInfo, TRUE); - RLOG_ARG2(L_ERROR,DBG_INSTID,inst, - "Meas req Failed.Invalid Cell Id errType(%d) errCause(%d)", + DU_LOG("\nERROR --> SCH : Meas req Failed.Invalid Cell Id errType(%d) errCause(%d)", err.errType, err.errCause); return RFAILED; } @@ -237,8 +233,7 @@ LrgSchMeasReqInfo *measInfo /* Meas Req Info */ rgSchL2mFillCfmPst(pst, &cfmPst, measInfo); RGSCHFILLERR(err, RGSCHERR_L2M_MEASREQ, RGSCHERR_SCH_INVALID_MEASTYPE); rgSchL2mSndCfm(&cfmPst, NULLP, measInfo, TRUE); - RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId, - "Meas req Failed.Invalid Measurement Type" + DU_LOG("\nERROR --> SCH : Meas req Failed.Invalid Measurement Type" "errCasue(%d) errType(%d)", err.errType, err.errCause); return RFAILED; } @@ -255,8 +250,7 @@ LrgSchMeasReqInfo *measInfo /* Meas Req Info */ rgSchL2mFillCfmPst(pst, &cfmPst, measInfo); RGSCHFILLERR(err, RGSCHERR_L2M_MEASREQ, RGSCHERR_SCH_DUP_TRANSID); rgSchL2mSndCfm(&cfmPst, measCb, measInfo, TRUE); - RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId, - "Meas req Failed.Dublicate TransId" + DU_LOG("\nERROR --> SCH : Meas req Failed Duplicate TransId" "errType(%d) errCause(%d)", err.errType, err.errCause); return RFAILED; } @@ -269,8 +263,7 @@ LrgSchMeasReqInfo *measInfo /* Meas Req Info */ rgSchL2mFillCfmPst(pst, &cfmPst, measInfo); RGSCHFILLERR(err, RGSCHERR_L2M_MEASREQ, RGSCHERR_SCH_L2MEAS_FAILED); rgSchL2mSndCfm(&cfmPst, measCb, measInfo, TRUE); - RLOG_ARG2(L_ERROR,DBG_CELLID,cell->cellId, - "Meas req Failed.errType(%d) errCause(%d)", + DU_LOG("\nERROR --> SCH : Meas req Failed.errType(%d) errCause(%d)", err.errType, err.errCause); return RFAILED; } @@ -317,8 +310,7 @@ LrgSchMeasStopReqInfo *measInfo /* Meas Req Info */ } if (cell == NULLP) { - RLOG_ARG0(L_ERROR,DBG_CELLID,measInfo->cellId, - "Stop req Failed.Invalid Cell Id "); + DU_LOG("\nERROR --> SCH : Stop req Failed.Invalid Cell Id "); return RFAILED; } memset(&measCfm, 0, sizeof(LrgSchMeasCfmInfo)); @@ -390,8 +382,7 @@ LrgSchMeasSndReqInfo *measInfo /* Meas Req Info */ } if (cell == NULLP) { - RLOG_ARG0(L_ERROR,DBG_CELLID,measInfo->cellId, - "Send req Failed.Invalid Cell Id"); + DU_LOG("\nERROR --> SCH : Send req Failed.Invalid Cell Id"); return RFAILED; } @@ -467,7 +458,7 @@ S16 RgUiRgrBndReq(Pst *pst, SuId suId, SpId spId) /* This case might not be needed if SAP not configured then it will go * to else of above if condition */ case LRG_UNBND: /* SAP is not bound */ - RLOG0(L_DEBUG,"SAP Not yet bound"); + DU_LOG("\nDEBUG --> SCH : SAP Not yet bound"); rgSchCb[instId].rgrSap[spId].sapSta.sapState = LRG_BND; rgSchCb[instId].rgrSap[spId].sapCfg.suId = suId; /* Send Bind Confirm with status as SUCCESS */ @@ -478,14 +469,12 @@ S16 RgUiRgrBndReq(Pst *pst, SuId suId, SpId spId) LRG_EVENT_RGRSAP_ENB, LCM_CAUSE_UNKNOWN, &dgn); break; case LRG_BND: /* SAP is already bound*/ - RLOG0(L_DEBUG,"SAP is already bound"); + DU_LOG("\nDEBUG --> SCH : SAP is already bound"); ret = rgSCHUtlRgrBndCfm(instId, suId, CM_BND_OK); break; default: /* Should Never Enter here */ #if (ERRCLASS & ERRCLS_ADD_RES) - RGSCHLOGERROR(instId, ERRCLS_INT_PAR, ERG001, - (ErrVal)rgSchCb[instId].rgrSap[spId].sapSta.sapState, - "Invalid SAP State:RgUiRrgBndReq failed\n"); + DU_LOG("\nERROR --> SCH : Invalid SAP State:RgUiRrgBndReq failed\n"); #endif ret = rgSCHUtlRgrBndCfm(instId, suId, CM_BND_NOK); break; @@ -496,8 +485,7 @@ S16 RgUiRgrBndReq(Pst *pst, SuId suId, SpId spId) #if (ERRCLASS & ERRCLS_ADD_RES) /* ccpu00117035 - MOD - Changed ErrVal argument from accessing sap state to spId to avoid seg fault due to invalid sapID */ - RGSCHLOGERROR(instId, ERRCLS_INT_PAR, ERG002, - (ErrVal)spId, "Invalid SAP Id:RgUiRrgBndReq failed\n"); + DU_LOG("\nERROR --> SCH : Invalid SAP Id:RgUiRrgBndReq failed\n"); #endif ret = RgUiRgrBndCfm(&tmpPst, suId, CM_BND_NOK); } @@ -533,15 +521,13 @@ S16 RgUiRgrUbndReq(Pst *pst,SpId spId,Reason reason) switch(rgSchCb[instId].rgrSap[spId].sapSta.sapState) { case LRG_BND: /* SAP is already bound*/ - RLOG0(L_DEBUG,"SAP is already bound"); + DU_LOG("\nDEBUG --> SCH : SAP is already bound"); /* setting SAP state to UN BOUND */ rgSchCb[instId].rgrSap[spId].sapSta.sapState = LRG_UNBND; break; default: #if (ERRCLASS & ERRCLS_ADD_RES) - RGSCHLOGERROR(instId, ERRCLS_INT_PAR, ERG003, - (ErrVal)rgSchCb[instId].rgrSap[spId].sapSta.sapState, - "Invalid SAP State: RgUiRgrUbndReq failed\n"); + DU_LOG("\nERROR --> SCH : Invalid SAP State RgUiRgrUbndReq failed\n"); #endif return RFAILED; } @@ -549,9 +535,7 @@ S16 RgUiRgrUbndReq(Pst *pst,SpId spId,Reason reason) else { #if (ERRCLASS & ERRCLS_ADD_RES) - RGSCHLOGERROR(instId,ERRCLS_INT_PAR, ERG004, - (ErrVal)rgSchCb[instId].rgrSap[spId].sapSta.sapState, - "Invalid SAP Id:RgUiRgrUbndReq failed\n"); + DU_LOG("\nERROR --> SCH : Invalid SAP Id RgUiRgrUbndReq failed\n"); #endif return RFAILED; } @@ -593,8 +577,7 @@ S16 RgUiRgrSiCfgReq(Pst *pst, SpId spId,RgrCfgTransId transId,RgrSiCfgReqInfo * if (cfgReqInfo == NULLP) { - RLOG_ARG0(L_ERROR,DBG_INSTID,instId,"Input Message Buffer " - "is NULL"); + DU_LOG("\nERROR --> SCH : Input Message Buffer is NULL"); rgSCHUtlRgrSiCfgCfm(instId, spId, transId, cfmStatus); return RFAILED; } @@ -604,9 +587,7 @@ S16 RgUiRgrSiCfgReq(Pst *pst, SpId spId,RgrCfgTransId transId,RgrSiCfgReqInfo * if(LRG_BND != rgSchCb[instId].rgrSap[spId].sapSta.sapState) { #if (ERRCLASS & ERRCLS_ADD_RES) - RGSCHLOGERROR(instId, ERRCLS_INT_PAR, ERG007, - (ErrVal)rgSchCb[instId].rgrSap[spId].sapSta.sapState, - "Invalid SAP State: RgUiRgrSiCfgReq failed\n"); + DU_LOG("\nERROR --> SCH : Invalid SAP State: RgUiRgrSiCfgReq failed\n"); #endif SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, (Size)sizeof(*cfgReqInfo)); @@ -617,9 +598,7 @@ S16 RgUiRgrSiCfgReq(Pst *pst, SpId spId,RgrCfgTransId transId,RgrSiCfgReqInfo * else { #if (ERRCLASS & ERRCLS_ADD_RES) - RGSCHLOGERROR(instId, ERRCLS_INT_PAR, ERG008, - (ErrVal)rgSchCb[instId].rgrSap[spId].sapCfg.spId, - "Invalid SAP Id:RgUiRgrSiCfgReq failed\n"); + DU_LOG("\nERROR --> SCH : Invalid SAP Id:RgUiRgrSiCfgReq failed\n"); #endif SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, (Size)sizeof(*cfgReqInfo)); @@ -648,7 +627,7 @@ else #endif if (ret != ROK) { - RLOG_ARG0(L_ERROR,DBG_INSTID,instId,"RgUiRgrSiCfgReq:" + DU_LOG("\nERROR --> SCH : RgUiRgrSiCfgReq:" "Configuration Request Handling Failed"); return RFAILED; } @@ -690,7 +669,7 @@ S16 RgUiRgrWarningSiCfgReq(Pst *pst, SpId spId,RgrCfgTransId transId,RgrWarningS if (warningSiCfgReqInfo == NULLP) { - RLOG_ARG0(L_ERROR,DBG_INSTID,instId,"Input Message Buffer " + DU_LOG("\nERROR --> SCH : Input Message Buffer " "is NULL"); rgSCHUtlRgrWarningSiCfgCfm(instId, spId, 0, transId, cfmStatus); return RFAILED; @@ -701,9 +680,7 @@ S16 RgUiRgrWarningSiCfgReq(Pst *pst, SpId spId,RgrCfgTransId transId,RgrWarningS if(LRG_BND != rgSchCb[instId].rgrSap[spId].sapSta.sapState) { #if (ERRCLASS & ERRCLS_ADD_RES) - RGSCHLOGERROR(instId, ERRCLS_INT_PAR, ERG023, - (ErrVal)rgSchCb[instId].rgrSap[spId].sapSta.sapState, - "Invalid SAP State: warningSiCfgReqInfo failed\n"); + DU_LOG("\nERROR --> SCH : Invalid SAP State: warningSiCfgReqInfo failed\n"); #endif rgSCHUtlFreeWarningSiSeg(pst->region, pst->pool, &warningSiCfgReqInfo->siPduLst); @@ -717,9 +694,7 @@ S16 RgUiRgrWarningSiCfgReq(Pst *pst, SpId spId,RgrCfgTransId transId,RgrWarningS else { #if (ERRCLASS & ERRCLS_ADD_RES) - RGSCHLOGERROR(instId, ERRCLS_INT_PAR, ERG024, - (ErrVal)rgSchCb[instId].rgrSap[spId].sapCfg.spId, - "Invalid SAP Id:warningSiCfgReqInfo failed\n"); + DU_LOG("\nERROR --> SCH : Invalid SAP Id:warningSiCfgReqInfo failed\n"); #endif rgSCHUtlFreeWarningSiSeg(pst->region, pst->pool, &warningSiCfgReqInfo->siPduLst); @@ -748,8 +723,7 @@ else #endif if(ret != ROK) { - RLOG_ARG0(L_ERROR,DBG_INSTID,instId, - "Configuration Request Handling Failed"); + DU_LOG("\nERROR --> SCH : Configuration Request Handling Failed"); return RFAILED; } @@ -786,9 +760,7 @@ S16 RgUiRgrWarningSiStopReq(Pst *pst,SpId spId,RgrCfgTransId transId,uint8_t si if(LRG_BND != rgSchCb[instId].rgrSap[spId].sapSta.sapState) { #if (ERRCLASS & ERRCLS_ADD_RES) - RGSCHLOGERROR(instId, ERRCLS_INT_PAR, ERG025, - (ErrVal)rgSchCb[instId].rgrSap[spId].sapSta.sapState, - "Invalid SAP State: RgUiRgrWarningSiStopReq failed\n"); + DU_LOG("\nERROR --> SCH : Invalid SAP State: RgUiRgrWarningSiStopReq failed\n"); #endif return RFAILED; } @@ -796,9 +768,7 @@ S16 RgUiRgrWarningSiStopReq(Pst *pst,SpId spId,RgrCfgTransId transId,uint8_t si else { #if (ERRCLASS & ERRCLS_ADD_RES) - RGSCHLOGERROR(instId, ERRCLS_INT_PAR, ERG026, - (ErrVal)rgSchCb[instId].rgrSap[spId].sapCfg.spId, - "Invalid SAP Id:RgUiRgrWarningSiStopReq failed\n"); + DU_LOG("\nERROR --> SCH : Invalid SAP Id:RgUiRgrWarningSiStopReq failed\n"); #endif return RFAILED; } @@ -845,7 +815,7 @@ S16 RgUiRgrLoadInfReq(Pst *pst, SpId spId, RgrCfgTransId transId,RgrLoadInfReqI if (loadInfReq == NULLP) { - RLOG_ARG0(L_ERROR,DBG_INSTID,instId,"Input Message Buffer " + DU_LOG("\nERROR --> SCH : Input Message Buffer " "is NULL"); return RFAILED; } @@ -855,9 +825,7 @@ S16 RgUiRgrLoadInfReq(Pst *pst, SpId spId, RgrCfgTransId transId,RgrLoadInfReqI if(LRG_BND != rgSchCb[instId].rgrSap[spId].sapSta.sapState) { #if (ERRCLASS & ERRCLS_ADD_RES) - RGSCHLOGERROR(instId, ERRCLS_INT_PAR, ERG007, - (ErrVal)rgSchCb[instId].rgrSap[spId].sapSta.sapState, - "Invalid SAP State: RgUiRgrLoadInfReq failed\n"); + DU_LOG("\nERROR --> SCH : Invalid SAP State: RgUiRgrLoadInfReq failed\n"); #endif SPutSBuf(pst->region, pst->pool, (Data *)loadInfReq, (Size)sizeof(*loadInfReq)); @@ -867,9 +835,7 @@ S16 RgUiRgrLoadInfReq(Pst *pst, SpId spId, RgrCfgTransId transId,RgrLoadInfReqI else { #if (ERRCLASS & ERRCLS_ADD_RES) - RGSCHLOGERROR(instId, ERRCLS_INT_PAR, ERG008, - (ErrVal)rgSchCb[instId].rgrSap[spId].sapCfg.spId, - "Invalid SAP Id:RgUiRgrLoadInfReq failed\n"); + DU_LOG("\nERROR --> SCH : Invalid SAP Id:RgUiRgrLoadInfReq failed\n"); #endif SPutSBuf(pst->region, pst->pool, (Data *)loadInfReq, (Size)sizeof(*loadInfReq)); @@ -882,8 +848,7 @@ S16 RgUiRgrLoadInfReq(Pst *pst, SpId spId, RgrCfgTransId transId,RgrLoadInfReqI loadInfReq); if (ret != ROK) { - RLOG_ARG0(L_ERROR,DBG_INSTID,instId, - "Configuration Request Handling Failed"); + DU_LOG("\nERROR --> SCH : Configuration Request Handling Failed"); return RFAILED; } @@ -919,7 +884,7 @@ S16 RgMacSchDedBoUpdtReq(Pst* pst,RgInfDedBoRpt *boRpt) Inst inst = (pst->dstInst - SCH_INST_START); S16 cellSapId = boRpt->cellSapId; /* - RLOG_ARG2(L_DEBUG,DBG_CELLID,boRpt->cellId,"rgMacSchDedBoUpdtReq():" + DU_LOG("\nDEBUG --> SCH : rgMacSchDedBoUpdtReq():" " boRpt->rnti = %u boRpt->lcId = %u",boRpt->rnti, boRpt->lcId); */ /* No need to chk for cell being NULL as MAC wouldn't have found instance if @@ -930,8 +895,7 @@ S16 RgMacSchDedBoUpdtReq(Pst* pst,RgInfDedBoRpt *boRpt) if (cell->cellId != boRpt->cellId) { /* Handle Cell fetch failure */ - RGSCHLOGERROR(inst, ERRCLS_INT_PAR,ERG009,(ErrVal)boRpt->cellId, - "rgMacSchDedBoUpdtReq(): Invalid cell Id"); + DU_LOG("\nERROR --> SCH : rgMacSchDedBoUpdtReq(): Invalid cell Id"); return RFAILED; } #endif @@ -1046,7 +1010,7 @@ S16 RgMacSchCmnBoUpdtReq(Pst* pst,RgInfCmnBoRpt *boRpt) cell = rgSchCb[inst].rgrSap[cellSapId].cell; if (cell->cellId != boRpt->cellId) { - RLOG_ARG1(L_DEBUG,DBG_CELLID,cell->cellId,"RgMacSchCmnBoUpdtReq():" + DU_LOG("\nERROR --> SCH : RgMacSchCmnBoUpdtReq():" "Invalid boRpt cell Id:%d",boRpt->cellId); return RFAILED; } @@ -1054,7 +1018,7 @@ S16 RgMacSchCmnBoUpdtReq(Pst* pst,RgInfCmnBoRpt *boRpt) /* handle status response on CCCH */ if(boRpt->lcId == cell->dlCcchId) { - RLOG_ARG0(L_DEBUG,DBG_CELLID,cell->cellId,"RgMacSchCmnBoUpdtReq():" + DU_LOG("\nDEBUG --> SCH : RgMacSchCmnBoUpdtReq():" " BO update for CCCH"); rgSCHUtlHndlCcchBoUpdt(cell, boRpt); } @@ -1091,7 +1055,7 @@ S16 RgMacSchUeDelInd(Pst* pst,RgInfUeDelInd *ueDelInd) if (rgSchCb[inst].rgrSap == NULLP || rgSchCb[inst].rgrSap[cellSapId].cell == NULLP) { - RLOG_ARG0(L_ERROR,DBG_CELLID,ueDelInd->cellId,"rgrSap or cell is not configured"); + DU_LOG("\nERROR --> SCH : rgrSap or cell is not configured"); return ROK; } cell = rgSchCb[inst].rgrSap[cellSapId].cell; @@ -1099,8 +1063,7 @@ S16 RgMacSchUeDelInd(Pst* pst,RgInfUeDelInd *ueDelInd) if (cell->cellId != ueDelInd->cellId) { /* Handle Cell fetch failure */ - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, - "rgMacSchUeDelInd(): Invalid ueDelInd cell Id:%d", + DU_LOG("\nERROR --> SCH : rgMacSchUeDelInd(): Invalid ueDelInd cell Id:%d", ueDelInd->cellId); return ROK; } @@ -1116,8 +1079,7 @@ S16 RgMacSchUeDelInd(Pst* pst,RgInfUeDelInd *ueDelInd) cmLListDelFrm(&cell->rntiDb.rntiGuardPool, tmp); tmp->node = NULLP; rgSCHDbmRlsRnti(cell, rntiLnk); - RLOG_ARG2(L_DEBUG,DBG_CELLID,cell->cellId, - "RNTI:%d Released from the Guard pool(%ld)", + DU_LOG("\nDEBUG --> SCH : RNTI:%d Released from the Guard pool(%d)", ueDelInd->rnti, cell->rntiDb.rntiGuardPool.count); break; @@ -1132,8 +1094,8 @@ S16 RgMacSchUeDelInd(Pst* pst,RgInfUeDelInd *ueDelInd) if(tmp == NULLP) { /* Fix : syed HO UE does not have a valid ue->rntiLnk */ - RLOG_ARG2(L_INFO,DBG_CELLID,ueDelInd->cellId,"HO CRNTI:%d not present in the" - "Guard Pool:%ld", ueDelInd->rnti, cell->rntiDb.rntiGuardPool.count); + DU_LOG("\nINFO --> SCH : HO CRNTI:%d not present in the" + "Guard Pool:%d", ueDelInd->rnti, cell->rntiDb.rntiGuardPool.count); } return ROK; @@ -1226,8 +1188,7 @@ S16 RgMacSchSfRecpInd(Pst* pst,RgInfSfDatInd *subfrmInfo) { RGSCH_FREE_MEM(subfrmInfo); err.errType = RGSCHERR_TOM_DATIND; - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, - "Received MSG3 with CRNTI:%d and also CCCH ", + DU_LOG("\nDEBUG --> SCH : Received MSG3 with CRNTI:%d and also CCCH ", datInd->ceInfo.ces.cRnti); return RFAILED; } @@ -1239,7 +1200,7 @@ S16 RgMacSchSfRecpInd(Pst* pst,RgInfSfDatInd *subfrmInfo) /* ccpu00141318 - Removed condition for SPS rnti checking*/ RGSCH_FREE_MEM(subfrmInfo); err.errType = RGSCHERR_TOM_DATIND; - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Received MSG3 " + DU_LOG("\nERROR --> SCH : Received MSG3 " "with CRNTI:%d unable to find ueCb", datInd->ceInfo.ces.cRnti); return RFAILED; @@ -1250,7 +1211,7 @@ S16 RgMacSchSfRecpInd(Pst* pst,RgInfSfDatInd *subfrmInfo) { RGSCH_FREE_MEM(subfrmInfo); err.errType = RGSCHERR_TOM_DATIND; - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Processing for MSG3 failed for CRNTI:%d", + DU_LOG("\nERROR --> SCH : Processing for MSG3 failed for CRNTI:%d", datInd->rnti); return RFAILED; } @@ -1275,8 +1236,7 @@ S16 RgMacSchSfRecpInd(Pst* pst,RgInfSfDatInd *subfrmInfo) ret = rgSCHUtlFillSndUeStaInd(cell, ue, ueStaInd); if(ret != ROK) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, - "Could not Send Ue Sta Ind UEID:%d",ue->ueId); + DU_LOG("\nERROR --> SCH : Could not Send Ue Sta Ind UEID:%d",ue->ueId); } } CM_LLIST_NEXT_NODE(lnkLst, tmp); @@ -1297,7 +1257,7 @@ S16 RgMacSchSfRecpInd(Pst* pst,RgInfSfDatInd *subfrmInfo) { RGSCH_FREE_MEM(subfrmInfo); err.errType = RGSCHERR_TOM_DATIND; - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Processing for MSG3 failed for CRNTI:%d", + DU_LOG("\nERROR --> SCH : Processing for MSG3 failed for CRNTI:%d", datInd->rnti); return RFAILED; } @@ -1317,7 +1277,7 @@ S16 RgMacSchSfRecpInd(Pst* pst,RgInfSfDatInd *subfrmInfo) { RGSCH_FREE_MEM(subfrmInfo); err.errType = RGSCHERR_TOM_DATIND; - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to get the UE CB for CRNTI:%d", + DU_LOG("\nERROR --> SCH : Unable to get the UE CB for CRNTI:%d", datInd->rnti); return RFAILED; } @@ -1381,7 +1341,7 @@ S16 RgMacSchSfRecpInd(Pst* pst,RgInfSfDatInd *subfrmInfo) { RGSCH_FREE_MEM(subfrmInfo); err.errType = RGSCHERR_TOM_DATIND; - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Unable to handle Data" + DU_LOG("\nERROR --> SCH : Unable to handle Data" " Indication for UEID:%d",ue->ueId); return RFAILED; } @@ -1435,15 +1395,13 @@ S16 RgMacSchSpsRelInd(Pst *pst,RgInfSpsRelInfo *relInfo) if ((ue = rgSCHDbmGetUeCb(cell, relInfo->cRnti)) == NULLP) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, - "No Ue exists with CRNTI:%d",relInfo->cRnti); + DU_LOG("\nERROR --> SCH : No Ue exists with CRNTI:%d",relInfo->cRnti); return RFAILED; } if ((rgSCHUtlSpsRelInd(cell, ue, relInfo->isExplRel)) != ROK) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, - "RelInd processing for CRNTI:%d failed",relInfo->cRnti); + DU_LOG("\nERROR --> SCH : RelInd processing for CRNTI:%d failed",relInfo->cRnti); return RFAILED; } return ROK; @@ -1499,8 +1457,7 @@ S16 RgMacSchL2MeasCfm(Pst *pst, RgInfL2MeasCfm *measCfm) /* If no cellCb return Err with Invalid Cell Id */ if (cell == NULLP) { - RLOG_ARG0(L_ERROR,DBG_CELLID,measCfm->cellId, - "Meas Cfm Failed.Invalid Cell Id"); + DU_LOG("\nERROR --> SCH : Meas Cfm Failed.Invalid Cell Id"); return RFAILED; } @@ -1631,7 +1588,7 @@ S16 RgLiTfuSchBndCfm (Pst *pst,SuId suId, uint8_t status) if(suId >= rgSchCb[instId].numSaps) { - RLOG_ARG0(L_ERROR,DBG_INSTID,instId, "Incorrect SuId"); + DU_LOG("\nERROR --> SCH : Incorrect SuId"); return RFAILED; } /* Lets validate suId first */ @@ -1639,7 +1596,7 @@ S16 RgLiTfuSchBndCfm (Pst *pst,SuId suId, uint8_t status) if (suId != tfuSap->sapCfg.suId) { - RLOG_ARG2(L_ERROR,DBG_INSTID,instId, "Incorrect SuId. Configured (%d)" + DU_LOG("\nERROR --> SCH : Incorrect SuId. Configured (%d)" "Recieved (%d)", tfuSap->sapCfg.suId, suId); return RFAILED; } @@ -1672,7 +1629,7 @@ S16 RgLiTfuRaReqInd(Pst *pst,SuId suId, TfuRaReqIndInfo *raReqInd) if ((ret = rgSCHUtlValidateTfuSap (inst, suId)) != ROK) { - RLOG_ARG1(L_ERROR,DBG_INSTID,inst,"SAP Validation failed SuId(%d)", suId); + DU_LOG("\nERROR --> SCH : SAP Validation failed SuId(%d)", suId); /* Free up the memory for the request structure */ RGSCH_FREE_MEM(raReqInd); return (ret); @@ -1680,13 +1637,13 @@ S16 RgLiTfuRaReqInd(Pst *pst,SuId suId, TfuRaReqIndInfo *raReqInd) if(raReqInd == NULLP) { - RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"Invalid input pointer for raReqInd Failed"); + DU_LOG("\nERROR --> SCH : Invalid input pointer for raReqInd Failed"); return RFAILED; } if (rgSchCb[inst].tfuSap[suId].cell == NULLP) { - RLOG_ARG0(L_ERROR,DBG_CELLID,raReqInd->cellId,"No cell exists"); + DU_LOG("\nERROR --> SCH : No cell exists"); return RFAILED; } @@ -1722,7 +1679,7 @@ S16 RgLiTfuUlCqiInd(Pst *pst, SuId suId, TfuUlCqiIndInfo *ulCqiInd) if ((ret = rgSCHUtlValidateTfuSap (inst, suId)) != ROK) { - RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"SAP Validation failed"); + DU_LOG("\nERROR --> SCH : SAP Validation failed"); /* Free up the memory for the request structure */ RGSCH_FREE_MEM(ulCqiInd); return (ret); @@ -1730,7 +1687,7 @@ S16 RgLiTfuUlCqiInd(Pst *pst, SuId suId, TfuUlCqiIndInfo *ulCqiInd) if (rgSchCb[inst].tfuSap[suId].cell == NULLP) { - RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"No cell exists"); + DU_LOG("\nERROR --> SCH : No cell exists"); /* Free up the memory for the request structure */ RGSCH_FREE_MEM(ulCqiInd); return RFAILED; @@ -1765,7 +1722,7 @@ S16 RgLiTfuPucchDeltaPwrInd(Pst *pst,SuId suId,TfuPucchDeltaPwrIndInfo *pucchDel if ((ret = rgSCHUtlValidateTfuSap (inst, suId)) != ROK) { - RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"SAP Validation failed"); + DU_LOG("\nERROR --> SCH : SAP Validation failed"); /* Free up the memory for the request structure */ RGSCH_FREE_MEM(pucchDeltaPwr); return (ret); @@ -1773,7 +1730,7 @@ S16 RgLiTfuPucchDeltaPwrInd(Pst *pst,SuId suId,TfuPucchDeltaPwrIndInfo *pucchDel if (rgSchCb[inst].tfuSap[suId].cell == NULLP) { - RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"No cell exists"); + DU_LOG("\nERROR --> SCH : No cell exists"); return RFAILED; } ret = rgSCHTomPucchDeltaPwrInd (rgSchCb[inst].tfuSap[suId].cell, pucchDeltaPwr); @@ -1811,14 +1768,14 @@ S16 RgLiTfuHqInd(Pst *pst, SuId suId, TfuHqIndInfo *harqAckInd) #ifndef NO_ERRCLS if ((ret = rgSCHUtlValidateTfuSap (inst, suId)) != ROK) { - RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"SAP Validation failed"); + DU_LOG("\nERROR --> SCH : SAP Validation failed"); RGSCH_FREE_MEM(harqAckInd); return (ret); } if (rgSchCb[inst].tfuSap[suId].cell == NULLP) { - RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"No cell exists"); + DU_LOG("\nERROR --> SCH : No cell exists"); return RFAILED; } #endif @@ -1857,14 +1814,14 @@ S16 RgLiTfuSrInd(Pst *pst, SuId suId, TfuSrIndInfo *srInd) #ifndef NO_ERRCLS if ((ret = rgSCHUtlValidateTfuSap (inst, suId)) != ROK) { - RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"() SAP Validation failed"); + DU_LOG("\nERROR --> SCH : SAP Validation failed"); RGSCH_FREE_MEM(srInd); return (ret); } if (rgSchCb[inst].tfuSap[suId].cell == NULLP) { - RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"RgLiTfuSrInd()No cell exists"); + DU_LOG("\nERROR --> SCH : RgLiTfuSrInd()No cell exists"); return RFAILED; } #endif @@ -1901,7 +1858,7 @@ S16 RgLiTfuDlCqiInd(Pst *pst, SuId suId, TfuDlCqiIndInfo *dlCqiInd) if ((ret = rgSCHUtlValidateTfuSap (inst, suId)) != ROK) { - RLOG_ARG0(L_ERROR,DBG_INSTID,inst," SAP Validation failed"); + DU_LOG("\nERROR --> SCH : SAP Validation failed"); /* Free up the memory for the request structure */ RGSCH_FREE_MEM(dlCqiInd); return (ret); @@ -1909,7 +1866,7 @@ S16 RgLiTfuDlCqiInd(Pst *pst, SuId suId, TfuDlCqiIndInfo *dlCqiInd) if (rgSchCb[inst].tfuSap[suId].cell == NULLP) { - RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"No cell exists"); + DU_LOG("\nERROR --> SCH : No cell exists"); return RFAILED; } ret = rgSCHTomDlCqiInd (rgSchCb[inst].tfuSap[suId].cell, dlCqiInd); @@ -1945,7 +1902,7 @@ S16 RgLiTfuRawCqiInd(Pst *pst, SuId suId, TfuRawCqiIndInfo *rawCqiInd) #ifdef NO_ERRCLS if ((ret = rgSCHUtlValidateTfuSap (inst, suId)) != ROK) { - RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"SAP Validation failed"); + DU_LOG("\nERROR --> SCH : SAP Validation failed"); /* Free up the memory for the request structure */ RGSCH_FREE_MEM(rawCqiInd); return (ret); @@ -1953,7 +1910,7 @@ S16 RgLiTfuRawCqiInd(Pst *pst, SuId suId, TfuRawCqiIndInfo *rawCqiInd) if (rgSchCb[inst].tfuSap[suId].cell == NULLP) { - RLOG_ARG0(L_ERROR,DBG_INSTID,inst," No cell exists"); + DU_LOG("\nERROR --> SCH : No cell exists"); return RFAILED; } #endif @@ -1988,7 +1945,7 @@ S16 RgLiTfuSrsInd(Pst *pst, SuId suId, TfuSrsIndInfo *srsInd) if ((ret = rgSCHUtlValidateTfuSap (inst, suId)) != ROK) { - RLOG_ARG0(L_ERROR,DBG_INSTID,inst," SAP Validation failed"); + DU_LOG("\nERROR --> SCH : SAP Validation failed"); /* Free up the memory for the request structure */ RGSCH_FREE_MEM(srsInd); return (ret); @@ -1996,7 +1953,7 @@ S16 RgLiTfuSrsInd(Pst *pst, SuId suId, TfuSrsIndInfo *srsInd) if (rgSchCb[inst].tfuSap[suId].cell == NULLP) { - RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"No cell exists"); + DU_LOG("\nERROR --> SCH : No cell exists"); return RFAILED; } ret = rgSCHTomSrsInd (rgSchCb[inst].tfuSap[suId].cell, srsInd); @@ -2032,7 +1989,7 @@ S16 RgLiTfuDoaInd(Pst *pst, SuId suId, TfuDoaIndInfo *doaInd) if ((ret = rgSCHUtlValidateTfuSap (inst, suId)) != ROK) { - RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"SAP Validation failed"); + DU_LOG("\nERROR --> SCH : SAP Validation failed"); /* Free up the memory for the request structure */ RGSCH_FREE_MEM(doaInd); return (ret); @@ -2040,7 +1997,7 @@ S16 RgLiTfuDoaInd(Pst *pst, SuId suId, TfuDoaIndInfo *doaInd) if (rgSchCb[inst].tfuSap[suId].cell == NULLP) { - RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"No cell exists"); + DU_LOG("\nERROR --> SCH : No cell exists"); return RFAILED; } ret = rgSCHTomDoaInd (rgSchCb[inst].tfuSap[suId].cell, doaInd); @@ -2077,14 +2034,14 @@ gettimeofday(&start6, NULL); #ifndef NO_ERRCLS if ((ret = rgSCHUtlValidateTfuSap (inst, suId)) != ROK) { - RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"SAP Validation failed"); + DU_LOG("\nERROR --> SCH : SAP Validation failed"); RGSCH_FREE_MEM(crcInd); return (ret); } if (rgSchCb[inst].tfuSap[suId].cell == NULLP) { - RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"No cell exists"); + DU_LOG("\nERROR --> SCH : No cell exists"); return RFAILED; } #endif @@ -2123,7 +2080,7 @@ S16 RgLiTfuTimingAdvInd(Pst *pst, SuId suId, TfuTimingAdvIndInfo *timingAdvInd) if ((ret = rgSCHUtlValidateTfuSap (inst, suId)) != ROK) { - RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"SAP Validation failed"); + DU_LOG("\nERROR --> SCH : SAP Validation failed"); /* Free up the memory for the request structure */ RGSCH_FREE_MEM(timingAdvInd); return (ret); @@ -2131,7 +2088,7 @@ S16 RgLiTfuTimingAdvInd(Pst *pst, SuId suId, TfuTimingAdvIndInfo *timingAdvInd) if (rgSchCb[inst].tfuSap[suId].cell == NULLP) { - RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"No cell exists"); + DU_LOG("\nERROR --> SCH : No cell exists"); return RFAILED; } /* Now call the TOM (Tfu ownership module) primitive to process further */ @@ -2194,7 +2151,7 @@ S16 RgUiRgmBndReq(Pst *pst,SuId suId,SpId spId) /* This case might not be needed if SAP not configured then it will go * to else of above if condition */ case LRG_UNBND: /* SAP is not bound */ - RLOG0(L_DEBUG,"SAP is not yet bound"); + DU_LOG("\nDEBUG --> SCH : SAP is not yet bound"); rgSchCb[instId].rgmSap[spId].sapSta.sapState = LRG_BND; rgSchCb[instId].rgmSap[spId].sapCfg.suId = suId; /* Send Bind Confirm with status as SUCCESS */ @@ -2202,14 +2159,12 @@ S16 RgUiRgmBndReq(Pst *pst,SuId suId,SpId spId) /*Indicate to Layer manager */ break; case LRG_BND: /* SAP is already bound*/ - RLOG0(L_DEBUG,"SAP is already bound"); + DU_LOG("\nDEBUG --> SCH : SAP is already bound"); ret = rgSCHUtlRgmBndCfm(instId, suId, CM_BND_OK); break; default: /* Should Never Enter here */ #if (ERRCLASS & ERRCLS_ADD_RES) - RGSCHLOGERROR(instId, ERRCLS_INT_PAR, ERG001, - (ErrVal)rgSchCb[instId].rgmSap[spId].sapSta.sapState, - "Invalid SAP State:RgUiRgmBndReq failed\n"); + DU_LOG("\nERROR --> SCH : Invalid SAP State:RgUiRgmBndReq failed\n"); #endif ret = rgSCHUtlRgmBndCfm(instId, suId, CM_BND_NOK); break; @@ -2220,8 +2175,7 @@ S16 RgUiRgmBndReq(Pst *pst,SuId suId,SpId spId) #if (ERRCLASS & ERRCLS_ADD_RES) /* ccpu00117035 - MOD - Changed ErrVal argument from accessing sap state to spId to avoid seg fault due to invalid sapID */ - RGSCHLOGERROR(instId, ERRCLS_INT_PAR, ERG002, - (ErrVal)spId, "Invalid SAP Id:RgUiRrmBndReq failed\n"); + DU_LOG("\nERROR --> SCH : Invalid SAP Id:RgUiRrmBndReq failed\n"); #endif ret = RgUiRgmBndCfm(&tmpPst, suId, CM_BND_NOK); } @@ -2258,14 +2212,12 @@ S16 RgUiRgmUbndReq(Pst *pst,SpId spId,Reason reason) { case LRG_BND: /* SAP is already bound*/ /* setting SAP state to UN BOUND */ - RLOG0(L_DEBUG,"SAP is already bound"); + DU_LOG("\nDEBUG --> SCH : SAP is already bound"); rgSchCb[instId].rgmSap[spId].sapSta.sapState = LRG_UNBND; break; default: #if (ERRCLASS & ERRCLS_ADD_RES) - RGSCHLOGERROR(instId, ERRCLS_INT_PAR, ERG003, - (ErrVal)rgSchCb[instId].rgmSap[spId].sapSta.sapState, - "Invalid SAP State: RgUiRgmUbndReq failed\n"); + DU_LOG("\nERROR --> SCH : Invalid SAP State: RgUiRgmUbndReq failed\n"); #endif return RFAILED; } @@ -2273,9 +2225,7 @@ S16 RgUiRgmUbndReq(Pst *pst,SpId spId,Reason reason) else { #if (ERRCLASS & ERRCLS_ADD_RES) - RGSCHLOGERROR(instId,ERRCLS_INT_PAR, ERG004, - (ErrVal)rgSchCb[instId].rgmSap[spId].sapSta.sapState, - "Invalid SAP Id:RgUiRgmUbndReq failed\n"); + DU_LOG("\nERROR --> SCH : Invalid SAP Id:RgUiRgmUbndReq failed\n"); #endif return RFAILED; } @@ -2318,9 +2268,7 @@ S16 RgUiRgmCfgPrbRprt(Pst *pst, SpId spId,RgmPrbRprtCfg *prbRprtCfg) /* clear the qciPrbRpts for all GBR QCIs */ memset(&prbUsage->qciPrbRpts[0], 0, (RGM_MAX_QCI_REPORTS * sizeof(RgSchQciPrbUsage))); - - RLOG_ARG2(L_DEBUG,DBG_CELLID,cell->cellId, - "RgUiRgmCfgPrbRprt config type %d with the report period %d", + DU_LOG("\nDEBUG --> SCH : RgUiRgmCfgPrbRprt config type %d with the report period %d", prbUsage->prbRprtEnabld,prbUsage->rprtPeriod); /* ccpu00134393 : mem leak fix */ @@ -2359,13 +2307,13 @@ S16 RgLiTfuErrInd(Pst *pst, SuId suId, TfuErrIndInfo *errInd) if ((ret = rgSCHUtlValidateTfuSap (inst, suId)) != ROK) { - RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"SAP Validation failed"); + DU_LOG("\nERROR --> SCH : SAP Validation failed"); return (ret); } if (rgSchCb[inst].tfuSap[suId].cell == NULLP) { - RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"No cell exists"); + DU_LOG("\nERROR --> SCH : No cell exists"); return RFAILED; } #endif diff --git a/src/5gnrsch/rg_sch_dhm.c b/src/5gnrsch/rg_sch_dhm.c index 2e51df97d..a2ef1731f 100755 --- a/src/5gnrsch/rg_sch_dhm.c +++ b/src/5gnrsch/rg_sch_dhm.c @@ -32,9 +32,6 @@ @brief APIs related to Downlink HARQ for the scheduler. */ -static const char* RLOG_MODULE_NAME="MAC"; -static int RLOG_FILE_ID=242; -static int RLOG_MODULE_ID=4096; /* header include files -- defines (.h) */ #include "common_def.h" @@ -321,8 +318,7 @@ RgSchDlHqEnt *rgSCHDhmHqEntInit(RgSchCellCb *cell) /* Init the HARQ data structure */ if (rgSCHUtlAllocSBuf(inst, (Data **)&hqE, sizeof(RgSchDlHqEnt)) != ROK) { - RLOG_ARG0(L_DEBUG,DBG_CELLID,cell->cellId, - "rgSCHDhmHqEntInit hqE alloc fail"); + DU_LOG("\nERROR --> SCH: rgSCHDhmHqEntInit hqE alloc fail"); return (NULLP); } #ifdef LTE_TDD @@ -331,8 +327,7 @@ RgSchDlHqEnt *rgSCHDhmHqEntInit(RgSchCellCb *cell) if (rgSCHUtlAllocSBuf(inst, (Data **)&hqE->procs, hqE->numHqPrcs * sizeof(RgSchDlHqProcCb)) != ROK) { - RLOG_ARG0(L_DEBUG,DBG_CELLID,cell->cellId, - "rgSCHDhmHqEntInit hqP alloc fail in hqE"); + DU_LOG("\nERROR --> SCH: rgSCHDhmHqEntInit hqP alloc fail in hqE"); return (NULLP); } #else @@ -391,7 +386,7 @@ S16 rgSCHDhmGetAvlHqProc(RgSchCellCb *cell,RgSchUeCb *ue,CmLteTimingInfo timing if (hqE == NULLP) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHDhmGetAvlHqProc hqE NULL ue %d" + DU_LOG("\nERROR --> SCH : rgSCHDhmGetAvlHqProc hqE NULL ue %d" , ue->ueId); return RFAILED; } @@ -401,8 +396,7 @@ S16 rgSCHDhmGetAvlHqProc(RgSchCellCb *cell,RgSchUeCb *ue,CmLteTimingInfo timing if (NULLP == tmp) { - RLOG_ARG3(L_ERROR,DBG_CELLID,cell->cellId, - "rgSCHDhmGetAvlHqProc free %ld inUse %ld ue %d" + DU_LOG("\nERROR --> SCH : rgSCHDhmGetAvlHqProc free %d inUse %d ue %d" , hqE->free.count, hqE->inUse.count, ue->ueId); /* No Harq Process available in the free queue. */ return RFAILED; @@ -866,8 +860,8 @@ rgEmtcsetNullSubFrm(hqP); if (hqE->free.count > 8) { int *p = NULL; - printf("Crashing invalid hq count after free \n"); - printf("Crashing %d \n", *p); + printf("\nDEBUG --> SCH: Crashing invalid hq count after free \n"); + printf("\nDEBUG --> SCH: Crashing %d \n", *p); *p = 10; } #endif @@ -1109,7 +1103,7 @@ static Void rgSCHDhmFdbkIndHndlTa(RgSchDlHqProcCb *hqP,uint8_t tbIdx,uint8_t fdb else { #ifdef DEBUGP - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Trying to add CRNTI:%d into TA" + DU_LOG("\nERROR --> SCH : Trying to add CRNTI:%d into TA" "ACK List twice", ueCb->ueId); #endif } @@ -1125,8 +1119,7 @@ static Void rgSCHDhmFdbkIndHndlTa(RgSchDlHqProcCb *hqP,uint8_t tbIdx,uint8_t fdb hqP->hqE->ue->dl.taCb.state = RGSCH_TA_IDLE; rgSCHUtlReTxTa(cell, ueCb); - RLOG_ARG0(L_DEBUG,DBG_CELLID,cell->cellId, - "Nack Rcvd for TA. Max Tries Attempted"); + DU_LOG("\nERROR --> SCH : Nack Rcvd for TA. Max Tries Attempted"); } break; case TFU_HQFDB_DTX: @@ -1371,8 +1364,7 @@ Void rgSCHDhmHqTbTrnsFail(RgSchCellCb *cell,RgSchDlHqProcCb *hqP,uint8_t tbCnt,B #ifdef RGR_V1 if(hqP->hqE->raCb->expiryTime.sfn == RGSCH_CONTRES_EXP) { - RLOG_ARG1(L_DEBUG,DBG_CELLID,cell->cellId, - "rgSCHDhmHqTbTrnsFail contRes exp(): tmpCRNTI = %u", + DU_LOG("\nDEBUG --> SCH : rgSCHDhmHqTbTrnsFail contRes exp(): tmpCRNTI = %u", hqP->hqE->raCb->tmpCrnti); rgSCHRamMsg4Done(cell, (RgSchRaCb *)hqP->hqE->raCb); return; @@ -1505,8 +1497,7 @@ Void rgSCHDhmHqTbTrnsFail(RgSchCellCb *cell,RgSchDlHqProcCb *hqP,uint8_t tbCnt,B #endif /* Perform RAM MSG4 done processing */ - RLOG_ARG1(L_DEBUG,DBG_CELLID,cell->cellId, - "rgSCHDhmHqTbTrnsFail(): hq max retx fail: tmpCRNTI = %u", + DU_LOG("\nDEBUG --> SCH : rgSCHDhmHqTbTrnsFail(): hq max retx fail: tmpCRNTI = %u", hqP->hqE->raCb->tmpCrnti); rgSCHRamMsg4Done(cell, (RgSchRaCb *)hqP->hqE->raCb); } @@ -2439,8 +2430,7 @@ RgSchErrInfo *err if ( found == FALSE ) { RGSCH_NULL_CHECK(cellCb->instIdx, ue); - RLOG_ARG3(L_ERROR,DBG_CELLID,cellCb->cellId,"CRNTI:%d" - " NO HARQ proc available for feedback:timeInfo:snf %d,slot %d", + DU_LOG("\nERROR --> SCH : NO HARQ proc available for feedback:timeInfo:snf %d,slot %d", ue->ueId,timeInfo.sfn, timeInfo.slot); err->errType = RGSCHERR_DHM_FDBK_IND; err->errCause = RGSCHERR_DHM_FDBK_IND_INVALID_CB; @@ -2653,20 +2643,19 @@ RgSchErrInfo *err { raCb = rgSCHDbmGetRaCb(cell, rnti); } - RGSCHDBGINFO(cell->instIdx, - (rgSchPBuf(cell->instIdx), "Ack Rcvd. FdbkInd for Msg4Done\n")); + DU_LOG("\nDEBUG --> SCH: Ack Rcvd. FdbkInd for Msg4Done\n"); /* Inform Random Access Module regarding the ack received */ if (raCb != NULLP) { /*RRC Connection Setup failure issue where RRC connection * setup was not reaching UE due to message 4 HARQ failure */ - printf("\nMSG4 Ack ,calling rgSCHRamMsg4Done\n"); + printf("\nDEBUG --> SCH: MSG4 Ack ,calling rgSCHRamMsg4Done\n"); ret = rgSCHRamMsg4Done(cell, raCb); hqFreed = TRUE; } else { - printf("\nraCb is NULLP\n"); + printf("\nDEBUG --> SCH: raCb is NULLP\n"); } } else /*ccpu00114124- HARQ Release for Msg4 */ @@ -3191,8 +3180,7 @@ RgSchErrInfo *err { if (!sf->relPdcch) { - RLOG_ARG3(L_ERROR,DBG_CELLID,cell->cellId, - "CRNTI:%d NO HARQ proc available for feedback: TimingInfo: " + DU_LOG("\nERROR --> SCH : CRNTI:%d NO HARQ proc available for feedback: TimingInfo: " "sfn %d slot %d", ue->ueId, timingInfo.sfn, timingInfo.slot); return RFAILED; @@ -3871,8 +3859,7 @@ S16 rgSCHDhmRlsDlsfHqProc(RgSchCellCb *cellCb,CmLteTimingInfo uciTimingInfo) rgSCHUtlReTxTa(cellCb, ue); - RLOG_ARG0(L_DEBUG,DBG_CELLID,cellCb->cellId, - "Nack/DTX Rcvd for TA. Max Tries Attempted"); + DU_LOG("\nDEBUG --> SCH : Nack/DTX Rcvd for TA. Max Tries Attempted"); } } } @@ -3956,8 +3943,7 @@ S16 rgSCHDhmRlsDlsfHqProc(RgSchCellCb *cellCb,CmLteTimingInfo uciTimingInfo) ue->dl.taCb.state = RGSCH_TA_IDLE; rgSCHUtlReTxTa(cellCb, ue); - RLOG_ARG0(L_DEBUG,DBG_CELLID,cellCb->cellId, - "Nack/DTX Rcvd for TA. Max Tries Attempted"); + DU_LOG("\nDEBUG --> SCH : Nack/DTX Rcvd for TA. Max Tries Attempted"); } } @@ -4350,7 +4336,7 @@ static S16 rgSCHDhmUpdateAckNackHistory(RgSchCellCb *cell,RgSchUeCb *ueCb,uint8_ ueDl->laCb[tbCnt].deltaiTbs = ueDl->laCb[tbCnt].deltaiTbs - DL_LA_STEPDOWN; } /* - printf("deltaiTbs[%d] cqibasediTbs[%d] iTbs[%d] tbCnt[%d]\n", + printf("\nDEBUG --> SCH: deltaiTbs[%d] cqibasediTbs[%d] iTbs[%d] tbCnt[%d]\n", ueDl->laCb[tbCnt].deltaiTbs, ueDl->laCb[tbCnt].cqiBasediTbs, (ueDl->laCb[tbCnt].deltaiTbs + ueDl->laCb[tbCnt].cqiBasediTbs)/100, tbCnt); @@ -4486,8 +4472,8 @@ Void rgSCHDhmHqPAdd2FreeLst(RgSchDlHqProcCb *hqP) if (hqP->hqPLst) { int *p = NULL; - printf("Crashing already part of free lst\n"); - printf("Crashing %d \n", *p); + printf("\nDEBUG --> SCH: Crashing already part of free lst\n"); + printf("\nDEBUG --> SCH: Crashing %d \n", *p); *p = 10; } #endif @@ -4499,8 +4485,8 @@ Void rgSCHDhmHqPAdd2FreeLst(RgSchDlHqProcCb *hqP) if (hqP->hqE->free.count > 8) { int *p = NULL; - printf("Crashing invalid hq count\n"); - printf("Crashing %d \n", *p); + printf("\nDEBUG --> SCH: Crashing invalid hq count\n"); + printf("\nDEBUG --> SCH: Crashing %d \n", *p); *p = 10; } #endif @@ -4534,8 +4520,8 @@ Void rgSCHDhmHqPAdd2InUseLst(RgSchDlHqProcCb *hqP) if (hqP->hqPLst) { int *p = NULL; - printf("Crashing already part of inuse lst\n"); - printf("Crashing %d \n", *p); + printf("\nDEBUG --> SCH: Crashing already part of inuse lst\n"); + printf("\nDEBUG --> SCH: Crashing %d \n", *p); *p = 10; } #endif @@ -4547,8 +4533,8 @@ Void rgSCHDhmHqPAdd2InUseLst(RgSchDlHqProcCb *hqP) if (hqP->hqE->inUse.count > 8) { int *p = NULL; - printf("Crashing invalid hq count \n"); - printf("Crashing %d \n", *p); + printf("\nDEBUG --> SCH: Crashing invalid hq count \n"); + printf("\nDEBUG --> SCH: Crashing %d \n", *p); *p = 10; } #endif @@ -4577,8 +4563,8 @@ Void rgSCHDhmHqPDelFrmFreeLst(RgSchDlHqProcCb *hqP) if (!hqP->hqPLst) { int *p = NULL; - printf("Crashing not part of any lst\n"); - printf("Crashing %d \n", *p); + printf("\nDEBUG --> SCH: Crashing not part of any lst\n"); + printf("\nDEBUG --> SCH: Crashing %d \n", *p); *p = 10; } #endif @@ -4586,8 +4572,8 @@ Void rgSCHDhmHqPDelFrmFreeLst(RgSchDlHqProcCb *hqP) if (hqP->hqPLst != &hqP->hqE->free) { int *p = NULL; - printf("Crashing del from wrong lst\n"); - printf("Crashing %d \n", *p); + printf("\nDEBUG --> SCH: Crashing del from wrong lst\n"); + printf("\nDEBUG --> SCH: Crashing %d \n", *p); *p = 10; } #endif @@ -4599,8 +4585,8 @@ Void rgSCHDhmHqPDelFrmFreeLst(RgSchDlHqProcCb *hqP) if (hqP->hqE->free.count > 8) { int *p = NULL; - printf("Crashing invalid hq count\n"); - printf("Crashing %d \n", *p); + printf("\nDEBUG --> SCH: Crashing invalid hq count\n"); + printf("\nDEBUG --> SCH: Crashing %d \n", *p); *p = 10; } #endif @@ -4631,8 +4617,8 @@ Void rgSCHDhmHqPDelFrmInUseLst(RgSchDlHqProcCb *hqP) if (!hqP->hqPLst) { int *p = NULL; - printf("Crashing not part of any lst\n"); - printf("Crashing %d \n", *p); + printf("\nDEBUG --> SCH: Crashing not part of any lst\n"); + printf("\nDEBUG --> SCH: Crashing %d \n", *p); *p = 10; } @@ -4641,8 +4627,8 @@ Void rgSCHDhmHqPDelFrmInUseLst(RgSchDlHqProcCb *hqP) if (hqP->hqPLst != &hqP->hqE->inUse) { int *p = NULL; - printf("Crashing del from wrong lst\n"); - printf("Crashing %d \n", *p); + printf("\nDEBUG --> SCH: Crashing del from wrong lst\n"); + printf("\nDEBUG --> SCH: Crashing %d \n", *p); *p = 10; } #endif @@ -4654,8 +4640,8 @@ Void rgSCHDhmHqPDelFrmInUseLst(RgSchDlHqProcCb *hqP) if (hqP->hqE->inUse.count > 8) { int *p = NULL; - printf("Crashing invalid hq count\n"); - printf("Crashing %d \n", *p); + printf("\nDEBUG --> SCH: Crashing invalid hq count\n"); + printf("\nDEBUG --> SCH: Crashing %d \n", *p); *p = 10; } #endif diff --git a/src/5gnrsch/rg_sch_gom.c b/src/5gnrsch/rg_sch_gom.c index 174867e83..40c4b1aa2 100755 --- a/src/5gnrsch/rg_sch_gom.c +++ b/src/5gnrsch/rg_sch_gom.c @@ -33,9 +33,6 @@ invoked by RRM towards MAC. */ -static const char* RLOG_MODULE_NAME="MAC"; -static int RLOG_MODULE_ID=4096; -static int RLOG_FILE_ID=164; /* header include files -- defines (.h) */ #include "common_def.h" @@ -142,9 +139,6 @@ S16 rgSCHGomHndlCfg(Pst *pst,RgSchCb *instCb,RgrCfgTransId transId,RgrCfgReqInf CmLteCellId cellId; RgSchCellCb *cell = NULLP; uint8_t cfmStatus = RGR_CFG_CFM_NOK; -#ifdef DEBUGP - Inst inst = (instCb->rgSchInit.inst ); -#endif /* Apply the configuration for Cell Configuration or Delete */ if (cfgReqInfo->action != RGR_RECONFIG) @@ -157,7 +151,7 @@ S16 rgSCHGomHndlCfg(Pst *pst,RgSchCb *instCb,RgrCfgTransId transId,RgrCfgReqInf /* Fetch the cell Id for the recieved request */ if((rgSCHGomGetCellIdFrmCfgReq(cfgReqInfo, &cellId)) != ROK) { - RLOG_ARG0(L_ERROR,DBG_INSTID,inst, "Action.Config Type Error"); + DU_LOG("\nERROR --> SCH : Action.Config Type Error"); SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, (Size)sizeof(*cfgReqInfo)); @@ -170,7 +164,7 @@ S16 rgSCHGomHndlCfg(Pst *pst,RgSchCb *instCb,RgrCfgTransId transId,RgrCfgReqInf { if(cellId != instCb->rgrSap[spId].cell->cellId) { - RLOG_ARG2(L_ERROR,DBG_CELLID,cellId, "Cell with Id %d already exists " + DU_LOG("\nERROR --> SCH : Cell with Id %d already exists " "on sap %d", instCb->rgrSap[spId].cell->cellId, spId); SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, @@ -185,7 +179,7 @@ S16 rgSCHGomHndlCfg(Pst *pst,RgSchCb *instCb,RgrCfgTransId transId,RgrCfgReqInf ret = rgSCHGomEnqCfgReq(pst->region, pst->pool, cell, transId, cfgReqInfo); if (ret != ROK) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cellId, "rgSCHGomHndlCfg: Enqueuing CfgReq " + DU_LOG("\nERROR --> SCH : rgSCHGomHndlCfg: Enqueuing CfgReq " "Failed "); SPutSBuf(pst->region, pst->pool, (Data *)cfgReqInfo, @@ -236,11 +230,8 @@ static S16 rgSCHGomCfgReq(Region reg,Pool pool,RgSchCb *instCb,RgrCfgTransId t uint8_t cfmStatus = RGR_CFG_CFM_OK; S16 ret; RgSchErrInfo errInfo; -#ifdef DEBUGP - Inst inst = (instCb->rgSchInit.inst ); -#endif #ifdef EMTC_ENABLE -printf("\n AT MAC rgSCHGomCfgReq \n"); +printf("\nDEBUG --> SCH: AT MAC rgSCHGomCfgReq \n"); #endif /* Process Config/Reconfig/Delete request from RRM */ @@ -282,7 +273,7 @@ printf("\n AT MAC rgSCHGomCfgReq \n"); #endif /* LTE_ADV */ default: { - RLOG_ARG1(L_ERROR,DBG_INSTID,inst, "Invalid configuration " + DU_LOG("\nERROR --> SCH : Invalid configuration " "action %d", cfgReqInfo->action); ret = RFAILED; } @@ -297,13 +288,13 @@ printf("\n AT MAC rgSCHGomCfgReq \n"); (Size)sizeof(*cfgReqInfo)); cfgReqInfo = NULLP; #ifdef EMTC_ENABLE -printf("\n AT MAC sending RGR cfg cfm \n"); +printf("\nDEBUG --> SCH: AT MAC sending RGR cfg cfm \n"); #endif /* Send back confirmation status to RRM */ schSendCfgCfm(reg, pool, transId, cfmStatus); #ifdef EMTC_ENABLE -printf("\n AT MAC RGR cfg cfm sent\n"); +printf("\nDEBUG --> SCH: AT MAC RGR cfg cfm sent\n"); #endif return (ret); @@ -376,7 +367,7 @@ static S16 rgSCHGomEnqCfgReq(Region reg,Pool pool,RgSchCellCb *cell,RgrCfgTransI if (actvTime.sfn >= RGSCH_MAX_SFN || actvTime.slot >= RGSCH_NUM_SUB_FRAMES_5G) { - RLOG_ARG4(L_ERROR,DBG_CELLID,cell->cellId, "Invalid activation time for RGR " + DU_LOG("\nERROR --> SCH : Invalid activation time for RGR " "config request: activation sfn %d activation slot %d current " "sfn %d current slot %d", actvTime.sfn, actvTime.slot, cell->crntTime.sfn, cell->crntTime.slot); @@ -390,7 +381,7 @@ static S16 rgSCHGomEnqCfgReq(Region reg,Pool pool,RgSchCellCb *cell,RgrCfgTransI if (sfDiff > (RGR_ACTV_WIN_SIZE * RGSCH_NUM_SUB_FRAMES_5G)) { - RLOG_ARG4(L_ERROR,DBG_CELLID,cell->cellId,"Invalid activation time for RGR" + DU_LOG("\nERROR --> SCH : Invalid activation time for RGR" " config request: activation sfn %d activation slot %d " "current sfn %d current slot %d", actvTime.sfn, actvTime.slot, cell->crntTime.sfn, cell->crntTime.slot); @@ -512,7 +503,7 @@ static S16 rgSCHGomHndlCfgReq(RgSchCb *instCb,SpId spId,RgrCfg *cfg,RgSchErrInfo ret = rgSCHCfgVldtRgrCellCfg(inst, &cfg->u.cellCfg, cell, errInfo); if (ret != ROK) { - RLOG1(L_ERROR,"Rgr Cell configuration " + DU_LOG("\nERROR --> SCH : Rgr Cell configuration " "validation FAILED: Cell %d", cfg->u.cellCfg.cellId); return RFAILED; } @@ -525,7 +516,7 @@ static S16 rgSCHGomHndlCfgReq(RgSchCb *instCb,SpId spId,RgrCfg *cfg,RgSchErrInfo ret = rgSCHCfgVldtRgrUeCfg(inst, &cfg->u.ueCfg, &cell, errInfo); if (ret != ROK) { - RLOG1(L_ERROR,"Ue configuration validation" + DU_LOG("\nERROR --> SCH : Ue configuration validation" " FAILED: CRNTI:%d", cfg->u.ueCfg.crnti); return RFAILED; } @@ -537,7 +528,7 @@ static S16 rgSCHGomHndlCfgReq(RgSchCb *instCb,SpId spId,RgrCfg *cfg,RgSchErrInfo ret = rgSCHCfgVldtRgrLcCfg(inst, &cfg->u.lchCfg, &cell, &ue, errInfo); if (ret != ROK) { - RLOG1(L_ERROR,"LC configuration validation " + DU_LOG("\nERROR --> SCH : LC configuration validation " "FAILED: LCID:%d", cfg->u.lchCfg.lcId); return RFAILED; } @@ -549,7 +540,7 @@ static S16 rgSCHGomHndlCfgReq(RgSchCb *instCb,SpId spId,RgrCfg *cfg,RgSchErrInfo ret = rgSCHCfgVldtRgrLcgCfg(inst, &cfg->u.lcgCfg, &cell, &ue, errInfo); if (ret != ROK) { - RLOG1(L_ERROR,"LCG configuration validation " + DU_LOG("\nERROR --> SCH : LCG configuration validation " "FAILED: LCGID:%d", cfg->u.lcgCfg.ulInfo.lcgId); return RFAILED; } @@ -561,8 +552,7 @@ static S16 rgSCHGomHndlCfgReq(RgSchCb *instCb,SpId spId,RgrCfg *cfg,RgSchErrInfo ret = rgSCHCfgVldtRgrSchedEnbCfg(inst, &cfg->u.schedEnbCfg, errInfo); if (ret != ROK) { - RGSCHDBGERR(inst,(rgSchPBuf(inst), "SCH ENB configuration validation " - "FAILED: \n" )); + DU_LOG("\nERROR --> SCH : SCH ENB configuration validation FAILED: \n"); return RFAILED; } ret = rgSCHCfgRgrSchedEnbCfg(inst, spId, &cfg->u.schedEnbCfg, errInfo); @@ -571,7 +561,7 @@ static S16 rgSCHGomHndlCfgReq(RgSchCb *instCb,SpId spId,RgrCfg *cfg,RgSchErrInfo default: { #if(ERRCLASS & ERRCLS_INT_PAR) - RLOG1(L_ERROR,"Should never come here: " + DU_LOG("\nERROR --> SCH : Should never come here: " "cfgType %d", cfg->cfgType); #endif return RFAILED; @@ -613,7 +603,7 @@ static S16 rgSCHGomHndlSCellActDeactReq(RgSchCb *instCb,SpId spId,RgrSCellActD RgSchCellCb *cell = instCb->rgrSap[spId].cell; Inst inst = (instCb->rgSchInit.inst); - RGSCHDBGPRM(inst,(rgSchPBuf(inst), "Processing RGR SCell Actication request:" + DU_LOG(("\nDEBUG --> SCH : Processing RGR SCell Actication request:" "%d\n", sCellActDeactEvnt->crnti)); errInfo->errType = RGSCHERR_GOM_SCELL_REQ; @@ -621,7 +611,7 @@ static S16 rgSCHGomHndlSCellActDeactReq(RgSchCb *instCb,SpId spId,RgrSCellActD /* Fetch the Ue */ if ((ue = rgSCHDbmGetUeCb(cell, sCellActDeactEvnt->crnti)) == NULLP) { - RGSCHDBGERRNEW(inst, (rgSchPBuf(inst), "[%d]UE: does not exist\n", + DU_LOG(("\nERROR --> SCH : [%d]UE: does not exist\n", sCellActDeactEvnt->crnti)); return RFAILED; } @@ -632,15 +622,14 @@ static S16 rgSCHGomHndlSCellActDeactReq(RgSchCb *instCb,SpId spId,RgrSCellActD if (ROK != (rgSCHSCellTrigActDeact(cell, ue, sCellIdx, action))) { - RGSCHDBGERR(inst,(rgSchPBuf(inst), "SCell Actication failed" + DU_LOG("\nERROR --> SCH : SCell Actication failed" "for UE [%d] with SCellIdx [%d]\n", - sCellActDeactEvnt->crnti, idx)); + sCellActDeactEvnt->crnti, idx); return RFAILED; } - } - RGSCHDBGINFO(inst,(rgSchPBuf(inst), "RGR Reconfiguration processed\n")); + DU_LOG("\nINFO --> SCH : RGR Reconfiguration processed\n"); return ROK; } /* rgSCHGomHndlSCellActDeactReq */ @@ -687,7 +676,7 @@ static S16 rgSCHGomHndlRecfgReq(RgSchCb *instCb,SpId spId,RgrRecfg *recfg,RgSc errInfo); if (ret != ROK) { - RLOG_ARG0(L_ERROR,DBG_CELLID,recfg->u.cellRecfg.cellId,"Rgr Cell Recfg Validation " + DU_LOG("\nERROR --> SCH : Rgr Cell Recfg Validation " "FAILED"); return RFAILED; } @@ -700,7 +689,7 @@ static S16 rgSCHGomHndlRecfgReq(RgSchCb *instCb,SpId spId,RgrRecfg *recfg,RgSc ret = rgSCHCfgVldtRgrUeRecfg(inst, &recfg->u.ueRecfg, &cell, &ue, errInfo); if ( ret != ROK) { - RLOG_ARG1(L_ERROR,DBG_CELLID,recfg->u.ueRecfg.cellId,"Ue Recfg Validation FAILED" + DU_LOG("\nERROR --> SCH : Ue Recfg Validation FAILED" "OLD CRNTI:%d",recfg->u.ueRecfg.oldCrnti); return RFAILED; } @@ -713,7 +702,7 @@ static S16 rgSCHGomHndlRecfgReq(RgSchCb *instCb,SpId spId,RgrRecfg *recfg,RgSc &dlLc, errInfo); if (ret != ROK) { - RLOG_ARG1(L_ERROR,DBG_CELLID,recfg->u.lchRecfg.cellId,"Lc Recfg Validation FAILED" + DU_LOG("\nERROR --> SCH : Lc Recfg Validation FAILED" "LCID:%d",recfg->u.lchRecfg.lcId); return RFAILED; } @@ -726,7 +715,7 @@ static S16 rgSCHGomHndlRecfgReq(RgSchCb *instCb,SpId spId,RgrRecfg *recfg,RgSc errInfo); if (ret != ROK) { - RLOG_ARG1(L_ERROR,DBG_CELLID,recfg->u.lcgRecfg.cellId, "Lcg Recfg Validation FAILED" + DU_LOG("\nERROR --> SCH : Lcg Recfg Validation FAILED" "LCGID:%d",recfg->u.lcgRecfg.ulRecfg.lcgId); return RFAILED; } @@ -736,7 +725,7 @@ static S16 rgSCHGomHndlRecfgReq(RgSchCb *instCb,SpId spId,RgrRecfg *recfg,RgSc default: { #if(ERRCLASS & ERRCLS_INT_PAR) - RLOG1(L_ERROR,"Should never come here: recfgType %d", recfg->recfgType); + DU_LOG("\nERROR --> SCH : Should never come here: recfgType %d", recfg->recfgType); #endif return RFAILED; } @@ -779,7 +768,7 @@ static S16 rgSCHGomHndlResetReq(RgSchCb *instCb,SpId spId,RgrRst *reset,RgSchEr ret = rgSCHCfgVldtRgrUeReset(inst, reset, cell, &ue, errInfo); if (ret != ROK) { - RLOG_ARG1(L_ERROR,DBG_CELLID,reset->cellId,"Rgr UE Reset Validation FAILED" + DU_LOG("\nERROR --> SCH : Rgr UE Reset Validation FAILED" "CRNTI:%d",reset->crnti); return RFAILED; } @@ -787,7 +776,7 @@ static S16 rgSCHGomHndlResetReq(RgSchCb *instCb,SpId spId,RgrRst *reset,RgSchEr ret = rgSCHCfgRgrUeReset(cell, ue, reset, errInfo); if (ret != ROK) { - RLOG_ARG1(L_ERROR,DBG_CELLID,reset->cellId,"Rgr UE Reset FAILED" + DU_LOG("\nERROR --> SCH : Rgr UE Reset FAILED" "CRNTI:%d",reset->crnti); return RFAILED; } @@ -822,16 +811,13 @@ static S16 rgSCHGomHndlDelReq(RgSchCb *instCb,SpId spId,RgrDel *del,RgSchErrInfo { S16 ret; -#ifdef DEBUGP - Inst inst = (instCb->rgSchInit.inst); -#endif volatile uint32_t startTime=0; errInfo->errType = RGSCHERR_GOM_DEL_REQ; if(instCb->rgrSap[spId].cell == NULLP) { - RLOG_ARG0(L_ERROR,DBG_INSTID,inst,"Cell doesnt exist"); + DU_LOG("\nERROR --> SCH : Cell doesnt exist"); return RFAILED; } @@ -879,7 +865,7 @@ static S16 rgSCHGomHndlDelReq(RgSchCb *instCb,SpId spId,RgrDel *del,RgSchErrInfo default: { #if(ERRCLASS & ERRCLS_INT_PAR) - RLOG1(L_ERROR,"Should never come here: delType %d", del->delType); + DU_LOG("\nERROR --> SCH : Should never come here: delType %d", del->delType); #endif return RFAILED; } @@ -994,8 +980,7 @@ S16 rgSCHGomHndlSiCfg(Region reg,Pool pool,RgSchCb *instCb,SpId spId,RgrCfgTrans /* check if cell does not exists */ if (((uint8_t *)cell == NULLP) || (cell->cellId != cfgReqInfo->cellId)) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cfgReqInfo->cellId,"Cell Control block does not exist" - ); + DU_LOG("\nERROR --> SCH : Cell Control block does not exist"); RGSCH_FREE_MSG(cfgReqInfo->pdu); SPutSBuf(reg, pool, (Data *)cfgReqInfo, (Size)sizeof(*cfgReqInfo)); cfgReqInfo = NULLP; @@ -1007,7 +992,7 @@ S16 rgSCHGomHndlSiCfg(Region reg,Pool pool,RgSchCb *instCb,SpId spId,RgrCfgTrans ret = rgSCHCfgVldtRgrSiCfg(inst, cfgReqInfo, cell, &errInfo); if (ret != ROK) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cfgReqInfo->cellId,"Rgr SI configuration " + DU_LOG("\nERROR --> SCH : Rgr SI configuration " "validation FAILED"); RGSCH_FREE_MSG(cfgReqInfo->pdu); SPutSBuf(reg, pool, (Data *)cfgReqInfo, (Size)sizeof(*cfgReqInfo)); @@ -1067,7 +1052,7 @@ S16 rgSCHGomHndlSiCfg(Region reg,Pool pool,RgSchCb *instCb,SpId spId,RgrCfgTrans if ( SGetSBuf(reg,pool,&padding,nmPadBytes) != ROK) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cfgReqInfo->cellId,"Rgr SI configuration " + DU_LOG("\nERROR --> SCH : Rgr SI configuration " "SGetSBuf failed for padding failed"); SPutSBuf(reg, pool, (Data *)cfgReqInfo, (Size)sizeof(*cfgReqInfo)); cfgReqInfo = NULLP; @@ -1083,7 +1068,7 @@ S16 rgSCHGomHndlSiCfg(Region reg,Pool pool,RgSchCb *instCb,SpId spId,RgrCfgTrans #endif if ( SAddPstMsgMult((Data*)padding,nmPadBytes,cfgReqInfo->pdu) != ROK) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cfgReqInfo->cellId,"Rgr SI configuration " + DU_LOG("\nERROR --> SCH : Rgr SI configuration " "Failed to add padding bytes"); SPutSBuf(reg, pool, (Data *)cfgReqInfo, (Size)sizeof(*cfgReqInfo)); cfgReqInfo = NULLP; @@ -1114,7 +1099,7 @@ S16 rgSCHGomHndlSiCfg(Region reg,Pool pool,RgSchCb *instCb,SpId spId,RgrCfgTrans ret = rgSCHUtlCalMcsAndNPrb(cell, cfgReqInfo->cfgType, pduLen,0); if (ret != ROK) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cfgReqInfo->cellId,"Failed to get MCS and NPRB" + DU_LOG("\nERROR --> SCH : Failed to get MCS and NPRB" "value"); RGSCH_FREE_MSG(cfgReqInfo->pdu); SPutSBuf(reg, pool, (Data *)cfgReqInfo, (Size)sizeof(*cfgReqInfo)); @@ -1136,7 +1121,7 @@ S16 rgSCHGomHndlSiCfg(Region reg,Pool pool,RgSchCb *instCb,SpId spId,RgrCfgTrans ret = rgSCHUtlCalMcsAndNPrb(cell, cfgReqInfo->cfgType, pduLen,0); if (ret != ROK) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cfgReqInfo->cellId,"Failed to get MCS and NPRB" + DU_LOG("\nERROR --> SCH : Failed to get MCS and NPRB" "value"); RGSCH_FREE_MSG(cfgReqInfo->pdu); SPutSBuf(reg, pool, (Data *)cfgReqInfo, (Size)sizeof(*cfgReqInfo)); @@ -1157,7 +1142,7 @@ S16 rgSCHGomHndlSiCfg(Region reg,Pool pool,RgSchCb *instCb,SpId spId,RgrCfgTrans cfgReqInfo->siId); if (ret != ROK) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cfgReqInfo->cellId,"Failed to get MCS and NPRB" + DU_LOG("\nERROR --> SCH : Failed to get MCS and NPRB" "value"); RGSCH_FREE_MSG(cfgReqInfo->pdu); SPutSBuf(reg, pool, (Data *)cfgReqInfo, (Size)sizeof(*cfgReqInfo)); @@ -1205,7 +1190,7 @@ S16 rgSCHGomHndlSiCfg(Region reg,Pool pool,RgSchCb *instCb,SpId spId,RgrCfgTrans cfgReqInfo->siId); if (ret != ROK) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cfgReqInfo->cellId,"Failed to get MCS and NPRB" + DU_LOG("\nERROR --> SCH : Failed to get MCS and NPRB" "value"); RGSCH_FREE_MSG(cfgReqInfo->pdu); SPutSBuf(reg, pool, (Data *)cfgReqInfo, (Size)sizeof(*cfgReqInfo)); @@ -1221,7 +1206,7 @@ S16 rgSCHGomHndlSiCfg(Region reg,Pool pool,RgSchCb *instCb,SpId spId,RgrCfgTrans cell->siCb.siArray[cfgReqInfo->siId-1].isWarningSi = FALSE; break; default: - RLOG_ARG0(L_ERROR,DBG_CELLID,cfgReqInfo->cellId,"Invalid cfgType " + DU_LOG("\nERROR --> SCH : Invalid cfgType " "parameter value"); RGSCH_FREE_MSG(cfgReqInfo->pdu); SPutSBuf(reg, pool, (Data *)cfgReqInfo, @@ -1305,7 +1290,7 @@ RgrWarningSiCfgReqInfo *warningSiCfgReqInfo (warningSiCfgReqInfo->siId > ((minPeriod * 10)/siWinSize))) { - RLOG_ARG2(L_ERROR,DBG_CELLID,warningSiCfgReqInfo->cellId,"Warning SI Cfg Failed for siId = %d" + DU_LOG("\nERROR --> SCH : Warning SI Cfg Failed for siId = %d" "warning cellID:%d",warningSiCfgReqInfo->siId,warningSiCfgReqInfo->cellId); rgSCHUtlFreeWarningSiSeg(reg, pool, &warningSiCfgReqInfo->siPduLst); SPutSBuf(reg, pool, (Data *)warningSiCfgReqInfo, @@ -1354,11 +1339,9 @@ RgrWarningSiCfgReqInfo *warningSiCfgReqInfo #endif { - RGSCHLOGERROR(cell->instIdx,ERRCLS_INT_PAR,ERG011, - (ErrVal)msgLen, - "rgSCHGomHndlWarningSiCfg():msgLen does not match\ + DU_LOG("\nERROR --> SCH : rgSCHGomHndlWarningSiCfg():msgLen does not match\ any valid TB Size."); - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"Warning SI Cfg Failed" + DU_LOG("\nERROR --> SCH : Warning SI Cfg Failed" "for siId = %d", warningSiCfgReqInfo->siId); rgSCHUtlFreeWarningSiSeg(reg, pool, &warningSiCfgReqInfo->siPduLst); @@ -1414,7 +1397,7 @@ RgrWarningSiCfgReqInfo *warningSiCfgReqInfo if (freeNodeFound == FALSE) { - RLOG_ARG0(L_DEBUG,DBG_CELLID,cell->cellId,"No SI Index is free"); + DU_LOG("\nDEBUG --> SCH : No SI Index is free"); rgSCHUtlFreeWarningSiSeg(reg, pool, &warningSiCfgReqInfo->siPduLst); SPutSBuf(reg, pool, (Data *)warningSiCfgReqInfo, sizeof(RgrWarningSiCfgReqInfo)); @@ -1563,7 +1546,7 @@ S16 rgSCHGomHndlLoadInf(Region reg,Pool pool,RgSchCb *instCb,SpId spId,RgrCfgTra /* check if cell does not exists */ if (((uint8_t *)cell == NULLP) || (cell->cellId != loadInfReq->cellId)) { - RLOG_ARG1(L_ERROR,DBG_CELLID,loadInfReq->cellId,"Cell Control block does not exist" + DU_LOG("\nERROR --> SCH : Cell Control block does not exist" "for load cellId:%d",loadInfReq->cellId); SPutSBuf(reg, pool, (Data *)loadInfReq, (Size)sizeof(*loadInfReq)); return RFAILED; @@ -1571,7 +1554,7 @@ S16 rgSCHGomHndlLoadInf(Region reg,Pool pool,RgSchCb *instCb,SpId spId,RgrCfgTra if (cell->lteAdvCb.dsfrCfg.status == RGR_DISABLE) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "rgSCHGomHndlLoadInf(): DSFR Feature not enabled"); + DU_LOG("\nERROR --> SCH : rgSCHGomHndlLoadInf(): DSFR Feature not enabled"); SPutSBuf(reg, pool, (Data *)loadInfReq, (Size)sizeof(*loadInfReq)); return RFAILED; } @@ -1579,7 +1562,7 @@ S16 rgSCHGomHndlLoadInf(Region reg,Pool pool,RgSchCb *instCb,SpId spId,RgrCfgTra ret = rgSCHCfgVldtRgrLoadInf(inst, loadInfReq, cell, &errInfo); if (ret != ROK) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Rgr LOAD INF Configuration " + DU_LOG("\nERROR --> SCH : Rgr LOAD INF Configuration " "validation FAILED"); SPutSBuf(reg, pool, (Data *)loadInfReq, (Size)sizeof(*loadInfReq)); return RFAILED; diff --git a/src/5gnrsch/rg_sch_lmm.c b/src/5gnrsch/rg_sch_lmm.c index 9c4e05a8c..b5afd680a 100755 --- a/src/5gnrsch/rg_sch_lmm.c +++ b/src/5gnrsch/rg_sch_lmm.c @@ -34,9 +34,6 @@ request primitives are defined here. */ -static const char* RLOG_MODULE_NAME="MAC"; -static int RLOG_MODULE_ID=4096; -static int RLOG_FILE_ID=167; /* header include files (.h) */ #include "common_def.h" @@ -93,8 +90,8 @@ void printSchCellInfo(void) * with this SAP */ if (rgSchCb[inst].tfuSap[idx].cell != NULLP) { - RLOG1(L_INFO,"CELL %d\n", idx); - RLOG1(L_INFO,"NUM UEs :%d\n",rgSchCb[inst].tfuSap[idx].cell->ueLst.nmbEnt); + DU_LOG("\nINFO --> SCH : CELL %d\n", idx); + DU_LOG("\nINFO --> SCH : NUM UEs :%d\n",rgSchCb[inst].tfuSap[idx].cell->ueLst.nmbEnt); } } } @@ -141,7 +138,7 @@ Elmnt sapType /* SAP Type */ (cfg->s.schInstCfg.rgrSap[sapIdx].selector != ODU_SELECTOR_LC)) { ret = LCM_REASON_INVALID_PAR_VAL; - RLOG_ARG0(L_ERROR,DBG_INSTID,inst, "rgSCHLmmSapCfg(): unsupported" + DU_LOG("\nERROR --> SCH : rgSCHLmmSapCfg(): unsupported" " Selector value for RGR."); break; } @@ -175,7 +172,7 @@ Elmnt sapType /* SAP Type */ (cfg->s.schInstCfg.tfuSap[sapIdx].selector != ODU_SELECTOR_LC)) { ret = LCM_REASON_INVALID_PAR_VAL; - RLOG_ARG0(L_ERROR,DBG_INSTID,inst, "rgSCHLmmSapCfg(): unsupported" + DU_LOG("\nERROR --> SCH : rgSCHLmmSapCfg(): unsupported" " Selector value for TFU."); break; } @@ -215,7 +212,7 @@ Elmnt sapType /* SAP Type */ (cfg->s.schInstCfg.rgmSap[sapIdx].selector != RGM_SEL_TC)) { ret = LCM_REASON_INVALID_PAR_VAL; - RLOG_ARG0(L_ERROR,DBG_INSTID,inst, "rgSCHLmmSapCfg(): unsupported" + DU_LOG("\nERROR --> SCH : rgSCHLmmSapCfg(): unsupported" " Selector value for RGM."); break; } @@ -474,7 +471,7 @@ Void rgSCHLmmGenCntrl(RgMngmt *cntrl,RgMngmt *cfm,Pst *cfmPst) default: cfm->cfm.status = LCM_PRIM_NOK; cfm->cfm.reason = LCM_REASON_INVALID_PAR_VAL; - RLOG_ARG1(L_ERROR,DBG_INSTID,inst, "rgSCHLmmGenCntrl(): " + DU_LOG("\nERROR --> SCH : rgSCHLmmGenCntrl(): " "invalid subaction=%d", cntrl->t.cntrl.subAction); break; } @@ -498,7 +495,7 @@ Void rgSCHLmmGenCntrl(RgMngmt *cntrl,RgMngmt *cfm,Pst *cfmPst) default: cfm->cfm.status = LCM_PRIM_NOK; cfm->cfm.reason = LCM_REASON_INVALID_PAR_VAL; - RLOG_ARG1(L_ERROR,DBG_INSTID,inst, "rgSCHLmmGenCntrl():" + DU_LOG("\nERROR --> SCH : rgSCHLmmGenCntrl():" " invalid subaction=%d", cntrl->t.cntrl.subAction); break; } @@ -510,7 +507,7 @@ Void rgSCHLmmGenCntrl(RgMngmt *cntrl,RgMngmt *cfm,Pst *cfmPst) default: cfm->cfm.status = LCM_PRIM_NOK; cfm->cfm.reason = LCM_REASON_INVALID_PAR_VAL; - RLOG_ARG1(L_ERROR,DBG_INSTID,inst, "rgSCHLmmGenCntrl(): invalid" + DU_LOG("\nERROR --> SCH : rgSCHLmmGenCntrl(): invalid" " action=%d", cntrl->t.cntrl.action); break; } @@ -642,7 +639,7 @@ Pst *cfmPst default: cfm->cfm.status = LCM_PRIM_NOK; cfm->cfm.reason = LCM_REASON_INVALID_PAR_VAL; - RLOG_ARG1(L_ERROR,DBG_INSTID,inst, "rgSCHLmmSapCntrl(): " + DU_LOG("\nERROR --> SCH : rgSCHLmmSapCntrl(): " "invalid action=%d", cntrl->t.cntrl.action); break; } @@ -665,7 +662,7 @@ Pst *cfmPst default: cfm->cfm.status = LCM_PRIM_NOK; cfm->cfm.reason = LCM_REASON_INVALID_PAR_VAL; - RLOG_ARG1(L_ERROR,DBG_INSTID,inst, "rgSCHLmmSapCntrl(): " + DU_LOG("\nERROR --> SCH : rgSCHLmmSapCntrl(): " "invalid action=%d", cntrl->t.cntrl.action); break; } @@ -688,7 +685,7 @@ Pst *cfmPst default: cfm->cfm.status = LCM_PRIM_NOK; cfm->cfm.reason = LCM_REASON_INVALID_PAR_VAL; - RLOG_ARG1(L_ERROR,DBG_INSTID,inst, "rgSCHLmmSapCntrl(): " + DU_LOG("\nERROR --> SCH : rgSCHLmmSapCntrl(): " "invalid action=%d", cntrl->t.cntrl.action); break; } @@ -877,9 +874,6 @@ S16 tmrEvnt /* Timer Event */ { S16 ret = ROK; RgSchLowSapCb *tfuSap = (RgSchLowSapCb *)cb; -#ifdef DEBUGP - Inst inst = tfuSap->cell->instIdx; -#endif switch(tmrEvnt) @@ -908,7 +902,7 @@ S16 tmrEvnt /* Timer Event */ } break; default: - RLOG_ARG1(L_ERROR,DBG_INSTID,inst, "rgSCHLmmTmrExpiry(): Invalid" + DU_LOG("\nERROR --> SCH : rgSCHLmmTmrExpiry(): Invalid" " tmrEvnt=%d", tmrEvnt); ret = RFAILED; break; diff --git a/src/5gnrsch/rg_sch_ram.c b/src/5gnrsch/rg_sch_ram.c index 2d42b5789..d1c2cfb2d 100755 --- a/src/5gnrsch/rg_sch_ram.c +++ b/src/5gnrsch/rg_sch_ram.c @@ -32,9 +32,6 @@ @brief This file has APIs to handle the random access procedure functionality for the scheduler. */ -static const char* RLOG_MODULE_NAME="MAC"; -static int RLOG_MODULE_ID=4096; -static int RLOG_FILE_ID=171; /* header include files (.h) */ #include "common_def.h" @@ -218,9 +215,7 @@ RgSchErrInfo *err /* allocate new raReqInfos and enqueue them */ if (raReqInd->raReqInfoArr[raReqCnt].rapId >= RGSCH_MAX_NUM_RA_PREAMBLE) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, - "RARNTI:%d rgSCHTomRaReqInd(): RAM processing failed errType(%d) ", - raReqInd->raRnti); + DU_LOG("\nERROR --> SCH : RARNTI:%d rgSCHTomRaReqInd(): RAM processing failed", raReqInd->raRnti); return RFAILED; } @@ -249,7 +244,7 @@ RgSchErrInfo *err if((rgSCHUtlAllocSBuf(cell->instIdx, (Data **)(&raReqInfo), sizeof(RgSchRaReqInfo))) == RFAILED) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"rgSCHRamProcRaReq(): Allocation" + DU_LOG("\nERROR --> SCH : rgSCHRamProcRaReq(): Allocation" " of RaReq failed RARNTI:%d",raRnti); err->errCause = RGSCHERR_RAM_MEM_EXHAUST; return RFAILED; @@ -312,7 +307,7 @@ RgSchErrInfo *err if((rgSCHUtlAllocSBuf(inst, (Data **)(raCb), sizeof(RgSchRaCb))) == RFAILED) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"rgSCHRamCreateRaCb(): Allocation of " + DU_LOG("\nERROR --> SCH : rgSCHRamCreateRaCb(): Allocation of " "RaCb failed"); err->errCause = RGSCHERR_RAM_MEM_EXHAUST; return RFAILED; @@ -331,7 +326,7 @@ RgSchErrInfo *err rgNumRarFailDuetoRntiExhaustion++; /* No rnti available! */ - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"rgSCHRamCreateRaCb(): Allocation of " + DU_LOG("\nERROR --> SCH : rgSCHRamCreateRaCb(): Allocation of " "temporary RNTI failed at MAC(CRNTI exhausted)"); /* ccpu00117052 - MOD - Passing double pointer for proper NULLP assignment*/ @@ -345,7 +340,7 @@ RgSchErrInfo *err if ((*raCb)->dlHqE == NULLP) { /* No memory available! */ - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"rgSCHRamCreateRaCb(): Creation of" + DU_LOG("\nERROR --> SCH : rgSCHRamCreateRaCb(): Creation of" " DL HARQ failed"); /* ccpu00117052 - MOD - Passing double pointer for proper NULLP assignment*/ @@ -529,8 +524,7 @@ RgSchRaCb *raCb #endif if(raCb->raState != RGSCH_RA_MSG3_PENDING) { - RLOG_ARG2(L_DEBUG,DBG_CELLID,cell->cellId, - "RNTI:%d RaCb in wrong State %d Drop Msg 3", + DU_LOG("\nERROR --> SCH : RNTI:%d RaCb in wrong State %d Drop Msg 3", raCb->rntiLnk->rnti, raCb->raState); return ROK; @@ -745,8 +739,7 @@ S16 rgSCHRamMsg4FdbkInd(RgSchRaCb *raCb) S16 rgSCHRamMsg4Done(RgSchCellCb *cell,RgSchRaCb *raCb) { - RLOG_ARG1(L_DEBUG,DBG_CELLID,cell->cellId, - "rgSCHRamMsg4Done(): tmpCRNTI = %u", + DU_LOG("\nDEBUG --> SCH : rgSCHRamMsg4Done(): tmpCRNTI = %u", raCb->tmpCrnti); if(raCb->ue != NULLP) @@ -785,7 +778,7 @@ S16 rgSCHRamMsg4Done(RgSchCellCb *cell,RgSchRaCb *raCb) else if(raCb->toDel == TRUE) { #ifdef XEON_SPECIFIC_CHANGES - CM_LOG_DEBUG(CM_LOG_ID_SCH, "Deleting RacB:%d\n", raCb->tmpCrnti); + DU_LOG("\nDEBUG --> SCH : Deleting RacB:%d\n", raCb->tmpCrnti); #endif /* Delete RACB and release RNTI */ rgSCHRamDelRaCb(cell, raCb, TRUE); @@ -793,14 +786,12 @@ S16 rgSCHRamMsg4Done(RgSchCellCb *cell,RgSchRaCb *raCb) else { #ifdef XEON_SPECIFIC_CHANGES - CM_LOG_DEBUG(CM_LOG_ID_SCH, "Releasing Harq of RacB:%d\n", raCb->tmpCrnti); + DU_LOG("\nDEBUG --> SCH : Releasing Harq of RacB:%d\n", raCb->tmpCrnti); #endif raCb->raState = RGSCH_RA_MSG4_DONE; /* Release harq process as final feedback is received for Msg4. In other * cases, delRaCb will take care of releasing the harq process */ - printf("=======Harq process released \n"); - RLOG_ARG0(L_DEBUG,DBG_CELLID,cell->cellId, - "Harq process released "); + DU_LOG("\nDEBUG --> SCH : Harq process released "); rgSCHDhmRlsHqpTb(raCb->dlHqE->msg4Proc, 0, TRUE); } @@ -870,7 +861,7 @@ S16 rgSCHRamDelRaCb(RgSchCellCb *cell,RgSchRaCb *raCb,Bool rlsRnti) if ((raCb->dlHqE->msg4Proc->subFrm != NULLP) && (raCb->dlHqE->msg4Proc->hqPSfLnk.node != NULLP)) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"TMP CRNTI:%d RACH FAILURE!! " + DU_LOG("\nERROR --> SCH : TMP CRNTI:%d RACH FAILURE!! " "msg4proc removed from SF", raCb->tmpCrnti); rgSCHUtlDlHqPTbRmvFrmTx(raCb->dlHqE->msg4Proc->subFrm, raCb->dlHqE->msg4Proc, 0, FALSE); @@ -1177,8 +1168,7 @@ static Void rgSCHRamProcContResGrdExp(RgSchCellCb *cell,RgSchRaCb *raCb) raCb->contResTmrLnk.node = NULLP; /* MSG4 Fix Start */ - RLOG_ARG1(L_DEBUG,DBG_CELLID,cell->cellId, - "Con Res Grd Tmr exp RNTI:%d", + DU_LOG("\nDEBUG --> SCH : Con Res Grd Tmr exp RNTI:%d", raCb->rntiLnk->rnti); rgSCHRamAddToRaInfoSchdLst(cell, raCb); /* MSG4 Fix End */ -- 2.16.6