X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_ram.c;h=ea819cd319afb65826cca5096b02f19145a80519;hb=9634ca974c4418c0800090e33d37ef1fe7e8cb30;hp=f82bb8bda4279a11dd2a155400a956a098d6e069;hpb=105199ef642ffe9736ea24a01d4546578fa25e60;p=o-du%2Fl2.git

diff --git a/src/5gnrmac/rg_ram.c b/src/5gnrmac/rg_ram.c
index f82bb8bda..ea819cd31 100755
--- a/src/5gnrmac/rg_ram.c
+++ b/src/5gnrmac/rg_ram.c
@@ -83,19 +83,17 @@ static int RLOG_MODULE_ID=4096;
  *
  **********************************************************/
 #ifdef ANSI
-PUBLIC Void rgRAMFreeUeCb
+Void rgRAMFreeUeCb
 (
 Inst        inst,
 RgUeCb      *ue
 )
 #else
-PUBLIC Void rgRAMFreeUeCb(inst,ue)
+Void rgRAMFreeUeCb(inst,ue)
 Inst        inst;
 RgUeCb      *ue;
 #endif
 {
-   TRC2(rgRAMFreeUeCb);
-
    rgDHMFreeUe(inst,&ue->dl.hqEnt);
 
    /*ccpu00117052 - MOD - Passing double pointer for proper NULLP 
@@ -104,7 +102,7 @@ RgUeCb      *ue;
    rgFreeSBuf(inst,(Data **)&ue, sizeof(*ue));
 
    /* Stack Crash problem for TRACE5 changes. Added the return below */
-   RETVOID;
+   return;
 
 }  /* rgRAMFreeUeCb */
 
@@ -123,7 +121,7 @@ RgUeCb      *ue;
  *  @return  RgUeCb*
  **/
 #ifdef ANSI
-PUBLIC RgUeCb* rgRAMCreateUeCb
+RgUeCb* rgRAMCreateUeCb
 (
 RgCellCb       *cell,
 CmLteRnti      tmpCrnti,
@@ -131,7 +129,7 @@ Bool           insert,
 RgErrInfo      *err
 )
 #else
-PUBLIC RgUeCb* rgRAMCreateUeCb(cell, tmpCrnti, insert, err)
+RgUeCb* rgRAMCreateUeCb(cell, tmpCrnti, insert, err)
 RgCellCb       *cell;
 CmLteRnti      tmpCrnti;
 Bool           insert;
@@ -141,8 +139,6 @@ 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 */
@@ -151,7 +147,7 @@ RgErrInfo      *err;
       RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,
                 "Memory allocation FAILED for CRNTI:%d",tmpCrnti);
       err->errCause = RGERR_RAM_MEM_EXHAUST;
-      RETVALUE(NULLP);
+      return (NULLP);
    }
 
    /* Inititialize Ue control block */
@@ -178,7 +174,7 @@ RgErrInfo      *err;
       rgDBMInsUeCbInRachLst(cell, ueCb);
    }
 
-   RETVALUE(ueCb);
+   return (ueCb);
 }  /* rgRAMCreateUeCb */
 
 /**
@@ -197,20 +193,18 @@ RgErrInfo      *err;
  *      -# ROK 
  **/
 #ifdef ANSI
-PUBLIC S16 rgRAMFreeCell
+S16 rgRAMFreeCell
 (
 RgCellCb    *cell
 )
 #else
-PUBLIC S16 rgRAMFreeCell(cell)
+S16 rgRAMFreeCell(cell)
 RgCellCb    *cell;
 #endif
 {
    Inst    inst = cell->macInst - RG_INST_START;
    RgUeCb  *ueCb;
 
-   TRC2(rgRAMFreeCell);
-
    /* Free CURRENT CRG cfg list */
    while ((ueCb = rgDBMGetNextUeCbFromRachLst(cell, NULLP)) != NULLP)
    {
@@ -218,7 +212,7 @@ RgCellCb    *cell;
       rgRAMFreeUeCb(inst,ueCb);
    }
 
-   RETVALUE(ROK); 
+   return ROK; 
 } /* rgRAMFreeCell */
 /**
  * @brief Function for handling RA response scheduled for a subframe.
@@ -244,7 +238,7 @@ RgCellCb    *cell;
  *      -# ROK 
  **/
 #ifdef ANSI
-PUBLIC S16 rgHndlRaResp
+S16 rgHndlRaResp
 (
 RgCellCb            *cell,
 CmLteTimingInfo     timingInfo,
@@ -252,23 +246,21 @@ RgInfRarInfo        *rarInfo,
 RgErrInfo           *err
 )
 #else
-PUBLIC S16 rgHndlRaResp(cell, timingInfo, rarInfo, err)
+S16 rgHndlRaResp(cell, timingInfo, rarInfo, err)
 RgCellCb            *cell;
 CmLteTimingInfo     timingInfo;
 RgInfRarInfo        *rarInfo;
 RgErrInfo           *err;
 #endif
 {
-   U8       idx1,idx2;
+   uint8_t  idx1,idx2;
    Buffer   *rarPdu;
    RgDlSf   *dlSf;
-   U8       idx;
-
-   TRC2(rgHndlRaResp)
+   uint8_t  idx;
 
    if(NULLP == rarInfo->raRntiInfo)
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    idx = (timingInfo.slot % RG_NUM_SUB_FRAMES);
@@ -289,7 +281,7 @@ RgErrInfo           *err;
                   rarInfo->raRntiInfo[idx1].crntiInfo[idx2].tmpCrnti, 
                   TRUE, err) == NULLP)
                {
-                  RETVALUE(RFAILED);
+                  return RFAILED;
                }
             }
          }
@@ -314,7 +306,7 @@ RgErrInfo           *err;
          continue;
       }
    } /* end of raRntis loop */
-   RETVALUE(ROK);
+   return ROK;
 } /* end of rgHndlRaResp */
 
 /**********************************************************************