X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_lim.c;h=6f0286d4e9ab73df9d5046efb0c0df80f714e473;hb=9634ca974c4418c0800090e33d37ef1fe7e8cb30;hp=9eccb08595ff33365c7ce409780022ec130e423c;hpb=0a26c487f1b6bbb5217e47b15fa8273b2e749283;p=o-du%2Fl2.git

diff --git a/src/5gnrmac/rg_lim.c b/src/5gnrmac/rg_lim.c
index 9eccb0859..6f0286d4e 100755
--- a/src/5gnrmac/rg_lim.c
+++ b/src/5gnrmac/rg_lim.c
@@ -56,12 +56,12 @@ static int RLOG_MODULE_ID=4096;
 
 /* local externs */
 #ifdef UNUSED_FUNC
-PRIVATE S16  rgLIMValidateSap ARGS((Inst inst,SuId suId));
+static S16  rgLIMValidateSap ARGS((Inst inst,SuId suId));
 #endif
-PRIVATE Void rgLIMUtlFreeDatIndEvnt ARGS((TfuDatIndInfo *datInd,
+static Void rgLIMUtlFreeDatIndEvnt ARGS((TfuDatIndInfo *datInd,
                                           Bool error));
 #ifdef RG_UNUSED
-PRIVATE Void rgLIMUtlFreeDatReqEvnt ARGS((TfuDatReqInfo *datReq,
+static Void rgLIMUtlFreeDatReqEvnt ARGS((TfuDatReqInfo *datReq,
                                           Bool error));
 #endif
 /* forward references */
@@ -102,11 +102,10 @@ 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");
@@ -151,11 +150,10 @@ 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");
@@ -177,7 +175,7 @@ Reason  reason;
  *           
  *  @param[in]  Pst   *pst 
  *  @param[in]  SuId  suId 
- *  @param[in]  U8    status
+ *  @param[in]  uint8_t    status
  *  @return  S16
  *      -# ROK 
  *      -# RFAILED 
@@ -187,20 +185,19 @@ S16 RgLiTfuBndCfm
 (
 Pst     *pst,
 SuId    suId, 
-U8      status
+uint8_t status
 )
 #else
 S16 RgLiTfuBndCfm(pst, suId, status)
 Pst     *pst; 
 SuId    suId; 
-U8      status;
+uint8_t status;
 #endif
 {
    Inst inst;
    S16 ret;
    RgLowSapCb  *tfuSap;
 
-   TRC3(RgLiTfuBndCfm);
 
 
    RG_IS_INST_VALID(pst->dstInst);
@@ -231,20 +228,19 @@ U8      status;
   */
 #ifdef UNUSED_FUNC
 #ifdef ANSI
-PRIVATE S16 rgLIMValidateSap
+static S16 rgLIMValidateSap
 (
  Inst    inst,
  SuId    suId
 )
 #else
-PRIVATE S16 rgLIMValidateSap(inst,suId)
+static S16 rgLIMValidateSap(inst,suId)
  Inst    inst;
  SuId    suId;
 #endif
 {
    RgLowSapCb  *tfuSap;
 
-   TRC2(rgLIMValidateSap)
 
    tfuSap = &(rgCb[inst].tfuSap);
 
@@ -278,13 +274,13 @@ PRIVATE S16 rgLIMValidateSap(inst,suId)
  * @return 
  */
 #ifdef ANSI
-PRIVATE Void rgLIMUtlFreeDatIndEvnt 
+static Void rgLIMUtlFreeDatIndEvnt 
 (
  TfuDatIndInfo *datInd,
  Bool          error
  )
 #else
-PRIVATE Void rgLIMUtlFreeDatIndEvnt(datInd, error)
+static Void rgLIMUtlFreeDatIndEvnt(datInd, error)
  TfuDatIndInfo *datInd;
  Bool          error;
 #endif
@@ -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
@@ -309,7 +304,7 @@ PRIVATE Void rgLIMUtlFreeDatIndEvnt(datInd, error)
       }
    }
    RG_FREE_MEM(datInd);
-   RETVOID;
+   return;
 } /* end of rgLIMUtlFreeDatIndEvnt*/
 
 /**
@@ -345,9 +340,8 @@ TfuDatIndInfo    *datInd;
 {
    Inst             inst;
    S16              ret;
-   VOLATILE U32     startTime=0;
+   volatile uint32_t     startTime=0;
 
-   TRC3(RgLiTfuDatInd);
 
   // printf("5GTF:: DatindRcvd\n");
 
@@ -400,13 +394,13 @@ TfuDatIndInfo    *datInd;
  * @return 
  */
 #ifdef ANSI
-PRIVATE Void rgLIMUtlFreeDatReqEvnt
+static Void rgLIMUtlFreeDatReqEvnt
 (
  TfuDatReqInfo *datReq,
  Bool          error
  )
 #else
-PRIVATE Void rgLIMUtlFreeDatReqEvnt(datReq, error)
+static Void rgLIMUtlFreeDatReqEvnt(datReq, error)
  TfuDatReqInfo *datReq;
  Bool          error;
 #endif
@@ -414,9 +408,8 @@ PRIVATE Void rgLIMUtlFreeDatReqEvnt(datReq, error)
 
    TfuDatReqPduInfo *datInfo;
    CmLList          *node;
-   U8               i;
+   uint8_t          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.
@@ -446,7 +439,7 @@ PRIVATE Void rgLIMUtlFreeDatReqEvnt(datReq, error)
       }
    }
    RG_FREE_MEM(datReq);
-   RETVOID;
+   return;
 } /* end of rgLIMUtlFreeDatReqEvnt*/
 #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);
@@ -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);
@@ -594,7 +585,6 @@ Pst                 *pst;
 SuId                suId;
 #endif
 {
-   TRC3(RgLiTfuNonRtInd);
 
 #ifdef NO_ERRCLS
    if (rgLIMValidateSap (pst->dstInst - RG_INST_START, suId) != ROK)