From: Sphoorthi Dayanand Date: Thu, 4 Feb 2021 07:18:08 +0000 (+0000) Subject: Merge "Part -7 Classification of log [JIRA-ID ODUHIGH-275]" X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=ef21e69ff09d53e6db07ec4f5b75bf644f40c5e6;hp=d526f86c752d12c797597fcb970572e8cd40f560;p=o-du%2Fl2.git Merge "Part -7 Classification of log [JIRA-ID ODUHIGH-275]" --- diff --git a/src/5gnrmac/rg.h b/src/5gnrmac/rg.h index fca0089a6..bf58326dd 100755 --- a/src/5gnrmac/rg.h +++ b/src/5gnrmac/rg.h @@ -287,7 +287,7 @@ uint32_t macHeader[2]; ssGetDBufOfSize(mInfo->region,_size, &_padBuf); \ if (_padBuf == NULLP) \ { \ - RLOG0(L_ERROR, "RGERR_MUX_BLD_CEHDR_FAIL");\ + DU_LOG("\nERROR --> MAC : RGERR_MUX_BLD_CEHDR_FAIL");\ return RFAILED;\ } \ if (mInfo->endptr == NULLP) { \ @@ -378,13 +378,13 @@ toFill.slot = (RG_NUM_SUB_FRAMES_5G + crntTime.slot - (dcr)) % (RG_NUM_SUB_FRAME #define RG_NULL_CHECK(_inst, _ptr ) \ if((_ptr) == NULLP) \ { \ - RGDBGERRNEW(_inst, (rgPBuf(_inst),"Null Pointer detected"));\ + DU_LOG("\nERROR --> MAC : Null Pointer detected");\ SExit();\ } #define RG_ARRAY_BOUND_CHECK(_inst, _array, _idxVal) \ if((_idxVal) >= (sizeof(_array)/sizeof(_array[0]))) \ { \ - RGDBGERRNEW(_inst, (rgPBuf(_inst),"Array Bound Check Failed"));\ + DU_LOG("\nERROR --> MAC : Array Bound Check Failed");\ SExit();\ } #else diff --git a/src/5gnrmac/rg_mux.c b/src/5gnrmac/rg_mux.c index 1473e7af5..22b8f1eae 100755 --- a/src/5gnrmac/rg_mux.c +++ b/src/5gnrmac/rg_mux.c @@ -32,9 +32,6 @@ @brief MAC Multiplexing API. */ -static const char* RLOG_MODULE_NAME="MAC"; -static int RLOG_FILE_ID=229; -static int RLOG_MODULE_ID=4096; /* header include files -- defines (.h) */ #include "common_def.h" @@ -175,7 +172,7 @@ RgErrInfo *err if(ret != ROK) { err->errCause = RGERR_MUX_BLD_CEHDR_FAIL; - RLOG0(L_ERROR, "Muxing of Contention Resolution CE sub-header is failed"); + DU_LOG("\nERROR --> MAC : Muxing of Contention Resolution CE sub-header is failed"); return RFAILED; } @@ -184,7 +181,7 @@ RgErrInfo *err if(ret != ROK) { err->errCause = RGERR_MUX_BLD_CE_FAIL; - RLOG0(L_ERROR, "Muxing of Contention Resolution CE is failed") + DU_LOG("\nERROR --> MAC : Muxing of Contention Resolution CE is failed"); return RFAILED; } pdu->schdTbSz -= RG_CRES_ELM_LEN; @@ -200,7 +197,7 @@ RgErrInfo *err if(ret != ROK) { err->errCause = RGERR_MUX_BLD_CEHDR_FAIL; - RLOG0(L_ERROR, "Muxing of TA CE sub-hdr is failed") + DU_LOG("\nERROR --> MAC : Muxing of TA CE sub-hdr is failed"); return RFAILED; } @@ -210,11 +207,11 @@ RgErrInfo *err if(ret != ROK) { err->errCause = RGERR_MUX_BLD_CE_FAIL; - RLOG0(L_ERROR, "Muxing of TA CE is failed") + DU_LOG("\nERROR --> MAC : Muxing of TA CE is failed"); return RFAILED; } pdu->schdTbSz -= RG_TA_ELM_LEN; - RLOG1(L_DEBUG,"TA muxed by MAC: %u", pdu->ta.val); + DU_LOG("\nDEBUG --> MAC : TA muxed by MAC: %u", pdu->ta.val); } } #ifdef LTE_ADV @@ -228,7 +225,7 @@ RgErrInfo *err if(ret != ROK) { err->errCause = RGERR_MUX_BLD_CEHDR_FAIL; - RLOG0(L_ERROR, "Muxing of SCELL Activation CE sub-hdr is failed") + DU_LOG("\nERROR --> MAC : Muxing of SCELL Activation CE sub-hdr is failed") return RFAILED; } @@ -238,7 +235,7 @@ RgErrInfo *err if(ret != ROK) { err->errCause = RGERR_MUX_BLD_CE_FAIL; - RLOG0(L_ERROR, "Muxing of SCELL Activation CE is failed") + DU_LOG("\nERROR --> MAC : Muxing of SCELL Activation CE is failed") return RFAILED; } pdu->schdTbSz -= RG_SCELL_CE_ELM_LEN; @@ -300,7 +297,7 @@ RgErrInfo *err if(ret != ROK) { err->errCause = RGERR_MUX_BLD_SDUHDR_FAIL; - RLOG1(L_ERROR, "RGERR_MUX_BLD_SDUHDR_FAIL for LCID:%d",lcId); + DU_LOG("\nERROR --> MAC : RGERR_MUX_BLD_SDUHDR_FAIL for LCID:%d",lcId); return RFAILED; } @@ -315,7 +312,7 @@ RgErrInfo *err if(ret != ROK) { err->errCause = RGERR_MUX_BLD_SDU_FAIL; - RLOG1(L_ERROR, "RGERR_MUX_BLD_SDU_FAIL for LCID:%d",lcId); + DU_LOG("\nERROR --> MAC : RGERR_MUX_BLD_SDU_FAIL for LCID:%d",lcId); return RFAILED; } @@ -324,9 +321,9 @@ RgErrInfo *err else { /* This Sub-PDU can not be accodmodated at all */ - RLOG4(L_ERROR, "Failed lcId %u, elmTotLen %d lenBytes %d LCID:%d", + DU_LOG("\nERROR --> MAC : Failed lcId %u, elmTotLen %d lenBytes %d LCID:%d", lcId, ((S16)elmTotLen), lenBytes,lcId); - RLOG3(L_ERROR, "msglen %d schdTbSz %d LCID:%d", + DU_LOG("\nERROR --> MAC : msglen %d schdTbSz %d LCID:%d", ((S16)msgLen), ((S16)*schdTbSz),lcId); return RFAILED; } @@ -381,7 +378,7 @@ RgErrInfo *err if(ret != ROK) { err->errCause = RGERR_MUX_BLD_PADHDR_FAIL; - RLOG0(L_ERROR, "RGERR_MUX_BLD_PADHDR_FAIL"); + DU_LOG("\nERROR --> MAC : RGERR_MUX_BLD_PADHDR_FAIL"); return RFAILED; } @@ -405,7 +402,7 @@ RgErrInfo *err if(ret != ROK) { err->errCause = RGERR_MUX_BLD_PAD_FAIL; - RLOG0(L_ERROR, "RGERR_MUX_BLD_PAD_FAIL"); + DU_LOG("\nERROR --> MAC : RGERR_MUX_BLD_PAD_FAIL"); return RFAILED; } *schdTbSz = 0; @@ -430,7 +427,7 @@ RgErrInfo *err if(ret != ROK) { err->errCause = RGERR_MUX_BLD_PAD_FAIL; - RLOG0(L_ERROR, "RGERR_MUX_BLD_PAD_FAIL"); + DU_LOG("\nERROR --> MAC : RGERR_MUX_BLD_PAD_FAIL"); return RFAILED; } @@ -452,7 +449,7 @@ RgErrInfo *err if(ret != ROK) { err->errCause = RGERR_MUX_BLD_PAD_FAIL; - RLOG0(L_ERROR, "RGERR_MUX_BLD_PAD_FAIL"); + DU_LOG("\nERROR --> MAC : RGERR_MUX_BLD_PAD_FAIL"); return RFAILED; } @@ -533,7 +530,7 @@ RgErrInfo *err datReqTb->lchData[idx1].pdu.mBuf[idx2], sduBuf, err) != ROK) { - RLOG1(L_ERROR, "FAILED for LCID:%d",datReqTb->lchData[idx1].lcId); + DU_LOG("\nERROR --> MAC : FAILED for LCID:%d",datReqTb->lchData[idx1].lcId); return RFAILED; } } @@ -558,7 +555,7 @@ RgErrInfo *err datReqTb->lchData[idx1].pdu.mBuf[idx2], sduBuf, err) != ROK) { - RLOG2(L_ERROR, "FAILED TB Size %d LCID:%d", + DU_LOG("\nERROR --> MAC : FAILED TB Size %d LCID:%d", ((S16)pdu->schdTbSz),datReqTb->lchData[idx1].lcId); return RFAILED; } @@ -575,7 +572,7 @@ RgErrInfo *err } /* End of switch(reqType) */ if(rgMUXAddPadd(inst,&pdu->schdTbSz, sduBuf, FALSE, err) != ROK) { - RLOG1(L_ERROR, "FAILED for TB Size:%d",(S16)pdu->schdTbSz); + DU_LOG("\nERROR --> MAC : FAILED for TB Size:%d",(S16)pdu->schdTbSz); return RFAILED; } return ROK; @@ -623,7 +620,7 @@ RgErrInfo *err /* Buffer couldnt get allocated. Return a failure */ err->errCause = RGERR_MUX_MEM_ALLOC_FAIL; err->errType = RGERR_MUX_BLD_PDU; - RLOG1(L_FATAL, "Memory allocation failed during MUXing of MAC TB: MacInst %d", inst); + DU_LOG("\nERROR --> MAC : Memory allocation failed during MUXing of MAC TB: MacInst %d", inst); return RFAILED; } @@ -631,7 +628,7 @@ RgErrInfo *err { RG_FREE_MSG(mBuf); err->errType = RGERR_MUX_BLD_PDU; - RLOG1(L_ERROR, "Failed to Multiplex MAC CEs: MacInst %d", inst); + DU_LOG("\nERROR --> MAC : Failed to Multiplex MAC CEs: MacInst %d", inst); return RFAILED; } @@ -639,7 +636,7 @@ RgErrInfo *err { RG_FREE_MSG(mBuf); err->errType = RGERR_MUX_BLD_PDU; - RLOG1(L_ERROR, "FAILED to Multiplex MAC SDU: MacInst %d", inst); + DU_LOG("\nERROR --> MAC : FAILED to Multiplex MAC SDU: MacInst %d", inst); return RFAILED; } @@ -699,7 +696,8 @@ RgErrInfo *err = cDatReq->pdu; tb->lchInfo[tb->numLch].numPdu++; tb->numLch++; - RLOG3(L_INFO,"MSG4 is muxed numLch=%ld numPdu=%ld tbaddr =%p", tb->numLch,tb->lchInfo[tb->numLch-1].numPdu, (uint32_t)tb); + DU_LOG("\nINFO --> MAC : MSG4 is muxed numLch=%ld numPdu=%ld tbaddr =%p",\ + tb->numLch,tb->lchInfo[tb->numLch-1].numPdu, (uint32_t)tb); } break; @@ -731,7 +729,7 @@ RgErrInfo *err datReqTb->lchData[idx1].pdu.mBuf[idx2], sHdrBuf, NULLP, err) != ROK) { - RGDBGERRNEW(inst,(rgPBuf(inst), "FAILED\n")); + DU_LOG("\nERROR --> MAC : Failed to insert SDU in rgMUXAddSdus\n"); return RFAILED; } @@ -753,12 +751,12 @@ RgErrInfo *err tmp = datReqTb->lchData[idx1].pdu.mBuf[idx2]->b_cont; if(NULL == tmp->b_rptr) { - RLOG0(L_INFO,"11111Its Null here only "); + DU_LOG("\nERROR --> MAC : rgMUXAddSdus failed in EVTRGUDDATREQ"); } } else { - RLOG0(L_INFO,"222222Its Null here only \n"); + DU_LOG("\nERROR --> MAC : rgMUXAddSdus failed in EVTRGUDDATREQ"); } pduIdx++; //tb->lchInfo[tb->numLch].numPdu++; @@ -797,8 +795,8 @@ RgErrInfo *err datReqTb->lchData[idx1].pdu.mBuf[idx2], sHdrBuf, NULLP, err) != ROK) { - RGDBGERRNEW(inst,(rgPBuf(inst), "FAILED TB Size %d\n", - ((S16)pdu->schdTbSz))); + DU_LOG("\nERROR --> MAC : FAILED TB Size %d\n", + ((S16)pdu->schdTbSz)); return RFAILED; } /* L2 Optimization for mUe/Tti:Increment numPdu by 1 @@ -817,12 +815,12 @@ RgErrInfo *err tmp = datReqTb->lchData[idx1].pdu.mBuf[idx2]->b_cont; if(NULL == tmp->b_rptr) { - RLOG0(L_INFO,"2212121Its Null here only \n"); + DU_LOG("\nERROR --> MAC : rgMUXAddSdus failed in EVTRGUDDATREQ"); } } else { - RLOG0(L_INFO,"343343433ts Null here only \n"); + DU_LOG("\nERROR --> MAC : rgMUXAddSdus failed in EVTRGUDDATREQ"); } pduIdx++; // tb->lchInfo[tb->numLch].numPdu++; @@ -918,7 +916,7 @@ RgErrInfo *err if(rgMUXAddCes(inst, pdu, mBuf1, mBuf2, err) != ROK) { /* Reset rPtr and wPtr to the base of data buffer(db_base)*/ - RLOG0(L_INFO,"rgMUXBldPdu: rgMUXAddCes is Failed \n"); + DU_LOG("\nERROR --> MAC : rgMUXBldPdu: rgMUXAddCes is Failed \n"); RG_FREE_TB(tb); err->errType = RGERR_MUX_BLD_PDU; //RGDBGERRNEW((rgPBuf, "FAILED")); @@ -928,7 +926,7 @@ RgErrInfo *err { /*TODO:MP Reset rPtr and wPtr to the base of data buffer(db_base) * Reset numLch and numPdu to zero and set MAC SDU buf to NULLP */ - RLOG0(L_INFO, "rgMUXBldPdu: rgMUXAddSdus is Failed \n"); + DU_LOG("\nERROR --> MAC : rgMUXBldPdu: rgMUXAddSdus is Failed \n"); RG_FREE_TB(tb); err->errType = RGERR_MUX_BLD_PDU; @@ -1001,7 +999,7 @@ RgErrInfo *err { /* Buffer couldnt get allocated. Return a failure */ err->errCause = RGERR_MUX_MEM_ALLOC_FAIL; - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "FAILED to getMsg"); + DU_LOG("\nERROR --> MAC : FAILED to getMsg"); return RFAILED; } @@ -1017,7 +1015,7 @@ RgErrInfo *err if(ret != ROK) { err->errCause = RGERR_MUX_BLD_BI_FAIL; - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"RGERR_MUX_BLD_BI_FAIL"); + DU_LOG("\nERROR --> MAC : RGERR_MUX_BLD_BI_FAIL"); RG_FREE_MSG(datBuf); return RFAILED; } @@ -1037,7 +1035,7 @@ RgErrInfo *err if(ret != ROK) { err->errCause = RGERR_MUX_BLD_RAPIDHDR_FAIL; - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"RGERR_MUX_BLD_RAPIDHDR_FAIL"); + DU_LOG("\nERROR --> MAC : RGERR_MUX_BLD_RAPIDHDR_FAIL"); RG_FREE_MSG(datBuf); return RFAILED; } @@ -1054,15 +1052,14 @@ RgErrInfo *err data[4] = (alloc->crntiInfo[idx].tmpCrnti) >> 8; data[5] = (uint8_t) (alloc->crntiInfo[idx].tmpCrnti); - RLOG_ARG2(L_DEBUG,DBG_CELLID,cell->cellId, - "Rar,Rapid=%d, Temp CRNTI:%d", + DU_LOG("\nDEBUG --> MAC : Rar,Rapid=%d, Temp CRNTI:%d", alloc->crntiInfo[idx].rapId, alloc->crntiInfo[idx].tmpCrnti); MS_BUF_ADD_ALLOC_CALLER(); if(SAddPstMsgMult(&data[0], RG_RAR_ELEM_LEN, datBuf) != ROK) { err->errCause = RGERR_MUX_BLD_RAPID_FAIL; - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"RGERR_MUX_BLD_RAPID_FAIL"); + DU_LOG("\nERROR --> MAC : RGERR_MUX_BLD_RAPID_FAIL"); RG_FREE_MSG(datBuf); return RFAILED; } @@ -1072,7 +1069,7 @@ RgErrInfo *err if(rgMUXAddPadd(inst,&schdTbSz, datBuf, TRUE, err) != ROK) { RG_FREE_MSG(datBuf); - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"FAILED to mux add padding"); + DU_LOG("\nERROR --> MAC : FAILED to mux add padding"); return RFAILED; } diff --git a/src/5gnrmac/rg_uim.c b/src/5gnrmac/rg_uim.c index 043292dee..e13168a15 100755 --- a/src/5gnrmac/rg_uim.c +++ b/src/5gnrmac/rg_uim.c @@ -33,9 +33,6 @@ manages Pst and Sap related information for upper interface APIs. */ -static const char* RLOG_MODULE_NAME="MAC"; -static int RLOG_MODULE_ID=4096; -static int RLOG_FILE_ID=178; /* header include files -- defines (.h) */ @@ -129,15 +126,14 @@ SpId spId switch (rgCb[inst].rguSap[spId].sapSta.sapState) { case LRG_NOT_CFG: /* SAP Not configured */ - RGDBGINFO(inst,(rgPBuf(inst), "SAP Not Configured\n")); rgFillDgnParams(inst,&dgn, LRG_USTA_DGNVAL_MEM); ret = rgLMMStaInd(inst,LCM_CATEGORY_INTERFACE,LRG_NOT_CFG, LCM_CAUSE_INV_SAP, &dgn); - RLOG0(L_DEBUG,"SAP Not Configured"); + DU_LOG("\nDEBUG --> MAC : SAP Not Configured"); ret = RgUiRguBndCfm(&tmpPst, suId, CM_BND_NOK); break; case LRG_UNBND: /* SAP is not bound */ - RLOG0(L_DEBUG,"SAP Not yet bound"); + DU_LOG("\nDEBUG --> MAC : SAP Not yet bound"); rgCb[inst].rguSap[spId].sapSta.sapState = LRG_BND; rgCb[inst].rguSap[spId].sapCfg.suId = suId; /* Send Bind Confirm with status as SUCCESS */ @@ -149,14 +145,13 @@ SpId spId LCM_CAUSE_UNKNOWN, &dgn); break; case LRG_BND: /* SAP is already bound*/ - RLOG0(L_DEBUG,"SAP already bound"); + DU_LOG("\nDEBUG --> MAC : SAP already bound"); /*T2K - Passing spId as it is required to access the SAP CB*/ ret = rgUIMRguBndCfm(inst,spId, CM_BND_OK); break; default: /* Should Never Enter here */ #if (ERRCLASS & ERRCLS_ADD_RES) - RGLOGERROR(inst,ERRCLS_INT_PAR, ERG008, (ErrVal)rgCb[inst].rguSap[spId].sapSta.sapState, - "Invalid SAP State:RgUiRguBndReq failed\n"); + DU_LOG("\nERROR --> MAC : Invalid SAP State:RgUiRguBndReq failed\n"); #endif /*T2K - Passing spId as it is required to access the SAP CB*/ ret = rgUIMRguBndCfm(inst,spId, CM_BND_NOK); @@ -166,8 +161,7 @@ SpId spId else { #if (ERRCLASS & ERRCLS_ADD_RES) - RGLOGERROR(inst,ERRCLS_INT_PAR, ERG009, (ErrVal)rgCb[inst].rguSap[spId].sapCfg.spId, - "Invalid SAP Id:RgUiRguBndReq failed\n"); + DU_LOG("\nERROR --> MAC : Invalid SAP Id:RgUiRguBndReq failed\n"); #endif /*T2K - Passing spId as it is required to access the SAP CB*/ ret = rgUIMRguBndCfm(inst,spId, CM_BND_NOK); @@ -210,13 +204,13 @@ Reason reason switch(rgCb[inst].rguSap[spId].sapSta.sapState) { case LRG_BND: /* SAP is already bound*/ - RLOG0(L_DEBUG,"SAP already bound"); + DU_LOG("\nDEBUG --> MAC : SAP already bound"); /* setting SAP state to UN BOUND */ rgCb[inst].rguSap[spId].sapSta.sapState = LRG_UNBND; break; default: #if (ERRCLASS & ERRCLS_ADD_RES) - RLOG1(L_ERROR,"Invalid SAP State:%d RgUiRguUbndReq failed", + DU_LOG("\nERROR --> MAC : Invalid SAP State:%d RgUiRguUbndReq failed", rgCb[inst].rguSap[spId].sapSta.sapState); #endif @@ -226,8 +220,7 @@ Reason reason else { #if (ERRCLASS & ERRCLS_ADD_RES) - RGLOGERROR(inst,ERRCLS_INT_PAR, ERG011, (ErrVal)rgCb[inst].rguSap[spId].sapCfg.spId, - "Invalid SAP Id:RgUiRguUbndReq failed\n"); + DU_LOG("\nERROR --> MAC : Invalid SAP Id:RgUiRguUbndReq failed\n"); #endif return RFAILED; } @@ -260,7 +253,7 @@ S16 rgUIMRguBndCfm(Inst inst,SpId spId,uint8_t status) if (ret != ROK) { - RLOG0(L_ERROR,"RgUiRguBndCfm Failed "); + DU_LOG("\nERROR --> MAC : RgUiRguBndCfm Failed "); return (ret); } return (ret); @@ -299,7 +292,7 @@ S16 RgUiRguDDatReq(Pst *pst,SpId spId,RguDDatReqInfo *datReq) #ifndef NO_ERRCLS if (datReq == NULLP) { - RLOG0(L_ERROR,"Input Message Buffer is NULL"); + DU_LOG("\nERROR --> MAC : Input Message Buffer is NULL"); return RFAILED; } @@ -308,11 +301,11 @@ S16 RgUiRguDDatReq(Pst *pst,SpId spId,RguDDatReqInfo *datReq) switch (rgCb[inst].rguSap[spId].sapSta.sapState) { case LRG_BND: /* SAP is bound */ - RLOG0(L_DEBUG,"SAP is already bound"); + DU_LOG("\nDEBUG --> MAC : SAP is already bound"); break; default: /* Should never reach here */ #if (ERRCLASS & ERRCLS_ADD_RES) - RLOG1(L_ERROR,"Invalid SAP State:%d RgUiRguDDatReq failed", + DU_LOG("\nERROR --> MAC : Invalid SAP State:%d RgUiRguDDatReq failed", rgCb[inst].rguSap[spId].sapSta.sapState); #endif #ifndef L2_OPTMZ @@ -327,8 +320,7 @@ S16 RgUiRguDDatReq(Pst *pst,SpId spId,RguDDatReqInfo *datReq) else { #if (ERRCLASS & ERRCLS_ADD_RES) - RGLOGERROR(inst,ERRCLS_INT_PAR, ERG013, (ErrVal)spId, - "Invalid SAP Id:RgUiRguDDatReq failed\n"); + DU_LOG("\nERROR --> MAC : Invalid SAP Id:RgUiRguDDatReq failed\n"); #endif #ifndef L2_OPTMZ for(id3 = 0; id3 < datReq->nmbOfUeGrantPerTti; id3++) @@ -405,7 +397,7 @@ RguCDatReqInfo *datReq #ifndef NO_ERRCLS if (datReq == NULLP) { - RLOG0(L_ERROR,"Input Message Buffer is NULL"); + DU_LOG("\nERROR --> MAC : Input Message Buffer is NULL"); return RFAILED; } @@ -414,11 +406,11 @@ RguCDatReqInfo *datReq switch (rgCb[inst].rguSap[spId].sapSta.sapState) { case LRG_BND: /* SAP is bound */ - RLOG0(L_DEBUG,"SAP is already bound"); + DU_LOG("\nERROR --> MAC : SAP is already bound"); break; default: /* Should never reach here */ #if (ERRCLASS & ERRCLS_ADD_RES) - RLOG1(L_ERROR,"Invalid SAP State:%d RgUiRguCDatReq failed", + DU_LOG("\nERROR --> MAC : Invalid SAP State:%d RgUiRguCDatReq failed", rgCb[inst].rguSap[spId].sapSta.sapState); #endif return RFAILED; @@ -427,7 +419,7 @@ RguCDatReqInfo *datReq else { #if (ERRCLASS & ERRCLS_ADD_RES) - RLOG1(L_ERROR,"Invalid SAP Id:%d RgUiRguCDatReq failed ",spId); + DU_LOG("\nERROR --> MAC : Invalid SAP Id:%d RgUiRguCDatReq failed ",spId); #endif return RFAILED; } @@ -491,8 +483,7 @@ RguDStaRspInfo *staRsp ret = rgROMDedStaRsp(inst,staRsp); if (ret != ROK) { - RLOG_ARG0(L_ERROR,DBG_CELLID,staRsp->cellId, - "Processing Of Status Response Failed"); + DU_LOG("\nERROR --> MAC : Processing Of Status Response Failed"); } @@ -535,7 +526,7 @@ RguCStaRspInfo *staRsp #ifndef NO_ERRCLS if (staRsp == NULLP) { - RLOG0(L_ERROR,"Input Response Buffer is NULL"); + DU_LOG("\nERROR --> MAC : Input Response Buffer is NULL"); return RFAILED; } @@ -544,11 +535,11 @@ RguCStaRspInfo *staRsp switch (rgCb[inst].rguSap[spId].sapSta.sapState) { case LRG_BND: /* SAP is bound */ - RLOG0(L_DEBUG,"SAP is already bound"); + DU_LOG("\nDEBUG --> MAC : SAP is already bound"); break; default: /* Should never reach here */ #if (ERRCLASS & ERRCLS_ADD_RES) - RLOG1(L_ERROR,"Invalid SAP State:%d RgUiRguCStaRsp failed", + DU_LOG("\nERROR --> MAC : Invalid SAP State:%d RgUiRguCStaRsp failed", rgCb[inst].rguSap[spId].sapSta.sapState); #endif return RFAILED; @@ -557,7 +548,7 @@ RguCStaRspInfo *staRsp else { #if (ERRCLASS & ERRCLS_ADD_RES) - RLOG1(L_ERROR,"Invalid SAP Id:%d RgUiRguCStaRsp failed",spId); + DU_LOG("\nERROR --> MAC : Invalid SAP Id:%d RgUiRguCStaRsp failed",spId); #endif return RFAILED; } @@ -566,7 +557,7 @@ RguCStaRspInfo *staRsp ret = rgROMCmnStaRsp(inst,staRsp); if (ret != ROK) { - RLOG_ARG0(L_ERROR,DBG_CELLID,staRsp->cellId,"Processing Of Status Response Failed"); + DU_LOG("\nERROR --> MAC : Processing Of Status Response Failed"); return (ret); } @@ -609,7 +600,7 @@ RguL2MUlThrpMeasReqInfo *measReq #ifndef NO_ERRCLS if (measReq == NULLP) { - RLOG0(L_ERROR,"Input Response Buffer is NULL"); + DU_LOG("\nERROR --> MAC : Input Response Buffer is NULL"); return RFAILED; } @@ -618,11 +609,11 @@ RguL2MUlThrpMeasReqInfo *measReq switch (rgCb[inst].rguSap[spId].sapSta.sapState) { case LRG_BND: /* SAP is bound */ - RLOG0(L_DEBUG,"SAP is already bound"); + DU_LOG("\nERROR --> MAC : SAP is already bound"); break; default: /* Should never reach here */ #if (ERRCLASS & ERRCLS_ADD_RES) - RLOG1(L_ERROR,"Invalid SAP State:%d RgUiRguL2MUlThrpMeasReq failed", + DU_LOG("\nERROR --> MAC : Invalid SAP State:%d RgUiRguL2MUlThrpMeasReq failed", rgCb[inst].rguSap[spId].sapSta.sapState); #endif return RFAILED; @@ -631,7 +622,7 @@ RguL2MUlThrpMeasReqInfo *measReq else { #if (ERRCLASS & ERRCLS_ADD_RES) - RLOG1(L_ERROR,"Invalid SAP Id:%d RgUiRguL2MUlThrpMeasReq failed",spId); + DU_LOG("\nERROR --> MAC : Invalid SAP Id:%d RgUiRguL2MUlThrpMeasReq failed",spId); #endif return RFAILED; } @@ -640,7 +631,7 @@ RguL2MUlThrpMeasReqInfo *measReq ret = rgROML2MUlThrpMeasReq(inst,measReq); if (ret != ROK) { - RLOG_ARG0(L_ERROR,DBG_CELLID,measReq->cellId,"Processing Of Meas Request Failed"); + DU_LOG("\nERROR --> MAC : Processing Of Meas Request Failed"); } SPutStaticBuffer(pst->region, pst->pool, (Data *)measReq,sizeof(RguL2MUlThrpMeasReqInfo) , SS_SHARABLE_MEMORY); @@ -676,13 +667,13 @@ RgRguDedStaInd *staInd { S16 ret = ROK; - RGDBGPRM(inst,(rgPBuf(inst),"rgUIMSndDedStaInd(): staInd = %p;\n", (void *)staInd)); + DU_LOG("\nINFO --> MAC : rgUIMSndDedStaInd(): staInd = %p;\n", (void *)staInd); ret = RgUiRguDStaInd(&(rguSap->sapCfg.sapPst), rguSap->sapCfg.suId, staInd); if (ret != ROK) { - RLOG_ARG0(L_ERROR,DBG_CELLID,staInd->cellId,"RgUiRguDStaInd Failed"); + DU_LOG("\nERROR --> MAC : RgUiRguDStaInd Failed"); return (ret); } return (ret); @@ -720,7 +711,7 @@ RgRguCmnStaInd *staInd staInd); if (ret != ROK) { - RLOG_ARG0(L_ERROR,DBG_CELLID,staInd->cellId,"RgUiRguCStaInd Failed"); + DU_LOG("\nERROR --> MAC : RgUiRguCStaInd Failed"); return (ret); } return (ret); @@ -760,7 +751,7 @@ RgRguDedDatInd *datInd datInd); if (ret != ROK) { - RLOG_ARG0(L_ERROR,DBG_CELLID,datInd->cellId,"RgUiRguDdatInd Failed"); + DU_LOG("\nERROR --> MAC : RgUiRguDdatInd Failed"); return (ret); } #else @@ -793,17 +784,16 @@ S16 rgUIMSndCmnDatInd(Inst inst,RgUpSapCb *rguUlSap,RgRguCmnDatInd *datInd) { S16 ret = ROK; - RGDBGPRM(inst,(rgPBuf(inst),"rgUIMSndCmnDatInd(): staInd = %p;\n", (void *)datInd)); + DU_LOG("\nDEBUG --> MAC : rgUIMSndCmnDatInd(): staInd = %p;\n", (void *)datInd); rguUlSap->sapSts.numPduTxmit++; - RGDBGPRM(inst,(rgPBuf(inst),"rgUIMSndCmnDatInd suId = %d\n", rguUlSap->sapCfg.suId)); + DU_LOG("\nDEBUG --> MAC : rgUIMSndCmnDatInd suId = %d\n", rguUlSap->sapCfg.suId); ret = RgUiRguCDatInd(&(rguUlSap->sapCfg.sapPst), rguUlSap->sapCfg.suId, datInd); if (ret != ROK) { - RGDBGERRNEW(inst,(rgPBuf(inst),"RgUiRguCDatInd Failed\n")); - RLOG_ARG0(L_ERROR,DBG_CELLID,datInd->cellId,"RgUiRguCDatInd Failed"); + DU_LOG("\nERROR --> MAC : RgUiRguCDatInd Failed"); return (ret); } return (ret); @@ -862,11 +852,11 @@ S16 RgUiCrgBndReq(Pst *pst, SuId suId,SpId spId) rgFillDgnParams(inst,&dgn, LRG_USTA_DGNVAL_MEM); ret = rgLMMStaInd(inst,LCM_CATEGORY_INTERFACE,LRG_NOT_CFG, LCM_CAUSE_INV_SAP, &dgn); - RLOG0(L_DEBUG,"SAP Not Configured"); + DU_LOG("\nDEBUG --> MAC : SAP Not Configured"); ret = RgUiCrgBndCfm(&tmpPst, suId, CM_BND_NOK); break; case LRG_UNBND: /* SAP is not bound */ - RLOG0(L_DEBUG,"SAP Not yet bound"); + DU_LOG("\nERROR --> MAC : SAP Not yet bound"); rgCb[inst].crgSap.sapSta.sapState = LRG_BND; rgCb[inst].crgSap.sapCfg.suId = suId; @@ -878,13 +868,13 @@ S16 RgUiCrgBndReq(Pst *pst, SuId suId,SpId spId) LCM_CAUSE_UNKNOWN, &dgn); break; case LRG_BND: /* SAP is already bound*/ - RLOG0(L_DEBUG,"SAP is already bound"); + DU_LOG("\nDEBUG --> MAC : SAP is already bound"); ret = rgUIMCrgBndCfm(inst,suId, CM_BND_OK); break; default: /* Should Never Enter here */ #if (ERRCLASS & ERRCLS_ADD_RES) - RLOG1(L_ERROR,"Invalid SAP State:%d RgUiCrgBndReq failed", + DU_LOG("\nERROR --> MAC : Invalid SAP State:%d RgUiCrgBndReq failed", rgCb[inst].crgSap.sapSta.sapState); #endif ret = rgUIMCrgBndCfm(inst,suId, CM_BND_NOK); @@ -894,7 +884,7 @@ S16 RgUiCrgBndReq(Pst *pst, SuId suId,SpId spId) else { #if (ERRCLASS & ERRCLS_ADD_RES) - RLOG1(L_ERROR,"Invalid SAP Id:%d RgUiCrgBndReq failed", + DU_LOG("\nERROR --> MAC : Invalid SAP Id:%d RgUiCrgBndReq failed", rgCb[inst].crgSap.sapCfg.spId); #endif ret = rgUIMCrgBndCfm(inst,suId, CM_BND_NOK); @@ -934,13 +924,13 @@ S16 RgUiCrgUbndReq(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 --> MAC : SAP is already bound"); rgCb[inst].crgSap.sapSta.sapState = LRG_UNBND; break; default: #if (ERRCLASS & ERRCLS_ADD_RES) - RLOG1(L_ERROR,"Invalid SAP State:%d RgUiCrgUbndReq failed", + DU_LOG("\nERROR --> MAC : Invalid SAP State:%d RgUiCrgUbndReq failed", rgCb[inst].crgSap.sapSta.sapState); #endif return RFAILED; @@ -949,7 +939,7 @@ S16 RgUiCrgUbndReq(Pst *pst,SpId spId,Reason reason) else { #if (ERRCLASS & ERRCLS_ADD_RES) - RLOG1(L_ERROR,"Invalid SAP Id:%d RgUiCrgUbndReq failed", + DU_LOG("\nERROR --> MAC : Invalid SAP Id:%d RgUiCrgUbndReq failed", rgCb[inst].crgSap.sapCfg.spId); #endif return RFAILED; @@ -980,7 +970,7 @@ S16 rgUIMCrgBndCfm(Inst inst,SuId suId,uint8_t status) if(RgUiCrgBndCfm(&(rgCb[inst].crgSap.sapCfg.sapPst), rgCb[inst].crgSap.sapCfg.suId, status) != ROK) { - RLOG0(L_ERROR,"RgUiCrgBndCfm Failed "); + DU_LOG("\nERROR --> MAC : RgUiCrgBndCfm Failed "); return RFAILED; } @@ -1030,7 +1020,7 @@ CrgCfgReqInfo *cfgReqInfo /* CrgCfgReqInfo Validation for NULLP */ if (cfgReqInfo == NULLP) { - RLOG0(L_ERROR,"Input Param crgReqInfo is NULL "); + DU_LOG("\nERROR --> MAC : Input Param crgReqInfo is NULL "); rgUIMCrgCfgCfm(inst,transId, cfmStatus); return RFAILED; } @@ -1041,11 +1031,11 @@ CrgCfgReqInfo *cfgReqInfo switch(rgCb[inst].crgSap.sapSta.sapState) { case LRG_BND: /* SAP is already bound */ - RLOG0(L_DEBUG,"SAP is already bound"); + DU_LOG("\nDEBUG --> MAC : SAP is already bound"); break; default: /* Should never reach here */ #if (ERRCLASS & ERRCLS_ADD_RES) - RLOG1(L_ERROR,"Invalid SAP State:%d RgUiCrgCfgReq failed", + DU_LOG("\nERROR --> MAC : Invalid SAP State:%d RgUiCrgCfgReq failed", rgCb[inst].crgSap.sapSta.sapState); #endif SPutSBuf (pst->region, pst->pool, (Data *)cfgReqInfo, @@ -1059,7 +1049,7 @@ CrgCfgReqInfo *cfgReqInfo else { #if (ERRCLASS & ERRCLS_ADD_RES) - RLOG1(L_ERROR,"Invalid SAP Id:%d RgUiCrgCfgReq failed", + DU_LOG("\nERROR --> MAC : Invalid SAP Id:%d RgUiCrgCfgReq failed", rgCb[inst].crgSap.sapCfg.spId); #endif SPutSBuf (pst->region, pst->pool, (Data *)cfgReqInfo, @@ -1074,7 +1064,7 @@ CrgCfgReqInfo *cfgReqInfo cfgReqInfo = NULLP; if (ret != ROK) { - RLOG0(L_ERROR,"Configuration Request Handling Failed "); + DU_LOG("\nERROR --> MAC : Configuration Request Handling Failed "); return RFAILED; } @@ -1116,7 +1106,7 @@ uint8_t status ret = RgUiCrgCfgCfm(&(rgCb[inst].crgSap.sapCfg.sapPst), rgCb[inst].crgSap.sapCfg.suId, transId, status); if (ret != ROK) { - RLOG0(L_ERROR,"RgUiCrgCfgCfm Failed "); + DU_LOG("\nERROR --> MAC : RgUiCrgCfgCfm Failed "); return (ret); } diff --git a/src/5gnrmac/rg_utl.c b/src/5gnrmac/rg_utl.c index 5736fc8b2..c5e4025c6 100755 --- a/src/5gnrmac/rg_utl.c +++ b/src/5gnrmac/rg_utl.c @@ -32,9 +32,6 @@ @brief This file implements utility functions for LTE MAC */ -static const char* RLOG_MODULE_NAME="MAC"; -static int RLOG_MODULE_ID=4096; -static int RLOG_FILE_ID=179; /* header include files (.h) */ #include "common_def.h" @@ -138,16 +135,16 @@ Size size /* size */ /* Send an alarm to Layer Manager */ rgLMMStaInd(inst,LCM_CATEGORY_RESOURCE, LCM_EVENT_SMEM_ALLOC_FAIL, LCM_CAUSE_MEM_ALLOC_FAIL, &dgn); - RGLOGERROR(inst,ERRCLS_DEBUG, ERG028, 0, "Unable to Allocate Buffer"); + DU_LOG("\nERROR --> MAC : Unable to Allocate Buffer"); return RFAILED; } #ifndef ALIGN_64BIT - RGDBGINFO(inst,(rgPBuf(inst), "SGetSBuf(Region (%d), Pool (%d), Size (%ld)), Data (0x%p))\n", - rgCb[inst].rgInit.region, rgCb[inst].rgInit.pool, size, *pData)); + DU_LOG("\nDEBUG --> MAC : SGetSBuf(Region (%d), Pool (%d), Size (%ld)), Data (0x%p))\n", + rgCb[inst].rgInit.region, rgCb[inst].rgInit.pool, size, *pData); #else - RGDBGINFO(inst,(rgPBuf(inst), "SGetSBuf(Region (%d), Pool (%d), Size (%d)), Data (0x%p))\n", - rgCb[inst].rgInit.region, rgCb[inst].rgInit.pool, size, *pData)); + DU_LOG("\nDEBUG --> MAC : SGetSBuf(Region (%d), Pool (%d), Size (%d)), Data (0x%p))\n", + rgCb[inst].rgInit.region, rgCb[inst].rgInit.pool, size, *pData); #endif /* zero out the allocated memory */ @@ -204,7 +201,7 @@ Size size /* size */ /* Send an alarm to Layer Manager */ rgLMMStaInd(inst,LCM_CATEGORY_RESOURCE, LCM_EVENT_SMEM_ALLOC_FAIL, LCM_CAUSE_MEM_ALLOC_FAIL, &dgn); - RGLOGERROR(inst,ERRCLS_DEBUG, ERG028, 0, "Unable to Allocate Buffer"); + DU_LOG("\nERROR --> MAC : Unable to Allocate Buffer"); return RFAILED; } @@ -302,7 +299,7 @@ Size size /* size */ if (ret != ROK) { - RGLOGERROR(inst,ERRCLS_DEBUG, ERG029, (ErrVal) 0, "rgFreeSBuf failed.\n"); + DU_LOG("\nERROR --> MAC : rgFreeSBuf failed.\n"); return; } @@ -352,7 +349,7 @@ Buffer **mBuf /* Message Buffer pointer be returned */ /* Send an alarm to Layer Manager */ rgLMMStaInd(inst,LCM_CATEGORY_RESOURCE, LCM_EVENT_DMEM_ALLOC_FAIL, LCM_CAUSE_MEM_ALLOC_FAIL, &dgn); - RGLOGERROR(inst,ERRCLS_DEBUG, ERG030, 0, "Unable to Allocate Buffer"); + DU_LOG("\nERROR --> MAC : Unable to Allocate Buffer"); return RFAILED; } @@ -604,8 +601,7 @@ Size memSize #if (ERRCLASS & ERRCLS_DEBUG) if (memSize<= 0) { - RGLOGERROR(inst,ERRCLS_INT_PAR, ERG031, memSize, - "rgAllocEventMem(): memSize invalid\n"); + DU_LOG("\nERROR --> MAC : rgAllocEventMem(): memSize invalid\n"); return (RFAILED); } #endif /* ERRCLASS & ERRCLS_DEBUG */ @@ -623,7 +619,7 @@ Size memSize if(ROK != cmAllocEvnt(memSize, TFU_MAX_MEMBLK_SIZE, &sMem, memPtr)) #endif /* */ { - RLOG0(L_ERROR,"cmAllocEvnt Failed"); + DU_LOG("\nERROR --> MAC : cmAllocEvnt Failed"); return RFAILED; } @@ -742,13 +738,13 @@ S16 RgSchMacLcgRegReq(Pst *pst,RgInfLcgRegReq *lcgRegReq) (cell->cellId != lcgRegReq->cellId)) { - RLOG_ARG0(L_ERROR,DBG_CELLID,lcgRegReq->cellId,"Cell does not exist "); + DU_LOG("\nERROR --> MAC : Cell does not exist "); return RFAILED; } if ((ue = rgDBMGetUeCb(cell, lcgRegReq->crnti)) == NULLP) { - RLOG_ARG1(L_ERROR, DBG_CELLID,cell->cellId,"CRNTI:%d does not exist", + DU_LOG("\nERROR --> MAC : CRNTI:%d does not exist", lcgRegReq->crnti); return RFAILED; } @@ -789,13 +785,13 @@ S16 RgSchMacUlSpsResetReq(Pst *pst,RgInfUlSpsReset *ulSpsResetInfo) (cell->cellId != ulSpsResetInfo->cellId)) { - RLOG_ARG0(L_ERROR, DBG_CELLID,ulSpsResetInfo->cellId,"Cell does not exist "); + DU_LOG("\nERROR --> MAC : Cell does not exist "); return RFAILED; } if ((ue = rgDBMGetUeCb(cell, ulSpsResetInfo->crnti)) == NULLP) { - RLOG_ARG1(L_ERROR, DBG_CELLID,cell->cellId,"CRNTI:%d does not exist", + DU_LOG("\nERROR --> MAC : CRNTI:%d does not exist", ulSpsResetInfo->crnti); return RFAILED; } @@ -848,13 +844,13 @@ S16 RgSchMacSpsLcRegReq(Pst *pst,RgInfSpsLcInfo *lcInfo) (cell->cellId != lcInfo->cellId)) { - RLOG_ARG0(L_ERROR,DBG_CELLID,lcInfo->cellId, "Cell does not exist "); + DU_LOG("\nERROR --> MAC : Cell does not exist "); return RFAILED; } if ((ue = rgDBMGetUeCb(cell, lcInfo->crnti)) == NULLP) { - RLOG_ARG1(L_ERROR, DBG_CELLID,cell->cellId,"CRNTI:%d does not exist", + DU_LOG("\nERROR --> MAC : CRNTI:%d does not exist", lcInfo->crnti); return RFAILED; } @@ -872,8 +868,7 @@ S16 RgSchMacSpsLcRegReq(Pst *pst,RgInfSpsLcInfo *lcInfo) /* Insert the UE into SPS UE List */ if (rgDBMInsSpsUeCb(cell, ue) == RFAILED) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, - "Ue insertion into SPS list failed SPS CRNTI:%d", ue->spsRnti); + DU_LOG("\nERROR --> MAC : Ue insertion into SPS list failed SPS CRNTI:%d", ue->spsRnti); return RFAILED; } @@ -918,13 +913,13 @@ S16 RgSchMacSpsLcDeregReq(Pst *pst,CmLteCellId cellId,CmLteRnti crnti) (cell->cellId != cellId)) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cellId, "Cell does not exist "); + DU_LOG("\nERROR --> MAC : Cell does not exist "); return RFAILED; } if ((ue = rgDBMGetUeCb(cell, crnti)) == NULLP) { - RLOG_ARG1(L_ERROR, DBG_CELLID,cellId,"CRNTI:%d Ue does not exist", crnti); + DU_LOG("\nERROR --> MAC : CRNTI:%d Ue does not exist", crnti); return RFAILED; } @@ -973,13 +968,12 @@ CmLteRnti newRnti newUe = rgDBMGetUeCbFromRachLst(cell, newRnti); if ((ue == NULLP) || (newUe == NULLP)) { - RLOG_ARG4(L_ERROR,DBG_CELLID,cell->cellId, - "RNTI:%d Failed to get UECB[%lu:%lu] or NEW RNTI:%d", + DU_LOG("\nERROR --> MAC : RNTI:%d Failed to get UECB[%lu:%lu] or NEW RNTI:%d", rnti, ((PTR)ue), ((PTR)newUe), newRnti); return RFAILED; } #ifdef XEON_SPECIFIC_CHANGES - CM_LOG_DEBUG(CM_LOG_ID_MAC, "MAC:UE[%d] id changed to %d\n", rnti, newRnti); + DU_LOG("\nDEBUG --> MAC : MAC:UE[%d] id changed to %d\n", rnti, newRnti); #endif rgDBMDelUeCb(cell, ue); @@ -1069,19 +1063,18 @@ S16 rgUtlVltdAddSCellCfg(RgPrgUeSCellCfgInfo *ueSCellCb,RgCellCb *cell,Inst inst if((cell == NULLP) || (cell->cellId != ueSCellCb->cellId)) { - RGDBGERRNEW(inst, (rgPBuf(inst), - "[%d]Sec Cell does not exit %d\n", - ueSCellCb->ueId, ueSCellCb->cellId)); + DU_LOG("\nERROR --> MAC : [%d]Sec Cell does not exit %d\n", + ueSCellCb->ueId, ueSCellCb->cellId); ret = RFAILED; } #ifdef TENB_MULT_CELL_SUPPRT if((ueSCellCb->rguDlSapId > rgCb[inst].numRguSaps) || (ueSCellCb->rguUlSapId > rgCb[inst].numRguSaps)) { - RGDBGERRNEW(inst,(rgPBuf(inst), "Invald Sap Id: DL %d UL %d for ueId %d failed\n", + DU_LOG("\nERROR --> MAC : Invald Sap Id: DL %d UL %d for ueId %d failed\n", ueSCellCb->rguDlSapId, ueSCellCb->rguUlSapId, - ueSCellCb->cellId)); + ueSCellCb->cellId); ret = RFAILED; } #endif @@ -1127,8 +1120,8 @@ TfuDelDatReqInfo delDatReq; ue = rgDBMGetUeCb(cell, newRnti); if (ue == NULLP) { - RGDBGERRNEW(inst,(rgPBuf(inst),"[%d]RNTI:Failed to get ueCb \ - newRnti=%d\n", rnti, newRnti)); + DU_LOG("\nERROR --> MAC : [%d]RNTI:Failed to get ueCb \ + newRnti=%d\n", rnti, newRnti); return RFAILED; } /* For all added SCells, prepare and send ueIdChngReq */ @@ -1202,8 +1195,7 @@ static Void rgUtlHndlCrntiRls(RgCellCb *cell,RgInfRlsRnti *rlsRnti) } else { - RLOG_ARG1(L_WARNING,DBG_CELLID,cell->cellId, - "RNTI:%d No ueCb found in RachLst",rlsRnti->rnti); + DU_LOG("\nERROR --> MAC : RNTI:%d No ueCb found in RachLst",rlsRnti->rnti); } } else @@ -1231,8 +1223,7 @@ static Void rgUtlHndlCrntiRls(RgCellCb *cell,RgInfRlsRnti *rlsRnti) { if((ue=rgDBMGetUeCbFromRachLst (cell, rlsRnti->rnti)) != NULLP) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, - "RNTI:%d STALE UE is still present", rlsRnti->rnti); + DU_LOG("\nERROR --> MAC : RNTI:%d STALE UE is still present", rlsRnti->rnti); } } } @@ -1282,8 +1273,7 @@ TfuDelDatReqInfo delDatReq; (cell->cellId != rlsRnti->cellId)) { - RLOG_ARG1(L_ERROR,DBG_CELLID,rlsRnti->cellId, - "No cellCb found with cellId for RNTI:%d", + DU_LOG("\nERROR --> MAC : No cellCb found with cellId for RNTI:%d", rlsRnti->rnti); return RFAILED; } @@ -1296,8 +1286,7 @@ TfuDelDatReqInfo delDatReq; * is dummy */ if (rgUtlHndlCrntiChng(macInst,cell, rlsRnti->rnti, rlsRnti->newRnti) != ROK) { - RLOG_ARG2(L_ERROR,DBG_CELLID,rlsRnti->cellId, - "CRNTI change failed for RNTI:%d new RNTI:%d", + DU_LOG("\nERROR --> MAC : CRNTI change failed for RNTI:%d new RNTI:%d", rlsRnti->rnti,rlsRnti->newRnti); return RFAILED; }