X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_lim.c;h=df56929e147b360fbef9536d49cf58ca910888f8;hb=694adde1a08c393a8443fd5bbd4f036f5cf85403;hp=ca124358d89df6e7e58591eb44c12e7887f31808;hpb=a5530e70a9d414952dadd1688aa9b4280c0dbb5a;p=o-du%2Fl2.git

diff --git a/src/5gnrmac/rg_lim.c b/src/5gnrmac/rg_lim.c
index ca124358d..df56929e1 100755
--- a/src/5gnrmac/rg_lim.c
+++ b/src/5gnrmac/rg_lim.c
@@ -85,14 +85,14 @@ PRIVATE Void rgLIMUtlFreeDatReqEvnt ARGS((TfuDatReqInfo *datReq,
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgLIMTfuBndReq
+S16 rgLIMTfuBndReq
 (
 Inst    inst,
 SuId    suId, 
 SpId    spId
 )
 #else
-PUBLIC S16 rgLIMTfuBndReq(inst,suId, spId)
+S16 rgLIMTfuBndReq(inst,suId, spId)
 Inst    inst;
 SuId    suId; 
 SpId    spId;
@@ -102,16 +102,15 @@ SpId    spId;
    RgLowSapCb  *tfuSap;
    Pst         pst;
 
-   TRC2(rgLIMTfuBndReq);
 
    /* Get the lower SAP control block from the layer control block. */
    tfuSap = &(rgCb[inst].tfuSap);
-   (Void)cmMemcpy ((U8*)&pst, (U8*)&(tfuSap->sapCfg.sapPst), sizeof(Pst));
+   memcpy (&pst, &(tfuSap->sapCfg.sapPst), sizeof(Pst));
    if((ret = RgLiTfuBndReq (&pst, suId, spId)) != ROK)
    {
       RLOG0(L_ERROR,"Call to RgLiTfuBndReq() failed");
    }
-   RETVALUE(ret);
+   return (ret);
 }  /* rgLIMTfuBndReq */
 
 
@@ -134,14 +133,14 @@ SpId    spId;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgLIMTfuUbndReq
+S16 rgLIMTfuUbndReq
 (
 Inst    inst,
 SpId    spId, 
 Reason  reason
 )
 #else
-PUBLIC S16 rgLIMTfuUbndReq(inst,spId, reason)
+S16 rgLIMTfuUbndReq(inst,spId, reason)
 Inst    inst;
 SpId    spId; 
 Reason  reason;
@@ -151,16 +150,15 @@ Reason  reason;
    RgLowSapCb  *tfuSap;
    Pst         pst;
 
-   TRC2(rgLIMTfuUbndReq);
 
    /* Get the lower SAP control block from the layer control block. */
    tfuSap = &(rgCb[inst].tfuSap);
-   cmMemcpy ((U8*)&pst, (U8*)&(tfuSap->sapCfg.sapPst), sizeof(Pst));
+   memcpy (&pst, &(tfuSap->sapCfg.sapPst), sizeof(Pst));
    if((ret = RgLiTfuUbndReq (&pst, tfuSap->sapCfg.spId, reason)) != ROK)
    {
       RLOG0(L_ERROR,"Call to RgLiTfuUbndReq() failed");
    }
-   RETVALUE(ret);
+   return (ret);
 
 }  /* rgLIMTfuUbndReq */
 
@@ -183,14 +181,14 @@ Reason  reason;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 RgLiTfuBndCfm 
+S16 RgLiTfuBndCfm 
 (
 Pst     *pst,
 SuId    suId, 
 U8      status
 )
 #else
-PUBLIC S16 RgLiTfuBndCfm(pst, suId, status)
+S16 RgLiTfuBndCfm(pst, suId, status)
 Pst     *pst; 
 SuId    suId; 
 U8      status;
@@ -200,7 +198,6 @@ U8      status;
    S16 ret;
    RgLowSapCb  *tfuSap;
 
-   TRC3(RgLiTfuBndCfm);
 
 
    RG_IS_INST_VALID(pst->dstInst);
@@ -213,10 +210,10 @@ U8      status;
    {
       RLOG2(L_ERROR,"Incorrect SuId. Configured (%d) Recieved (%d)",
             tfuSap->sapCfg.suId, suId);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    ret = rgLMMBndCfm (pst, suId, status);
-   RETVALUE(ret);
+   return (ret);
 }  /* RgLiTfuBndCfm */
 
  /** @brief This function Validates the SAP information received along with the
@@ -244,7 +241,6 @@ PRIVATE S16 rgLIMValidateSap(inst,suId)
 {
    RgLowSapCb  *tfuSap;
 
-   TRC2(rgLIMValidateSap)
 
    tfuSap = &(rgCb[inst].tfuSap);
 
@@ -253,15 +249,15 @@ PRIVATE S16 rgLIMValidateSap(inst,suId)
    {
       RLOG2(L_ERROR,"Incorrect SuId. Configured (%d) Recieved (%d)",
             tfuSap->sapCfg.suId, suId);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    if (tfuSap->sapSta.sapState != LRG_BND)
    {
       RLOG1(L_ERROR,"Lower SAP not enabled SuId (%d)",
             tfuSap->sapCfg.suId);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
-   RETVALUE(ROK);
+   return ROK;
 } /* end of rgLIMValidateSap */
 #endif
 /** @brief This function frees up the TfuDatIndInfo structure
@@ -293,7 +289,6 @@ PRIVATE Void rgLIMUtlFreeDatIndEvnt(datInd, error)
    TfuDatInfo     *datInfo;
    CmLList        *node;
 
-   TRC2(rgLIMUtlFreeDatIndEvnt);
    /* Steps of freeing up the TfuDatInd.
     * 1. loop through the datIndLst and free up all the buffers.
     * 2. free up the whole event
@@ -330,14 +325,14 @@ PRIVATE Void rgLIMUtlFreeDatIndEvnt(datInd, error)
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 RgLiTfuDatInd
+S16 RgLiTfuDatInd
 (
 Pst                *pst, 
 SuId               suId, 
 TfuDatIndInfo    *datInd
 )
 #else
-PUBLIC S16 RgLiTfuDatInd(pst, suId, datInd)
+S16 RgLiTfuDatInd(pst, suId, datInd)
 Pst                *pst; 
 SuId               suId; 
 TfuDatIndInfo    *datInd;
@@ -347,7 +342,6 @@ TfuDatIndInfo    *datInd;
    S16              ret;
    VOLATILE U32     startTime=0;
 
-   TRC3(RgLiTfuDatInd);
 
   // printf("5GTF:: DatindRcvd\n");
 
@@ -361,7 +355,7 @@ TfuDatIndInfo    *datInd;
    {
       RLOG_ARG0(L_ERROR,DBG_CELLID,datInd->cellId,"SAP Validation failed");
       rgLIMUtlFreeDatIndEvnt(datInd, TRUE);
-      RETVALUE(ret);
+      return (ret);
    }
 #endif
    /* Now call the TOM (Tfu ownership module) primitive to process further */
@@ -382,7 +376,7 @@ TfuDatIndInfo    *datInd;
    /*stoping Task*/
    SStopTask(startTime, PID_MAC_TFU_DATIND);
 
-   RETVALUE(ret);
+   return (ret);
 }  /* RgLiTfuDatInd*/
 
 #ifdef RG_UNUSED
@@ -416,7 +410,6 @@ PRIVATE Void rgLIMUtlFreeDatReqEvnt(datReq, error)
    CmLList          *node;
    U8               i;
 
-   TRC2(rgLIMUtlFreeDatReqEvnt);
    /* Steps of freeing up the TfuDatReq.
     * 1. Free the bch buffer.
     * 2. loop through the pdus list and free up all the buffers.
@@ -467,13 +460,13 @@ PRIVATE Void rgLIMUtlFreeDatReqEvnt(datReq, error)
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgLIMTfuDatReq 
+S16 rgLIMTfuDatReq 
 (
 Inst          inst,
 TfuDatReqInfo *datReq
 )
 #else
-PUBLIC S16 rgLIMTfuDatReq(inst,datReq)
+S16 rgLIMTfuDatReq(inst,datReq)
 Inst          inst;
 TfuDatReqInfo *datReq;
 #endif
@@ -481,7 +474,6 @@ TfuDatReqInfo *datReq;
    S16         ret;
    RgLowSapCb  *tfuSap;
 
-   TRC2(rgLIMTfuDatReq)
 
    /* Get the lower SAP control block from the layer control block. */
    tfuSap = &(rgCb[inst].tfuSap);
@@ -495,7 +487,7 @@ TfuDatReqInfo *datReq;
       /* This case will never be hit if sap is not bound then we dont get TTI */
       rgLIMUtlFreeDatReqEvnt(datReq, TRUE);
 #endif
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif
 
@@ -507,7 +499,7 @@ TfuDatReqInfo *datReq;
    {
       RLOG_ARG0(L_ERROR,DBG_CELLID,datReq->cellId,"Call to RgLiTfuDatReq() failed");
    }
-   RETVALUE(ret);
+   return (ret);
 }  /* rgLIMTfuDatReq*/
 
 #ifdef L2_OPTMZ
@@ -529,13 +521,13 @@ TfuDatReqInfo *datReq;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 rgLIMTfuDelDatReq 
+S16 rgLIMTfuDelDatReq 
 (
 Inst          inst,
 TfuDelDatReqInfo *delDatReq
 )
 #else
-PUBLIC S16 rgLIMTfuDatReq(inst,delDatReq)
+S16 rgLIMTfuDatReq(inst,delDatReq)
 Inst          inst;
 TfuDelDatReqInfo *delDatReq;
 #endif
@@ -543,7 +535,6 @@ TfuDelDatReqInfo *delDatReq;
    S16         ret;
    RgLowSapCb  *tfuSap;
 
-   TRC2(rgLIMTfuDelDatReq)
 
    /* Get the lower SAP control block from the layer control block. */
    tfuSap = &(rgCb[inst].tfuSap);
@@ -553,7 +544,7 @@ TfuDelDatReqInfo *delDatReq;
    {
       RLOG_ARG1(L_ERROR,DBG_CELLID,delDatReq->cellId,"Lower SAP not bound (%d)",
             tfuSap->sapSta.sapState);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif
 
@@ -562,7 +553,7 @@ TfuDelDatReqInfo *delDatReq;
    {
       RLOG_ARG0(L_ERROR,DBG_CELLID,delDatReq->cellId,"Call to RgLiTfuDelDatReq() failed");
    }
-   RETVALUE(ret);
+   return (ret);
 }  /* rgLIMTfuDatReq*/
 #endif /*L2_OPTMZ */
 
@@ -583,28 +574,27 @@ TfuDelDatReqInfo *delDatReq;
  *      -# RFAILED 
  **/
 #ifdef ANSI
-PUBLIC S16 RgLiTfuNonRtInd
+S16 RgLiTfuNonRtInd
 (
 Pst                 *pst,
 SuId                suId
 )
 #else
-PUBLIC S16 RgLiTfuNonRtInd(pst, suId)
+S16 RgLiTfuNonRtInd(pst, suId)
 Pst                 *pst;
 SuId                suId;
 #endif
 {
-   TRC3(RgLiTfuNonRtInd);
 
 #ifdef NO_ERRCLS
    if (rgLIMValidateSap (pst->dstInst - RG_INST_START, suId) != ROK)
    {
       RGDBGERRNEW(pst->dstInst - RG_INST_START, (rgPBuf(pst->dstInst - RG_INST_START),"RgLiTfuNonRtInd() SAP Validation failed.\n"));
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif
    rgDHMFreeTbBufs(pst->dstInst - RG_INST_START);
-   RETVALUE(ROK);
+   return ROK;
 }  /* RgLiTfuNonRtInd */
 
 #endif