X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_lmm.c;h=0b3357b0193418bef0d806c8044cb3198131d17c;hb=2193e4cf01012809495be026097e8d7eacb9f0ac;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..0b3357b01 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 */
@@ -207,12 +207,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 +235,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    
@@ -301,7 +301,7 @@ RgMngmt  *cfg;    /* config structure  */
 
    RgMiLrgCfgCfm(&cfmPst, &cfm);
    
-   RETVALUE(ROK);
+   return ROK;
 }/*-- RgMiLrgCfgReq --*/
 
 
@@ -325,13 +325,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    
@@ -366,7 +366,7 @@ 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)
@@ -477,7 +477,7 @@ RgMngmt  *sts;    /* statistics structure  */
          break;     
    }
    RgMiLrgStsCfm(&cfmPst,&cfm);
-   RETVALUE(ROK);
+   return ROK;
 }/*-- RgMiLrgStsReq --*/
 
 
@@ -500,13 +500,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    
@@ -545,7 +545,7 @@ 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);
       rgGetSId(&cfm.t.ssta.s.sysId);
@@ -554,7 +554,7 @@ RgMngmt  *sta;    /* status structure  */
       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,7 +566,7 @@ 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);
          rgGetSId(&cfm.t.ssta.s.sysId);
@@ -606,7 +606,7 @@ RgMngmt  *sta;    /* status structure  */
          RLOG1(L_ERROR, "Invalid elmnt=%d",sta->hdr.elmId.elmnt);
          break;     
    }
-   RETVALUE(ROK);
+   return ROK;
 }/*-- RgMiLrgStaReq --*/
 
 
@@ -631,13 +631,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    
@@ -672,7 +672,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 +693,7 @@ RgMngmt  *cntrl;  /* control structure  */
          RLOG1(L_ERROR, "invalid elmnt=%d",cntrl->hdr.elmId.elmnt);
          break;
    }
-   RETVALUE(ret);
+   return (ret);
 }/*-- RgMiLrgCntrlReq --*/
 
 
@@ -739,7 +739,7 @@ Elmnt sapType;            /* Sap Type */
 
    /* 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)
    {   
@@ -841,7 +841,7 @@ Elmnt sapType;            /* Sap Type */
          /* would never reach here */
          break;
    }
-   RETVALUE(ret);
+   return (ret);
 }
 
 
@@ -883,13 +883,13 @@ RgCfg *cfg;            /* Configuaration information */
    /* 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,
@@ -913,7 +913,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,7 +923,7 @@ 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;
 
@@ -953,13 +953,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);
 }
 
 
@@ -1401,7 +1401,7 @@ RgMngmt       *cfm;
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 rgLMMStartTmr
+S16 rgLMMStartTmr
 (
 Inst               inst,
 S16                tmrEvnt,            /* Timer Event */
@@ -1409,7 +1409,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 */
@@ -1435,7 +1435,7 @@ PTR                cb;                 /* Entry for which Timer Expired */
    arg.wait = tmrVal;      
    cmPlcCbTq(&arg);
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 
@@ -1460,14 +1460,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 */
@@ -1506,7 +1506,7 @@ PTR                cb;                 /* Entry for which Timer Expired */
    }
 
 
-   RETVALUE(ret);
+   return (ret);
 }
 
 
@@ -1527,13 +1527,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
@@ -1573,7 +1573,7 @@ S16 tmrEvnt;          /* Timer Event */
          ret = RFAILED;
          break;
    }
-   RETVALUE(ret);
+   return (ret);
 }
 
 
@@ -1597,7 +1597,7 @@ S16 tmrEvnt;          /* Timer Event */
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 rgLMMStaInd
+S16 rgLMMStaInd
 (
 Inst inst,
 U16 category,
@@ -1606,7 +1606,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;
@@ -1620,7 +1620,7 @@ RgUstaDgn *dgn;
 
    if(rgCb[inst].rgInit.usta == FALSE)
    {
-      RETVALUE(ROK);
+      return ROK;
    }
 
    cmMemset((U8 *)&usta, 0, sizeof(RgMngmt));
@@ -1641,7 +1641,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 +1661,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 */
@@ -1814,14 +1814,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 */
@@ -1840,7 +1840,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 +1850,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;
@@ -1896,7 +1896,7 @@ U8 status;              /* Status */
 
    ret = RgMiLrgCntrlCfm(&cfmPst, &cntrlCfm);
 
-   RETVALUE(ret);
+   return (ret);
 }
 
 
@@ -1914,13 +1914,13 @@ 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
@@ -1931,7 +1931,7 @@ Inst    inst;
    /* Check if any MAC timer has expired */ 
    cmPrcTmr(&rgCb[macInst].tmrTqCp, rgCb[macInst].tmrTq, (PFV) rgLMMTmrExpiry);
  
-   RETVALUE(ROK);
+   return ROK;
  
 } /* end of rgActvTmr */