X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_utl.c;h=2e2e3796444d5924c231ad4b810b31a81ca84a41;hb=def50dc175cebc67238db5f1acd5ff322a2279bd;hp=709c0d2ba0869ec1603b9b67eb2dcc8737cf5c64;hpb=829bbd114f1c3dc00c1da47bca0a8207c049df3f;p=o-du%2Fl2.git diff --git a/src/5gnrmac/rg_utl.c b/src/5gnrmac/rg_utl.c index 709c0d2ba..2e2e37964 100755 --- a/src/5gnrmac/rg_utl.c +++ b/src/5gnrmac/rg_utl.c @@ -37,18 +37,7 @@ static int RLOG_MODULE_ID=4096; static int RLOG_FILE_ID=179; /* header include files (.h) */ -#include "envopt.h" /* environment options */ -#include "envdep.h" /* environment dependent */ -#include "envind.h" /* environment independent */ - -#include "gen.h" /* general */ -#include "ssi.h" /* system services */ -#include "cm_tkns.h" /* Common Token Defines */ -#include "cm_llist.h" /* Common Link List Defines */ -#include "cm_hash.h" /* Common Hash List Defines */ -#include "cm_mblk.h" /* common memory link list library */ -#include "cm_lte.h" /* Common LTE */ - +#include "common_def.h" #include "rg_env.h" /* MAC Environment Defines */ #include "crg.h" /* CRG Interface defines */ #include "rgu.h" /* RGU Interface defines */ @@ -61,15 +50,7 @@ static int RLOG_FILE_ID=179; #include "rg_err.h" /* MAC error defines */ /* header/extern include files (.x) */ -#include "gen.x" /* general */ -#include "ssi.x" /* system services */ #include "cm5.x" /* Timer */ -#include "cm_tkns.x" /* Common Token Definitions */ -#include "cm_llist.x" /* Common Link List Definitions */ -#include "cm_lib.x" /* Common Library Definitions */ -#include "cm_hash.x" /* Common Hash List Definitions */ -#include "cm_mblk.x" /* common memory link list library */ -#include "cm_lte.x" /* Common LTE */ #include "crg.x" /* CRG Interface includes */ #include "rgu.x" /* RGU Interface includes */ @@ -78,6 +59,7 @@ static int RLOG_FILE_ID=179; #include "lrg.x" /* LRG Interface includes */ #include "rg_prg.x" /* PRG(MAC-MAC) Interface includes */ +#include "du_app_mac_inf.h" #include "rg.x" /* MAC includes */ /* local defines */ @@ -99,7 +81,7 @@ PRIVATE Void rgUtlHndlCrntiRls ARGS(( RgInfRlsRnti *rlsRnti )); -PUBLIC S16 rgDelUeFrmAllSCell ARGS(( +S16 rgDelUeFrmAllSCell ARGS(( RgCellCb *cell, RgUeCb *ue )); @@ -131,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 */ @@ -146,14 +128,12 @@ Size size; /* size */ { RgUstaDgn dgn; /* Alarm diagnostics structure */ - TRC2(rgAllocShrablSBuf) - /* Initialize the param to NULLP */ *pData = NULLP; if (size == 0) { - RETVALUE(RFAILED); + return RFAILED; } /* allocate buffer */ @@ -166,7 +146,7 @@ Size size; /* size */ 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"); - RETVALUE(RFAILED); + return RFAILED; } #ifndef ALIGN_64BIT @@ -178,9 +158,9 @@ Size size; /* size */ #endif /* zero out the allocated memory */ - cmMemset((U8 *)*pData, 0x00, size); + memset(*pData, 0x00, size); - RETVALUE(ROK); + return ROK; } /* end of rgAllocSBuf */ @@ -203,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 */ @@ -218,14 +198,12 @@ Size size; /* size */ { RgUstaDgn dgn; /* Alarm diagnostics structure */ - TRC2(rgAllocSBuf) - /* Initialize the param to NULLP */ *pData = NULLP; if (size == 0) { - RETVALUE(RFAILED); + return RFAILED; } /* allocate buffer */ @@ -241,13 +219,13 @@ Size size; /* size */ 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"); - RETVALUE(RFAILED); + return RFAILED; } /* zero out the allocated memory */ - cmMemset((U8 *)*pData, 0x00, size); + memset(*pData, 0x00, size); - RETVALUE(ROK); + return ROK; } /* end of rgAllocSBuf */ @@ -259,7 +237,7 @@ Size size; /* size */ * previously allocated by rgAllocSBuf() and size. It * deallocates the memory. * -* Ret: RETVOID +* Ret: void * * Notes: ccpu00117052 - MOD- changed the Data parameter from * pointer to address of pointer so that @@ -268,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 */ @@ -284,11 +262,9 @@ Size size; /* size */ S16 ret; - TRC2(rgFreeSharableBuf) - if ((data == NULLP) || (*data == NULLP) || (size == 0)) { - RETVOID; + return; } /* Deallocate buffer */ @@ -296,12 +272,12 @@ Size size; /* size */ if (ret != ROK) { - RETVOID; + return; } *data = NULLP; - RETVOID; + return; } /* end of rgFreeSharableBuf */ @@ -315,7 +291,7 @@ Size size; /* size */ * previously allocated by rgAllocSBuf() and size. It * deallocates the memory. * -* Ret: RETVOID +* Ret: void * * Notes: ccpu00117052 - MOD- changed the Data parameter from * pointer to address of pointer so that @@ -324,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 */ @@ -340,11 +316,9 @@ Size size; /* size */ S16 ret; - TRC2(rgFreeSBuf) - if ((data == NULLP) || (*data == NULLP) || (size == 0)) { - RETVOID; + return; } @@ -357,12 +331,12 @@ Size size; /* size */ if (ret != ROK) { RGLOGERROR(inst,ERRCLS_DEBUG, ERG029, (ErrVal) 0, "rgFreeSBuf failed.\n"); - RETVOID; + return; } *data = NULLP; - RETVOID; + return; } /* end of rgFreeSBuf */ @@ -384,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 /* */ @@ -415,10 +387,10 @@ Buffer **mBuf; /* Message Buffer pointer be returned */ 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"); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* end of rgGetMsg */ @@ -437,26 +409,24 @@ Buffer **mBuf; /* Message Buffer pointer be returned */ * **********************************************************/ #ifdef ANSI -PUBLIC Void rgFillDgnParams +Void rgFillDgnParams ( Inst inst, RgUstaDgn *dgn, -U8 dgnType +uint8_t dgnType ) #else -PUBLIC Void rgFillDgnParams(inst,dgn, dgnType) +Void rgFillDgnParams(inst,dgn, dgnType) Inst inst; RgUstaDgn *dgn; -U8 dgnType; +uint8_t dgnType; #endif { - TRC2(rgFillDgnParams) - switch(dgnType) { case LRG_USTA_DGNVAL_MEM: - dgn->type = (U8) LRG_USTA_DGNVAL_MEM; + dgn->type = (uint8_t) LRG_USTA_DGNVAL_MEM; dgn->u.mem.region = rgCb[inst].rgInit.region; dgn->u.mem.pool = rgCb[inst].rgInit.pool; break; @@ -465,7 +435,7 @@ U8 dgnType; break; } - RETVOID; + return; } /* end of rgFillDgnParams */ @@ -486,27 +456,23 @@ U8 dgnType; * **********************************************************/ #ifdef ANSI -PUBLIC Void rgUpdtRguDedSts +Void rgUpdtRguDedSts ( Inst inst, -RgUpSapCb *rguDlSap, -U8 stsType, /* Statistics type to update */ +RgUpSapCb *rguDlSap, +uint8_t 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 */ +RgUpSapCb *rguDlSap; +uint8_t stsType; /* Statistics type to update */ RgRguDedDatReq *datReq; /* DatReq pointer */ #endif { - U8 idx1,idx2; - U32 idx; - - - TRC2(rgUpdtRguDedSts) - + uint8_t idx1,idx2; + uint32_t idx; switch(stsType) { @@ -544,7 +510,7 @@ RgRguDedDatReq *datReq; /* DatReq pointer */ break; } - RETVOID; + return; } /* rgUpdtRguDedSts */ @@ -565,22 +531,19 @@ RgRguDedDatReq *datReq; /* DatReq pointer */ * **********************************************************/ #ifdef ANSI -PUBLIC Void rgUpdtRguCmnSts +Void rgUpdtRguCmnSts ( Inst inst, RgUpSapCb *rguDlSap, -U8 stsType /* Statistics type to update */ +uint8_t 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 */ +uint8_t stsType; /* Statistics type to update */ #endif { - TRC2(rgUpdtRguCmnSts) - - switch(stsType) { @@ -593,7 +556,7 @@ U8 stsType; /* Statistics type to update */ break; } - RETVOID; + return; } /* rgUpdtRguCmnSts */ @@ -615,18 +578,17 @@ U8 stsType; /* Statistics type to update */ * **********************************************************/ #ifdef ANSI -PUBLIC Void rgUpdtCellCnt +Void rgUpdtCellCnt ( Inst inst, -U8 updtType +uint8_t updtType ) #else -PUBLIC Void rgUpdtCellCnt(inst,updtType) +Void rgUpdtCellCnt(inst,updtType) Inst inst; -U8 updtType; +uint8_t updtType; #endif { - TRC2(rgUpdtCellCnt); switch (updtType) { @@ -640,7 +602,7 @@ U8 updtType; break; } - RETVOID; + return; } /* rgUpdtCellCnt */ @@ -662,19 +624,17 @@ U8 updtType; * **********************************************************/ #ifdef ANSI -PUBLIC Void rgUpdtUeCnt +Void rgUpdtUeCnt ( Inst inst, -U8 updtType +uint8_t updtType ) #else -PUBLIC Void rgUpdtUeCnt (inst,updtType) +Void rgUpdtUeCnt (inst,updtType) Inst inst; -U8 updtType; +uint8_t updtType; #endif { - TRC2(rgUpdtUeCnt); - switch (updtType) { case RG_CFG_ADD: @@ -686,7 +646,7 @@ U8 updtType; default: break; } - RETVOID; + return; } /* rgUpdtUeCnt */ /* @@ -704,23 +664,21 @@ 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; #endif { Mem sMem; - VOLATILE U32 startTime=0; - - TRC2(rgAllocEventMem) + VOLATILE uint32_t startTime=0; sMem.region = rgCb[inst].rgInit.region; sMem.pool = rgCb[inst].rgInit.pool; @@ -730,7 +688,7 @@ Size memSize; { RGLOGERROR(inst,ERRCLS_INT_PAR, ERG031, memSize, "rgAllocEventMem(): memSize invalid\n"); - RETVALUE (RFAILED); + return (RFAILED); } #endif /* ERRCLASS & ERRCLS_DEBUG */ @@ -748,13 +706,13 @@ Size memSize; #endif /* */ { RLOG0(L_ERROR,"cmAllocEvnt Failed"); - RETVALUE(RFAILED); + return RFAILED; } /*stoping Task*/ SStopTask(startTime, PID_MACUTL_CMALLCEVT); - RETVALUE(ROK); + return ROK; } /* end of rgAllocEventMem*/ /* @@ -772,7 +730,7 @@ Size memSize; * */ #ifdef ANSI -PUBLIC S16 rgGetEventMem +S16 rgGetEventMem ( Inst inst, Ptr *ptr, @@ -780,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; @@ -789,13 +747,12 @@ Ptr memCp; { S16 ret; - TRC2(rgGetEventMem) #ifdef TFU_ALLOC_EVENT_NO_INIT ret = cmGetMemNoInit(memCp, len, (Ptr *)ptr); #else ret = cmGetMem(memCp, len, (Ptr *)ptr); #endif /* */ - RETVALUE(ret); + return (ret); } /* end of rgGetEventMem*/ /*********************************************************** @@ -816,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; @@ -845,7 +801,7 @@ Inst dstInst; pst->intfVer = 0; pst->route = RTESPEC; - RETVOID; + return; } /* end of rgGetPstToInst */ /*********************************************************** @@ -870,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 @@ -885,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; @@ -896,18 +850,18 @@ RgInfLcgRegReq *lcgRegReq; { RLOG_ARG0(L_ERROR,DBG_CELLID,lcgRegReq->cellId,"Cell does not exist "); - RETVALUE(RFAILED); + return RFAILED; } if ((ue = rgDBMGetUeCb(cell, lcgRegReq->crnti)) == NULLP) { RLOG_ARG1(L_ERROR, DBG_CELLID,cell->cellId,"CRNTI:%d does not exist", lcgRegReq->crnti); - RETVALUE(RFAILED); + return RFAILED; } ue->ul.lcgArr[lcgRegReq->lcgId].isGbr = lcgRegReq->isGbr; - RETVALUE(ROK); + return ROK; } /* end of RgSchMacLcgRegReq */ #ifdef LTEMAC_SPS @@ -929,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 @@ -944,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; @@ -955,20 +907,20 @@ RgInfUlSpsReset *ulSpsResetInfo; { RLOG_ARG0(L_ERROR, DBG_CELLID,ulSpsResetInfo->cellId,"Cell does not exist "); - RETVALUE(RFAILED); + return RFAILED; } if ((ue = rgDBMGetUeCb(cell, ulSpsResetInfo->crnti)) == NULLP) { RLOG_ARG1(L_ERROR, DBG_CELLID,cell->cellId,"CRNTI:%d does not exist", ulSpsResetInfo->crnti); - RETVALUE(RFAILED); + return RFAILED; } ue->ul.implRelCntr = 0; ue->ul.explRelCntr = 0; - RETVALUE(ROK); + return ROK; } /* end of RgSchMacUlSpsResetReq */ @@ -999,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 @@ -1013,9 +965,7 @@ RgInfSpsLcInfo *lcInfo; Inst inst; RgCellCb *cell= NULLP; RgUeCb *ue; - U8 idx; - - TRC2(RgSchMacSpsLcRegReq); + uint8_t idx; RG_IS_INST_VALID(pst->dstInst); inst = pst->dstInst - RG_INST_START; @@ -1026,14 +976,14 @@ RgInfSpsLcInfo *lcInfo; { RLOG_ARG0(L_ERROR,DBG_CELLID,lcInfo->cellId, "Cell does not exist "); - RETVALUE(RFAILED); + return RFAILED; } if ((ue = rgDBMGetUeCb(cell, lcInfo->crnti)) == NULLP) { RLOG_ARG1(L_ERROR, DBG_CELLID,cell->cellId,"CRNTI:%d does not exist", lcInfo->crnti); - RETVALUE(RFAILED); + return RFAILED; } /* Store the sps-rnti and SPS LC information in the UE */ @@ -1051,10 +1001,10 @@ RgInfSpsLcInfo *lcInfo; { RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId, "Ue insertion into SPS list failed SPS CRNTI:%d", ue->spsRnti); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* end of RgSchMacSpsLcRegReq */ @@ -1082,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; @@ -1099,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; @@ -1110,13 +1058,13 @@ CmLteRnti crnti; { RLOG_ARG0(L_ERROR,DBG_CELLID,cellId, "Cell does not exist "); - RETVALUE(RFAILED); + return RFAILED; } if ((ue = rgDBMGetUeCb(cell, crnti)) == NULLP) { RLOG_ARG1(L_ERROR, DBG_CELLID,cellId,"CRNTI:%d Ue does not exist", crnti); - RETVALUE(RFAILED); + return RFAILED; } /* No need to reset the SPS LC Ids as they will not be looked at*/ @@ -1124,7 +1072,7 @@ CmLteRnti crnti; /* Delete UE from the SPS UE List */ rgDBMDelSpsUeCb(cell, ue); - RETVALUE(ROK); + return ROK; } /* end of RgSchMacSpsLcDeregReq */ #endif /* LTEMAC_SPS */ @@ -1168,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)) @@ -1177,7 +1123,7 @@ CmLteRnti newRnti; RLOG_ARG4(L_ERROR,DBG_CELLID,cell->cellId, "RNTI:%d Failed to get UECB[%lu:%lu] or NEW RNTI:%d", rnti, ((PTR)ue), ((PTR)newUe), newRnti); - RETVALUE(RFAILED); + return RFAILED; } #ifdef XEON_SPECIFIC_CHANGES CM_LOG_DEBUG(CM_LOG_ID_MAC, "MAC:UE[%d] id changed to %d\n", rnti, newRnti); @@ -1186,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. */ @@ -1198,7 +1144,7 @@ CmLteRnti newRnti; rgDBMDelUeCbFromRachLst(cell, newUe); rgFreeSBuf(inst,(Data **)&newUe, sizeof(*newUe)); - RETVALUE(ROK); + return ROK; } /* end of rgUtlHndlCrntiChng */ #ifdef LTE_ADV @@ -1218,25 +1164,23 @@ 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 { Inst inst = cell->macInst - RG_INST_START; - U8 idx = 0; + uint8_t idx = 0; Inst sCellInstIdx; 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,7 +1201,7 @@ RgUeCb *ue; } /* loop of if */ } /* loop of for */ - RETVALUE(ROK); + return ROK; } /* rgDelUeFrmAllSCell */ /** @@ -1275,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; @@ -1290,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)) { @@ -1312,7 +1254,7 @@ PUBLIC S16 rgUtlVltdAddSCellCfg(ueSCellCb, cell, inst) ret = RFAILED; } #endif - RETVALUE(ret); + return (ret); } /* rgUtlVltdAddSCellCfg */ /** @@ -1352,20 +1294,18 @@ CmLteRnti newRnti; Pst dstInstPst; RgPrgUeSCellDelInfo ueIdChngReq; RgUeCb *ue; - U8 idx; + uint8_t idx; #ifdef L2_OPTMZ 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) { RGDBGERRNEW(inst,(rgPBuf(inst),"[%d]RNTI:Failed to get ueCb \ newRnti=%d\n", rnti, newRnti)); - RETVALUE(RFAILED); + return RFAILED; } /* For all added SCells, prepare and send ueIdChngReq */ for(idx = 0; idx < RG_MAX_SCELL_PER_UE ; idx++) @@ -1397,7 +1337,7 @@ TfuDelDatReqInfo delDatReq; } /* loop of if */ } /* loop of for */ - RETVALUE(ROK); + return ROK; } /* rgUtlSndCrntiChngReq2AllSMacs */ #endif /* LTE_ADV */ @@ -1435,8 +1375,6 @@ CmLteRnti *rlsRnti; RgUeCb *spsUeCb = NULLP; #endif - TRC3(rgUtlHndlCrntiRls) - if ((ue = rgDBMGetUeCb(cell, rlsRnti->rnti)) == NULLP) { /* Check in RachLst */ @@ -1485,7 +1423,7 @@ CmLteRnti *rlsRnti; } } - RETVOID; + return; } /* end of rgUtlHndlCrntiRls */ /** @@ -1508,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 @@ -1527,15 +1465,13 @@ RgInfRlsRnti *rlsRnti; TfuDelDatReqInfo delDatReq; #endif - TRC3(RgSchMacRlsRntiReq) - RG_IS_INST_VALID(pst->dstInst); macInst = pst->dstInst - RG_INST_START; cell = rgCb[macInst].cell; if(NULLP == rlsRnti) { - RETVALUE(RFAILED); + return RFAILED; } if((cell == NULLP) || @@ -1545,7 +1481,7 @@ TfuDelDatReqInfo delDatReq; RLOG_ARG1(L_ERROR,DBG_CELLID,rlsRnti->cellId, "No cellCb found with cellId for RNTI:%d", rlsRnti->rnti); - RETVALUE(RFAILED); + return RFAILED; } /* Fix : syed Clearing UE context when SCH indicates to do so * UE DEL from CRG interface is now dummy. */ @@ -1559,7 +1495,7 @@ TfuDelDatReqInfo delDatReq; RLOG_ARG2(L_ERROR,DBG_CELLID,rlsRnti->cellId, "CRNTI change failed for RNTI:%d new RNTI:%d", rlsRnti->rnti,rlsRnti->newRnti); - RETVALUE(RFAILED); + return RFAILED; } #ifdef LTE_ADV @@ -1569,7 +1505,7 @@ TfuDelDatReqInfo delDatReq; if(rgUtlSndCrntiChngReq2AllSMacs(cell, rlsRnti->rnti, rlsRnti->newRnti) != ROK) { /* TODO: do we need to send DelInd to SCH in failure case*/ - RETVALUE(RFAILED); + return RFAILED; } #endif #ifdef L2_OPTMZ @@ -1600,23 +1536,23 @@ TfuDelDatReqInfo delDatReq; #endif } - RETVALUE(ROK); + return ROK; } /* end of RgSchMacRlsRntiReq */ #ifdef L2_OPTMZ #ifdef ANSI -PUBLIC Bool RgUtlIsTbMuxed +Bool RgUtlIsTbMuxed ( TfuDatReqTbInfo *tb ) #else -PUBLIC Bool RgUtlIsTbMuxed() +Bool RgUtlIsTbMuxed() TfuDatReqTbInfo *tb #endif { MsgLen len = 0; SFndLenMsg(tb->macHdr, &len); - RETVALUE(len?TRUE : FALSE); + return (len?TRUE : FALSE); } #endif