X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_ram.c;h=e8e3473574581d9fed16f29e3bac91d5bad3abc7;hb=514d4c21e79d37636005186dd9ac5510742b7618;hp=bfaefcba70d331b22d19d3c4505d0e9b47f81401;hpb=0a26c487f1b6bbb5217e47b15fa8273b2e749283;p=o-du%2Fl2.git diff --git a/src/5gnrmac/rg_ram.c b/src/5gnrmac/rg_ram.c index bfaefcba7..e8e347357 100755 --- a/src/5gnrmac/rg_ram.c +++ b/src/5gnrmac/rg_ram.c @@ -82,20 +82,8 @@ static int RLOG_MODULE_ID=4096; * File : * **********************************************************/ -#ifdef ANSI -Void rgRAMFreeUeCb -( -Inst inst, -RgUeCb *ue -) -#else -Void rgRAMFreeUeCb(inst,ue) -Inst inst; -RgUeCb *ue; -#endif +Void rgRAMFreeUeCb(Inst inst,RgUeCb *ue) { - TRC2(rgRAMFreeUeCb); - rgDHMFreeUe(inst,&ue->dl.hqEnt); /*ccpu00117052 - MOD - Passing double pointer for proper NULLP @@ -104,7 +92,7 @@ RgUeCb *ue; rgFreeSBuf(inst,(Data **)&ue, sizeof(*ue)); /* Stack Crash problem for TRACE5 changes. Added the return below */ - RETVOID; + return; } /* rgRAMFreeUeCb */ @@ -122,27 +110,11 @@ RgUeCb *ue; * @param[out] RgErrInfo *err * @return RgUeCb* **/ -#ifdef ANSI -RgUeCb* rgRAMCreateUeCb -( -RgCellCb *cell, -CmLteRnti tmpCrnti, -Bool insert, -RgErrInfo *err -) -#else -RgUeCb* rgRAMCreateUeCb(cell, tmpCrnti, insert, err) -RgCellCb *cell; -CmLteRnti tmpCrnti; -Bool insert; -RgErrInfo *err; -#endif +RgUeCb* rgRAMCreateUeCb(RgCellCb *cell,CmLteRnti tmpCrnti,Bool insert,RgErrInfo *err) { Inst inst = cell->macInst - RG_INST_START; RgUeCb *ueCb = NULLP; - TRC2(rgRAMCreateUeCb) - RLOG_ARG1(L_INFO,DBG_CELLID,cell->cellId,"CREATE UECB FOR CRNTI:%d", tmpCrnti); /* Allocate the Ue control block */ @@ -196,21 +168,11 @@ RgErrInfo *err; * @return S16 * -# ROK **/ -#ifdef ANSI -S16 rgRAMFreeCell -( -RgCellCb *cell -) -#else -S16 rgRAMFreeCell(cell) -RgCellCb *cell; -#endif +S16 rgRAMFreeCell(RgCellCb *cell) { Inst inst = cell->macInst - RG_INST_START; RgUeCb *ueCb; - TRC2(rgRAMFreeCell); - /* Free CURRENT CRG cfg list */ while ((ueCb = rgDBMGetNextUeCbFromRachLst(cell, NULLP)) != NULLP) { @@ -243,28 +205,12 @@ RgCellCb *cell; * @return S16 * -# ROK **/ -#ifdef ANSI -S16 rgHndlRaResp -( -RgCellCb *cell, -CmLteTimingInfo timingInfo, -RgInfRarInfo *rarInfo, -RgErrInfo *err -) -#else -S16 rgHndlRaResp(cell, timingInfo, rarInfo, err) -RgCellCb *cell; -CmLteTimingInfo timingInfo; -RgInfRarInfo *rarInfo; -RgErrInfo *err; -#endif +S16 rgHndlRaResp(RgCellCb *cell,CmLteTimingInfo timingInfo,RgInfRarInfo *rarInfo,RgErrInfo *err) { - U8 idx1,idx2; + uint8_t idx1,idx2; Buffer *rarPdu; RgDlSf *dlSf; - U8 idx; - - TRC2(rgHndlRaResp) + uint8_t idx; if(NULLP == rarInfo->raRntiInfo) {