X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_utl.c;h=87fe3e59d14a5abc60af18172160d4a0b0320d5a;hb=7c6820e987fadb1102e5891408ad33a8ce36ba95;hp=9af90e4e64401db715c9ecc9216916246dbf71fc;hpb=aee73991f728cc127d1ed76d5a52571d916235a4;p=o-du%2Fl2.git diff --git a/src/5gnrmac/rg_utl.c b/src/5gnrmac/rg_utl.c index 9af90e4e6..87fe3e59d 100755 --- a/src/5gnrmac/rg_utl.c +++ b/src/5gnrmac/rg_utl.c @@ -81,7 +81,7 @@ PRIVATE Void rgUtlHndlCrntiRls ARGS(( RgInfRlsRnti *rlsRnti )); -PUBLIC S16 rgDelUeFrmAllSCell ARGS(( +S16 rgDelUeFrmAllSCell ARGS(( RgCellCb *cell, RgUeCb *ue )); @@ -113,14 +113,14 @@ PRIVATE S16 rgUtlSndCrntiChngReq2AllSMacs ARGS(( * **********************************************************/ #ifdef ANSI -PUBLIC S16 rgAllocShrablSBuf +S16 rgAllocShrablSBuf ( Inst inst, Data **pData, /* Pointer of the data to be returned */ Size size /* size */ ) #else -PUBLIC S16 rgAllocShrablSBuf(inst,pData, size) +S16 rgAllocShrablSBuf(inst,pData, size) Inst inst; Data **pData; /* Pointer of the data to be returned */ Size size; /* size */ @@ -128,8 +128,6 @@ Size size; /* size */ { RgUstaDgn dgn; /* Alarm diagnostics structure */ - TRC2(rgAllocShrablSBuf) - /* Initialize the param to NULLP */ *pData = NULLP; @@ -160,7 +158,7 @@ Size size; /* size */ #endif /* zero out the allocated memory */ - cmMemset((U8 *)*pData, 0x00, size); + memset(*pData, 0x00, size); return ROK; @@ -185,14 +183,14 @@ Size size; /* size */ * **********************************************************/ #ifdef ANSI -PUBLIC S16 rgAllocSBuf +S16 rgAllocSBuf ( Inst inst, Data **pData, /* Pointer of the data to be returned */ Size size /* size */ ) #else -PUBLIC S16 rgAllocSBuf(inst,pData, size) +S16 rgAllocSBuf(inst,pData, size) Inst inst; Data **pData; /* Pointer of the data to be returned */ Size size; /* size */ @@ -200,8 +198,6 @@ Size size; /* size */ { RgUstaDgn dgn; /* Alarm diagnostics structure */ - TRC2(rgAllocSBuf) - /* Initialize the param to NULLP */ *pData = NULLP; @@ -227,7 +223,7 @@ Size size; /* size */ } /* zero out the allocated memory */ - cmMemset((U8 *)*pData, 0x00, size); + memset(*pData, 0x00, size); return ROK; @@ -250,14 +246,14 @@ Size size; /* size */ * File: rg_utl.c */ #ifdef ANSI -PUBLIC Void rgFreeSharableSBuf +Void rgFreeSharableSBuf ( Inst inst, Data **data, /* address of pointer to data */ Size size /* size */ ) #else -PUBLIC Void rgFreeSharableSBuf(inst,data, size) +Void rgFreeSharableSBuf(inst,data, size) Inst inst; Data **data; /* address of pointer to data */ Size size; /* size */ @@ -266,8 +262,6 @@ Size size; /* size */ S16 ret; - TRC2(rgFreeSharableBuf) - if ((data == NULLP) || (*data == NULLP) || (size == 0)) { RETVOID; @@ -306,14 +300,14 @@ Size size; /* size */ * File: rg_utl.c */ #ifdef ANSI -PUBLIC Void rgFreeSBuf +Void rgFreeSBuf ( Inst inst, Data **data, /* address of pointer to data */ Size size /* size */ ) #else -PUBLIC Void rgFreeSBuf(inst,data, size) +Void rgFreeSBuf(inst,data, size) Inst inst; Data **data; /* address of pointer to data */ Size size; /* size */ @@ -322,8 +316,6 @@ Size size; /* size */ S16 ret; - TRC2(rgFreeSBuf) - if ((data == NULLP) || (*data == NULLP) || (size == 0)) { RETVOID; @@ -366,21 +358,19 @@ Size size; /* size */ * **********************************************************/ #ifdef ANSI -PUBLIC S16 rgGetMsg +S16 rgGetMsg ( Inst inst, Buffer **mBuf /* Message Buffer pointer be returned */ ) #else -PUBLIC S16 rgGetMsg(inst,mBuf) +S16 rgGetMsg(inst,mBuf) Inst inst; Buffer **mBuf; /* Message Buffer pointer be returned */ #endif { S16 ret; - TRC2(rgGetMsg) - #ifdef MS_MBUF_CORRUPTION /* Should be enabled when debugging mbuf corruption */ MS_BUF_ADD_ALLOC_CALLER(); #endif /* */ @@ -419,22 +409,20 @@ Buffer **mBuf; /* Message Buffer pointer be returned */ * **********************************************************/ #ifdef ANSI -PUBLIC Void rgFillDgnParams +Void rgFillDgnParams ( Inst inst, RgUstaDgn *dgn, U8 dgnType ) #else -PUBLIC Void rgFillDgnParams(inst,dgn, dgnType) +Void rgFillDgnParams(inst,dgn, dgnType) Inst inst; RgUstaDgn *dgn; U8 dgnType; #endif { - TRC2(rgFillDgnParams) - switch(dgnType) { case LRG_USTA_DGNVAL_MEM: @@ -468,7 +456,7 @@ U8 dgnType; * **********************************************************/ #ifdef ANSI -PUBLIC Void rgUpdtRguDedSts +Void rgUpdtRguDedSts ( Inst inst, RgUpSapCb *rguDlSap, @@ -476,7 +464,7 @@ U8 stsType, /* Statistics type to update */ RgRguDedDatReq *datReq /* DatReq pointer */ ) #else -PUBLIC Void rgUpdtRguDedSts(inst,rguDlSap,stsType, datReq) +Void rgUpdtRguDedSts(inst,rguDlSap,stsType, datReq) Inst inst; RgUpSapCb *rguDlSap; U8 stsType; /* Statistics type to update */ @@ -486,10 +474,6 @@ RgRguDedDatReq *datReq; /* DatReq pointer */ U8 idx1,idx2; U32 idx; - - TRC2(rgUpdtRguDedSts) - - switch(stsType) { case RG_RGU_SDU_RCVD: @@ -547,22 +531,19 @@ RgRguDedDatReq *datReq; /* DatReq pointer */ * **********************************************************/ #ifdef ANSI -PUBLIC Void rgUpdtRguCmnSts +Void rgUpdtRguCmnSts ( Inst inst, RgUpSapCb *rguDlSap, U8 stsType /* Statistics type to update */ ) #else -PUBLIC Void rgUpdtRguCmnSts(inst,rguDlSap,stsType) +Void rgUpdtRguCmnSts(inst,rguDlSap,stsType) Inst inst; RgUpSapCb *rguDlSap; U8 stsType; /* Statistics type to update */ #endif { - TRC2(rgUpdtRguCmnSts) - - switch(stsType) { @@ -597,18 +578,17 @@ U8 stsType; /* Statistics type to update */ * **********************************************************/ #ifdef ANSI -PUBLIC Void rgUpdtCellCnt +Void rgUpdtCellCnt ( Inst inst, U8 updtType ) #else -PUBLIC Void rgUpdtCellCnt(inst,updtType) +Void rgUpdtCellCnt(inst,updtType) Inst inst; U8 updtType; #endif { - TRC2(rgUpdtCellCnt); switch (updtType) { @@ -644,19 +624,17 @@ U8 updtType; * **********************************************************/ #ifdef ANSI -PUBLIC Void rgUpdtUeCnt +Void rgUpdtUeCnt ( Inst inst, U8 updtType ) #else -PUBLIC Void rgUpdtUeCnt (inst,updtType) +Void rgUpdtUeCnt (inst,updtType) Inst inst; U8 updtType; #endif { - TRC2(rgUpdtUeCnt); - switch (updtType) { case RG_CFG_ADD: @@ -686,14 +664,14 @@ U8 updtType; * */ #ifdef ANSI -PUBLIC S16 rgAllocEventMem +S16 rgAllocEventMem ( Inst inst, Ptr *memPtr, Size memSize ) #else -PUBLIC S16 rgAllocEventMem(inst,memPtr, memSize) +S16 rgAllocEventMem(inst,memPtr, memSize) Inst inst; Ptr *memPtr; Size memSize; @@ -702,8 +680,6 @@ Size memSize; Mem sMem; VOLATILE U32 startTime=0; - TRC2(rgAllocEventMem) - sMem.region = rgCb[inst].rgInit.region; sMem.pool = rgCb[inst].rgInit.pool; @@ -754,7 +730,7 @@ Size memSize; * */ #ifdef ANSI -PUBLIC S16 rgGetEventMem +S16 rgGetEventMem ( Inst inst, Ptr *ptr, @@ -762,7 +738,7 @@ Size len, Ptr memCp ) #else -PUBLIC S16 rgGetEventMem(inst,ptr, len, memCp) +S16 rgGetEventMem(inst,ptr, len, memCp) Inst inst; Ptr *ptr; Size len; @@ -771,7 +747,6 @@ Ptr memCp; { S16 ret; - TRC2(rgGetEventMem) #ifdef TFU_ALLOC_EVENT_NO_INIT ret = cmGetMemNoInit(memCp, len, (Ptr *)ptr); #else @@ -798,20 +773,19 @@ Ptr memCp; * **********************************************************/ #ifdef ANSI -PUBLIC Void rgGetPstToInst +Void rgGetPstToInst ( Pst *pst, Inst srcInst, Inst dstInst ) #else -PUBLIC Void rgGetPstToInst (pst, srcInst, dstInst) +Void rgGetPstToInst (pst, srcInst, dstInst) Pst *pst; Inst srcInst; Inst dstInst; #endif { - TRC2(rgGetPstToInst); pst->srcEnt = rgCb[srcInst].rgInit.ent; pst->srcInst = rgCb[srcInst].rgInit.inst; @@ -852,13 +826,13 @@ Inst dstInst; * **********************************************************/ #ifdef ANSI -PUBLIC S16 RgSchMacLcgRegReq +S16 RgSchMacLcgRegReq ( Pst *pst, RgInfLcgRegReq *lcgRegReq ) #else -PUBLIC S16 RgSchMacLcgRegReq (pst, lcgRegReq) +S16 RgSchMacLcgRegReq (pst, lcgRegReq) Pst *pst; RgInfLcgRegReq *lcgRegReq; #endif @@ -867,8 +841,6 @@ RgInfLcgRegReq *lcgRegReq; RgCellCb *cell = NULLP; RgUeCb *ue; - TRC2(RgSchMacLcgRegReq); - RG_IS_INST_VALID(pst->dstInst); inst = pst->dstInst - RG_INST_START; cell = rgCb[inst].cell; @@ -911,13 +883,13 @@ RgInfLcgRegReq *lcgRegReq; * **********************************************************/ #ifdef ANSI -PUBLIC S16 RgSchMacUlSpsResetReq +S16 RgSchMacUlSpsResetReq ( Pst *pst, RgInfUlSpsReset *ulSpsResetInfo ) #else -PUBLIC S16 RgSchMacUlSpsResetReq (pst, lcInfo) +S16 RgSchMacUlSpsResetReq (pst, lcInfo) Pst *pst; RgInfUlSpsReset *ulSpsResetInfo; #endif @@ -926,8 +898,6 @@ RgInfUlSpsReset *ulSpsResetInfo; RgCellCb *cell = NULLP; RgUeCb *ue; - TRC2(RgSchMacUlSpsResetReq); - RG_IS_INST_VALID(pst->dstInst); inst = pst->dstInst - RG_INST_START; cell = rgCb[inst].cell; @@ -981,13 +951,13 @@ RgInfUlSpsReset *ulSpsResetInfo; * **********************************************************/ #ifdef ANSI -PUBLIC S16 RgSchMacSpsLcRegReq +S16 RgSchMacSpsLcRegReq ( Pst *pst, RgInfSpsLcInfo *lcInfo ) #else -PUBLIC S16 RgSchMacSpsLcRegReq (pst, lcInfo) +S16 RgSchMacSpsLcRegReq (pst, lcInfo) Pst *pst; RgInfSpsLcInfo *lcInfo; #endif @@ -997,8 +967,6 @@ RgInfSpsLcInfo *lcInfo; RgUeCb *ue; U8 idx; - TRC2(RgSchMacSpsLcRegReq); - RG_IS_INST_VALID(pst->dstInst); inst = pst->dstInst - RG_INST_START; cell = rgCb[inst].cell; @@ -1064,14 +1032,14 @@ RgInfSpsLcInfo *lcInfo; * **********************************************************/ #ifdef ANSI -PUBLIC S16 RgSchMacSpsLcDeregReq +S16 RgSchMacSpsLcDeregReq ( Pst *pst, CmLteCellId cellId, CmLteRnti crnti ) #else -PUBLIC S16 RgSchMacSpsLcDeregReq (pst, cellId, crnti) +S16 RgSchMacSpsLcDeregReq (pst, cellId, crnti) Pst *pst; CmLteCellId cellId; CmLteRnti crnti; @@ -1081,8 +1049,6 @@ CmLteRnti crnti; RgCellCb *cell = NULLP; RgUeCb *ue; - TRC2(RgSchMacSpsLcDeregReq); - RG_IS_INST_VALID(pst->dstInst); inst = pst->dstInst - RG_INST_START; cell = rgCb[inst].cell; @@ -1150,8 +1116,6 @@ CmLteRnti newRnti; RgUeCb *ue = NULLP; RgUeCb *newUe = NULLP; - TRC3(rgUtlHndlCrntiChng) - ue = rgDBMGetUeCb(cell, rnti); newUe = rgDBMGetUeCbFromRachLst(cell, newRnti); if ((ue == NULLP) || (newUe == NULLP)) @@ -1168,7 +1132,7 @@ CmLteRnti newRnti; ue->ueId = newRnti; - cmMemcpy((U8*)&(ue->contResId), (U8*)&(newUe->contResId), + memcpy(&(ue->contResId), &(newUe->contResId), sizeof(newUe->contResId)); /* Fix : syed MSG4 might be RETXing need to store the * HARQ context. */ @@ -1200,13 +1164,13 @@ CmLteRnti newRnti; * @return ROK is SUCCESS **/ #ifdef ANSI -PUBLIC S16 rgDelUeFrmAllSCell +S16 rgDelUeFrmAllSCell ( RgCellCb *cell, RgUeCb *ue ) #else -PUBLIC S16 rgDelUeFrmAllSCell(cell, ue) +S16 rgDelUeFrmAllSCell(cell, ue) RgCellCb *cell; RgUeCb *ue; #endif @@ -1217,8 +1181,6 @@ RgUeCb *ue; Pst dstInstPst; RgPrgUeSCellDelInfo ueSCellDelInfo; - TRC2(rgDelUeFrmAllSCell) - /* To Delete the SCells if exisits for that UE */ for(idx = 0; idx < RG_MAX_SCELL_PER_UE ; idx++) { @@ -1257,14 +1219,14 @@ RgUeCb *ue; * -# ROK **/ #ifdef ANSI -PUBLIC S16 rgUtlVltdAddSCellCfg +S16 rgUtlVltdAddSCellCfg ( RgPrgUeSCellCfgInfo *ueSCellCb, RgCellCb *cell, Inst inst ) #else -PUBLIC S16 rgUtlVltdAddSCellCfg(ueSCellCb, cell, inst) +S16 rgUtlVltdAddSCellCfg(ueSCellCb, cell, inst) RgPrgUeSCellCfgInfo *ueSCellCb; RgCellCb *cell; Inst inst; @@ -1272,9 +1234,7 @@ PUBLIC S16 rgUtlVltdAddSCellCfg(ueSCellCb, cell, inst) { S16 ret = ROK; - TRC3(rgUtlVltdAddSCellCfg) - - /* To Validate the CellID presence */ + /* To Validate the CellID presence */ if((cell == NULLP) || (cell->cellId != ueSCellCb->cellId)) { @@ -1339,8 +1299,6 @@ CmLteRnti newRnti; TfuDelDatReqInfo delDatReq; #endif - TRC2(rgUtlSndCrntiChngReq2AllSMacs) - /* use newRnti to get UeCb in PMac because rnti is already changed in PMac*/ ue = rgDBMGetUeCb(cell, newRnti); if (ue == NULLP) @@ -1417,8 +1375,6 @@ CmLteRnti *rlsRnti; RgUeCb *spsUeCb = NULLP; #endif - TRC3(rgUtlHndlCrntiRls) - if ((ue = rgDBMGetUeCb(cell, rlsRnti->rnti)) == NULLP) { /* Check in RachLst */ @@ -1490,13 +1446,13 @@ CmLteRnti *rlsRnti; * -# ROK **/ #ifdef ANSI -PUBLIC S16 RgSchMacRlsRntiReq +S16 RgSchMacRlsRntiReq ( Pst *pst, RgInfRlsRnti *rlsRnti ) #else -PUBLIC S16 RgSchMacRlsRntiReq(pst, rlsRnti) +S16 RgSchMacRlsRntiReq(pst, rlsRnti) Pst *pst; RgInfRlsRnti *rlsRnti; #endif @@ -1509,8 +1465,6 @@ RgInfRlsRnti *rlsRnti; TfuDelDatReqInfo delDatReq; #endif - TRC3(RgSchMacRlsRntiReq) - RG_IS_INST_VALID(pst->dstInst); macInst = pst->dstInst - RG_INST_START; cell = rgCb[macInst].cell; @@ -1587,12 +1541,12 @@ TfuDelDatReqInfo delDatReq; #ifdef L2_OPTMZ #ifdef ANSI -PUBLIC Bool RgUtlIsTbMuxed +Bool RgUtlIsTbMuxed ( TfuDatReqTbInfo *tb ) #else -PUBLIC Bool RgUtlIsTbMuxed() +Bool RgUtlIsTbMuxed() TfuDatReqTbInfo *tb #endif {