U8, U16, U32 data type changes
[o-du/l2.git] / src / 5gnrmac / rg_lmm.c
index d6fcdef..c49861e 100755 (executable)
@@ -84,12 +84,12 @@ LwrMacCb   lwrMacCb;
 extern MacCb  macCb;
 
 /* forward references */
-PRIVATE U16 rgLMMGenCfg ARGS((
+PRIVATE uint16_t rgLMMGenCfg ARGS((
    Inst           inst,
    RgCfg          *cfg           
 ));
 
-PRIVATE U16 rgLMMSapCfg ARGS((
+PRIVATE uint16_t rgLMMSapCfg ARGS((
    Inst           inst,
    RgCfg          *cfg,
    Elmnt          sapType
@@ -175,7 +175,7 @@ Reason reason;         /* reason */
 #ifdef DEBUGP
 #ifdef RG_DEBUG
    /* disabling debugs by default */
-    rgCb[macInst].rgInit.dbgMask = 0xffffffff; 
+   rgCb[macInst].rgInit.dbgMask = 0xffffffff; 
 #endif
 #endif /* DEBUGP */
 #ifdef SS_DIAG
@@ -245,16 +245,16 @@ Pst      *pst;    /* post structure  */
 RgMngmt  *cfg;    /* config structure  */
 #endif    
 {
-   U16       ret = LCM_PRIM_OK;
-   U16       reason = LCM_REASON_NOT_APPL;
+   uint16_t  ret = LCM_PRIM_OK;
+   uint16_t  reason = LCM_REASON_NOT_APPL;
    RgMngmt   cfm;
    Pst       cfmPst;
    Inst      inst;
 
 
-   RG_DIAG_LVL0(inst,0x0a0b0001, RG_DIAG_NA, SS_DIAG_INV_ARG,
-              "Received CfgReq for MAC layer, Entity = %d, Instance = %d\n",
-              pst->srcEnt, pst->srcInst,0,0);
+
+   RG_DIAG_LVL0(inst,0x0a0b0001, RG_DIAG_NA, SS_DIAG_INV_ARG,\
+   "Received CfgReq for MAC layer, Entity = %d, Instance = %d\n", pst->srcEnt, pst->srcInst,0,0);
 
    RG_IS_INST_VALID(pst->dstInst);
    inst = pst->dstInst - RG_INST_START;
@@ -273,19 +273,19 @@ RgMngmt  *cfg;    /* config structure  */
    switch(cfg->hdr.elmId.elmnt)
    {
       case STGEN:
-         reason = rgLMMGenCfg(inst,&cfg->t.cfg); 
-         break;
+        reason = rgLMMGenCfg(inst,&cfg->t.cfg); 
+        break;
       case STRGUSAP:
       case STCRGSAP:
       case STTFUSAP:
-         reason = rgLMMSapCfg(inst,&cfg->t.cfg, cfg->hdr.elmId.elmnt);
-         break;
+        reason = rgLMMSapCfg(inst,&cfg->t.cfg, cfg->hdr.elmId.elmnt);
+        break;
       default:
-         ret = LCM_PRIM_NOK;
-         reason = LCM_REASON_INVALID_ELMNT;
-         RLOG1(L_ERROR, "Invalid Elmnt=%d",
-                  cfg->hdr.elmId.elmnt);
-         break;
+        ret = LCM_PRIM_NOK;
+        reason = LCM_REASON_INVALID_ELMNT;
+        RLOG1(L_ERROR, "Invalid Elmnt=%d",
+              cfg->hdr.elmId.elmnt);
+        break;
    }
 
    if (reason != LCM_REASON_NOT_APPL)
@@ -297,7 +297,7 @@ RgMngmt  *cfg;    /* config structure  */
    cfm.cfm.reason = reason;
 
    RgMiLrgCfgCfm(&cfmPst, &cfm);
-   
+
    return ROK;
 }/*-- RgMiLrgCfgReq --*/
 
@@ -337,7 +337,6 @@ RgMngmt  *sts;    /* statistics structure  */
    RgMngmt   cfm;
    Inst      inst;
 
-
    RG_IS_INST_VALID(pst->dstInst);
    inst = pst->dstInst - RG_INST_START;
    /* Fill the post structure for sending the confirmation */
@@ -379,7 +378,7 @@ RgMngmt  *sts;    /* statistics structure  */
 #ifdef MAC_SCH_STATS
             {
                RgGenSts *genSts = &(cfm.t.sts.s.genSts);
-               U8       cqi = 0;
+               uint8_t       cqi = 0;
                for(cqi=0; cqi <= 14; cqi++)
                {
                   /* Filling DL ACK/NACK stats */
@@ -436,8 +435,8 @@ RgMngmt  *sts;    /* statistics structure  */
                }
             }
 #endif /* MAC_SCH_STATS*/
-         }
-         break;
+        }
+        break;
       case STRGUSAP:
          memcpy(&(cfm.t.sts.s.rguSts), &rgCb[inst].rguSap[sts->t.sts.sapInst].sapSts,
                   sizeof(RgSapSts));
@@ -446,7 +445,7 @@ RgMngmt  *sts;    /* statistics structure  */
          if(sts->t.sts.action == ARST)
             memset(&rgCb[inst].rguSap[sts->t.sts.sapInst].sapSts, 0, sizeof(RgSapSts));
 
-         break;
+        break;
       case STCRGSAP:
          memcpy(&(cfm.t.sts.s.crgSts), &rgCb[inst].crgSap.sapSts,
                   sizeof(RgSapSts));
@@ -455,7 +454,7 @@ RgMngmt  *sts;    /* statistics structure  */
          if(sts->t.sts.action == ARST)
             memset(&rgCb[inst].crgSap.sapSts, 0, sizeof(RgSapSts));
 
-         break;
+        break;
       case STTFUSAP:
          memcpy(&(cfm.t.sts.s.tfuSts), &rgCb[inst].tfuSap.sapSts,
                   sizeof(RgSapSts));
@@ -464,12 +463,12 @@ RgMngmt  *sts;    /* statistics structure  */
          if(sts->t.sts.action == ARST)
             memset(&rgCb[inst].tfuSap.sapSts, 0, sizeof(RgSapSts));
 
-         break;
+        break;
       default:
-         cfm.cfm.status = LCM_PRIM_NOK;
-         cfm.cfm.reason = LCM_REASON_INVALID_ELMNT;
-         RLOG1(L_ERROR, "Invalid Elmnt = %d",sts->hdr.elmId.elmnt);
-         break;     
+        cfm.cfm.status = LCM_PRIM_NOK;
+        cfm.cfm.reason = LCM_REASON_INVALID_ELMNT;
+        RLOG1(L_ERROR, "Invalid Elmnt = %d",sts->hdr.elmId.elmnt);
+        break;     
    }
    RgMiLrgStsCfm(&cfmPst,&cfm);
    return ROK;
@@ -534,11 +533,11 @@ RgMngmt  *sta;    /* status structure  */
    {
       SGetDateTime(&cfm.t.ssta.dt);
       if (SGetSBuf(cfmPst.region, cfmPst.pool, 
-          (Data **)&(cfm.t.ssta.s.sysId.ptNmb), LRG_MAX_PT_NUM_SIZE)
-         != ROK)
+              (Data **)&(cfm.t.ssta.s.sysId.ptNmb), LRG_MAX_PT_NUM_SIZE)
+           != ROK)
       {
-         RLOG0(L_ERROR, "Memory Unavailable for Confirmation");
-         return ROK;
+        RLOG0(L_ERROR, "Memory Unavailable for Confirmation");
+        return ROK;
       } 
       memset((cfm.t.ssta.s.sysId.ptNmb), 0, LRG_MAX_PT_NUM_SIZE);
       rgGetSId(&cfm.t.ssta.s.sysId);
@@ -593,11 +592,11 @@ RgMngmt  *sta;    /* status structure  */
          RgMiLrgStaCfm(&cfmPst, &cfm);
          break;
       default:
-         cfm.cfm.status = LCM_PRIM_NOK;
-         cfm.cfm.reason = LCM_REASON_INVALID_ELMNT;
-         RgMiLrgStaCfm(&cfmPst, &cfm);
-         RLOG1(L_ERROR, "Invalid elmnt=%d",sta->hdr.elmId.elmnt);
-         break;     
+        cfm.cfm.status = LCM_PRIM_NOK;
+        cfm.cfm.reason = LCM_REASON_INVALID_ELMNT;
+        RgMiLrgStaCfm(&cfmPst, &cfm);
+        RLOG1(L_ERROR, "Invalid elmnt=%d",sta->hdr.elmId.elmnt);
+        break;     
    }
    return ROK;
 }/*-- RgMiLrgStaReq --*/
@@ -639,8 +638,6 @@ RgMngmt  *cntrl;  /* control structure  */
    Pst       cfmPst;
    RgMngmt   cfm;
    Inst      inst;
-   
-   
    /* Fill the post structure for sending the confirmation */
 
    RG_IS_INST_VALID(pst->dstInst);
@@ -666,24 +663,24 @@ RgMngmt  *cntrl;  /* control structure  */
       RLOG0(L_ERROR, "Gen Cfg not done");
       return ROK;
    }
+
    /* General Config done, process the Control request */   
    switch(cntrl->hdr.elmId.elmnt)
    {
       case STGEN:
-         rgLMMGenCntrl(cntrl, &cfm, &cfmPst);
-         break;
+        rgLMMGenCntrl(cntrl, &cfm, &cfmPst);
+        break;
       case STTFUSAP:
       case STRGUSAP:
       case STCRGSAP:
-         rgLMMSapCntrl(cntrl, &cfm, &cfmPst);
-         break;
+        rgLMMSapCntrl(cntrl, &cfm, &cfmPst);
+        break;
       default:
-         cfm.cfm.status = LCM_PRIM_NOK;
-         cfm.cfm.reason = LCM_REASON_INVALID_PAR_VAL;
-         RgMiLrgCntrlCfm(&cfmPst, &cfm);
-         RLOG1(L_ERROR, "invalid elmnt=%d",cntrl->hdr.elmId.elmnt);
-         break;
+        cfm.cfm.status = LCM_PRIM_NOK;
+        cfm.cfm.reason = LCM_REASON_INVALID_PAR_VAL;
+        RgMiLrgCntrlCfm(&cfmPst, &cfm);
+        RLOG1(L_ERROR, "invalid elmnt=%d",cntrl->hdr.elmId.elmnt);
+        break;
    }
    return (ret);
 }/*-- RgMiLrgCntrlReq --*/
@@ -703,107 +700,107 @@ RgMngmt  *cntrl;  /* control structure  */
  *     
  *  @param[in]  Inst        inst
  *  @param[in]  RgCfg *cfg, the Configuaration information 
- *  @return  U16
+ *  @return  uint16_t
  *      -# LCM_REASON_GENCFG_NOT_DONE
  *      -# LCM_REASON_INVALID_SAP
  *      -# LCM_REASON_NOT_APPL
  **/
 #ifdef ANSI
-PRIVATE U16 rgLMMSapCfg
+PRIVATE uint16_t rgLMMSapCfg
 (
 Inst  inst,
 RgCfg *cfg,            /* Configuaration information */
 Elmnt sapType             /* Sap Type */
 )
 #else
-PRIVATE U16 rgLMMSapCfg(inst,cfg,sapType)
+PRIVATE uint16_t rgLMMSapCfg(inst,cfg,sapType)
 Inst  inst;
 RgCfg *cfg;            /* Configuaration information */
 Elmnt sapType;            /* Sap Type */
 #endif
 {
-   U16               ret = LCM_REASON_NOT_APPL;
+   uint16_t          ret = LCM_REASON_NOT_APPL;
    RgLowSapCfgInfo   *lowSapCfg = NULLP;
    RgUpSapCfgInfo    *upSapCfg = NULLP;
-   RgUpSapCb          *upSapCb  = NULLP;
+   RgUpSapCb         *upSapCb  = NULLP;
 
 
-   /* Check if Gen Config has been done */
+      /* Check if Gen Config has been done */
    if(rgCb[inst].rgInit.cfgDone != TRUE)
-      return (LCM_REASON_GENCFG_NOT_DONE);
+        return (LCM_REASON_GENCFG_NOT_DONE);
 
    switch(sapType)
    {   
       case STRGUSAP:
-         if ((cfg->s.rguSap.spId > LRG_MAX_RGU_SAPS) &&
-             (cfg->s.rguSap.selector != ODU_SELECTOR_TC) &&
-             (cfg->s.rguSap.selector != ODU_SELECTOR_LC))
-         {
-            ret = LCM_REASON_INVALID_PAR_VAL;
-            RLOG0(L_ERROR, "unsupported Selector value for RGU");
-            break;
-         }
-         upSapCb = &(rgCb[inst].rguSap[cfg->s.rguSap.spId]);
-         if(upSapCb->sapSta.sapState == LRG_NOT_CFG)
-         
-            upSapCb->sapSta.sapState = LRG_UNBND;
-         }
-         upSapCfg = &(upSapCb->sapCfg);
-         upSapCfg->sapPst.dstEnt = cfg->s.rguSap.ent;
-         upSapCfg->sapPst.dstInst = cfg->s.rguSap.inst;
-         upSapCfg->sapPst.dstProcId = cfg->s.rguSap.procId;
-         upSapCfg->sapPst.srcEnt = rgCb[inst].rgInit.ent;
-         upSapCfg->sapPst.srcInst = rgCb[inst].rgInit.inst;
-         upSapCfg->sapPst.srcProcId = rgCb[inst].rgInit.procId;
-         upSapCfg->sapPst.region = cfg->s.rguSap.mem.region;
-         upSapCfg->sapPst.pool = cfg->s.rguSap.mem.pool;
-         upSapCfg->sapPst.selector = cfg->s.rguSap.selector;
-         upSapCfg->sapPst.route = cfg->s.rguSap.route;
-         upSapCfg->sapPst.intfVer = 0; 
-         upSapCfg->sapPst.prior = cfg->s.rguSap.prior;
-         upSapCfg->suId = cfg->s.rguSap.suId;
-         upSapCfg->spId = cfg->s.rguSap.spId;
-         /*T2K uses 2 saps, T3K uses 1 sap. change the rgRguDlSap to 1 only if
-          * there is cfg request with sap is 1*/
-         break;
+        if ((cfg->s.rguSap.spId > LRG_MAX_RGU_SAPS) &&
+              (cfg->s.rguSap.selector != ODU_SELECTOR_TC) &&
+              (cfg->s.rguSap.selector != ODU_SELECTOR_LC))
+        {
+           ret = LCM_REASON_INVALID_PAR_VAL;
+           RLOG0(L_ERROR, "unsupported Selector value for RGU");
+           break;
+        }
+        upSapCb = &(rgCb[inst].rguSap[cfg->s.rguSap.spId]);
+        if(upSapCb->sapSta.sapState == LRG_NOT_CFG)
+        { 
+           upSapCb->sapSta.sapState = LRG_UNBND;
+        }
+        upSapCfg = &(upSapCb->sapCfg);
+        upSapCfg->sapPst.dstEnt = cfg->s.rguSap.ent;
+        upSapCfg->sapPst.dstInst = cfg->s.rguSap.inst;
+        upSapCfg->sapPst.dstProcId = cfg->s.rguSap.procId;
+        upSapCfg->sapPst.srcEnt = rgCb[inst].rgInit.ent;
+        upSapCfg->sapPst.srcInst = rgCb[inst].rgInit.inst;
+        upSapCfg->sapPst.srcProcId = rgCb[inst].rgInit.procId;
+        upSapCfg->sapPst.region = cfg->s.rguSap.mem.region;
+        upSapCfg->sapPst.pool = cfg->s.rguSap.mem.pool;
+        upSapCfg->sapPst.selector = cfg->s.rguSap.selector;
+        upSapCfg->sapPst.route = cfg->s.rguSap.route;
+        upSapCfg->sapPst.intfVer = 0; 
+        upSapCfg->sapPst.prior = cfg->s.rguSap.prior;
+        upSapCfg->suId = cfg->s.rguSap.suId;
+        upSapCfg->spId = cfg->s.rguSap.spId;
+        /*T2K uses 2 saps, T3K uses 1 sap. change the rgRguDlSap to 1 only if
+         * there is cfg request with sap is 1*/
+        break;
       case STCRGSAP:
-         if ((cfg->s.crgSap.selector != ODU_SELECTOR_TC) &&
-             (cfg->s.crgSap.selector != ODU_SELECTOR_LC))
-         {
-            ret = LCM_REASON_INVALID_PAR_VAL;
-            RLOG0(L_ERROR, "unsupported Selector value for CRG");
-            break;
-         }
-         if(rgCb[inst].crgSap.sapSta.sapState == LRG_NOT_CFG)
-         
-            rgCb[inst].crgSap.sapSta.sapState = LRG_UNBND;
-         }
-         upSapCfg = &rgCb[inst].crgSap.sapCfg;
-
-         upSapCfg->sapPst.dstEnt = cfg->s.crgSap.ent;
-         upSapCfg->sapPst.dstInst = cfg->s.crgSap.inst;
-         upSapCfg->sapPst.dstProcId = cfg->s.crgSap.procId;
-         upSapCfg->sapPst.srcEnt = rgCb[inst].rgInit.ent;
-         upSapCfg->sapPst.srcInst = rgCb[inst].rgInit.inst;
-         upSapCfg->sapPst.srcProcId = rgCb[inst].rgInit.procId;
-         upSapCfg->sapPst.region = cfg->s.crgSap.mem.region;
-         upSapCfg->sapPst.pool = cfg->s.crgSap.mem.pool;
-         upSapCfg->sapPst.selector = cfg->s.crgSap.selector;
-         upSapCfg->sapPst.route = cfg->s.crgSap.route;
-         upSapCfg->sapPst.intfVer = 0; 
-         upSapCfg->sapPst.prior = cfg->s.crgSap.prior;
-         upSapCfg->suId = cfg->s.crgSap.suId;
-         upSapCfg->spId = cfg->s.crgSap.spId;
-         break;
+        if ((cfg->s.crgSap.selector != ODU_SELECTOR_TC) &&
+              (cfg->s.crgSap.selector != ODU_SELECTOR_LC))
+        {
+           ret = LCM_REASON_INVALID_PAR_VAL;
+           RLOG0(L_ERROR, "unsupported Selector value for CRG");
+           break;
+        }
+        if(rgCb[inst].crgSap.sapSta.sapState == LRG_NOT_CFG)
+        { 
+           rgCb[inst].crgSap.sapSta.sapState = LRG_UNBND;
+        }
+        upSapCfg = &rgCb[inst].crgSap.sapCfg;
+
+        upSapCfg->sapPst.dstEnt = cfg->s.crgSap.ent;
+        upSapCfg->sapPst.dstInst = cfg->s.crgSap.inst;
+        upSapCfg->sapPst.dstProcId = cfg->s.crgSap.procId;
+        upSapCfg->sapPst.srcEnt = rgCb[inst].rgInit.ent;
+        upSapCfg->sapPst.srcInst = rgCb[inst].rgInit.inst;
+        upSapCfg->sapPst.srcProcId = rgCb[inst].rgInit.procId;
+        upSapCfg->sapPst.region = cfg->s.crgSap.mem.region;
+        upSapCfg->sapPst.pool = cfg->s.crgSap.mem.pool;
+        upSapCfg->sapPst.selector = cfg->s.crgSap.selector;
+        upSapCfg->sapPst.route = cfg->s.crgSap.route;
+        upSapCfg->sapPst.intfVer = 0; 
+        upSapCfg->sapPst.prior = cfg->s.crgSap.prior;
+        upSapCfg->suId = cfg->s.crgSap.suId;
+        upSapCfg->spId = cfg->s.crgSap.spId;
+        break;
       case STTFUSAP:
 #ifndef CL_MAC_LWLC 
-         if ((cfg->s.tfuSap.selector != ODU_SELECTOR_TC) &&
-             (cfg->s.tfuSap.selector != ODU_SELECTOR_LC))
-         {
-            ret = LCM_REASON_INVALID_PAR_VAL;
-            RLOG0(L_ERROR, "unsupported Selector value for TFU");
-            break;
-         }
+        if ((cfg->s.tfuSap.selector != ODU_SELECTOR_TC) &&
+              (cfg->s.tfuSap.selector != ODU_SELECTOR_LC))
+        {
+           ret = LCM_REASON_INVALID_PAR_VAL;
+           RLOG0(L_ERROR, "unsupported Selector value for TFU");
+           break;
+        }
 #endif
          if (rgCb[inst].tfuSap.sapSta.sapState == LRG_NOT_CFG) 
          { 
@@ -829,8 +826,8 @@ Elmnt sapType;            /* Sap Type */
                    sizeof(TmrCfg));
          break;
       default:
-         /* would never reach here */
-         break;
+        /* would never reach here */
+        break;
    }
    return (ret);
 }
@@ -850,24 +847,24 @@ Elmnt sapType;            /* Sap Type */
  *     
  *  @param[in]  Inst        inst
  *  @param[in]  RgCfg *cfg, the Configuaration information 
- *  @return  U16
+ *  @return  uint16_t
  *      -# LCM_REASON_NOT_APPL 
  *      -# LCM_REASON_INVALID_MSGTYPE
  *      -# LCM_REASON_MEM_NOAVAIL
  **/
 #ifdef ANSI
-PRIVATE U16 rgLMMGenCfg
+PRIVATE uint16_t rgLMMGenCfg
 (
 Inst inst,
 RgCfg *cfg            /* Configuaration information */
 )
 #else
-PRIVATE U16 rgLMMGenCfg(inst,cfg)
+PRIVATE uint16_t rgLMMGenCfg(inst,cfg)
 Inst inst;
 RgCfg *cfg;            /* Configuaration information */
 #endif
 {
-   U16    ret = LCM_REASON_NOT_APPL;
+   uint16_t    ret = LCM_REASON_NOT_APPL;
 
 
    /* Check if General Configuration is done already */
@@ -876,7 +873,7 @@ RgCfg *cfg;            /* Configuaration information */
       return (LCM_REASON_INVALID_MSGTYPE);
    }
    if ((cfg->s.genCfg.lmPst.selector != ODU_SELECTOR_TC) &&
-       (cfg->s.genCfg.lmPst.selector != ODU_SELECTOR_LC))
+        (cfg->s.genCfg.lmPst.selector != ODU_SELECTOR_LC))
    {
       RLOG0(L_ERROR, "unsupported Selector value for RGU");
       return (LCM_REASON_INVALID_PAR_VAL);
@@ -908,9 +905,9 @@ RgCfg *cfg;            /* Configuaration information */
 
    /* allocate RGR saps */
    if (SGetSBuf(rgCb[inst].rgInit.region,
-                rgCb[inst].rgInit.pool,
-                (Data **)&rgCb[inst].rguSap,
-                (sizeof(RgUpSapCb) * cfg->s.genCfg.numRguSaps)) != ROK)
+           rgCb[inst].rgInit.pool,
+           (Data **)&rgCb[inst].rguSap,
+           (sizeof(RgUpSapCb) * cfg->s.genCfg.numRguSaps)) != ROK)
    {
       RGDBGERRNEW(inst,(rgPBuf(inst), "\nrgGenCfg(): Failed to allocate mem for RGU SAP's.\n"));
       return RFAILED;
@@ -933,15 +930,15 @@ RgCfg *cfg;            /* Configuaration information */
 #if 0
    /* Timer Registration request to SSI */
    if (SRegTmrMt(rgCb[inst].rgInit.ent, rgCb[inst].rgInit.inst,
-            (S16)rgCb[inst].genCfg.tmrRes, rgActvTmr) != ROK)
+           (S16)rgCb[inst].genCfg.tmrRes, rgActvTmr) != ROK)
    {
-      
+
       RLOG0(L_ERROR, "Failed to register timer");
 
       SPutSBuf(rgCb[inst].rgInit.region,
-                rgCb[inst].rgInit.pool,
-                (Data *)rgCb[inst].rguSap,
-                (sizeof(RgUpSapCb) * cfg->s.genCfg.numRguSaps));
+           rgCb[inst].rgInit.pool,
+           (Data *)rgCb[inst].rguSap,
+           (sizeof(RgUpSapCb) * cfg->s.genCfg.numRguSaps));
 
       return (LCM_REASON_MEM_NOAVAIL);
    }
@@ -980,17 +977,17 @@ Inst inst;
 #endif
 {
    RgCellCb   *cell = rgCb[inst].cell;
-   U8 idx;
+   uint8_t    idx;
 
 
-   /* Unbind the TFU Sap */
+    /* Unbind the TFU Sap */
    if(rgCb[inst].tfuSap.sapSta.sapState == LRG_WAIT_BNDCFM)
    {
       rgLIMTfuUbndReq(inst,rgCb[inst].tfuSap.sapCfg.spId, LRG_UNBND);
       if (rgCb[inst].tfuSap.sapCfg.bndTmr.enb == TRUE)
       {
          rgLMMStopTmr(inst,RG_BNDREQ_TMR, (PTR)&rgCb[inst].tfuSap); 
-      }
+      } 
       rgCb[inst].tfuSap.sapSta.sapState = LRG_UNBND;
    }
    if(rgCb[inst].tfuSap.sapSta.sapState == LRG_BND)
@@ -1004,7 +1001,7 @@ Inst inst;
    {
       for(idx=0;idx < RG_NUM_SUB_FRAMES; idx++)
       {
-         rgTOMRlsSf(inst,&cell->subFrms[idx]);
+        rgTOMRlsSf(inst,&cell->subFrms[idx]);
       }
 
       rgCFGFreeCellCb(cell);
@@ -1012,9 +1009,9 @@ Inst inst;
 
    /* Deleting the RGU SAPs */
    SPutSBuf(rgCb[inst].rgInit.region,
-                rgCb[inst].rgInit.pool,
-                (Data *)rgCb[inst].rguSap,
-                (sizeof(RgUpSapCb) * rgCb[inst].numRguSaps));
+        rgCb[inst].rgInit.pool,
+        (Data *)rgCb[inst].rguSap,
+        (sizeof(RgUpSapCb) * rgCb[inst].numRguSaps));
    rgCb[inst].rguSap = NULLP;
 
    rgCb[inst].inactiveCell = NULLP;
@@ -1022,14 +1019,14 @@ Inst inst;
 
    /* De-register the Timer Service */
    (Void) SDeregTmrMt(rgCb[inst].rgInit.ent, rgCb[inst].rgInit.inst,
-                     (S16)rgCb[inst].genCfg.tmrRes, rgActvTmr); 
+        (S16)rgCb[inst].genCfg.tmrRes, rgActvTmr); 
 
    /* call back the task initialization function to intialize
     * the global RgCb Struct */
    rgActvInit(rgCb[inst].rgInit.ent, rgCb[inst].rgInit.inst, rgCb[inst].rgInit.region, 
-              rgCb[inst].rgInit.reason);
+        rgCb[inst].rgInit.reason);
 
-   RETVOID;
+   return;
 }
 
 \f
@@ -1066,7 +1063,7 @@ Pst           *cfmPst;
 
    cfm->cfm.status = LCM_PRIM_OK;
    cfm->cfm.reason = LCM_REASON_NOT_APPL;
-   
+
 
    switch(cntrl->t.cntrl.action)
    {
@@ -1095,65 +1092,65 @@ Pst           *cfmPst;
             case SADBG:
             /* Enable Debug Printing */
 #ifdef DEBUGP
-               rgCb[inst].rgInit.dbgMask |= cntrl->t.cntrl.s.rgDbgCntrl.dbgMask;
+              rgCb[inst].rgInit.dbgMask |= cntrl->t.cntrl.s.rgDbgCntrl.dbgMask;
 #endif
-               break;
+              break;
 #ifdef SS_DIAG
-            case SALOG:
-               rgCb[inst].rgInit.logMask = cntrl->t.cntrl.s.logMask;
-               break;
+           case SALOG:
+              rgCb[inst].rgInit.logMask = cntrl->t.cntrl.s.logMask;
+              break;
 #endif
 
-            default:
-               cfm->cfm.status = LCM_PRIM_NOK;
-               cfm->cfm.reason = LCM_REASON_INVALID_PAR_VAL;
-               RLOG1(L_ERROR, "invalid subaction=%d",cntrl->t.cntrl.subAction);
-               break;
-         }
-         break;
+           default:
+              cfm->cfm.status = LCM_PRIM_NOK;
+              cfm->cfm.reason = LCM_REASON_INVALID_PAR_VAL;
+              RLOG1(L_ERROR, "invalid subaction=%d",cntrl->t.cntrl.subAction);
+              break;
+        }
+        break;
       case ADISIMM:
-         /* Action is Diable immidiately */
-         switch(cntrl->t.cntrl.subAction)
-         {
-            case SATRC:
-            /* Disable Traces */
-               rgCb[inst].rgInit.trc = FALSE;
-               break;
-            case SAUSTA:
-            /* Disable Unsolicited Status (alarms) */
-               rgCb[inst].rgInit.usta = FALSE;
-               break;
-            case SADBG:
-            /* Disable Debug Printing */
+        /* Action is Diable immidiately */
+        switch(cntrl->t.cntrl.subAction)
+        {
+           case SATRC:
+              /* Disable Traces */
+              rgCb[inst].rgInit.trc = FALSE;
+              break;
+           case SAUSTA:
+              /* Disable Unsolicited Status (alarms) */
+              rgCb[inst].rgInit.usta = FALSE;
+              break;
+           case SADBG:
+              /* Disable Debug Printing */
 #ifdef DEBUGP
-               rgCb[inst].rgInit.dbgMask &=~cntrl->t.cntrl.s.rgDbgCntrl.dbgMask;
+              rgCb[inst].rgInit.dbgMask &=~cntrl->t.cntrl.s.rgDbgCntrl.dbgMask;
 #endif
-               break;
+              break;
 #ifdef SS_DIAG
-            case SALOG:
-               rgCb[inst].rgInit.logMask = cntrl->t.cntrl.s.logMask;
-                break;
+           case SALOG:
+              rgCb[inst].rgInit.logMask = cntrl->t.cntrl.s.logMask;
+              break;
 #endif
 
-            default:
-               cfm->cfm.status = LCM_PRIM_NOK;
-               cfm->cfm.reason = LCM_REASON_INVALID_PAR_VAL;
-               RLOG1(L_ERROR, "invalid subaction=%d",cntrl->t.cntrl.subAction);
-               break;
-         }
-         break;
+           default:
+              cfm->cfm.status = LCM_PRIM_NOK;
+              cfm->cfm.reason = LCM_REASON_INVALID_PAR_VAL;
+              RLOG1(L_ERROR, "invalid subaction=%d",cntrl->t.cntrl.subAction);
+              break;
+        }
+        break;
       case ASHUTDOWN:
-         /* Free all the memory dynamically allocated by MAC */
-         rgLMMShutdown(inst);
-         break;
+        /* Free all the memory dynamically allocated by MAC */
+        rgLMMShutdown(inst);
+        break;
       default:
-         cfm->cfm.status = LCM_PRIM_NOK;
-         cfm->cfm.reason = LCM_REASON_INVALID_PAR_VAL;
-         RLOG1(L_ERROR, "invalid action=%d",cntrl->t.cntrl.action);
-         break;
+        cfm->cfm.status = LCM_PRIM_NOK;
+        cfm->cfm.reason = LCM_REASON_INVALID_PAR_VAL;
+        RLOG1(L_ERROR, "invalid action=%d",cntrl->t.cntrl.action);
+        break;
    }
    RgMiLrgCntrlCfm(cfmPst, cfm);
-   RETVOID;
+   return;
 }
 
 \f
@@ -1314,7 +1311,7 @@ Pst           *cfmPst;
          RETVOID;
    }
    RgMiLrgCntrlCfm(cfmPst, cfm);
-   RETVOID;
+   return;
 }
 
 \f
@@ -1364,7 +1361,7 @@ RgMngmt       *cfm;
    cfmPst->region    = cfm->hdr.response.mem.region;
    cfmPst->pool      = cfm->hdr.response.mem.pool;
 
-   RETVOID;
+   return;
 }
 
 \f
@@ -1381,31 +1378,31 @@ RgMngmt       *cfm;
  *     
  *  @param[in]  Inst        inst
  *  @param[in]  S16   tmrEvnt, the Timer Event    
- *  @param[in]  U32   tmrVal,  the Wait Time
+ *  @param[in]  uint32_t   tmrVal,  the Wait Time
  *  @param[in]  PTR   cb,  Entry for which Timer expired
  *  @return  S16
  *      -# ROK
  **/
 #ifdef ANSI
-S16 rgLMMStartTmr
+   S16 rgLMMStartTmr
 (
-Inst               inst,
-S16                tmrEvnt,            /* Timer Event */
-U32                tmrVal,             /* Wait Time */
-PTR                cb                  /* Entry for which Timer Expired */
-)
+ Inst               inst,
+ S16                tmrEvnt,            /* Timer Event */
+ uint32_t           tmrVal,             /* Wait Time */
+ PTR                cb                  /* Entry for which Timer Expired */
+ )
 #else
 S16 rgLMMStartTmr(tmrEvnt, tmrVal, cb)
-Inst               inst;
-S16                tmrEvnt;            /* Timer Event */
-U32                tmrVal;             /* Wait Time */
-PTR                cb;                 /* Entry for which Timer Expired */
+   Inst               inst;
+   S16                tmrEvnt;            /* Timer Event */
+   uint32_t           tmrVal;             /* Wait Time */
+   PTR                cb;                 /* Entry for which Timer Expired */
 #endif
 {
    CmTmrArg    arg;
 
 
-   UNUSED(tmrEvnt);
+      UNUSED(tmrEvnt);
 
    /* Initialize the arg structure */
    memset(&arg, 0, sizeof(CmTmrArg));
@@ -1459,7 +1456,7 @@ PTR                cb;                 /* Entry for which Timer Expired */
 #endif
 {
    CmTmrArg   arg;
-   U8         i;
+   uint8_t      i;
    S16        ret; 
 
 
@@ -1570,9 +1567,9 @@ S16 tmrEvnt;          /* Timer Event */
  *     status indication to the Layer Manager.
  *     
  *  @param[in]  Inst        inst
- *  @param[in]  U16 category, the Alarm category
- *  @param[in]  U16 event, the Alarm event
- *  @param[in]  U16 cause, the cause of the Alarm
+ *  @param[in]  uint16_t category, the Alarm category
+ *  @param[in]  uint16_t event, the Alarm event
+ *  @param[in]  uint16_t cause, the cause of the Alarm
  *  @param[in]  RgUstaDgn *dgn, Alarm Diagonostics
  *  @return  S16
  *      -# ROK
@@ -1581,17 +1578,17 @@ S16 tmrEvnt;          /* Timer Event */
 S16 rgLMMStaInd
 (
 Inst inst,
-U16 category,
-U16 event,
-U16 cause,
+uint16_t category,
+uint16_t event,
+uint16_t cause,
 RgUstaDgn *dgn
 )
 #else
 S16 rgLMMStaInd(inst,category, event, cause, dgn) 
 Inst inst;
-U16 category;
-U16 event;
-U16 cause;
+uint16_t category;
+uint16_t event;
+uint16_t cause;
 RgUstaDgn *dgn;
 #endif
 {
@@ -1637,7 +1634,7 @@ RgUstaDgn *dgn;
  *     
  *  @param[in]  Inst        inst
  *  @param[in]   Buffer *srcMbuf, the Message Buffer .
- *  @param[in]   U8 event, the trace event.
+ *  @param[in]   uint8_t event, the trace event.
  *  @return Void 
  **/
 #ifdef ANSI
@@ -1645,13 +1642,13 @@ Void rgLMMTrcInd
 (
 Inst   inst,
 Buffer *srcMbuf,    /* Message Buffer */
-U8 event            /* event */
+uint8_t event            /* event */
 )
 #else
 Void rgLMMTrcInd(inst,srcMbuf,event)
 Inst   inst;
 Buffer *srcMbuf;    /* Message Buffer */
-U8 event;           /* event */
+uint8_t event;           /* event */
 #endif
 {
    Buffer   *dstMbuf = NULLP;   
@@ -1666,7 +1663,7 @@ U8 event;           /* event */
    if ((rgCb[inst].trcLen == LRG_NO_TRACE) || (srcMbuf == NULLP))
    {
       RLOG0(L_ERROR, "Trace Disabled.");
-      RETVOID;
+      return;
    }
    
    memset(&trc, 0, sizeof(RgMngmt));
@@ -1681,20 +1678,20 @@ U8 event;           /* event */
    trc.hdr.transId = rgCb[inst].genCfg.trcResp.transId;
 
    SGetDateTime(&trc.t.trc.dt);
-      
+
    /* Check if the whole buffer is to be sent in Trace indication */
    if(rgCb[inst].trcLen == LRG_FULL_TRACE)
    {
       if (SCpyMsgMsg(srcMbuf, pst.region, pst.pool, &dstMbuf)
-         != ROK)
+           != ROK)
       {
-         RLOG0(L_ERROR, "SCpyMsgMsg Failed.");
-         RETVOID;
+        RLOG0(L_ERROR, "SCpyMsgMsg Failed.");
+        return;
       }
       trc.cfm.status = LCM_PRIM_OK;
       trc.cfm.reason = LCM_REASON_NOT_APPL;
       trc.t.trc.evnt = event;
-         
+
       /* Send Trace Indication to Layer manager */
       RgMiLrgTrcInd(&pst, &trc, dstMbuf);
    }
@@ -1704,71 +1701,71 @@ U8 event;           /* event */
       /* Get the length of the recvd message buffer */
       if (SFndLenMsg(srcMbuf, &bufLen) != ROK)
       {
-         RLOG0(L_ERROR, "SFndLenMsg Failed.");
-         RETVOID;
+        RLOG0(L_ERROR, "SFndLenMsg Failed.");
+        return;
       }
       /* Check if the recvd buffer size is less than request trace len */
       if(bufLen < rgCb[inst].trcLen)
       {
-         /* Copy the whole of the recvd buffer in trace indication */
-      
-         if (SCpyMsgMsg(srcMbuf, pst.region, pst.pool, &dstMbuf)
-            != ROK)
-         {
-            RLOG0(L_ERROR, "SCpyMsgMsg Failed.");
-            RETVOID;
-         }
-         
-         trc.cfm.status = LCM_PRIM_OK;
-         trc.cfm.reason = LCM_REASON_NOT_APPL;
-         trc.t.trc.evnt = event;
+        /* Copy the whole of the recvd buffer in trace indication */
+
+        if (SCpyMsgMsg(srcMbuf, pst.region, pst.pool, &dstMbuf)
+              != ROK)
+        {
+           RLOG0(L_ERROR, "SCpyMsgMsg Failed.");
+           return;
+        }
+
+        trc.cfm.status = LCM_PRIM_OK;
+        trc.cfm.reason = LCM_REASON_NOT_APPL;
+        trc.t.trc.evnt = event;
 
-         /* Send Trace Indication to Layer manager */
-         RgMiLrgTrcInd(&pst, &trc, dstMbuf);
+        /* Send Trace Indication to Layer manager */
+        RgMiLrgTrcInd(&pst, &trc, dstMbuf);
       }
       /* if the recvd buffer size is greater than request trace len */
       if(bufLen >= rgCb[inst].trcLen)
       {
-         /* Get a temporary buffer to store the msg */
-         if (rgAllocSBuf(inst,&tempBuf, rgCb[inst].trcLen) != ROK)
-         {
-            RLOG0(L_ERROR, "rgAllocSBuf Failed.");
-            RETVOID;
-         }
-         
-         /* Copy trcLen nos of bytes from the recvd message */
-         if (SCpyMsgFix(srcMbuf,0,rgCb[inst].trcLen,tempBuf,&tempCnt) != ROK)   
-         {
-            RLOG0(L_ERROR, "SCpyMsgFix Failed.");
-            RETVOID;
-         }
-
-         if (SGetMsg(pst.region, pst.pool, &dstMbuf) != ROK)
-         {
-            RLOG0(L_ERROR, "dstMbuf Allocation Failed");
-            RETVOID;
-         }
-         /* Copy the tempBuf data to dst mBuf */
-         if (SCpyFixMsg(tempBuf,dstMbuf,0,rgCb[inst].trcLen,&tempCnt) != ROK)
-         {
-            RLOG0(L_ERROR, "SCpyFixMsg Failed.");
-            RETVOID;
-         }
-
-         /*ccpu00117052 - MOD - Passing double pointer for proper NULLP 
-                               assignment */
-         /* Free the memory allocated for tempBuf */
-         rgFreeSBuf(inst,&tempBuf, rgCb[inst].trcLen);
-               
-         trc.cfm.status = LCM_PRIM_OK;
-         trc.cfm.reason = LCM_REASON_NOT_APPL;
-         trc.t.trc.evnt = event;
-      
-         /* Send Trace Indication to Layer manager */
-         RgMiLrgTrcInd(&pst, &trc, dstMbuf);
+        /* Get a temporary buffer to store the msg */
+        if (rgAllocSBuf(inst,&tempBuf, rgCb[inst].trcLen) != ROK)
+        {
+           RLOG0(L_ERROR, "rgAllocSBuf Failed.");
+           return;
+        }
+
+        /* Copy trcLen nos of bytes from the recvd message */
+        if (SCpyMsgFix(srcMbuf,0,rgCb[inst].trcLen,tempBuf,&tempCnt) != ROK)   
+        {
+           RLOG0(L_ERROR, "SCpyMsgFix Failed.");
+           return;
+        }
+
+        if (SGetMsg(pst.region, pst.pool, &dstMbuf) != ROK)
+        {
+           RLOG0(L_ERROR, "dstMbuf Allocation Failed");
+           return;
+        }
+        /* Copy the tempBuf data to dst mBuf */
+        if (SCpyFixMsg(tempBuf,dstMbuf,0,rgCb[inst].trcLen,&tempCnt) != ROK)
+        {
+           RLOG0(L_ERROR, "SCpyFixMsg Failed.");
+           return;
+        }
+
+        /*ccpu00117052 - MOD - Passing double pointer for proper NULLP 
+          assignment */
+        /* Free the memory allocated for tempBuf */
+        rgFreeSBuf(inst,&tempBuf, rgCb[inst].trcLen);
+
+        trc.cfm.status = LCM_PRIM_OK;
+        trc.cfm.reason = LCM_REASON_NOT_APPL;
+        trc.t.trc.evnt = event;
+
+        /* Send Trace Indication to Layer manager */
+        RgMiLrgTrcInd(&pst, &trc, dstMbuf);
       }
    }
-   RETVOID;
+   return;
 }
 
 \f
@@ -1788,7 +1785,7 @@ U8 event;           /* event */
  *     
  *  @param[in]   Pst *pst, Post Structure
  *  @param[in]   SuId suId, Service user ID
- *  @param[in]   U8 status, Status
+ *  @param[in]   uint8_t status, Status
  *  @return  S16
  *      -# ROK
  **/
@@ -1797,13 +1794,13 @@ S16 rgLMMBndCfm
 (
 Pst *pst,               /* Post Structure */
 SuId suId,              /* Service user ID */
-U8 status               /* Status */
+uint8_t status               /* Status */
 )
 #else
 S16 rgLMMBndCfm(pst,suId,status)
 Pst *pst;               /* Post Structure */
 SuId suId;              /* Service user ID */
-U8 status;              /* Status */
+uint8_t status;              /* Status */
 #endif
 {
    Inst      inst = pst->dstInst - RG_INST_START;
@@ -1825,12 +1822,12 @@ U8 status;              /* Status */
    switch(rgCb[inst].tfuSap.sapSta.sapState)
    {
       case LRG_WAIT_BNDCFM:
-         break;
+        break;
       case LRG_BND:
-         /* SAP is already bound */
-         return ROK;
+        /* SAP is already bound */
+        return ROK;
       default:
-         return RFAILED;
+        return RFAILED;
    }
 
    cfmPst = rgCb[inst].rgInit.lmPst;
@@ -1845,28 +1842,28 @@ U8 status;              /* Status */
    switch(status)
    {
       case CM_BND_OK: /* status is OK */
-         /* Change SAP state to Bound */
-         rgCb[inst].tfuSap.sapSta.sapState = LRG_BND;
-         if (rgCb[inst].tfuSap.sapCfg.bndTmr.enb == TRUE)
-         {
-            ret = rgLMMStopTmr(inst,RG_BNDREQ_TMR, (PTR)&rgCb[inst].tfuSap);
-         }
-         /* Send Control Confirm with status as OK to Layer Manager */
-         cntrlCfm.cfm.status = LCM_PRIM_OK;
-         cntrlCfm.cfm.reason = LCM_REASON_NOT_APPL;
-         break;
+        /* Change SAP state to Bound */
+        rgCb[inst].tfuSap.sapSta.sapState = LRG_BND;
+        if (rgCb[inst].tfuSap.sapCfg.bndTmr.enb == TRUE)
+        {
+           ret = rgLMMStopTmr(inst,RG_BNDREQ_TMR, (PTR)&rgCb[inst].tfuSap);
+        }
+        /* Send Control Confirm with status as OK to Layer Manager */
+        cntrlCfm.cfm.status = LCM_PRIM_OK;
+        cntrlCfm.cfm.reason = LCM_REASON_NOT_APPL;
+        break;
 
       default:
-         /* Change SAP state to UnBound */
-         rgCb[inst].tfuSap.sapSta.sapState = LRG_UNBND;
-         if (rgCb[inst].tfuSap.sapCfg.bndTmr.enb == TRUE)
-         {
-            ret = rgLMMStopTmr(inst,RG_BNDREQ_TMR, (PTR)&rgCb[inst].tfuSap);
-         }
-         /* Send Control Confirm with status as NOK to Layer Manager */
-         cntrlCfm.cfm.status = LCM_PRIM_NOK;
-         cntrlCfm.cfm.reason = LCM_REASON_NEG_CFM;
-         break;
+        /* Change SAP state to UnBound */
+        rgCb[inst].tfuSap.sapSta.sapState = LRG_UNBND;
+        if (rgCb[inst].tfuSap.sapCfg.bndTmr.enb == TRUE)
+        {
+           ret = rgLMMStopTmr(inst,RG_BNDREQ_TMR, (PTR)&rgCb[inst].tfuSap);
+        }
+        /* Send Control Confirm with status as NOK to Layer Manager */
+        cntrlCfm.cfm.status = LCM_PRIM_NOK;
+        cntrlCfm.cfm.reason = LCM_REASON_NEG_CFM;
+        break;
    }
    rgCb[inst].tfuSap.numBndRetries = 0;
    cntrlCfm.hdr.elmId.elmnt = STTFUSAP;
@@ -1894,8 +1891,8 @@ U8 status;              /* Status */
 #ifdef ANSI
 S16 rgActvTmr
 (
- Ent     ent,
- Inst    inst
+Ent     ent,
+Inst    inst
 )
 #else
 S16 rgActvTmr(ent, inst)
@@ -1907,12 +1904,12 @@ Inst    inst;
 
    /* Check if any MAC timer has expired */ 
    cmPrcTmr(&rgCb[macInst].tmrTqCp, rgCb[macInst].tmrTq, (PFV) rgLMMTmrExpiry);
+
    return ROK;
+
 } /* end of rgActvTmr */
 
 /**********************************************************************
-         End of file
-**********************************************************************/
+
+  End of file
+ **********************************************************************/