X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_ram.c;h=225e448291e5865969748f4386923ab91fa0e2cb;hb=545c7a4a13972142fb36962323556dcad7119710;hp=da2b5787a398cfda2ae0068a07ef9e19643c9e64;hpb=5d74fef7c9fe6b65a965ceac6bfe812872dab323;p=o-du%2Fl2.git

diff --git a/src/5gnrmac/rg_ram.c b/src/5gnrmac/rg_ram.c
index da2b5787a..225e44829 100755
--- a/src/5gnrmac/rg_ram.c
+++ b/src/5gnrmac/rg_ram.c
@@ -32,10 +32,6 @@
 @brief This file has APIs to handle the random access procedure functionality.
 */
 
-static const char* RLOG_MODULE_NAME="MAC";
-static int RLOG_FILE_ID=132;
-static int RLOG_MODULE_ID=4096;
-
 /* header include files (.h) */
 #include "common_def.h"
 #include "rg_env.h"        /* MAC Environment Defines */
@@ -82,17 +78,7 @@ 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)
 {
    rgDHMFreeUe(inst,&ue->dl.hqEnt);
 
@@ -102,7 +88,7 @@ RgUeCb      *ue;
    rgFreeSBuf(inst,(Data **)&ue, sizeof(*ue));
 
    /* Stack Crash problem for TRACE5 changes. Added the return below */
-   RETVOID;
+   return;
 
 }  /* rgRAMFreeUeCb */
 
@@ -120,32 +106,17 @@ 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;
 
-   RLOG_ARG1(L_INFO,DBG_CELLID,cell->cellId,"CREATE UECB FOR CRNTI:%d",
+   DU_LOG("\nINFO  -->  MAC : CREATE UECB FOR CRNTI:%d",
              tmpCrnti);
    /* Allocate the Ue control block */
    if (rgAllocSBuf(inst,(Data **)&ueCb, sizeof(*ueCb)) != ROK)
    {
-      RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,
-                "Memory allocation FAILED for CRNTI:%d",tmpCrnti);
+      DU_LOG("\nERROR  -->  MAC : Memory allocation FAILED for CRNTI:%d",tmpCrnti);
       err->errCause = RGERR_RAM_MEM_EXHAUST;
       return (NULLP);
    }
@@ -192,15 +163,7 @@ 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;
@@ -237,26 +200,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;
+   uint8_t  idx;
 
    if(NULLP == rarInfo->raRntiInfo)
    {
@@ -301,7 +250,7 @@ RgErrInfo           *err;
       }
       else
       {
-         RLOG_ARG1(L_ERROR,DBG_CELLID,cell->cellId,"RARNTI:%d Creation of RAR"
+         DU_LOG("\nERROR  -->  MAC : RARNTI:%d Creation of RAR"
                   "PDU for failed", rarInfo->raRntiInfo[idx1].raRnti);
          continue;
       }