X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_lmm.c;h=d6fcdefeb07698025f82bc84a24ad1b9602052ec;hb=5d74fef7c9fe6b65a965ceac6bfe812872dab323;hp=0b230e7aa87ce745efb059fc3e83d7728c3bd225;hpb=a5530e70a9d414952dadd1688aa9b4280c0dbb5a;p=o-du%2Fl2.git

diff --git a/src/5gnrmac/rg_lmm.c b/src/5gnrmac/rg_lmm.c
index 0b230e7aa..d6fcdefeb 100755
--- a/src/5gnrmac/rg_lmm.c
+++ b/src/5gnrmac/rg_lmm.c
@@ -138,7 +138,7 @@ Pst           *cfmPst
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 rgActvInit
+S16 rgActvInit
 (
 Ent entity,            /* entity */
 Inst inst,             /* instance */
@@ -146,7 +146,7 @@ Region region,         /* region */
 Reason reason          /* reason */
 )
 #else
-PUBLIC S16 rgActvInit(entity, inst, region, reason)
+S16 rgActvInit(entity, inst, region, reason)
 Ent entity;            /* entity */
 Inst inst;             /* instance */
 Region region;         /* region */
@@ -154,13 +154,12 @@ Reason reason;         /* reason */
 #endif
 {
    Inst macInst ;
-   TRC2(rgActvInit);
 
    RG_IS_INST_VALID(inst);
 
    macInst = inst - RG_INST_START;
    /* Initialize the MAC TskInit structure to zero */
-   cmMemset ((U8 *)&rgCb[macInst], 0, sizeof(RgCb));
+   memset (&rgCb[macInst], 0, sizeof(RgCb));
 
    /* Initialize the MAC TskInit with received values */
    rgCb[macInst].rgInit.ent = entity;
@@ -207,12 +206,12 @@ Reason reason;         /* reason */
    lwrMacCb.phyState = PHY_STATE_IDLE; 
 
    /* Initialize Scheduler as well */
-   schActvInit(ENTRG, (DEFAULT_CELLS + SCH_INST_START), DFLT_REGION, PWR_UP);
+   schActvInit(ENTMAC, (DEFAULT_CELLS + SCH_INST_START), DFLT_REGION, PWR_UP);
 
    /* Initialize lower mac */
    lwrMacInit();
 
-   RETVALUE(ROK);
+   return ROK;
 
 } /* rgActvInit */
 
@@ -235,13 +234,13 @@ Reason reason;         /* reason */
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 RgMiLrgCfgReq
+S16 RgMiLrgCfgReq
 (
 Pst      *pst,    /* post structure  */
 RgMngmt  *cfg     /* config structure  */
 )
 #else
-PUBLIC S16 RgMiLrgCfgReq(pst, cfg)
+S16 RgMiLrgCfgReq(pst, cfg)
 Pst      *pst;    /* post structure  */
 RgMngmt  *cfg;    /* config structure  */
 #endif    
@@ -252,8 +251,6 @@ RgMngmt  *cfg;    /* config structure  */
    Pst       cfmPst;
    Inst      inst;
 
-   TRC2(RgMiLrgCfgReq)
-   
 
    RG_DIAG_LVL0(inst,0x0a0b0001, RG_DIAG_NA, SS_DIAG_INV_ARG,
               "Received CfgReq for MAC layer, Entity = %d, Instance = %d\n",
@@ -265,7 +262,7 @@ RgMngmt  *cfg;    /* config structure  */
    /* Fill the post structure for sending the confirmation */
    rgLMMFillCfmPst(pst, &cfmPst, cfg);
 
-   cmMemset((U8 *)&cfm, 0, sizeof(RgMngmt));
+   memset(&cfm, 0, sizeof(RgMngmt));
 
 #ifdef LMINT3
    cfm.hdr.transId = cfg->hdr.transId;
@@ -301,7 +298,7 @@ RgMngmt  *cfg;    /* config structure  */
 
    RgMiLrgCfgCfm(&cfmPst, &cfm);
    
-   RETVALUE(ROK);
+   return ROK;
 }/*-- RgMiLrgCfgReq --*/
 
 
@@ -325,13 +322,13 @@ RgMngmt  *cfg;    /* config structure  */
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 RgMiLrgStsReq
+S16 RgMiLrgStsReq
 (
 Pst      *pst,    /* post structure  */
 RgMngmt  *sts     /* statistics structure  */
 )
 #else
-PUBLIC S16 RgMiLrgStsReq(pst, sts)
+S16 RgMiLrgStsReq(pst, sts)
 Pst      *pst;    /* post structure  */
 RgMngmt  *sts;    /* statistics structure  */
 #endif    
@@ -340,15 +337,13 @@ RgMngmt  *sts;    /* statistics structure  */
    RgMngmt   cfm;
    Inst      inst;
 
-   TRC2(RgMiLrgStsReq)
-   
 
    RG_IS_INST_VALID(pst->dstInst);
    inst = pst->dstInst - RG_INST_START;
    /* Fill the post structure for sending the confirmation */
    rgLMMFillCfmPst(pst, &cfmPst, sts);
 
-   cmMemset((U8 *)&cfm, 0, sizeof(RgMngmt));
+   memset(&cfm, 0, sizeof(RgMngmt));
 
 #ifdef LMINT3
    cfm.hdr.transId = sts->hdr.transId;
@@ -366,14 +361,14 @@ RgMngmt  *sts;    /* statistics structure  */
       cfm.cfm.reason = LCM_REASON_GENCFG_NOT_DONE;
       RgMiLrgStsCfm(&cfmPst,&cfm);
       RLOG0(L_ERROR, "Gen Cfg not done");
-      RETVALUE(ROK);
+      return ROK;
    }
 
    switch(sts->hdr.elmId.elmnt)
    {
       case STGEN:
          {
-            cmMemcpy((U8 *)&(cfm.t.sts.s.genSts), (U8 *)&rgCb[inst].genSts,
+            memcpy(&(cfm.t.sts.s.genSts), &rgCb[inst].genSts,
                   sizeof(RgGenSts));
             /* check if action is read and reset */
             if(sts->t.sts.action == ARST)
@@ -434,9 +429,9 @@ RgMngmt  *sts;    /* statistics structure  */
                /* Reset statistics */
                if(sts->t.sts.action == ZEROSTS)
                {
-                  cmMemset((U8 *)&hqRetxStats, 0, \
+                  memset(&hqRetxStats, 0, \
                         sizeof(RgSchHqRetxStats));
-                  cmMemset((U8 *)&hqFailStats, 0, \
+                  memset(&hqFailStats, 0, \
                         sizeof(RgSchNackAckStats));
                }
             }
@@ -444,30 +439,30 @@ RgMngmt  *sts;    /* statistics structure  */
          }
          break;
       case STRGUSAP:
-         cmMemcpy((U8 *)&(cfm.t.sts.s.rguSts), (U8 *)&rgCb[inst].rguSap[sts->t.sts.sapInst].sapSts,
+         memcpy(&(cfm.t.sts.s.rguSts), &rgCb[inst].rguSap[sts->t.sts.sapInst].sapSts,
                   sizeof(RgSapSts));
 
          /* check if action is read and reset */
          if(sts->t.sts.action == ARST)
-            cmMemset((U8 *)&rgCb[inst].rguSap[sts->t.sts.sapInst].sapSts, 0, sizeof(RgSapSts));
+            memset(&rgCb[inst].rguSap[sts->t.sts.sapInst].sapSts, 0, sizeof(RgSapSts));
 
          break;
       case STCRGSAP:
-         cmMemcpy((U8 *)&(cfm.t.sts.s.crgSts), (U8 *)&rgCb[inst].crgSap.sapSts,
+         memcpy(&(cfm.t.sts.s.crgSts), &rgCb[inst].crgSap.sapSts,
                   sizeof(RgSapSts));
 
          /* check if action is read and reset */
          if(sts->t.sts.action == ARST)
-            cmMemset((U8 *)&rgCb[inst].crgSap.sapSts, 0, sizeof(RgSapSts));
+            memset(&rgCb[inst].crgSap.sapSts, 0, sizeof(RgSapSts));
 
          break;
       case STTFUSAP:
-         cmMemcpy((U8 *)&(cfm.t.sts.s.tfuSts), (U8 *)&rgCb[inst].tfuSap.sapSts,
+         memcpy(&(cfm.t.sts.s.tfuSts), &rgCb[inst].tfuSap.sapSts,
                   sizeof(RgSapSts));
 
          /* check if action is read and reset */
          if(sts->t.sts.action == ARST)
-            cmMemset((U8 *)&rgCb[inst].tfuSap.sapSts, 0, sizeof(RgSapSts));
+            memset(&rgCb[inst].tfuSap.sapSts, 0, sizeof(RgSapSts));
 
          break;
       default:
@@ -477,7 +472,7 @@ RgMngmt  *sts;    /* statistics structure  */
          break;     
    }
    RgMiLrgStsCfm(&cfmPst,&cfm);
-   RETVALUE(ROK);
+   return ROK;
 }/*-- RgMiLrgStsReq --*/
 
 
@@ -500,13 +495,13 @@ RgMngmt  *sts;    /* statistics structure  */
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 RgMiLrgStaReq
+S16 RgMiLrgStaReq
 (
 Pst      *pst,    /* post structure  */
 RgMngmt  *sta     /* status structure  */
 )
 #else
-PUBLIC S16 RgMiLrgStaReq(pst, sta)
+S16 RgMiLrgStaReq(pst, sta)
 Pst      *pst;    /* post structure  */
 RgMngmt  *sta;    /* status structure  */
 #endif    
@@ -515,8 +510,6 @@ RgMngmt  *sta;    /* status structure  */
    RgMngmt   cfm;
    Inst      inst ;
 
-   TRC2(RgMiLrgStaReq)
-   
 
    RG_IS_INST_VALID(pst->dstInst);
    inst = pst->dstInst - RG_INST_START;
@@ -530,7 +523,7 @@ RgMngmt  *sta;    /* status structure  */
       SPutSBuf(pst->region, pst->pool, (Data *)sta->t.ssta.s.sysId.ptNmb, LRG_MAX_PT_NUM_SIZE);
    }
    
-   cmMemset((U8 *)&cfm, 0, sizeof(RgMngmt));
+   memset(&cfm, 0, sizeof(RgMngmt));
    cfm.hdr.elmId.elmnt = sta->hdr.elmId.elmnt;
 
 #ifdef LMINT3
@@ -545,16 +538,16 @@ RgMngmt  *sta;    /* status structure  */
          != ROK)
       {
          RLOG0(L_ERROR, "Memory Unavailable for Confirmation");
-         RETVALUE(ROK);
+         return ROK;
       } 
-      cmMemset((U8 *)(cfm.t.ssta.s.sysId.ptNmb), 0, LRG_MAX_PT_NUM_SIZE);
+      memset((cfm.t.ssta.s.sysId.ptNmb), 0, LRG_MAX_PT_NUM_SIZE);
       rgGetSId(&cfm.t.ssta.s.sysId);
       cfm.cfm.status = LCM_PRIM_NOK;
       cfm.cfm.reason = LCM_REASON_GENCFG_NOT_DONE;
       cfm.hdr.elmId.elmnt = sta->hdr.elmId.elmnt;
       RgMiLrgStaCfm(&cfmPst, &cfm);
       RLOG0(L_ERROR, "Gen Cfg not done");
-      RETVALUE(ROK);
+      return ROK;
    }
 
    switch(sta->hdr.elmId.elmnt)
@@ -566,9 +559,9 @@ RgMngmt  *sta;    /* status structure  */
             != ROK)
          {
             RLOG0(L_ERROR, "Memory Unavailable for Confirmation");
-            RETVALUE(ROK);
+            return ROK;
          } 
-         cmMemset((U8 *)(cfm.t.ssta.s.sysId.ptNmb), 0, LRG_MAX_PT_NUM_SIZE);
+         memset((cfm.t.ssta.s.sysId.ptNmb), 0, LRG_MAX_PT_NUM_SIZE);
          rgGetSId(&cfm.t.ssta.s.sysId);
          cfm.cfm.status = LCM_PRIM_OK;
          cfm.cfm.reason = LCM_REASON_NOT_APPL;
@@ -578,8 +571,8 @@ RgMngmt  *sta;    /* status structure  */
          cfm.cfm.status = LCM_PRIM_OK;
          cfm.cfm.reason = LCM_REASON_NOT_APPL;
          SGetDateTime(&cfm.t.ssta.dt);
-         cmMemcpy((U8 *)&(cfm.t.ssta.s.rguSapSta), 
-				(U8 *)&rgCb[inst].rguSap[sta->t.ssta.sapInst].sapSta,
+         memcpy(&(cfm.t.ssta.s.rguSapSta), 
+				&rgCb[inst].rguSap[sta->t.ssta.sapInst].sapSta,
             sizeof(RgSapSta));
          RgMiLrgStaCfm(&cfmPst, &cfm);
          break;
@@ -587,7 +580,7 @@ RgMngmt  *sta;    /* status structure  */
          cfm.cfm.status = LCM_PRIM_OK;
          cfm.cfm.reason = LCM_REASON_NOT_APPL;
          SGetDateTime(&cfm.t.ssta.dt);
-         cmMemcpy((U8 *)&(cfm.t.ssta.s.crgSapSta), (U8 *)&rgCb[inst].crgSap.sapSta,
+         memcpy(&(cfm.t.ssta.s.crgSapSta), &rgCb[inst].crgSap.sapSta,
          sizeof(RgSapSta));
          RgMiLrgStaCfm(&cfmPst, &cfm);
          break;
@@ -595,7 +588,7 @@ RgMngmt  *sta;    /* status structure  */
          cfm.cfm.status = LCM_PRIM_OK;
          cfm.cfm.reason = LCM_REASON_NOT_APPL;
          SGetDateTime(&cfm.t.ssta.dt);
-         cmMemcpy((U8 *)&(cfm.t.ssta.s.tfuSapSta), (U8 *)&rgCb[inst].tfuSap.sapSta,
+         memcpy(&(cfm.t.ssta.s.tfuSapSta), &rgCb[inst].tfuSap.sapSta,
          sizeof(RgSapSta));
          RgMiLrgStaCfm(&cfmPst, &cfm);
          break;
@@ -606,7 +599,7 @@ RgMngmt  *sta;    /* status structure  */
          RLOG1(L_ERROR, "Invalid elmnt=%d",sta->hdr.elmId.elmnt);
          break;     
    }
-   RETVALUE(ROK);
+   return ROK;
 }/*-- RgMiLrgStaReq --*/
 
 
@@ -631,13 +624,13 @@ RgMngmt  *sta;    /* status structure  */
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 RgMiLrgCntrlReq
+S16 RgMiLrgCntrlReq
 (
 Pst      *pst,    /* post structure  */
 RgMngmt  *cntrl   /* control structure  */
 )
 #else
-PUBLIC S16 RgMiLrgCntrlReq(pst, cntrl)
+S16 RgMiLrgCntrlReq(pst, cntrl)
 Pst      *pst;    /* post structure  */
 RgMngmt  *cntrl;  /* control structure  */
 #endif    
@@ -647,7 +640,6 @@ RgMngmt  *cntrl;  /* control structure  */
    RgMngmt   cfm;
    Inst      inst;
    
-   TRC2(RgMiLrgCntrlReq)
    
    /* Fill the post structure for sending the confirmation */
 
@@ -656,7 +648,7 @@ RgMngmt  *cntrl;  /* control structure  */
 
    rgLMMFillCfmPst(pst, &cfmPst, cntrl);
 
-   cmMemset((U8 *)&cfm, 0, sizeof(RgMngmt));
+   memset(&cfm, 0, sizeof(RgMngmt));
 #ifdef LMINT3
    cfm.hdr.transId = cntrl->hdr.transId;
 #endif
@@ -672,7 +664,7 @@ RgMngmt  *cntrl;  /* control structure  */
       cfm.hdr.elmId.elmnt = cntrl->hdr.elmId.elmnt;
       RgMiLrgCntrlCfm(&cfmPst, &cfm);
       RLOG0(L_ERROR, "Gen Cfg not done");
-      RETVALUE(ROK);
+      return ROK;
    }
  
    /* General Config done, process the Control request */   
@@ -693,7 +685,7 @@ RgMngmt  *cntrl;  /* control structure  */
          RLOG1(L_ERROR, "invalid elmnt=%d",cntrl->hdr.elmId.elmnt);
          break;
    }
-   RETVALUE(ret);
+   return (ret);
 }/*-- RgMiLrgCntrlReq --*/
 
 
@@ -735,11 +727,10 @@ Elmnt sapType;            /* Sap Type */
    RgUpSapCfgInfo    *upSapCfg = NULLP;
    RgUpSapCb          *upSapCb  = NULLP;
 
-   TRC2(rgLMMSapCfg)
 
    /* Check if Gen Config has been done */
    if(rgCb[inst].rgInit.cfgDone != TRUE)
-      RETVALUE(LCM_REASON_GENCFG_NOT_DONE);
+      return (LCM_REASON_GENCFG_NOT_DONE);
 
    switch(sapType)
    {   
@@ -834,14 +825,14 @@ Elmnt sapType;            /* Sap Type */
          lowSapCfg->sapPst.prior = cfg->s.tfuSap.prior;
          lowSapCfg->suId = cfg->s.tfuSap.suId;
          lowSapCfg->spId = cfg->s.tfuSap.spId;
-         cmMemcpy((U8 *)&lowSapCfg->bndTmr, (U8 *)&cfg->s.tfuSap.bndTmr,
+         memcpy(&lowSapCfg->bndTmr, &cfg->s.tfuSap.bndTmr,
                    sizeof(TmrCfg));
          break;
       default:
          /* would never reach here */
          break;
    }
-   RETVALUE(ret);
+   return (ret);
 }
 
 
@@ -878,21 +869,20 @@ RgCfg *cfg;            /* Configuaration information */
 {
    U16    ret = LCM_REASON_NOT_APPL;
 
-   TRC2(rgLMMGenCfg)
 
    /* Check if General Configuration is done already */
    if (rgCb[inst].rgInit.cfgDone == TRUE)
    {
-      RETVALUE(LCM_REASON_INVALID_MSGTYPE);
+      return (LCM_REASON_INVALID_MSGTYPE);
    }
    if ((cfg->s.genCfg.lmPst.selector != ODU_SELECTOR_TC) &&
        (cfg->s.genCfg.lmPst.selector != ODU_SELECTOR_LC))
    {
       RLOG0(L_ERROR, "unsupported Selector value for RGU");
-      RETVALUE(LCM_REASON_INVALID_PAR_VAL);
+      return (LCM_REASON_INVALID_PAR_VAL);
    }
    /* Update the Pst structure for LM interface */
-   cmMemcpy((U8 *)&rgCb[inst].rgInit.lmPst, (U8 *)&cfg->s.genCfg.lmPst,
+   memcpy(&rgCb[inst].rgInit.lmPst, &cfg->s.genCfg.lmPst,
              sizeof(Pst));
 
    rgCb[inst].rgInit.lmPst.srcProcId = rgCb[inst].rgInit.procId;
@@ -913,7 +903,7 @@ RgCfg *cfg;            /* Configuaration information */
    if(cfg->s.genCfg.numRguSaps == 0)
    {
       RGDBGERRNEW(inst,(rgPBuf(inst), "\nrgGenCfg(): Invalid numRguSap.\n"));
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    /* allocate RGR saps */
@@ -923,22 +913,22 @@ RgCfg *cfg;            /* Configuaration information */
                 (sizeof(RgUpSapCb) * cfg->s.genCfg.numRguSaps)) != ROK)
    {
       RGDBGERRNEW(inst,(rgPBuf(inst), "\nrgGenCfg(): Failed to allocate mem for RGU SAP's.\n"));
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    rgCb[inst].numRguSaps = cfg->s.genCfg.numRguSaps;
 
    for (int idx = 0; idx < rgCb[inst].numRguSaps; idx++)
    {
       rgCb[inst].rguSap[idx].sapSta.sapState = LRG_NOT_CFG;
-      cmMemset((U8 *)&rgCb[inst].rguSap[idx], 0, sizeof(RgUpSapCb));
+      memset(&rgCb[inst].rguSap[idx], 0, sizeof(RgUpSapCb));
    }
    rgCb[inst].tfuSap.sapSta.sapState = LRG_NOT_CFG;
    /* Initialize the timer blocks */
    cmInitTimers(rgCb[inst].tmrBlk, RG_MAX_TIMER);
    /* Initialzie the timer queue */   
-   cmMemset((U8 *)&rgCb[inst].tmrTq, 0, sizeof(CmTqType)*RG_TQ_SIZE);
+   memset(&rgCb[inst].tmrTq, 0, sizeof(CmTqType)*RG_TQ_SIZE);
    /* Initialize the timer control point */
-   cmMemset((U8 *)&rgCb[inst].tmrTqCp, 0, sizeof(CmTqCp));
+   memset(&rgCb[inst].tmrTqCp, 0, sizeof(CmTqCp));
    rgCb[inst].tmrTqCp.tmrLen = RG_TQ_SIZE;
 #if 0
    /* Timer Registration request to SSI */
@@ -953,13 +943,13 @@ RgCfg *cfg;            /* Configuaration information */
                 (Data *)rgCb[inst].rguSap,
                 (sizeof(RgUpSapCb) * cfg->s.genCfg.numRguSaps));
 
-      RETVALUE(LCM_REASON_MEM_NOAVAIL);
+      return (LCM_REASON_MEM_NOAVAIL);
    }
 #endif
    /* Set Config done in TskInit */
    rgCb[inst].rgInit.cfgDone = TRUE;
 
-   RETVALUE(ret);
+   return (ret);
 }
 
 
@@ -992,7 +982,6 @@ Inst inst;
    RgCellCb   *cell = rgCb[inst].cell;
    U8 idx;
 
-   TRC2(rgLMMShutdown)
 
    /* Unbind the TFU Sap */
    if(rgCb[inst].tfuSap.sapSta.sapState == LRG_WAIT_BNDCFM)
@@ -1074,7 +1063,6 @@ Pst           *cfmPst;
 #endif
 {
    Inst      inst = (cfmPst->srcInst - RG_INST_START);
-   TRC2(rgLMMGenCntrl)
 
    cfm->cfm.status = LCM_PRIM_OK;
    cfm->cfm.reason = LCM_REASON_NOT_APPL;
@@ -1091,8 +1079,8 @@ Pst           *cfmPst;
                rgCb[inst].rgInit.trc = TRUE;
                rgCb[inst].trcLen = cntrl->t.cntrl.s.trcLen;
                /*Store the response and TransId for sending the Traces */
-               cmMemcpy((U8 *)&rgCb[inst].genCfg.trcResp.response, 
-               (U8 *)&cntrl->hdr.response, sizeof(Resp));
+               memcpy(&rgCb[inst].genCfg.trcResp.response, 
+               &cntrl->hdr.response, sizeof(Resp));
                rgCb[inst].genCfg.trcResp.transId = cntrl->hdr.transId;
                
                break;
@@ -1100,8 +1088,8 @@ Pst           *cfmPst;
             /* Enable Unsolicited Status (alarms) */
                rgCb[inst].rgInit.usta = TRUE;
                /*Store the response and TransId for sending the Alarms */
-               cmMemcpy((U8 *)&rgCb[inst].genCfg.ustaResp.response, 
-               (U8 *)&cntrl->hdr.response, sizeof(Resp));
+               memcpy(&rgCb[inst].genCfg.ustaResp.response, 
+               &cntrl->hdr.response, sizeof(Resp));
                rgCb[inst].genCfg.ustaResp.transId = cntrl->hdr.transId;
                break;
             case SADBG:
@@ -1199,7 +1187,6 @@ Pst           *cfmPst;
 #endif
 {
    Inst      inst = cfmPst->srcInst - RG_INST_START;
-   TRC2(rgLMMSapCntrl)
 
    /* Only TFU Sap can be controlled by LM */
    switch(cntrl->hdr.elmId.elmnt)
@@ -1227,8 +1214,8 @@ Pst           *cfmPst;
                   rgCb[inst].tfuSap.numBndRetries++;
                   /* Store the response and TransId for sending 
                    * the Control confirm */
-                  cmMemcpy((U8 *)&rgCb[inst].genCfg.bndCfmResp.response,
-                           (U8 *)&cntrl->hdr.response, sizeof(Resp));
+                  memcpy(&rgCb[inst].genCfg.bndCfmResp.response,
+                           &cntrl->hdr.response, sizeof(Resp));
                   rgCb[inst].genCfg.bndCfmResp.transId = cntrl->hdr.transId;
 
                   /* Sending Status Indication to Layer Manager */
@@ -1275,7 +1262,7 @@ Pst           *cfmPst;
                      rgLMMStopTmr(inst,RG_BNDREQ_TMR, (PTR)&rgCb[inst].tfuSap);
                   }
                }
-               cmMemset((U8 *)&rgCb[inst].tfuSap, 0, sizeof(RgLowSapCb));
+               memset(&rgCb[inst].tfuSap, 0, sizeof(RgLowSapCb));
                rgCb[inst].tfuSap.sapSta.sapState = LRG_NOT_CFG;
                cfm->cfm.status = LCM_PRIM_OK;
                cfm->cfm.reason = LCM_REASON_NOT_APPL;
@@ -1292,7 +1279,7 @@ Pst           *cfmPst;
          switch(cntrl->t.cntrl.action)
          {
             case ADEL:
-               cmMemset((U8 *)&rgCb[inst].rguSap[cntrl->t.cntrl.instId], 0, sizeof(RgUpSapCb));
+               memset(&rgCb[inst].rguSap[cntrl->t.cntrl.instId], 0, sizeof(RgUpSapCb));
                rgCb[inst].rguSap[cntrl->t.cntrl.instId].sapSta.sapState = LRG_NOT_CFG;
                cfm->cfm.status = LCM_PRIM_OK;
                cfm->cfm.reason = LCM_REASON_NOT_APPL;
@@ -1309,7 +1296,7 @@ Pst           *cfmPst;
          switch(cntrl->t.cntrl.action)
          {
             case ADEL:
-               cmMemset((U8 *)&rgCb[inst].crgSap, 0, sizeof(RgUpSapCb));
+               memset(&rgCb[inst].crgSap, 0, sizeof(RgUpSapCb));
                rgCb[inst].crgSap.sapSta.sapState = LRG_NOT_CFG;
                cfm->cfm.status = LCM_PRIM_OK;
                cfm->cfm.reason = LCM_REASON_NOT_APPL;
@@ -1362,7 +1349,6 @@ RgMngmt       *cfm;
 #endif
 {
    Inst inst;
-   TRC2(rgLMMFillCfmPst)
    inst = (reqPst->dstInst - RG_INST_START);
 
    cfmPst->srcEnt    = rgCb[inst].rgInit.ent;
@@ -1401,7 +1387,7 @@ RgMngmt       *cfm;
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 rgLMMStartTmr
+S16 rgLMMStartTmr
 (
 Inst               inst,
 S16                tmrEvnt,            /* Timer Event */
@@ -1409,7 +1395,7 @@ U32                tmrVal,             /* Wait Time */
 PTR                cb                  /* Entry for which Timer Expired */
 )
 #else
-PUBLIC S16 rgLMMStartTmr(tmrEvnt, tmrVal, cb)
+S16 rgLMMStartTmr(tmrEvnt, tmrVal, cb)
 Inst               inst;
 S16                tmrEvnt;            /* Timer Event */
 U32                tmrVal;             /* Wait Time */
@@ -1418,12 +1404,11 @@ PTR                cb;                 /* Entry for which Timer Expired */
 {
    CmTmrArg    arg;
 
-   TRC2(rgLMMStartTmr)
 
    UNUSED(tmrEvnt);
 
    /* Initialize the arg structure */
-   cmMemset((U8 *)&arg, 0, sizeof(CmTmrArg));
+   memset(&arg, 0, sizeof(CmTmrArg));
 
    arg.tqCp = &rgCb[inst].tmrTqCp;
    arg.tq = rgCb[inst].tmrTq;
@@ -1435,7 +1420,7 @@ PTR                cb;                 /* Entry for which Timer Expired */
    arg.wait = tmrVal;      
    cmPlcCbTq(&arg);
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 
@@ -1460,14 +1445,14 @@ PTR                cb;                 /* Entry for which Timer Expired */
  *      -# RFAILED
  **/
 #ifdef ANSI
-PUBLIC S16 rgLMMStopTmr
+S16 rgLMMStopTmr
 (
 Inst               inst,             /* Scheduler instance */
 S16                tmrEvnt,            /* Timer Event */
 PTR                cb                  /* Entry for which Timer Expired */
 )
 #else
-PUBLIC S16 rgLMMStopTmr(inst,tmrEvnt, cb)
+S16 rgLMMStopTmr(inst,tmrEvnt, cb)
 Inst               inst;             /* Scheduler instance */
 S16                tmrEvnt;            /* Timer Event */
 PTR                cb;                 /* Entry for which Timer Expired */
@@ -1477,7 +1462,6 @@ PTR                cb;                 /* Entry for which Timer Expired */
    U8         i;
    S16        ret; 
 
-   TRC2(rgLMMStopTmr)
 
    ret = RFAILED;
 
@@ -1487,7 +1471,7 @@ PTR                cb;                 /* Entry for which Timer Expired */
       if(rgCb[inst].tmrBlk[i].tmrEvnt == tmrEvnt)
       {
          /* Initialize the arg structure */
-         cmMemset((U8 *)&arg, 0, sizeof(CmTmrArg));
+         memset(&arg, 0, sizeof(CmTmrArg));
 
          arg.tqCp = &rgCb[inst].tmrTqCp;
          arg.tq = rgCb[inst].tmrTq;
@@ -1506,7 +1490,7 @@ PTR                cb;                 /* Entry for which Timer Expired */
    }
 
 
-   RETVALUE(ret);
+   return (ret);
 }
 
 
@@ -1527,13 +1511,13 @@ PTR                cb;                 /* Entry for which Timer Expired */
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 rgLMMTmrExpiry
+S16 rgLMMTmrExpiry
 (
 PTR cb,               /* Pointer to timer control block */
 S16 tmrEvnt           /* Timer Event */
 )
 #else
-PUBLIC S16 rgLMMTmrExpiry(cb,tmrEvnt)
+S16 rgLMMTmrExpiry(cb,tmrEvnt)
 PTR cb;               /* Pointer to timer control block */
 S16 tmrEvnt;          /* Timer Event */
 #endif
@@ -1542,9 +1526,6 @@ S16 tmrEvnt;          /* Timer Event */
    RgLowSapCb *tfuSap = (RgLowSapCb *)cb;
    Inst          inst = tfuSap->sapCfg.sapPst.srcInst - RG_INST_START;
 
-   TRC2(rgLMMTmrExpiry)
-
-   
    switch(tmrEvnt)
    {
       case RG_BNDREQ_TMR:
@@ -1573,7 +1554,7 @@ S16 tmrEvnt;          /* Timer Event */
          ret = RFAILED;
          break;
    }
-   RETVALUE(ret);
+   return (ret);
 }
 
 
@@ -1597,7 +1578,7 @@ S16 tmrEvnt;          /* Timer Event */
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 rgLMMStaInd
+S16 rgLMMStaInd
 (
 Inst inst,
 U16 category,
@@ -1606,7 +1587,7 @@ U16 cause,
 RgUstaDgn *dgn
 )
 #else
-PUBLIC S16 rgLMMStaInd(inst,category, event, cause, dgn) 
+S16 rgLMMStaInd(inst,category, event, cause, dgn) 
 Inst inst;
 U16 category;
 U16 event;
@@ -1616,14 +1597,13 @@ RgUstaDgn *dgn;
 {
    RgMngmt    usta;
 
-   TRC2(rgLMMStaInd)
 
    if(rgCb[inst].rgInit.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;
@@ -1631,7 +1611,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));
    }
 
    rgCb[inst].rgInit.lmPst.selector = rgCb[inst].genCfg.ustaResp.response.selector;
@@ -1641,7 +1621,7 @@ RgUstaDgn *dgn;
    rgCb[inst].rgInit.lmPst.pool = rgCb[inst].genCfg.ustaResp.response.mem.pool;
    usta.hdr.transId = rgCb[inst].genCfg.ustaResp.transId;
 
-   RETVALUE(RgMiLrgStaInd(&rgCb[inst].rgInit.lmPst, &usta));
+   return (RgMiLrgStaInd(&rgCb[inst].rgInit.lmPst, &usta));
 }
 
 
@@ -1661,14 +1641,14 @@ RgUstaDgn *dgn;
  *  @return Void 
  **/
 #ifdef ANSI
-PUBLIC Void rgLMMTrcInd
+Void rgLMMTrcInd
 (
 Inst   inst,
 Buffer *srcMbuf,    /* Message Buffer */
 U8 event            /* event */
 )
 #else
-PUBLIC Void rgLMMTrcInd(inst,srcMbuf,event)
+Void rgLMMTrcInd(inst,srcMbuf,event)
 Inst   inst;
 Buffer *srcMbuf;    /* Message Buffer */
 U8 event;           /* event */
@@ -1681,7 +1661,6 @@ U8 event;           /* event */
    RgMngmt  trc;
    Pst      pst;
 
-   TRC2(rgLMMTrcInd)
 
 
    if ((rgCb[inst].trcLen == LRG_NO_TRACE) || (srcMbuf == NULLP))
@@ -1690,7 +1669,7 @@ U8 event;           /* event */
       RETVOID;
    }
    
-   cmMemset((U8 *)&trc, 0, sizeof(RgMngmt));
+   memset(&trc, 0, sizeof(RgMngmt));
 
    pst = rgCb[inst].rgInit.lmPst;
    pst.selector = rgCb[inst].genCfg.trcResp.response.selector;
@@ -1814,14 +1793,14 @@ U8 event;           /* event */
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 rgLMMBndCfm
+S16 rgLMMBndCfm
 (
 Pst *pst,               /* Post Structure */
 SuId suId,              /* Service user ID */
 U8 status               /* Status */
 )
 #else
-PUBLIC S16 rgLMMBndCfm(pst,suId,status)
+S16 rgLMMBndCfm(pst,suId,status)
 Pst *pst;               /* Post Structure */
 SuId suId;              /* Service user ID */
 U8 status;              /* Status */
@@ -1832,7 +1811,6 @@ U8 status;              /* Status */
    RgMngmt   cntrlCfm;
    Pst       cfmPst;
 
-   TRC3(rgLMMBndCfm)
 
    UNUSED(pst);
 
@@ -1840,7 +1818,7 @@ U8 status;              /* Status */
    if(rgCb[inst].tfuSap.sapCfg.suId != suId)
    {
       RLOG0(L_ERROR, "Invalid SuId");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    /* check the Sap State */
@@ -1850,9 +1828,9 @@ U8 status;              /* Status */
          break;
       case LRG_BND:
          /* SAP is already bound */
-         RETVALUE(ROK);
+         return ROK;
       default:
-         RETVALUE(RFAILED);
+         return RFAILED;
    }
 
    cfmPst = rgCb[inst].rgInit.lmPst;
@@ -1862,7 +1840,7 @@ U8 status;              /* Status */
    cfmPst.region = rgCb[inst].genCfg.bndCfmResp.response.mem.region;
    cfmPst.pool = rgCb[inst].genCfg.bndCfmResp.response.mem.pool;
    
-   cmMemset((U8 *)&cntrlCfm, 0, sizeof(RgMngmt));
+   memset(&cntrlCfm, 0, sizeof(RgMngmt));
 
    switch(status)
    {
@@ -1896,7 +1874,7 @@ U8 status;              /* Status */
 
    ret = RgMiLrgCntrlCfm(&cfmPst, &cntrlCfm);
 
-   RETVALUE(ret);
+   return (ret);
 }
 
 
@@ -1914,24 +1892,23 @@ U8 status;              /* Status */
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 rgActvTmr
+S16 rgActvTmr
 (
  Ent     ent,
  Inst    inst
 )
 #else
-PUBLIC S16 rgActvTmr(ent, inst)
+S16 rgActvTmr(ent, inst)
 Ent     ent;
 Inst    inst;
 #endif
 {
    Inst macInst = (inst  - RG_INST_START);
-   TRC3(rgActvTmr)
 
    /* Check if any MAC timer has expired */ 
    cmPrcTmr(&rgCb[macInst].tmrTqCp, rgCb[macInst].tmrTq, (PFV) rgLMMTmrExpiry);
  
-   RETVALUE(ROK);
+   return ROK;
  
 } /* end of rgActvTmr */