X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_l2m.c;h=d335f826633aa80d50f92763d32ec25b11c27843;hb=0a26c487f1b6bbb5217e47b15fa8273b2e749283;hp=2a618a476d895a0f80609c65311d082e907fdab8;hpb=105199ef642ffe9736ea24a01d4546578fa25e60;p=o-du%2Fl2.git

diff --git a/src/5gnrmac/rg_l2m.c b/src/5gnrmac/rg_l2m.c
index 2a618a476..d335f8266 100755
--- a/src/5gnrmac/rg_l2m.c
+++ b/src/5gnrmac/rg_l2m.c
@@ -94,7 +94,7 @@ PRIVATE RgL2MeasCb * rgL2mAllocMeasCb ARGS((
  *
  */
 #ifdef ANSI
-PUBLIC S16 rgL2mCreateMeasCb 
+S16 rgL2mCreateMeasCb 
 (
 RgCellCb       *cell,
 RgInfL2MeasReq *measInfo, 
@@ -102,7 +102,7 @@ U8              measType,
 RgErrInfo      *err
 )
 #else
-PUBLIC S16 rgL2mCreateMeasCb(cell, measInfo, measType, err)
+S16 rgL2mCreateMeasCb(cell, measInfo, measType, err)
 RgCellCb       *cell;
 RgInfL2MeasReq *measInfo; 
 U8              measType;
@@ -122,7 +122,7 @@ RgErrInfo      *err;
       if ((measCb = rgL2mAllocMeasCb(cell, measInfo, err)) == NULLP)
       {
          RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"Allocation of RgL2MeasCb failed");
-         RETVALUE(RFAILED);
+         return RFAILED;
       }
    //Memcpy is already done in rgL2mAllocMeasCb
    /*cmMemcpy((U8 *)&measCb->measReq, (CONSTANT U8 *)measInfo,\
@@ -144,7 +144,7 @@ RgErrInfo      *err;
       }
       cell->qciArray[measInfo->t.prbReq.qci[idx]].mask = TRUE;
    }
-   RETVALUE(ROK);
+   return ROK;
 } /* rgL2mCreateMeasCb */
 
 
@@ -167,14 +167,14 @@ RgErrInfo      *err;
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 rgL2mMeasReq 
+S16 rgL2mMeasReq 
 (
 RgCellCb       *cell,
 RgInfL2MeasReq *measInfo,
 RgErrInfo      *err
 )
 #else
-PUBLIC S16 rgL2mMeasReq(cell, measInfo, err)
+S16 rgL2mMeasReq(cell, measInfo, err)
 RgCellCb       *cell;
 RgInfL2MeasReq *measInfo; 
 RgErrInfo      *err;
@@ -188,9 +188,9 @@ RgErrInfo      *err;
                LRG_L2MEAS_AVG_PRB_PER_QCI_UL, err)) != ROK)
    {
       /* Clear Downlink MeasCb created Above If exists*/
-      RETVALUE(ret);
+      return (ret);
    }
-   RETVALUE(ROK);
+   return ROK;
 } /* rgL2mMeasReq */
 /** @brief This function sends the measurement confirm
  *  from mac to scheduler
@@ -273,13 +273,13 @@ RgInfL2MeasCfm    *measCfm;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 RgSchMacL2MeasReq
+S16 RgSchMacL2MeasReq
 (
 Pst               *pst,          /* post structure  */
 RgInfL2MeasReq    *measInfo      /* Meas Req Info */
 )
 #else
-PUBLIC S16 RgSchMacL2MeasReq(pst, measInfo)
+S16 RgSchMacL2MeasReq(pst, measInfo)
 Pst               *pst;          /* post structure  */
 RgInfL2MeasReq    *measInfo;      /* Meas Req Info */
 #endif    
@@ -301,7 +301,7 @@ RgInfL2MeasReq    *measInfo;      /* Meas Req Info */
        (cellCb->cellId != measInfo->cellId))
    {
       RLOG_ARG0(L_ERROR,DBG_CELLID,measInfo->cellId,"unable to get the cellCb");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    /* Call L2M Function to store Meas req */
    ret = rgL2mMeasReq(cellCb, measInfo, &err);
@@ -317,9 +317,9 @@ RgInfL2MeasReq    *measInfo;      /* Meas Req Info */
       RLOG_ARG2(L_ERROR,DBG_CELLID,measInfo->cellId,
                "Meas req Failed  errType(%d) errCause(%d)",
                err.errType, err.errCause);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
-   RETVALUE(ret);
+   return (ret);
 } /* -- RgSchMacL2MeasReq-- */
 
 /**
@@ -337,13 +337,13 @@ RgInfL2MeasReq    *measInfo;      /* Meas Req Info */
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 RgSchMacL2MeasStopReq
+S16 RgSchMacL2MeasStopReq
 (
 Pst               *pst,          /* post structure  */
 RgInfL2MeasStopReq *measInfo      /* Meas Req Info */
 )
 #else
-PUBLIC S16 RgSchMacL2MeasStopReq(pst, measInfo)
+S16 RgSchMacL2MeasStopReq(pst, measInfo)
 Pst               *pst;          /* post structure  */
 RgInfL2MeasStopReq *measInfo;      /* Meas Req Info */
 #endif
@@ -371,7 +371,7 @@ RgInfL2MeasStopReq *measInfo;      /* Meas Req Info */
       
       RLOG_ARG0(L_ERROR,DBG_CELLID,measInfo->cellId,
             "Unable to get the cellCb");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    node = cellCb->l2mList.first; 
    while(node != NULLP)
@@ -393,7 +393,7 @@ RgInfL2MeasStopReq *measInfo;      /* Meas Req Info */
    measCfm.measType    = measInfo->measType;
    measCfm.cfm.status  = LCM_PRIM_OK;
    rgSndL2MeasStopCfm(cellCb, &measCfm);
-   RETVALUE(ret);
+   return (ret);
 } /* -- RgSchMacL2MeasStopReq-- */
 
 /**
@@ -411,13 +411,13 @@ RgInfL2MeasStopReq *measInfo;      /* Meas Req Info */
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 RgSchMacL2MeasSendReq
+S16 RgSchMacL2MeasSendReq
 (
 Pst               *pst,          /* post structure  */
 RgInfL2MeasSndReq *measInfo      /* Meas Req Info */
 )
 #else
-PUBLIC S16 RgSchMacL2MeasSendReq(pst, measInfo)
+S16 RgSchMacL2MeasSendReq(pst, measInfo)
 Pst               *pst;          /* post structure  */
 RgInfL2MeasSndReq *measInfo;      /* Meas Req Info */
 #endif
@@ -439,12 +439,12 @@ RgInfL2MeasSndReq *measInfo;      /* Meas Req Info */
       
       RLOG_ARG0(L_ERROR,DBG_CELLID,measInfo->cellId,
             "Unable to get the cellCb");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    /*set sndL2Meas as applicatoin sent l2 meas info request*/
    cellCb->sndL2Meas = TRUE;
 
-   RETVALUE(ret);
+   return (ret);
 }/*RgSchMacL2MeasSendReq*/ 
 
 /** @brief This function inserts the MeasCb in to data base
@@ -504,7 +504,7 @@ RgInfL2MeasReq *measInfo;
       {
          cell->l2mList.crnt = lnk;
          cmLListInsCrnt(&(cell->l2mList), node);
-         RETVALUE(ROK);
+         return ROK;
       }
       else
       {
@@ -513,7 +513,7 @@ RgInfL2MeasReq *measInfo;
    }  /* End of While */
 
    cmLListAdd2Tail(&(cell->l2mList), node);
-   RETVALUE(ROK);
+   return ROK;
 } /* rgL2mInsertMeasCb */
 
 /** @brief This function allocates memory from the heap
@@ -553,12 +553,12 @@ RgErrInfo      *err;
                    "Allocation of RgL2MeasCb failed");
          err->errType  = RGERR_L2M_MEASREQ;
          err->errCause = RGERR_RAM_MEM_EXHAUST;
-         RETVALUE(NULLP);
+         return (NULLP);
       }
    cmMemcpy((U8 *)&measCb->measReq, (U8 *)measInfo, sizeof(RgInfL2MeasReq));
    RGCPYTIMEINFO(cell->crntTime, measCb->startTime);
 
-   RETVALUE(measCb);
+   return (measCb);
 } /* rgL2mAllocMeasCb */
 
 
@@ -577,12 +577,12 @@ RgErrInfo      *err;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgL2Meas
+S16 rgL2Meas
 (
 RgCellCb  *cell
 )
 #else
-PUBLIC S16 rgL2Meas(cell)
+S16 rgL2Meas(cell)
 RgCellCb  *cell;
 #endif
 {
@@ -652,7 +652,7 @@ RgCellCb  *cell;
          continue;
       } 
    }
-   RETVALUE(ROK);
+   return ROK;
 } /* rgL2MEas */
 
 #endif /* LTE_L2_MEAS */