X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2F5gnrsch%2Frg_sch_gom.c;h=b70e203a121af7a15eb61822b6e10509738dfe24;hb=5d74fef7c9fe6b65a965ceac6bfe812872dab323;hp=2c6a19e2404d11940b3faa77872ba4b36e033a66;hpb=aee73991f728cc127d1ed76d5a52571d916235a4;p=o-du%2Fl2.git diff --git a/src/5gnrsch/rg_sch_gom.c b/src/5gnrsch/rg_sch_gom.c index 2c6a19e24..b70e203a1 100755 --- a/src/5gnrsch/rg_sch_gom.c +++ b/src/5gnrsch/rg_sch_gom.c @@ -136,7 +136,7 @@ U16 idx * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHGomHndlCfg +S16 rgSCHGomHndlCfg ( Pst *pst, RgSchCb *instCb, @@ -144,7 +144,7 @@ RgrCfgTransId transId, RgrCfgReqInfo *cfgReqInfo ) #else -PUBLIC S16 rgSCHGomHndlCfg(pst, instCb, transId, cfgReqInfo) +S16 rgSCHGomHndlCfg(pst, instCb, transId, cfgReqInfo) Pst *pst; RgSchCb *instCb; RgrCfgTransId transId; @@ -160,7 +160,6 @@ RgrCfgReqInfo *cfgReqInfo; Inst inst = (instCb->rgSchInit.inst ); #endif - TRC2(rgSCHGomHndlCfg); /* Apply the configuration for Cell Configuration or Delete */ if (cfgReqInfo->action != RGR_RECONFIG) { @@ -270,7 +269,6 @@ RgrCfgReqInfo *cfgReqInfo; #ifdef DEBUGP Inst inst = (instCb->rgSchInit.inst ); #endif - TRC2(rgSCHGomCfgReq); #ifdef EMTC_ENABLE printf("\n AT MAC rgSCHGomCfgReq \n"); #endif @@ -394,8 +392,6 @@ RgrCfgReqInfo *rgrCfgReq; CmLteTimingInfo actvTime; Inst inst = cell->instIdx; - TRC2(rgSCHGomEnqCfgReq); - /* Allocate memory for config Element */ ret = rgSCHUtlAllocSBuf(inst, (Data **)&rgrCfgElem, sizeof(RgSchCfgElem)); if ((ret != ROK) || ((U8 *)rgrCfgElem == NULLP)) @@ -404,7 +400,7 @@ RgrCfgReqInfo *rgrCfgReq; } /* Initialize the configuration element */ - cmMemcpy((U8*)rgrCfgElem->rgrCfg.transId.trans,(U8*)transId.trans, + memcpy(rgrCfgElem->rgrCfg.transId.trans,transId.trans, sizeof(transId.trans)); rgrCfgElem->rgrCfg.reg = reg; rgrCfgElem->rgrCfg.pool = pool; @@ -490,20 +486,19 @@ RgrCfgReqInfo *rgrCfgReq; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHGomTtiHndlr +S16 rgSCHGomTtiHndlr ( RgSchCellCb *cell, SpId spId ) #else -PUBLIC S16 rgSCHGomTtiHndlr(cell, spId) +S16 rgSCHGomTtiHndlr(cell, spId) RgSchCellCb *cell; SpId spId; #endif { RgSchCfgElem *cfgElem; Inst inst= cell->instIdx; - TRC2(rgSCHGomTtiHndlr); /* Dequeue from current config list */ while ((cfgElem = rgSCHDbmGetNextCrntRgrCfgElem(cell, NULLP)) != NULLP) @@ -577,8 +572,6 @@ RgSchErrInfo *errInfo; Inst inst = (instCb->rgSchInit.inst ); RgSchUeCb *ue; - TRC2(rgSCHGomHndlCfgReq); - errInfo->errType = RGSCHERR_GOM_CFG_REQ; /* Validate and process the configuration request */ @@ -706,7 +699,6 @@ U8 action; RgSchCellCb *cell = instCb->rgrSap[spId].cell; Inst inst = (instCb->rgSchInit.inst); - TRC2(rgSCHGomHndlSCellActDeactReq); RGSCHDBGPRM(inst,(rgSchPBuf(inst), "Processing RGR SCell Actication request:" "%d\n", sCellActDeactEvnt->crnti)); @@ -784,8 +776,6 @@ RgSchErrInfo *errInfo; RgSchCellCb *cell = instCb->rgrSap[spId].cell; Inst inst = (instCb->rgSchInit.inst ); - TRC2(rgSCHGomHndlRecfgReq); - errInfo->errType = RGSCHERR_GOM_RECFG_REQ; /* Validate and process the re-configuration request */ @@ -897,9 +887,6 @@ RgSchErrInfo *errInfo; Inst inst = (instCb->rgSchInit.inst ); RgSchUeCb *ue = NULLP; - TRC2(rgSCHGomHndlResetReq); - - errInfo->errType = RGSCHERR_GOM_RESET_REQ; /* Validate and process the UE reset request */ @@ -968,8 +955,6 @@ RgSchErrInfo *errInfo; #endif VOLATILE U32 startTime=0; - TRC2(rgSCHGomHndlDelReq); - errInfo->errType = RGSCHERR_GOM_DEL_REQ; if(instCb->rgrSap[spId].cell == NULLP) @@ -1066,9 +1051,6 @@ CmLteCellId *cellId; #endif { - TRC2(rgSCHGomGetCellIdFrmCfgReq); - - /* Extract CellId depending on the action and Config Type in the Request * As of now this function is called for only re configuration so removed * othe CASES below if needed we can add them*/ @@ -1135,7 +1117,7 @@ CmLteCellId *cellId; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHGomHndlSiCfg +S16 rgSCHGomHndlSiCfg ( Region reg, Pool pool, @@ -1145,7 +1127,7 @@ RgrCfgTransId transId, RgrSiCfgReqInfo *cfgReqInfo ) #else -PUBLIC S16 rgSCHGomHndlSiCfg(reg, pool, instCb, spId, transId, cfgReqInfo) +S16 rgSCHGomHndlSiCfg(reg, pool, instCb, spId, transId, cfgReqInfo) Region reg; Pool pool; RgSchCb *instCb; @@ -1164,8 +1146,6 @@ RgrSiCfgReqInfo *cfgReqInfo; U8 nPrb = 0; U8 mcs = 0; - TRC2(rgSCHGomHndlSiCfg); - /* check if cell does not exists */ if (((U8 *)cell == NULLP) || (cell->cellId != cfgReqInfo->cellId)) @@ -1252,7 +1232,7 @@ RgrSiCfgReqInfo *cfgReqInfo; return RFAILED; } - cmMemset((U8*)padding,(U8)0,nmPadBytes); + memset(padding,0,nmPadBytes); #ifdef MS_MBUF_CORRUPTION MS_BUF_ADD_ALLOC_CALLER(); @@ -1439,7 +1419,7 @@ RgrSiCfgReqInfo *cfgReqInfo; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHGomHndlWarningSiCfg +S16 rgSCHGomHndlWarningSiCfg ( Region reg, Pool pool, @@ -1449,7 +1429,7 @@ RgrCfgTransId transId, RgrWarningSiCfgReqInfo *warningSiCfgReqInfo ) #else -PUBLIC S16 rgSCHGomHndlWarningSiCfg(reg, pool, instCb, spId, transId, +S16 rgSCHGomHndlWarningSiCfg(reg, pool, instCb, spId, transId, warningSiCfgReqInfo) Region reg; Pool pool; @@ -1475,8 +1455,6 @@ RgrWarningSiCfgReqInfo *warningSiCfgReqInfo; U8 isEmtc = warningSiCfgReqInfo->emtcEnable; #endif - TRC2(rgSCHGomHndlWarningSiCfg); - #ifdef EMTC_ENABLE if(TRUE == isEmtc) { @@ -1636,7 +1614,7 @@ RgrWarningSiCfgReqInfo *warningSiCfgReqInfo; * @return void **/ #ifdef ANSI -PUBLIC Void rgSCHGomHndlWarningSiStopReq +Void rgSCHGomHndlWarningSiStopReq ( Region reg, Pool pool, @@ -1646,7 +1624,7 @@ RgrCfgTransId transId, SpId spId ) #else -PUBLIC Void rgSCHGomHndlWarningSiStopReq(reg, pool, instCb, siId, transId, spId) +Void rgSCHGomHndlWarningSiStopReq(reg, pool, instCb, siId, transId, spId) Region reg; Pool pool; RgSchCb *instCb; @@ -1661,8 +1639,6 @@ SpId spId; RgSchWarningSiPdu *warningSiPdu; Buffer *pdu; - TRC3(rgSCHGomHndlWarningSiStopReq) - for(idx = 0; idx < RGR_MAX_NUM_WARNING_SI; idx++) { if(cell->siCb.warningSi[idx].siId == siId) @@ -1710,7 +1686,7 @@ SpId spId; * **/ #ifdef ANSI -PUBLIC S16 rgSchUpdtRNTPInfo +S16 rgSchUpdtRNTPInfo ( RgSchCellCb *cell, RgSchDlSf *sf, @@ -1730,8 +1706,6 @@ PRIVATE Void rgSchUpdtRNTPInfo(cell, sf) CmLList *n; S16 ret = RFAILED; - TRC2(rgSchUpdtRNTPInfo); - l = &sf->sfrTotalPoolInfo.ccPool; /*Get the first node from the CC Pool*/ @@ -1777,7 +1751,7 @@ PRIVATE Void rgSchUpdtRNTPInfo(cell, sf) * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgSCHGomHndlLoadInf +S16 rgSCHGomHndlLoadInf ( Region reg, Pool pool, @@ -1787,7 +1761,7 @@ PUBLIC S16 rgSCHGomHndlLoadInf RgrLoadInfReqInfo *loadInfReq ) #else -PUBLIC S16 rgSCHGomHndlLoadInf(reg, pool, instCb, spId, transId, loadInfReq) +S16 rgSCHGomHndlLoadInf(reg, pool, instCb, spId, transId, loadInfReq) Region reg; Pool pool; RgSchCb *instCb; @@ -1802,9 +1776,6 @@ PUBLIC S16 rgSCHGomHndlLoadInf(reg, pool, instCb, spId, transId, loadInfReq) RgSchErrInfo errInfo; U16 i; - TRC2(rgSCHGomHndlLoadInf); - - /* check if cell does not exists */ if (((U8 *)cell == NULLP) || (cell->cellId != loadInfReq->cellId)) {