replaced cmMemSet, cmMemcpy with memset and memcpy resp AND Removed TRC() traces...

[o-du/l2.git] / src / 5gnrsch / rg_sch_lmm.c

diff --git a/src/5gnrsch/rg_sch_lmm.c b/src/5gnrsch/rg_sch_lmm.c
index c5539f9..8f06546 100755 (executable)
--- a/src/5gnrsch/rg_sch_lmm.c
+++ b/src/5gnrsch/rg_sch_lmm.c
@@ -65,7 +65,7 @@ static int RLOG_FILE_ID=167;
 #include "rg_sch_cmn.x"    /* typedefs for Scheduler */
 #endif 
 #ifndef LTE_L2_MEAS
-PUBLIC Void rgSCHCmnInit ARGS((Void));
+Void rgSCHCmnInit ARGS((Void));
 #endif 
 /* forward references */
 extern int schActvInit(Ent entity, Inst instId, Region region, Reason reason);
@@ -82,7 +82,7 @@ PRIVATE Void rgSCHLmmShutdown ARGS((
 ));
 
 
-PUBLIC void printSchCellInfo(void)
+void printSchCellInfo(void)
 {
    U8 idx=0;
    U8 inst=0;
@@ -139,8 +139,6 @@ Elmnt sapType;            /* SAP Type */
    RgSchUpSapCfgInfo    *upSapCfg = NULLP;
    Inst  inst = (dInst - SCH_INST_START);
 
-   TRC2(rgSCHLmmSapCfg)
-
    /* Check if Gen Config has been done */
 
    switch(sapType)
@@ -214,8 +212,8 @@ Elmnt sapType;            /* SAP Type */
          lowSapCfg->sapPst.prior = cfg->s.schInstCfg.tfuSap[sapIdx].prior;
          lowSapCfg->suId = cfg->s.schInstCfg.tfuSap[sapIdx].suId;
          lowSapCfg->spId = cfg->s.schInstCfg.tfuSap[sapIdx].spId;
-         cmMemcpy((U8 *)&lowSapCfg->bndTmr, 
-                  (U8 *)&cfg->s.schInstCfg.tfuSap[sapIdx].bndTmr,
+         memcpy(&lowSapCfg->bndTmr, 
+                  &cfg->s.schInstCfg.tfuSap[sapIdx].bndTmr,
                   sizeof(TmrCfg));
          break;
       case STRGMSAP:
@@ -257,7 +255,7 @@ Elmnt sapType;            /* SAP Type */
          /* would never reach here */
          break;
    }
-   RETVALUE(ret);
+   return (ret);
 }
 #endif
 \f
@@ -299,8 +297,6 @@ Inst inst;
    RgSchClcBoRpt  *bo = NULL;
 #endif
 
-   TRC2(rgSCHLmmShutdown)
-
 #ifdef LTE_L2_MEAS
    for (idx = 0; idx < instCb->numSaps; idx++)
    {
@@ -439,21 +435,20 @@ Inst inst;
  *
  **********************************************************/
 #ifdef ANSI
-PUBLIC Void rgSCHLmmGenCntrl 
+Void rgSCHLmmGenCntrl 
 (
 RgMngmt       *cntrl,
 RgMngmt       *cfm,
 Pst           *cfmPst
 )
 #else
-PUBLIC Void rgSCHLmmGenCntrl(cntrl, cfm, cfmPst)
+Void rgSCHLmmGenCntrl(cntrl, cfm, cfmPst)
 RgMngmt       *cntrl;
 RgMngmt       *cfm;
 Pst           *cfmPst;
 #endif
 {
    Inst      inst = (cfmPst->srcInst - SCH_INST_START); /* Scheduler instance ID */
-   TRC2(rgSCHLmmGenCntrl)
 
    cfm->cfm.status = LCM_PRIM_OK;
    cfm->cfm.reason = LCM_REASON_NOT_APPL;
@@ -469,8 +464,8 @@ Pst           *cfmPst;
             /* Enable Unsolicited Status (alarms) */
                rgSchCb[inst].rgSchInit.usta = TRUE;
                /*Store the response and TransId for sending the Alarms */
-               cmMemcpy((U8 *)&rgSchCb[inst].genCfg.ustaResp.response, 
-               (U8 *)&cntrl->hdr.response, sizeof(Resp));
+               memcpy(&rgSchCb[inst].genCfg.ustaResp.response, 
+               &cntrl->hdr.response, sizeof(Resp));
                rgSchCb[inst].genCfg.ustaResp.transId = cntrl->hdr.transId;
                break;
             case SADBG:
@@ -498,8 +493,8 @@ Pst           *cfmPst;
                    * L2
                    * statistics
                    * */
-                  cmMemset((U8 *)&hqRetxStats, 0, sizeof(RgSchHqRetxStats));
-                  cmMemset((U8 *)&hqFailStats, 0, sizeof(RgSchNackAckStats));
+                  memset(&hqRetxStats, 0, sizeof(RgSchHqRetxStats));
+                  memset(&hqFailStats, 0, sizeof(RgSchNackAckStats));
 #endif
                   break;
                }
@@ -568,14 +563,14 @@ Pst           *cfmPst;
  *
  **********************************************************/
 #ifdef ANSI
-PUBLIC Void rgSCHLmmSapCntrl 
+Void rgSCHLmmSapCntrl 
 (
 RgMngmt       *cntrl,
 RgMngmt       *cfm,
 Pst           *cfmPst
 )
 #else
-PUBLIC Void rgSCHLmmSapCntrl(cntrl, cfm, cfmPst)
+Void rgSCHLmmSapCntrl(cntrl, cfm, cfmPst)
 RgMngmt       *cntrl;
 RgMngmt       *cfm;
 Pst           *cfmPst;
@@ -585,7 +580,6 @@ Pst           *cfmPst;
 
    /* TODO Pass InstId instead of using InstId from cfmPst */
    Inst      inst = (cfmPst->srcInst - SCH_INST_START); /* Scheduler instance Id */
-   TRC2(rgSCHLmmSapCntrl)
 
    /* Only TFU SAP can be controlled by LM */
    switch(cntrl->hdr.elmId.elmnt)
@@ -620,8 +614,8 @@ Pst           *cfmPst;
                   rgSchCb[inst].tfuSap[idx].numBndRetries++;
                   /* Store the response and TransId for sending 
                    * the Control confirm */
-                  cmMemcpy((U8 *)&rgSchCb[inst].genCfg.bndCfmResp[idx].response,
-                           (U8 *)&cntrl->hdr.response, sizeof(Resp));
+                  memcpy(&rgSchCb[inst].genCfg.bndCfmResp[idx].response,
+                           &cntrl->hdr.response, sizeof(Resp));
                   rgSchCb[inst].genCfg.bndCfmResp[idx].transId = 
                                                 cntrl->hdr.transId;
                   
@@ -675,7 +669,7 @@ Pst           *cfmPst;
                                      (PTR)&rgSchCb[inst].tfuSap[idx]);
                   }
                }
-               cmMemset((U8 *)&rgSchCb[inst].tfuSap[idx], 0, sizeof(RgSchLowSapCb));
+               memset(&rgSchCb[inst].tfuSap[idx], 0, sizeof(RgSchLowSapCb));
                rgSchCb[inst].tfuSap[idx].sapSta.sapState = LRG_NOT_CFG;
                cfm->cfm.status = LCM_PRIM_OK;
                cfm->cfm.reason = LCM_REASON_NOT_APPL;
@@ -698,7 +692,7 @@ Pst           *cfmPst;
          switch(cntrl->t.cntrl.action)
          {
             case ADEL:
-               cmMemset((U8 *)&rgSchCb[inst].rgrSap[idx], 0, sizeof(RgSchUpSapCb));
+               memset(&rgSchCb[inst].rgrSap[idx], 0, sizeof(RgSchUpSapCb));
                rgSchCb[inst].rgrSap[idx].sapSta.sapState = LRG_NOT_CFG;
                cfm->cfm.status = LCM_PRIM_OK;
                cfm->cfm.reason = LCM_REASON_NOT_APPL;
@@ -721,7 +715,7 @@ Pst           *cfmPst;
          switch(cntrl->t.cntrl.action)
          {
             case ADEL:
-               cmMemset((U8 *)&rgSchCb[inst].rgmSap[idx], 0, sizeof(RgSchUpSapCb));
+               memset(&rgSchCb[inst].rgmSap[idx], 0, sizeof(RgSchUpSapCb));
                rgSchCb[inst].rgmSap[idx].sapSta.sapState = LRG_NOT_CFG;
                cfm->cfm.status = LCM_PRIM_OK;
                cfm->cfm.reason = LCM_REASON_NOT_APPL;
@@ -761,14 +755,14 @@ Pst           *cfmPst;
  *
  **********************************************************/
 #ifdef ANSI
-PUBLIC Void SchFillCfmPst
+Void SchFillCfmPst
 (
 Pst           *reqPst,
 Pst           *cfmPst,
 RgMngmt       *cfm
 )
 #else
-PUBLIC Void SchFillCfmPst(reqPst, cfmPst, cfm)
+Void SchFillCfmPst(reqPst, cfmPst, cfm)
 Pst           *reqPst;
 Pst           *cfmPst;
 RgMngmt       *cfm;
@@ -776,14 +770,12 @@ RgMngmt       *cfm;
 {
    Inst inst;
 
-   TRC2(SchFillCfmPst)
-
    inst = (reqPst->dstInst - SCH_INST_START);
 
-   cfmPst->srcEnt    = ENTRG;
+   cfmPst->srcEnt    = ENTMAC;
    cfmPst->srcInst   = (Inst) 1;
    cfmPst->srcProcId = rgSchCb[inst].rgSchInit.procId;
-   cfmPst->dstEnt    = ENTRG;
+   cfmPst->dstEnt    = ENTMAC;
    cfmPst->dstInst   = (Inst) 0;
    cfmPst->dstProcId = reqPst->srcProcId;
 
@@ -814,7 +806,7 @@ RgMngmt       *cfm;
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHLmmStartTmr
+S16 rgSCHLmmStartTmr
 (
 Inst               inst,
 S16                tmrEvnt,            /* Timer Event */
@@ -822,7 +814,7 @@ U32                tmrVal,             /* Wait Time */
 PTR                cb                  /* Entry for which Timer Expired */
 )
 #else
-PUBLIC S16 rgSCHLmmStartTmr(inst, tmrEvnt, tmrVal, cb)
+S16 rgSCHLmmStartTmr(inst, tmrEvnt, tmrVal, cb)
 Inst               inst;             /* scheduler instance ID */
 S16                tmrEvnt;            /* Timer Event */
 U32                tmrVal;             /* Wait Time */
@@ -832,12 +824,10 @@ PTR                cb;                 /* Entry for which Timer Expired */
    CmTmrArg    arg;
 /*   Inst        dInst = inst + SCH_INST_START; */
 
-   TRC2(rgSCHLmmStartTmr)
-
    UNUSED(tmrEvnt);
 
    /* Initialize the arg structure */
-   cmMemset((U8 *)&arg, 0, sizeof(CmTmrArg));
+   memset(&arg, 0, sizeof(CmTmrArg));
 
    arg.tqCp = &rgSchCb[inst].tmrTqCp;
    arg.tq = rgSchCb[inst].tmrTq;
@@ -849,7 +839,7 @@ PTR                cb;                 /* Entry for which Timer Expired */
    arg.wait = tmrVal;      
    cmPlcCbTq(&arg);
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 \f
@@ -873,14 +863,14 @@ PTR                cb;                 /* Entry for which Timer Expired */
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHLmmStopTmr
+S16 rgSCHLmmStopTmr
 (
 Inst               inst,             /* Scheduler instance */
 S16                tmrEvnt,            /* Timer Event */
 PTR                cb                  /* Entry for which Timer Expired */
 )
 #else
-PUBLIC S16 rgSCHLmmStopTmr(inst, tmrEvnt, cb)
+S16 rgSCHLmmStopTmr(inst, tmrEvnt, cb)
 Inst               inst;             /* Scheduler instance */
 S16                tmrEvnt;            /* Timer Event */
 PTR                cb;                 /* Entry for which Timer Expired */
@@ -890,8 +880,6 @@ PTR                cb;                 /* Entry for which Timer Expired */
    U8         i;
    S16        ret; 
 
-   TRC2(rgSCHLmmStopTmr)
-
    ret = RFAILED;
 
    for(i=0;i<RGSCH_MAX_TIMER;i++)
@@ -900,7 +888,7 @@ PTR                cb;                 /* Entry for which Timer Expired */
       if(((RgSchLowSapCb *)cb)->tmrBlk.tmrEvnt == tmrEvnt)
       {
          /* Initialize the arg structure */
-         cmMemset((U8 *)&arg, 0, sizeof(CmTmrArg));
+         memset(&arg, 0, sizeof(CmTmrArg));
 
          arg.tqCp = &rgSchCb[inst].tmrTqCp;
          arg.tq = rgSchCb[inst].tmrTq;
@@ -918,7 +906,7 @@ PTR                cb;                 /* Entry for which Timer Expired */
    }
 
 
-   RETVALUE(ret);
+   return (ret);
 }
 
 \f
@@ -939,13 +927,13 @@ PTR                cb;                 /* Entry for which Timer Expired */
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHLmmTmrExpiry
+S16 rgSCHLmmTmrExpiry
 (
 PTR cb,               /* Pointer to timer control block */
 S16 tmrEvnt           /* Timer Event */
 )
 #else
-PUBLIC S16 rgSCHLmmTmrExpiry(cb,tmrEvnt)
+S16 rgSCHLmmTmrExpiry(cb,tmrEvnt)
 PTR cb;               /* Pointer to timer control block */
 S16 tmrEvnt;          /* Timer Event */
 #endif
@@ -955,7 +943,6 @@ S16 tmrEvnt;          /* Timer Event */
 #ifdef DEBUGP
    Inst          inst = tfuSap->cell->instIdx;
 #endif
-   TRC2(rgSCHLmmTmrExpiry)
 
    
    switch(tmrEvnt)
@@ -989,7 +976,7 @@ S16 tmrEvnt;          /* Timer Event */
          ret = RFAILED;
          break;
    }
-   RETVALUE(ret);
+   return (ret);
 }
 
 \f
@@ -1014,14 +1001,14 @@ S16 tmrEvnt;          /* Timer Event */
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHLmmBndCfm
+S16 rgSCHLmmBndCfm
 (
 Pst *pst,               /* Post Structure */
 SuId suId,              /* Service user ID */
 U8 status               /* Status */
 )
 #else
-PUBLIC S16 rgSCHLmmBndCfm(pst,suId,status)
+S16 rgSCHLmmBndCfm(pst,suId,status)
 Pst *pst;               /* Post Structure */
 SuId suId;              /* Service user Id */
 U8 status;              /* Status */
@@ -1032,8 +1019,6 @@ U8 status;              /* Status */
    Pst       cfmPst;
    Inst      inst = (pst->dstInst - SCH_INST_START); /* scheduler instance */
 
-   TRC2(rgSCHLmmBndCfm)
-
 
    /* check the SAP State */
    switch(rgSchCb[inst].tfuSap[suId].sapSta.sapState)
@@ -1042,9 +1027,9 @@ U8 status;              /* Status */
          break;
       case LRG_BND:
          /* SAP is already bound */
-         RETVALUE(ROK);
+         return ROK;
       default:
-         RETVALUE(RFAILED);
+         return RFAILED;
    }
 
    cfmPst = rgSchCb[inst].rgSchInit.lmPst;
@@ -1054,7 +1039,7 @@ U8 status;              /* Status */
    cfmPst.region = rgSchCb[inst].genCfg.bndCfmResp[suId].response.mem.region;
    cfmPst.pool = rgSchCb[inst].genCfg.bndCfmResp[suId].response.mem.pool;
    
-   cmMemset((U8 *)&cntrlCfm, 0, sizeof(RgMngmt));
+   memset(&cntrlCfm, 0, sizeof(RgMngmt));
 
    switch(status)
    {
@@ -1092,7 +1077,7 @@ U8 status;              /* Status */
 
    ret = RgMiLrgSchCntrlCfm(&cfmPst, &cntrlCfm);
 
-   RETVALUE(ret);
+   return (ret);
 }
 
 /**
@@ -1113,7 +1098,7 @@ U8 status;              /* Status */
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHLmmStaInd
+S16 rgSCHLmmStaInd
 (
 Inst inst,
 U16  category,
@@ -1122,7 +1107,7 @@ U16  cause,
 RgUstaDgn *dgn
 )
 #else
-PUBLIC S16 rgSCHLmmStaInd(inst, category, event, cause, dgn) 
+S16 rgSCHLmmStaInd(inst, category, event, cause, dgn) 
 Inst inst;
 U16 category;
 U16 event;
@@ -1132,14 +1117,12 @@ RgUstaDgn *dgn;
 {
    RgMngmt    usta;
 
-   TRC2(rgSCHLmmStaInd)
-
    if(rgSchCb[inst].rgSchInit.usta == FALSE)
    {
-      RETVALUE(ROK);
+      return ROK;
    }
 
-   cmMemset((U8 *)&usta, 0, sizeof(RgMngmt));
+   memset(&usta, 0, sizeof(RgMngmt));
 
    SGetDateTime(&usta.t.usta.cmAlarm.dt);
    usta.t.usta.cmAlarm.category = category;
@@ -1147,7 +1130,7 @@ RgUstaDgn *dgn;
    usta.t.usta.cmAlarm.cause = cause;
    if (dgn != NULLP)
    {
-      cmMemcpy((U8 *)&usta.t.usta.dgn, (U8 *)dgn, sizeof(RgUstaDgn));
+      memcpy(&usta.t.usta.dgn, dgn, sizeof(RgUstaDgn));
    }
 
    rgSchCb[inst].rgSchInit.lmPst.selector = 
@@ -1162,7 +1145,7 @@ RgUstaDgn *dgn;
                        rgSchCb[inst].genCfg.ustaResp.response.mem.pool;
    usta.hdr.transId = rgSchCb[inst].genCfg.ustaResp.transId;
 
-   RETVALUE(RgMiLrgSchStaInd(&rgSchCb[inst].rgSchInit.lmPst, &usta));
+   return (RgMiLrgSchStaInd(&rgSchCb[inst].rgSchInit.lmPst, &usta));
 }
 
 \f
@@ -1183,25 +1166,24 @@ RgUstaDgn *dgn;
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 schActvTmr
+S16 schActvTmr
 (
 Ent ent,
 Inst inst
 )
 #else
-PUBLIC S16 schActvTmr(ent, inst)
+S16 schActvTmr(ent, inst)
 Ent ent;
 Inst inst;
 #endif
 {
    Inst schInst = (inst  - SCH_INST_START);
-   TRC2(schActvTmr)
 
    /* Check if any timer in the scheduler instance has expired */ 
    cmPrcTmr(&rgSchCb[schInst].tmrTqCp,
             rgSchCb[schInst].tmrTq, (PFV) rgSCHLmmTmrExpiry);
  
-   RETVALUE(ROK);
+   return ROK;
  
 } /* end of schActvTmr */