X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_com.c;h=1d31c55e9244374228bc2b667fc70645298ae933;hb=9c8b78da0f4ef42dae5e30a3061463b81327e7a0;hp=170f69e456bcbf1e580e5ea35bdbf4834b8d1951;hpb=aee73991f728cc127d1ed76d5a52571d916235a4;p=o-du%2Fl2.git diff --git a/src/5gnrmac/rg_com.c b/src/5gnrmac/rg_com.c index 170f69e45..1d31c55e9 100755 --- a/src/5gnrmac/rg_com.c +++ b/src/5gnrmac/rg_com.c @@ -98,14 +98,14 @@ PRIVATE S16 rgCOMHndlResetReq ARGS((Inst inst,CrgRst *reset,RgErrInfo *errInfo)) * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 rgCOMCfgReq +S16 rgCOMCfgReq ( Inst inst, CrgCfgTransId transId, CrgCfgReqInfo *crgCfgReq ) #else -PUBLIC S16 rgCOMCfgReq(inst,transId, crgCfgReq) +S16 rgCOMCfgReq(inst,transId, crgCfgReq) Inst inst; CrgCfgTransId transId; CrgCfgReqInfo *crgCfgReq; @@ -116,8 +116,6 @@ CrgCfgReqInfo *crgCfgReq; RgErrInfo errInfo; Bool isCfmRqrd = TRUE; - TRC2(rgCOMCfgReq); - /* Process Config/Reconfig/Delete request from RRC */ switch (crgCfgReq->action) { @@ -219,8 +217,6 @@ CrgCfgTransId transId; RgCellCb *cell = NULLP; RgUeCb *ue = NULLP; - TRC2(rgCOMHndlCfgReq); - errInfo->errType = RGERR_COM_CFG_REQ; /* Validate and process the configuration request */ @@ -323,8 +319,6 @@ Bool *isCfmRqrd; RgUeCb *ue = NULLP; RgUlLcCb *ulLc = NULLP; - TRC2(rgCOMHndlRecfgReq); - errInfo->errType = RGERR_COM_RECFG_REQ; /* Validate and process the re-configuration request */ @@ -398,7 +392,7 @@ Bool *isCfmRqrd; #ifdef LTE_ADV /*ERAB- multicell fix*/ - cmMemcpy( (U8*)&(ue->cfgCfmInfo.transId), (U8*)&transId, + memcpy( &(ue->cfgCfmInfo.transId), &transId, sizeof(CrgCfgTransId)); #endif ret = rgCFGCrgLcRecfg(inst,cell, ue, ulLc, @@ -453,8 +447,6 @@ CrgRst *reset; RgErrInfo *errInfo; #endif { - TRC2(rgCOMHndlResetReq); - /* Fix : ccpu00126865: ignore CRG reset. Let SCH trigger it. */ errInfo->errCause = RGERR_NONE; @@ -507,8 +499,6 @@ CrgCfgTransId transId; S16 ret; VOLATILE U32 startTime=0; - TRC2(rgCOMHndlDelReq); - errInfo->errType = RGERR_COM_DEL_REQ; /* Process the delete request */ @@ -571,13 +561,13 @@ CrgCfgTransId transId; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 RgPrgPMacSMacUeSCellCfgReq +S16 RgPrgPMacSMacUeSCellCfgReq ( Pst *pst, RgPrgUeSCellCfgInfo *ueSCellCb ) #else -PUBLIC S16 RgPrgPMacSMacUeSCellCfgReq(pst, ueSCellCb) +S16 RgPrgPMacSMacUeSCellCfgReq(pst, ueSCellCb) Pst *pst; RgPrgUeSCellCfgInfo *ueSCellCb; #endif @@ -588,7 +578,6 @@ RgPrgUeSCellCfgInfo *ueSCellCb; S16 ret; Pst cfmPst; - TRC2(RgPrgPMacSMacUeSCellCfgReq); RGDBGPRM(inst,(rgPBuf(inst), "APPLYING CRG UE SCELL CONFIG: cellId %d ueId %d\n", @@ -653,13 +642,13 @@ RgPrgUeSCellCfgInfo *ueSCellCb; * -# RFAILED **/ #ifdef ANSI -PUBLIC S16 RgPrgSMacPMacCfgCfm +S16 RgPrgSMacPMacCfgCfm ( Pst *pst, RgPrgCfgCfmInfo *cfgCfm ) #else -PUBLIC S16 RgPrgSMacPMacCfgCfm(pst, cfgCfm) +S16 RgPrgSMacPMacCfgCfm(pst, cfgCfm) Pst *pst; RgPrgCfgCfmInfo *cfgCfm; #endif @@ -667,8 +656,6 @@ RgPrgCfgCfmInfo *cfgCfm; Inst inst = pst->dstInst; RgCellCb *cell; RgUeCb *ue; - TRC2(RgPrgSMacPMacCfgCfm); - RG_IS_INST_VALID(inst); @@ -753,13 +740,13 @@ RgPrgCfgCfmInfo *cfgCfm; * @return ROK is SUCCESS **/ #ifdef ANSI -PUBLIC S16 RgPrgPMacSMacUeSCellDelReq +S16 RgPrgPMacSMacUeSCellDelReq ( Pst *pst, RgPrgUeSCellDelInfo *ueSCellDelInfo ) #else -PUBLIC S16 RgPrgPMacSMacUeSCellDelReq(pst, ueSCellDelInfo) +S16 RgPrgPMacSMacUeSCellDelReq(pst, ueSCellDelInfo) Pst *pst; RgPrgUeSCellDelInfo *ueSCellDelInfo; #endif @@ -768,8 +755,6 @@ RgPrgUeSCellDelInfo *ueSCellDelInfo; RgCellCb *sCell = rgCb[inst].cell; RgUeCb *sCellUe = NULLP; - TRC2(RgPrgPMacSMacUeSCellDelReq) - /* Checking for cell Cb because in case of shutdownReq it is possible that * cell is already deleted for this cell*/ if(sCell == NULLP)