X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Frg_sch.c;h=f0420259bc31a1696142131ff2b6cfc4a1f652af;hb=3330932565e15a749fd5dd5039cdea2862ca51cc;hp=b002d90e03d3e89f6c1444683c2e2c5450c15ab4;hpb=5d74fef7c9fe6b65a965ceac6bfe812872dab323;p=o-du%2Fl2.git diff --git a/src/5gnrsch/rg_sch.c b/src/5gnrsch/rg_sch.c index b002d90e0..f0420259b 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" @@ -47,8 +44,6 @@ static int RLOG_MODULE_ID=4096; #include "rg_sch.h" #include "rg_sch_err.h" #include "rg_sch_cmn.h" -#include "rl_interface.h" -#include "rl_common.h" /* header/extern include files (.x) */ #include "tfu.x" /* TFU types */ @@ -60,8 +55,8 @@ static int RLOG_MODULE_ID=4096; #include "rg_sch_cmn.x" #ifdef EMTC_ENABLE -EXTERN S16 rgEmtcMacSchUeDelInd ARGS((RgSchCellCb *cell,RgInfUeDelInd *ueDelInd)); -EXTERN S16 rgSCHGomEmtcHndlSiCfg ARGS(( +S16 rgEmtcMacSchUeDelInd ARGS((RgSchCellCb *cell,RgInfUeDelInd *ueDelInd)); +S16 rgSCHGomEmtcHndlSiCfg ARGS(( Region reg, Pool pool, RgSchCb *instCb, @@ -69,7 +64,7 @@ SpId spId, RgrCfgTransId transId, RgrSiCfgReqInfo *cfgReqInfo )); -EXTERN S16 rgSCHGomEmtcHndlWarningSiCfg ARGS(( +S16 rgSCHGomEmtcHndlWarningSiCfg ARGS(( Region reg, Pool pool, RgSchCb *instCb, @@ -100,17 +95,11 @@ RgrWarningSiCfgReqInfo *warningSiCfgReqInfo * @return S16 * -# ROK **/ -#ifdef ANSI S16 RgMiLrgSchCntrlReq ( Pst *pst, /* post structure */ RgMngmt *cntrl /* control structure */ ) -#else -S16 RgMiLrgSchCntrlReq(pst, cntrl) -Pst *pst; /* post structure */ -RgMngmt *cntrl; /* control structure */ -#endif { S16 ret = ROK; /* return value */ Pst cfmPst; @@ -125,7 +114,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; } */ @@ -147,7 +136,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; } @@ -166,7 +155,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; } @@ -190,17 +179,11 @@ RgMngmt *cntrl; /* control structure */ * @return S16 * -# ROK **/ -#ifdef ANSI S16 RgMiLrgSchL2MeasReq ( Pst *pst, /* post structure */ LrgSchMeasReqInfo *measInfo /* Meas Req Info */ ) -#else -S16 RgMiLrgSchL2MeasReq(pst, measInfo) - Pst *pst; /* post structure */ - LrgSchMeasReqInfo *measInfo; /* Meas Req Info */ -#endif { Pst cfmPst; RgSchCellCb *cell; @@ -210,7 +193,7 @@ S16 RgMiLrgSchL2MeasReq(pst, measInfo) #if (ERRCLASS & ERRCLS_ADD_RES) CmLList *lnk; #endif - U32 idx; + uint32_t idx; RgSchL2MeasCb *measCb = NULLP; #ifdef DEBUGP Inst inst = (pst->dstInst - SCH_INST_START); /* Scheduler instance Id */ @@ -238,8 +221,7 @@ S16 RgMiLrgSchL2MeasReq(pst, measInfo) 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; } @@ -249,8 +231,7 @@ S16 RgMiLrgSchL2MeasReq(pst, measInfo) 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; } @@ -267,8 +248,7 @@ S16 RgMiLrgSchL2MeasReq(pst, measInfo) 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; } @@ -281,8 +261,7 @@ S16 RgMiLrgSchL2MeasReq(pst, measInfo) 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; } @@ -304,25 +283,19 @@ S16 RgMiLrgSchL2MeasReq(pst, measInfo) * @return S16 * -# ROK **/ -#ifdef ANSI S16 RgMiLrgSchL2MeasStopReq ( Pst *pst, /* post structure */ LrgSchMeasStopReqInfo *measInfo /* Meas Req Info */ ) -#else -S16 RgMiLrgSchL2MeasStopReq(pst, measInfo) - Pst *pst; /* post structure */ - LrgSchMeasStopReqInfo *measInfo; /* Meas Req Info */ -#endif { - S16 ret = ROK; - RgSchCellCb *cell = NULLP; - RgSchCb *instCb = &rgSchCb[(pst->dstInst - SCH_INST_START)]; - CmLList *node = NULLP; - RgSchL2MeasCb *measCb = NULLP; + S16 ret = ROK; + RgSchCellCb *cell = NULLP; + RgSchCb *instCb = &rgSchCb[(pst->dstInst - SCH_INST_START)]; + CmLList *node = NULLP; + RgSchL2MeasCb *measCb = NULLP; LrgSchMeasCfmInfo measCfm; - U8 idx; + uint8_t idx; for (idx = 0; idx < instCb->numSaps; idx++) { @@ -335,8 +308,7 @@ S16 RgMiLrgSchL2MeasStopReq(pst, measInfo) } 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)); @@ -385,22 +357,16 @@ S16 RgMiLrgSchL2MeasStopReq(pst, measInfo) * @return S16 * -# ROK **/ -#ifdef ANSI S16 RgMiLrgSchL2MeasSendReq ( Pst *pst, /* post structure */ LrgSchMeasSndReqInfo *measInfo /* Meas Req Info */ ) -#else -S16 RgMiLrgSchL2MeasSendReq(pst, measInfo) - Pst *pst; /* post structure */ - LrgSchMeasSndReqInfo *measInfo; /* Meas Req Info */ -#endif { S16 ret = ROK; RgSchCellCb *cell; RgSchCb *instCb = &rgSchCb[(pst->dstInst - SCH_INST_START)]; - U8 idx; + uint8_t idx; cell = NULLP; for (idx = 0; idx < instCb->numSaps; idx++) @@ -414,8 +380,7 @@ S16 RgMiLrgSchL2MeasSendReq(pst, measInfo) } 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; } @@ -463,19 +428,7 @@ S16 RgMiLrgSchL2MeasSendReq(pst, measInfo) * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 RgUiRgrBndReq -( - Pst *pst, - SuId suId, - SpId spId - ) -#else -S16 RgUiRgrBndReq(pst, suId, spId) - Pst *pst; - SuId suId; - SpId spId; -#endif +S16 RgUiRgrBndReq(Pst *pst, SuId suId, SpId spId) { S16 ret = ROK; Pst tmpPst; /* Temporary Post Structure */ @@ -503,7 +456,7 @@ S16 RgUiRgrBndReq(pst, suId, 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 */ @@ -514,14 +467,12 @@ S16 RgUiRgrBndReq(pst, suId, 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; @@ -532,8 +483,7 @@ S16 RgUiRgrBndReq(pst, suId, 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); } @@ -559,19 +509,7 @@ S16 RgUiRgrBndReq(pst, suId, spId) * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 RgUiRgrUbndReq -( - Pst *pst, - SpId spId, - Reason reason - ) -#else -S16 RgUiRgrUbndReq(pst, spId, reason) - Pst *pst; - SpId spId; - Reason reason; -#endif +S16 RgUiRgrUbndReq(Pst *pst,SpId spId,Reason reason) { Inst instId = pst->dstInst-SCH_INST_START; @@ -581,15 +519,13 @@ S16 RgUiRgrUbndReq(pst, spId, 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; } @@ -597,9 +533,7 @@ S16 RgUiRgrUbndReq(pst, spId, 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; } @@ -628,25 +562,11 @@ S16 RgUiRgrUbndReq(pst, spId, reason) * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 RgUiRgrSiCfgReq -( -Pst *pst, -SpId spId, -RgrCfgTransId transId, -RgrSiCfgReqInfo *cfgReqInfo -) -#else -S16 RgUiRgrSiCfgReq(pst, spId, transId, cfgReqInfo) -Pst *pst; -SpId spId; -RgrCfgTransId transId; -RgrSiCfgReqInfo *cfgReqInfo; -#endif +S16 RgUiRgrSiCfgReq(Pst *pst, SpId spId,RgrCfgTransId transId,RgrSiCfgReqInfo *cfgReqInfo) { S16 ret = ROK; - U8 cfmStatus = RGR_CFG_CFM_NOK; - U8 prntTrans[RGR_CFG_TRANSID_SIZE+1]; + uint8_t cfmStatus = RGR_CFG_CFM_NOK; + uint8_t prntTrans[RGR_CFG_TRANSID_SIZE+1]; Inst instId = pst->dstInst-SCH_INST_START; memcpy(prntTrans, transId.trans, RGR_CFG_TRANSID_SIZE); @@ -655,8 +575,7 @@ RgrSiCfgReqInfo *cfgReqInfo; 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; } @@ -666,9 +585,7 @@ RgrSiCfgReqInfo *cfgReqInfo; 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)); @@ -679,9 +596,7 @@ RgrSiCfgReqInfo *cfgReqInfo; 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)); @@ -710,7 +625,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; } @@ -740,35 +655,19 @@ else * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 RgUiRgrWarningSiCfgReq -( -Pst *pst, -SpId spId, -RgrCfgTransId transId, -RgrWarningSiCfgReqInfo *warningSiCfgReqInfo -) -#else -S16 RgUiRgrWarningSiCfgReq(pst, spId, transId, warningSiCfgReqInfo) -Pst *pst; -SpId spId; -RgrCfgTransId transId; -RgrWarningSiCfgReqInfo *warningSiCfgReqInfo; -#endif +S16 RgUiRgrWarningSiCfgReq(Pst *pst, SpId spId,RgrCfgTransId transId,RgrWarningSiCfgReqInfo *warningSiCfgReqInfo) { Inst instId = pst->dstInst-SCH_INST_START; S16 ret = ROK; - U8 cfmStatus = RGR_CFG_CFM_NOK; - U8 prntTrans[RGR_CFG_TRANSID_SIZE+1]; + uint8_t cfmStatus = RGR_CFG_CFM_NOK; + uint8_t prntTrans[RGR_CFG_TRANSID_SIZE+1]; memcpy(prntTrans, transId.trans, RGR_CFG_TRANSID_SIZE); prntTrans[RGR_CFG_TRANSID_SIZE] = '\0'; - - 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; @@ -779,9 +678,7 @@ RgrWarningSiCfgReqInfo *warningSiCfgReqInfo; 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); @@ -795,9 +692,7 @@ RgrWarningSiCfgReqInfo *warningSiCfgReqInfo; 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); @@ -826,8 +721,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; } @@ -855,21 +749,7 @@ else * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 RgUiRgrWarningSiStopReq -( -Pst *pst, -SpId spId, -RgrCfgTransId transId, -U8 siId -) -#else -S16 RgUiRgrWarningSiStopReq(pst,spId, transId, siId) -Pst *pst; -SpId spId; -RgrCfgTransId transId; -U8 siId; -#endif +S16 RgUiRgrWarningSiStopReq(Pst *pst,SpId spId,RgrCfgTransId transId,uint8_t siId) { Inst instId = pst->dstInst-SCH_INST_START; @@ -878,9 +758,7 @@ U8 siId; 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; } @@ -888,9 +766,7 @@ U8 siId; 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; } @@ -925,24 +801,10 @@ U8 siId; * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 RgUiRgrLoadInfReq -( - Pst *pst, - SpId spId, - RgrCfgTransId transId, - RgrLoadInfReqInfo *loadInfReq - ) -#else -S16 RgUiRgrLoadInfReq(pst, spId, transId, loadInfReq) - Pst *pst; - SpId spId; - RgrCfgTransId transId; - RgrLoadInfReqInfo *loadInfReq; -#endif +S16 RgUiRgrLoadInfReq(Pst *pst, SpId spId, RgrCfgTransId transId,RgrLoadInfReqInfo *loadInfReq) { S16 ret = ROK; - U8 prntTrans[RGR_CFG_TRANSID_SIZE+1]; + uint8_t prntTrans[RGR_CFG_TRANSID_SIZE+1]; Inst instId = pst->dstInst-SCH_INST_START; memcpy(prntTrans, transId.trans, RGR_CFG_TRANSID_SIZE); @@ -951,7 +813,7 @@ S16 RgUiRgrLoadInfReq(pst, spId, transId, loadInfReq) if (loadInfReq == NULLP) { - RLOG_ARG0(L_ERROR,DBG_INSTID,instId,"Input Message Buffer " + DU_LOG("\nERROR --> SCH : Input Message Buffer " "is NULL"); return RFAILED; } @@ -961,9 +823,7 @@ S16 RgUiRgrLoadInfReq(pst, spId, transId, loadInfReq) 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)); @@ -973,9 +833,7 @@ S16 RgUiRgrLoadInfReq(pst, spId, transId, loadInfReq) 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)); @@ -988,8 +846,7 @@ S16 RgUiRgrLoadInfReq(pst, spId, transId, loadInfReq) 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; } @@ -1014,30 +871,18 @@ S16 RgUiRgrLoadInfReq(pst, spId, transId, loadInfReq) * @return S16 * -# ROK **/ -#ifdef ANSI -S16 RgMacSchDedBoUpdtReq -( -Pst* pst, -RgInfDedBoRpt *boRpt -) -#else -S16 RgMacSchDedBoUpdtReq(pst, boRpt) -Pst* pst; -RgInfDedBoRpt *boRpt; -#endif +S16 RgMacSchDedBoUpdtReq(Pst* pst,RgInfDedBoRpt *boRpt) { RgSchCellCb *cell; RgSchUeCb *ue; #ifdef SCH_STATS - RgSchCmnDlUe *dlUe; + RgSchCmnDlUe *dlUe; #endif - 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 @@ -1048,8 +893,7 @@ 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 @@ -1152,17 +996,7 @@ RgInfDedBoRpt *boRpt; * @return S16 * -# ROK **/ -#ifdef ANSI -S16 RgMacSchCmnBoUpdtReq -( -Pst* pst, -RgInfCmnBoRpt *boRpt -) -#else -S16 RgMacSchCmnBoUpdtReq(pst, boRpt) -Pst* pst; -RgInfCmnBoRpt *boRpt; -#endif +S16 RgMacSchCmnBoUpdtReq(Pst* pst,RgInfCmnBoRpt *boRpt) { RgSchCellCb *cell; Inst inst = (pst->dstInst - SCH_INST_START); @@ -1174,7 +1008,7 @@ 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; } @@ -1182,7 +1016,7 @@ 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); } @@ -1209,17 +1043,7 @@ RgInfCmnBoRpt *boRpt; * @return S16 * -# ROK **/ -#ifdef ANSI -S16 RgMacSchUeDelInd -( -Pst* pst, -RgInfUeDelInd *ueDelInd -) -#else -S16 RgMacSchUeDelInd(pst, ueDelInd) -Pst* pst; -RgInfUeDelInd *ueDelInd; -#endif +S16 RgMacSchUeDelInd(Pst* pst,RgInfUeDelInd *ueDelInd) { RgSchCellCb *cell; Inst inst = (pst->dstInst - SCH_INST_START); @@ -1229,7 +1053,7 @@ 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; @@ -1237,8 +1061,7 @@ 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; } @@ -1254,8 +1077,7 @@ 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; @@ -1270,8 +1092,8 @@ 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; @@ -1295,17 +1117,7 @@ RgInfUeDelInd *ueDelInd; * @return S16 * -# ROK **/ -#ifdef ANSI -S16 RgMacSchSfRecpInd -( -Pst* pst, -RgInfSfDatInd *subfrmInfo -) -#else -S16 RgMacSchSfRecpInd(pst, subfrmInfo) -Pst* pst; -RgInfSfDatInd *subfrmInfo; -#endif +S16 RgMacSchSfRecpInd(Pst* pst,RgInfSfDatInd *subfrmInfo) { S16 ret = RFAILED; RgSchErrInfo err; @@ -1323,16 +1135,16 @@ RgInfSfDatInd *subfrmInfo; RgSchCmnUlUeSpsInfo *ulSpsUe ; #endif /* RRM_RBC_X */ - U32 idx; + uint32_t idx; /* RRM_RBC_Y */ #ifdef LTE_L2_MEAS - U8 qci; - U16 datIndActQci = 0; - U16 combDatIndActQci = 0; /* Prev and Latest Dat Ind combined */ - U16 tempUeActQci = 0; /* UE specific Active QCIs */ - U16 diffBits = 0; - U8 lcCount; + uint8_t qci; + uint16_t datIndActQci = 0; + uint16_t combDatIndActQci = 0; /* Prev and Latest Dat Ind combined */ + uint16_t tempUeActQci = 0; /* UE specific Active QCIs */ + uint16_t diffBits = 0; + uint8_t lcCount; #endif /* No need to chk for cell being NULL as MAC wouldn't have found instance if @@ -1374,8 +1186,7 @@ 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; } @@ -1387,7 +1198,7 @@ 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; @@ -1398,7 +1209,7 @@ 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; } @@ -1423,8 +1234,7 @@ 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); @@ -1445,7 +1255,7 @@ 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; } @@ -1465,7 +1275,7 @@ 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; } @@ -1529,7 +1339,7 @@ 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; } @@ -1570,17 +1380,7 @@ RgInfSfDatInd *subfrmInfo; * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 RgMacSchSpsRelInd -( -Pst *pst, -RgInfSpsRelInfo *relInfo -) -#else -S16 RgMacSchSpsRelInd(pst, relInfo) -Pst *pst; -RgInfSpsRelInfo *relInfo; -#endif +S16 RgMacSchSpsRelInd(Pst *pst,RgInfSpsRelInfo *relInfo) { RgSchUeCb *ue; RgSchCellCb *cell; @@ -1593,15 +1393,13 @@ 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; @@ -1630,28 +1428,18 @@ RgInfSpsRelInfo *relInfo; * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 RgMacSchL2MeasCfm -( -Pst *pst, -RgInfL2MeasCfm *measCfm -) -#else -S16 RgMacSchL2MeasCfm(pst, measCfm) -Pst *pst; -RgInfL2MeasCfm *measCfm; -#endif +S16 RgMacSchL2MeasCfm(Pst *pst, RgInfL2MeasCfm *measCfm) { RgSchCellCb *cell = NULLP; Inst inst = (pst->dstInst - SCH_INST_START); CmLList *lnk; RgSchL2MeasCb *measCb = NULLP; RgSchCb *instCb = &rgSchCb[inst]; - U32 idx; + uint32_t idx; LrgSchMeasCfmInfo schMeasCfm; - U8 qciVal; - U8 idx1; /*LTE_L2_MEAS_PHASE2*/ - U8 qciVal1; + uint8_t qciVal; + uint8_t idx1; /*LTE_L2_MEAS_PHASE2*/ + uint8_t qciVal1; /* Find the cellCb using cellId in measInfo. Iterate through all cells * in rgrsapCb in RgschCb */ @@ -1667,8 +1455,7 @@ 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; } @@ -1756,17 +1543,7 @@ RgInfL2MeasCfm *measCfm; * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 RgMacSchL2MeasStopCfm -( -Pst *pst, -RgInfL2MeasCfm *measCfm -) -#else -S16 RgMacSchL2MeasStopCfm(pst, measCfm) -Pst *pst; -RgInfL2MeasCfm *measCfm; -#endif +S16 RgMacSchL2MeasStopCfm(Pst *pst,RgInfL2MeasCfm *measCfm) { LrgSchMeasCfmInfo schMeasCfm; Inst inst = (pst->dstInst - SCH_INST_START); @@ -1796,24 +1573,12 @@ RgInfL2MeasCfm *measCfm; * * @param[in] Pst *pst * @param[in] SuId suId - * @param[in] U8 status + * @param[in] uint8_t status * @return S16 * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 RgLiTfuSchBndCfm -( -Pst *pst, -SuId suId, -U8 status -) -#else -S16 RgLiTfuSchBndCfm(pst, suId, status) -Pst *pst; -SuId suId; -U8 status; -#endif +S16 RgLiTfuSchBndCfm (Pst *pst,SuId suId, uint8_t status) { S16 ret; RgSchLowSapCb *tfuSap; @@ -1821,7 +1586,7 @@ U8 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 */ @@ -1829,7 +1594,7 @@ U8 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; } @@ -1855,26 +1620,14 @@ U8 status; * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 RgLiTfuRaReqInd -( -Pst *pst, -SuId suId, -TfuRaReqIndInfo *raReqInd -) -#else -S16 RgLiTfuRaReqInd(pst, suId, raReqInd) -Pst *pst; -SuId suId; -TfuRaReqIndInfo *raReqInd; -#endif +S16 RgLiTfuRaReqInd(Pst *pst,SuId suId, TfuRaReqIndInfo *raReqInd) { S16 ret; Inst inst = pst->dstInst-SCH_INST_START; 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); @@ -1882,13 +1635,13 @@ 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; } @@ -1917,26 +1670,14 @@ TfuRaReqIndInfo *raReqInd; * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 RgLiTfuUlCqiInd -( -Pst *pst, -SuId suId, -TfuUlCqiIndInfo *ulCqiInd -) -#else -S16 RgLiTfuUlCqiInd(pst, suId, ulCqiInd) -Pst *pst; -SuId suId; -TfuUlCqiIndInfo *ulCqiInd; -#endif +S16 RgLiTfuUlCqiInd(Pst *pst, SuId suId, TfuUlCqiIndInfo *ulCqiInd) { S16 ret; Inst inst = pst->dstInst-SCH_INST_START; 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); @@ -1944,7 +1685,7 @@ 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; @@ -1972,26 +1713,14 @@ TfuUlCqiIndInfo *ulCqiInd; * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 RgLiTfuPucchDeltaPwrInd -( -Pst *pst, -SuId suId, -TfuPucchDeltaPwrIndInfo *pucchDeltaPwr -) -#else -S16 RgLiTfuPucchDeltaPwrInd(pst, suId, pucchDeltaPwr) -Pst *pst; -SuId suId; -TfuPucchDeltaPwrIndInfo *pucchDeltaPwr; -#endif +S16 RgLiTfuPucchDeltaPwrInd(Pst *pst,SuId suId,TfuPucchDeltaPwrIndInfo *pucchDeltaPwr) { S16 ret; Inst inst = pst->dstInst-SCH_INST_START; 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); @@ -1999,7 +1728,7 @@ TfuPucchDeltaPwrIndInfo *pucchDeltaPwr; 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); @@ -2028,19 +1757,7 @@ TfuPucchDeltaPwrIndInfo *pucchDeltaPwr; * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 RgLiTfuHqInd -( -Pst *pst, -SuId suId, -TfuHqIndInfo *harqAckInd -) -#else -S16 RgLiTfuHqInd(pst, suId, harqAckInd) -Pst *pst; -SuId suId; -TfuHqIndInfo *harqAckInd; -#endif +S16 RgLiTfuHqInd(Pst *pst, SuId suId, TfuHqIndInfo *harqAckInd) { S16 ret; Inst inst = (pst->dstInst - SCH_INST_START); @@ -2049,14 +1766,14 @@ 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 @@ -2087,19 +1804,7 @@ TfuHqIndInfo *harqAckInd; * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 RgLiTfuSrInd -( -Pst *pst, -SuId suId, -TfuSrIndInfo *srInd -) -#else -S16 RgLiTfuSrInd(pst, suId, srInd) -Pst *pst; -SuId suId; -TfuSrIndInfo *srInd; -#endif +S16 RgLiTfuSrInd(Pst *pst, SuId suId, TfuSrIndInfo *srInd) { S16 ret; Inst inst = pst->dstInst-SCH_INST_START; @@ -2107,14 +1812,14 @@ 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 @@ -2144,26 +1849,14 @@ TfuSrIndInfo *srInd; * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 RgLiTfuDlCqiInd -( -Pst *pst, -SuId suId, -TfuDlCqiIndInfo *dlCqiInd -) -#else -S16 RgLiTfuDlCqiInd(pst, suId, dlCqiInd) -Pst *pst; -SuId suId; -TfuDlCqiIndInfo *dlCqiInd; -#endif +S16 RgLiTfuDlCqiInd(Pst *pst, SuId suId, TfuDlCqiIndInfo *dlCqiInd) { S16 ret; Inst inst = pst->dstInst-SCH_INST_START; 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); @@ -2171,7 +1864,7 @@ 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); @@ -2199,19 +1892,7 @@ TfuDlCqiIndInfo *dlCqiInd; * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 RgLiTfuRawCqiInd -( -Pst *pst, -SuId suId, -TfuRawCqiIndInfo *rawCqiInd -) -#else -S16 RgLiTfuRawCqiInd(pst, suId, rawCqiInd) -Pst *pst; -SuId suId; -TfuRawCqiIndInfo *rawCqiInd; -#endif +S16 RgLiTfuRawCqiInd(Pst *pst, SuId suId, TfuRawCqiIndInfo *rawCqiInd) { S16 ret; Inst inst = pst->dstInst-SCH_INST_START; @@ -2219,7 +1900,7 @@ 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); @@ -2227,7 +1908,7 @@ 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 @@ -2255,26 +1936,14 @@ TfuRawCqiIndInfo *rawCqiInd; * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 RgLiTfuSrsInd -( -Pst *pst, -SuId suId, -TfuSrsIndInfo *srsInd -) -#else -S16 RgLiTfuSrsInd(pst, suId, srsInd) -Pst *pst; -SuId suId; -TfuSrsIndInfo *srsInd; -#endif +S16 RgLiTfuSrsInd(Pst *pst, SuId suId, TfuSrsIndInfo *srsInd) { S16 ret; Inst inst = pst->dstInst-SCH_INST_START; 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); @@ -2282,7 +1951,7 @@ 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); @@ -2311,26 +1980,14 @@ TfuSrsIndInfo *srsInd; * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 RgLiTfuDoaInd -( -Pst *pst, -SuId suId, -TfuDoaIndInfo *doaInd -) -#else -S16 RgLiTfuDoaInd(pst, suId, doaInd) -Pst *pst; -SuId suId; -TfuDoaIndInfo *doaInd; -#endif +S16 RgLiTfuDoaInd(Pst *pst, SuId suId, TfuDoaIndInfo *doaInd) { S16 ret; Inst inst = pst->dstInst-SCH_INST_START; 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); @@ -2338,7 +1995,7 @@ 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); @@ -2363,19 +2020,7 @@ TfuDoaIndInfo *doaInd; * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 RgLiTfuCrcInd -( -Pst *pst, -SuId suId, -TfuCrcIndInfo *crcInd -) -#else -S16 RgLiTfuCrcInd (pst, suId, crcInd) -Pst *pst; -SuId suId; -TfuCrcIndInfo *crcInd; -#endif +S16 RgLiTfuCrcInd(Pst *pst, SuId suId, TfuCrcIndInfo *crcInd) { S16 ret; Inst inst = pst->dstInst-SCH_INST_START; @@ -2387,14 +2032,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 @@ -2426,26 +2071,14 @@ gettimeofday(&end6, NULL); * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 RgLiTfuTimingAdvInd -( -Pst *pst, -SuId suId, -TfuTimingAdvIndInfo *timingAdvInd -) -#else -S16 RgLiTfuTimingAdvInd(pst, suId, timingAdvInd) -Pst *pst; -SuId suId; -TfuTimingAdvIndInfo *timingAdvInd; -#endif +S16 RgLiTfuTimingAdvInd(Pst *pst, SuId suId, TfuTimingAdvIndInfo *timingAdvInd) { S16 ret; Inst inst = pst->dstInst-SCH_INST_START; 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); @@ -2453,7 +2086,7 @@ 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 */ @@ -2483,19 +2116,7 @@ TfuTimingAdvIndInfo *timingAdvInd; * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 RgUiRgmBndReq -( -Pst *pst, -SuId suId, -SpId spId -) -#else -S16 RgUiRgmBndReq(pst, suId, spId) -Pst *pst; -SuId suId; -SpId spId; -#endif +S16 RgUiRgmBndReq(Pst *pst,SuId suId,SpId spId) { S16 ret = ROK; Pst tmpPst; /* Temporary Post Structure */ @@ -2528,7 +2149,7 @@ 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 */ @@ -2536,14 +2157,12 @@ 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; @@ -2554,8 +2173,7 @@ 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); } @@ -2581,19 +2199,7 @@ SpId spId; * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 RgUiRgmUbndReq -( -Pst *pst, -SpId spId, -Reason reason -) -#else -S16 RgUiRgmUbndReq(pst, spId, reason) -Pst *pst; -SpId spId; -Reason reason; -#endif +S16 RgUiRgmUbndReq(Pst *pst,SpId spId,Reason reason) { Inst instId = pst->dstInst-SCH_INST_START; @@ -2604,14 +2210,12 @@ 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; } @@ -2619,9 +2223,7 @@ 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; } @@ -2648,19 +2250,7 @@ Reason reason; * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 RgUiRgmCfgPrbRprt -( -Pst *pst, -SpId spId, -RgmPrbRprtCfg *prbRprtCfg -) -#else -S16 RgUiRgmCfgPrbRprt(pst, spId, prbRprtCfg) -Pst *pst; -SpId spId; -RgmPrbRprtCfg *prbRprtCfg; -#endif +S16 RgUiRgmCfgPrbRprt(Pst *pst, SpId spId,RgmPrbRprtCfg *prbRprtCfg) { /* Initalize*/ RgSchCellCb *cell; @@ -2676,9 +2266,7 @@ 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 */ @@ -2706,19 +2294,7 @@ RgmPrbRprtCfg *prbRprtCfg; * -# ROK * -# RFAILED **/ -#ifdef ANSI -S16 RgLiTfuErrInd -( -Pst *pst, -SuId suId, -TfuErrIndInfo *errInd -) -#else -S16 RgLiTfuErrInd(pst, suId, errInd) -Pst *pst; -SuId suId; -TfuErrIndInfo *errInd; -#endif +S16 RgLiTfuErrInd(Pst *pst, SuId suId, TfuErrIndInfo *errInd) { S16 ret = ROK; #ifdef LTE_ADV @@ -2729,13 +2305,13 @@ 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