X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2F5gnrsch%2Frg_sch_l2m.c;h=b23df0ccce5956686de883efc250a066ba50b763;hb=5d74fef7c9fe6b65a965ceac6bfe812872dab323;hp=eaaa884c95738b86877f6abf86c1b59a23146213;hpb=aee73991f728cc127d1ed76d5a52571d916235a4;p=o-du%2Fl2.git

diff --git a/src/5gnrsch/rg_sch_l2m.c b/src/5gnrsch/rg_sch_l2m.c
index eaaa884c9..b23df0ccc 100755
--- a/src/5gnrsch/rg_sch_l2m.c
+++ b/src/5gnrsch/rg_sch_l2m.c
@@ -87,7 +87,7 @@ PRIVATE RgSchL2MeasCb * rgSchL2mAllocMeasCb ARGS((
  * @return  Void
  */
 #ifdef ANSI
-PUBLIC S16 rgSchFillL2MeasCfm
+S16 rgSchFillL2MeasCfm
 (
 RgSchCellCb       *cell,
 RgSchL2MeasCb     *measCb,
@@ -95,7 +95,7 @@ LrgSchMeasCfmInfo *cfm,
 U32               measTime   
 )
 #else
-PUBLIC S16 rgSchFillL2MeasCfm(cell, measCb, cfm, measTime)
+S16 rgSchFillL2MeasCfm(cell, measCb, cfm, measTime)
 RgSchCellCb       *cell;
 RgSchL2MeasCb     *measCb;
 LrgSchMeasCfmInfo *cfm;
@@ -107,8 +107,6 @@ U32               measTime;
    U8                 qciVal = 0;
    U32                 sampOc = 0;
 
-   TRC3(rgSchFillL2MeasCfm)
-   
    measInfo = &measCb->measReq;   
 
    cfm->hdr.transId  = measInfo->hdr.transId;
@@ -320,7 +318,7 @@ U32               measTime;
  * @return  Void
  */
 #ifdef ANSI
-PUBLIC S16 rgSchL2mSndCfm
+S16 rgSchL2mSndCfm
 (
 Pst               *pst,
 RgSchL2MeasCb     *measCb,
@@ -328,7 +326,7 @@ LrgSchMeasReqInfo *measInfo,
 Bool              isErr
 )
 #else
-PUBLIC S16 rgSchL2mSndCfm(pst, measCb, measInfo, isErr)
+S16 rgSchL2mSndCfm(pst, measCb, measInfo, isErr)
 Pst               *pst;
 RgSchL2MeasCb     *measCb;
 LrgSchMeasReqInfo *measInfo;
@@ -337,9 +335,7 @@ Bool              isErr;
 {
    LrgSchMeasCfmInfo   cfm;
 
-   TRC3(rgSchL2mSndCfm)
-
-   cmMemset((U8 *)&cfm, (U8)0, sizeof(LrgSchMeasCfmInfo));
+   memset(&cfm, 0, sizeof(LrgSchMeasCfmInfo));
    cfm.hdr.transId  = measInfo->hdr.transId;
    cfm.measType     = measInfo->measType;
    cfm.cellId       = measInfo->cellId;
@@ -366,24 +362,20 @@ Bool              isErr;
  * @return  Void
  */
 #ifdef ANSI
-PUBLIC Void rgSchL2mFillCfmPst
+Void rgSchL2mFillCfmPst
 (
 Pst    *pst,
 Pst    *cfmPst,
 LrgSchMeasReqInfo *measInfo 
 )
 #else
-PUBLIC Void rgSchL2mFillCfmPst(pst, cfmPst, measInfo)
+Void rgSchL2mFillCfmPst(pst, cfmPst, measInfo)
 Pst    *pst;
 Pst    *cfmPst;
 LrgSchMeasReqInfo *measInfo;
 #endif
 {
  
-
-   TRC3(rgSchL2mFillCfmPst)
-
-
    cfmPst->srcEnt    = pst->dstEnt;
    cfmPst->srcInst   = pst->dstInst;
    cfmPst->srcProcId = pst->dstProcId;
@@ -431,7 +423,6 @@ LrgSchMeasReqInfo *measInfo;
    RgSchL2MeasCb   *oldMeasCb;
    U32              diffTime;
    
-   TRC3(rgSchL2mInsertMeasCb)
    /* 
     * 1. Check if l2mList has any entries.
     * 2. If yes 
@@ -491,8 +482,6 @@ RgSchCellCb       *cell;
    U8                 idx;
 #endif
 
-   TRC3(rgSchL2CalDlPrbCount)
-
    frm   = cell->crntTime;
    RGSCH_INCR_SUB_FRAME(frm, RG_SCH_CMN_DL_DELTA);
    sf = rgSCHUtlSubFrmGet(cell, frm);
@@ -535,8 +524,6 @@ RgSchCellCb       *cell;
    U8                 idx;
 #endif
 
-   TRC3(rgSchL2CalUlPrbCount)
-
 #ifdef LTE_TDD
    idx = cellUl->schdIdx;
    if(idx < cellUl->numUlSubfrms)
@@ -578,7 +565,6 @@ RgSchErrInfo      err;
    RgSchL2MeasCb       *measCb = NULLP;
    Inst                inst = cell->instIdx;
    UNUSED(err);
-   TRC3(rgSchL2mAllocMeasCb)
 
    if((rgSCHUtlAllocSBuf(inst, (Data **)&measCb,
                    sizeof(RgSchL2MeasCb))) == RFAILED)
@@ -587,7 +573,7 @@ RgSchErrInfo      err;
                   "Allocation of RgSchL2MeasCb failed");
       return (NULLP);
    }
-   cmMemcpy((U8 *)&measCb->measReq, (U8 *)measInfo, sizeof(LrgSchMeasReqInfo));
+   memcpy(&measCb->measReq, measInfo, sizeof(LrgSchMeasReqInfo));
    RGSCHCPYTIMEINFO(cell->crntTime, measCb->startTime);
 
    measCb->dlTotalBw = 0;
@@ -616,14 +602,14 @@ RgSchErrInfo      err;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSchL2mMeasReq 
+S16 rgSchL2mMeasReq 
 (
 RgSchCellCb       *cell,
 LrgSchMeasReqInfo *measInfo,
 RgSchErrInfo      err
 )
 #else
-PUBLIC S16 rgSchL2mMeasReq(cell, measInfo, err)
+S16 rgSchL2mMeasReq(cell, measInfo, err)
 RgSchCellCb       *cell;
 LrgSchMeasReqInfo *measInfo;
 RgSchErrInfo      err;
@@ -633,7 +619,6 @@ RgSchErrInfo      err;
    U8            idx;
    U8            qciVal;
 
-   TRC3(rgSchL2mMeasReq)
 
    qciVal = 0;
    if ((measCb = rgSchL2mAllocMeasCb(cell, measInfo, err)) == NULLP)
@@ -644,7 +629,7 @@ RgSchErrInfo      err;
                 "Allocation of RgSchL2MeasCb failed");
        return RFAILED;
    }
-   /*cmMemcpy((U8 *)&measCb->measReq, (CONSTANT U8 *)measInfo,\
+   /*memcpy(&measCb->measReq, measInfo,\
              sizeof(LrgSchMeasReqInfo));*/
    rgSchL2mInsertMeasCb(cell, measCb, measInfo);
   
@@ -681,7 +666,7 @@ RgSchErrInfo      err;
    {
       RgInfL2MeasReq    measReq;
       Pst               pst;
-      cmMemset((U8 *)&measReq, 0, sizeof(RgInfL2MeasReq));
+      memset(&measReq, 0, sizeof(RgInfL2MeasReq));
       measReq.transId  = measInfo->hdr.transId;
       measReq.measType = measInfo->measType;
       measReq.timePrd  = measInfo->timePrd;
@@ -712,13 +697,13 @@ RgSchErrInfo      err;
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHL2Meas
+S16 rgSCHL2Meas
 (
 RgSchCellCb  *cell,
 U8 isCalrCrcInd
 )
 #else
-PUBLIC S16 rgschL2Meas(cell,isCalrCrcInd)
+S16 rgschL2Meas(cell,isCalrCrcInd)
 RgSchCellCb  *cell;
 U8 isCalrCrcInd
 #endif
@@ -737,10 +722,9 @@ U8 isCalrCrcInd
    U32               numDlSf;
    U32               numUlSf;
 #endif
-   TRC3(rgSCHL2Meas)
 
-      node = cell->l2mList.first;
-   cmMemset((U8 *)&measCfm, 0, sizeof(LrgSchMeasCfmInfo));
+   node = cell->l2mList.first;
+   memset(&measCfm, 0, sizeof(LrgSchMeasCfmInfo));
    while(node != NULLP)
    {
       measCb = (RgSchL2MeasCb *)node->node;
@@ -809,7 +793,7 @@ U8 isCalrCrcInd
          }
          RgMiLrgSchL2MeasCfm(&(rgSchCb[cell->instIdx].rgSchInit.lmPst),
                &measCfm);
-         cmMemset((U8 *)&measCfm, 0, sizeof(LrgSchMeasCfmInfo));
+         memset(&measCfm, 0, sizeof(LrgSchMeasCfmInfo));
          
          /* Delete this measCb from the list */
          if(measCb->measReq.timePrd > 0)
@@ -823,7 +807,7 @@ U8 isCalrCrcInd
             measCb->startTime = cell->crntTime;
             measCb->sfnCycle = 0;
             measCb->cfmRcvd = FALSE;
-            cmMemset((U8 *)&measCb->avgPrbQciUl, 0, sizeof(LrgAvgPrbQCICfm));
+            memset(&measCb->avgPrbQciUl, 0, sizeof(LrgAvgPrbQCICfm));
             cell->sndL2Meas = FALSE;
          } 
          /* ccpu00117052 - MOD - Passing double pointer