X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrrlc%2Fkw_lmm.c;h=b52f54205d3ce099e0a136b5fedafc88bc4caf90;hb=refs%2Fchanges%2F91%2F5391%2F11;hp=615d6c605a124077aa8d5adf3e4f648ed626cf56;hpb=9c8b78da0f4ef42dae5e30a3061463b81327e7a0;p=o-du%2Fl2.git

diff --git a/src/5gnrrlc/kw_lmm.c b/src/5gnrrlc/kw_lmm.c
index 615d6c605..b52f54205 100755
--- a/src/5gnrrlc/kw_lmm.c
+++ b/src/5gnrrlc/kw_lmm.c
@@ -79,23 +79,23 @@ RLCStats gRlcStats;
  *             Forward Declaration of LKW Porting Functions
  ********************************************************************/
 RlcCb *rlcCb[MAX_RLC_INSTANCES];
-EXTERN S16 rlcActvTmr ARGS ((Ent ent, Inst inst));
+S16 rlcActvTmr ARGS ((Ent ent, Inst inst));
 
-PRIVATE Void rlcLmmSendCfm ARGS ((RlcCb *gCb,Pst *pst,RlcMngmt *cfm,U8 type,
+static Void rlcLmmSendCfm ARGS ((RlcCb *gCb,Pst *pst,RlcMngmt *cfm,uint8_t type,
                                  Header *hdr));
-PRIVATE S16 rlcLmmGenCfg ARGS ((RlcCb *gCb, RlcGenCfg *cfg));
-PRIVATE S16 rlcLmmCfgKwuSap ARGS ((RlcCb *gCb,RlcSapCfg *cfg));
-PRIVATE S16 rlcLmmCfgUdxSap ARGS ((RlcCb *gCb,RlcSapCfg *cfg));
-PRIVATE S16 rlcLmmCfgCkwSap ARGS ((RlcCb *gCb,RlcSapCfg   *cfg));
-PRIVATE S16 rlcLmmCfgRguSap ARGS ((RlcCb *gCb,RlcSapCfg   *cfg));
-PRIVATE S16 rlcLmmGenCntrl ARGS ((RlcCb *gCb,RlcMngmt *cntrl));
-PRIVATE S16 rlcLmmUdxSapCntrl ARGS ((RlcCb *gCb,RlcMngmt *cntrl));
-PRIVATE S16 rlcLmmLSapCntrl ARGS ((RlcCb *gCb,RlcMngmt *cntrl));
-PRIVATE S16 rlcLmmGetKwuSapSta ARGS ((RlcCb *gCb,RlcKwuSapSta *sta));
-PRIVATE S16 rlcLmmGetRguSapSta ARGS ((RlcCb *gCb,RlcRguSapSta *sta));
-PRIVATE S16 rlcLmmGetCkwCntSapSta ARGS ((RlcCb *gCb,RlcCkwCntSapSta *sta));
-PRIVATE S16 rlcLmmGetGenSts ARGS ((RlcCb *gCb,RlcGenSts *sts,Action action));
-PRIVATE S16 rlcLmmGetSapSts ARGS ((RlcCb *gCb,RlcMngmt *sts,Elmnt elmnt,Action 
+static S16 rlcLmmGenCfg ARGS ((RlcCb *gCb, RlcGenCfg *cfg));
+static S16 rlcLmmCfgKwuSap ARGS ((RlcCb *gCb,RlcSapCfg *cfg));
+static S16 rlcLmmCfgUdxSap ARGS ((RlcCb *gCb,RlcSapCfg *cfg));
+static S16 rlcLmmCfgCkwSap ARGS ((RlcCb *gCb,RlcSapCfg   *cfg));
+static S16 rlcLmmCfgRguSap ARGS ((RlcCb *gCb,RlcSapCfg   *cfg));
+static S16 rlcLmmGenCntrl ARGS ((RlcCb *gCb,RlcMngmt *cntrl));
+static S16 rlcLmmUdxSapCntrl ARGS ((RlcCb *gCb,RlcMngmt *cntrl));
+static S16 rlcLmmLSapCntrl ARGS ((RlcCb *gCb,RlcMngmt *cntrl));
+static S16 rlcLmmGetKwuSapSta ARGS ((RlcCb *gCb,RlcKwuSapSta *sta));
+static S16 rlcLmmGetRguSapSta ARGS ((RlcCb *gCb,RlcRguSapSta *sta));
+static S16 rlcLmmGetCkwCntSapSta ARGS ((RlcCb *gCb,RlcCkwCntSapSta *sta));
+static S16 rlcLmmGetGenSts ARGS ((RlcCb *gCb,RlcGenSts *sts,Action action));
+static S16 rlcLmmGetSapSts ARGS ((RlcCb *gCb,RlcMngmt *sts,Elmnt elmnt,Action 
                                   action));
 
 
@@ -122,17 +122,7 @@ PRIVATE S16 rlcLmmGetSapSts ARGS ((RlcCb *gCb,RlcMngmt *sts,Elmnt elmnt,Action
  *    LCM_REASON_INVALID_PAR_VAL
  *    LCM_REASON_HASHING_FAILED
  */
-#ifdef ANSI
-PRIVATE S16 rlcLmmGenCfg
-(
-RlcCb       *gCb,
-RlcGenCfg   *cfg
-)
-#else
-PRIVATE S16 rlcLmmGenCfg(gCB,cfg)
-RlcCb       *gCb;
-RlcGenCfg   *cfg;
-#endif
+static S16 rlcLmmGenCfg(RlcCb  *gCb,RlcGenCfg *cfg)
 {
    Size     rlcSapSize;
    Size     rlcUdxSapSize;
@@ -260,7 +250,7 @@ RlcGenCfg   *cfg;
 #if 0
       /* Register the timer */
 /*Pradeep: changing the SRegTmrMt() to SRegTmr()*/
-      if(SRegTmrMt(gCb->init.ent, gCb->init.inst, (U16)cfg->timeRes,
+      if(SRegTmrMt(gCb->init.ent, gCb->init.inst, (uint16_t)cfg->timeRes,
               rlcActvTmr) != ROK)
       {
          RLC_FREE(gCb,gCb->u.dlCb->udxDlSap, rlcUdxSapSize);
@@ -361,8 +351,7 @@ RlcGenCfg   *cfg;
       }
 
       /* Register the timer */
-#if 0
-      if(SRegTmrMt(gCb->init.ent, gCb->init.inst, (U16)cfg->timeRes,
+      if(ODU_REG_TMR_MT(gCb->init.ent, gCb->init.inst, (uint16_t)cfg->timeRes,
               rlcActvTmr) != ROK)
       {
          RLC_FREE(gCb,gCb->u.ulCb->udxUlSap, rlcUdxSapSize);
@@ -372,7 +361,7 @@ RlcGenCfg   *cfg;
 
          return (LCM_REASON_REGTMR_FAIL);
       }
-#endif
+
 #ifdef LTE_L2_MEAS
       rlcUtlL2MeasUlInit(gCb);
 #endif
@@ -422,23 +411,14 @@ RlcGenCfg   *cfg;
  * @return  S16
  *     -# ROK
  */
-#ifdef ANSI
-PRIVATE Void rlcLmmSendCfm
+static Void rlcLmmSendCfm
 (
 RlcCb      *gCb,
-Pst       *pst,                
+Pst        *pst,                
 RlcMngmt   *cfm,               
-U8        type,              
-Header    *hdr              
+uint8_t    type,              
+Header     *hdr              
 )
-#else
-PRIVATE Void rlcLmmSendCfm(gCb,pst, cfm, type, hdr)
-RlcCb      gCb;
-Pst       *pst;            
-RlcMngmt   *cfm;           
-U8        type;          
-Header    *hdr;         
-#endif
 {
    Pst   rPst;   /* Reply post structure */
 
@@ -501,7 +481,7 @@ Header    *hdr;
          break;
    }
 
-   RETVOID; 
+   return; 
 } 
 
 
@@ -561,17 +541,7 @@ Header    *hdr;
  *    -# Failure : RFAILED
  */
 
-#ifdef ANSI
-uint8_t RlcMiRlcConfigReq 
-(
-Pst       *pst, 
-RlcMngmt   *cfg
-)
-#else
-uint8_t RlcMiRlcConfigReq (pst, cfg)
-Pst       *pst;
-RlcMngmt   *cfg;
-#endif
+uint8_t RlcMiRlcConfigReq (Pst *pst,RlcMngmt *cfg)
 {
    Reason   reason;   /* failure reason */
    RlcCb     *tRlcCb=NULLP;
@@ -715,17 +685,7 @@ RlcMngmt   *cfg;
  *    -# ROK
  *    -# RFAILED
  */
-#ifdef ANSI
-uint8_t RlcMiLkwCntrlReq
-(
-Pst       *pst, 
-RlcMngmt   *cntrl
-)
-#else
-uint8_t RlcMiLkwCntrlReq(pst, cntrl)
-Pst       *pst;
-RlcMngmt   *cntrl;
-#endif
+uint8_t RlcMiLkwCntrlReq(Pst *pst, RlcMngmt *cntrl)
 {
    Reason   reason;   /* failure reason */
    RlcCb     *tRlcCb=NULLP;
@@ -821,17 +781,7 @@ RlcMngmt   *cntrl;
  *    -# ROK (SUCCESS)
  *    -# RFAILED
  */
-#ifdef ANSI
-S16 RlcMiLkwStaReq
-(
-Pst       *pst, 
-RlcMngmt   *sta
-)
-#else
-S16 RlcMiLkwStaReq(pst, sta)
-Pst       *pst;
-RlcMngmt   *sta;
-#endif
+S16 RlcMiLkwStaReq(Pst *pst,RlcMngmt *sta)
 {
    RlcMngmt   rSta;     /* Status */
    Reason    reason;   /* Failure reason */
@@ -953,19 +903,7 @@ RlcMngmt   *sta;
  *    -# ROK
  *    -# RFAILED
  */
-#ifdef ANSI
-S16 RlcMiLkwStsReq 
-(
-Pst      *pst, 
-Action    action, 
-RlcMngmt   *sts
-)
-#else
-S16 RlcMiLkwStsReq (pst, action, sts)
-Pst       *pst;
-Action    action;
-RlcMngmt   *sts;
-#endif
+S16 RlcMiLkwStsReq (Pst *pst, Action action,RlcMngmt *sts)
 {
    RlcMngmt   rSts;     /* Statistics */
    Reason    reason;   /* Reason for failure */
@@ -1069,21 +1007,11 @@ measurement confirm is sent.
  *      -# Success : ROK
  *      -# Failure : RFAILED
 */
-#ifdef ANSI
-S16 RlcMiLkwL2MeasReq 
-(
-Pst            *pst, 
-RlcL2MeasReqEvt *measReqEvt 
-)
-#else
-S16 RlcMiLkwL2MeasReq (pst, measReqEvt)
-Pst            *pst; 
-RlcL2MeasReqEvt *measReqEvt;
-#endif
+S16 RlcMiLkwL2MeasReq(Pst *pst, RlcL2MeasReqEvt *measReqEvt)
 {
    S16            ret = ROK;
-   U16            cntr;
-   U8             measType;
+   uint16_t       cntr;
+   uint8_t        measType;
    RlcL2MeasCfmEvt measCfmEvt;
 
    RlcCb     *tRlcCb;
@@ -1196,23 +1124,13 @@ After receving this request, RLC stops L2 Measurement
  *      -# Failure : RFAILED
 */
 
-#ifdef ANSI
-S16 RlcMiLkwL2MeasStopReq
-(
-Pst            *pst,
-U8             measType
-)
-#else
-S16 RlcMiLkwL2MeasStopReq (pst, measType)
-Pst            *pst;
-U8             measType;
-#endif
+S16 RlcMiLkwL2MeasStopReq(Pst *pst,uint8_t measType)
 {
    S16 ret = ROK;
    RlcL2MeasEvtCb *measEvtCb = NULLP;
 
-   U16            cntr;
-   U8             status = ROK;
+   uint16_t            cntr;
+   uint8_t             status = ROK;
    RlcCb     *tRlcCb;
 
    tRlcCb =  RLC_GET_RLCCB(pst->dstInst);
@@ -1262,21 +1180,11 @@ After receving this request, RLC sends L2 Measurement
  *      -# Failure : RFAILED
 */
 
-#ifdef ANSI
-S16 RlcMiLkwL2MeasSendReq
-(
-Pst            *pst,
-U8             measType
-)
-#else
-S16 RlcMiLkwL2MeasSendReq (pst, measType)
-Pst            *pst;
-U8             measType;
-#endif
+S16 RlcMiLkwL2MeasSendReq(Pst *pst,uint8_t measType)
 {
    /*S16 ret = ROK;*/
    RlcL2MeasEvtCb *measEvtCb = NULLP;
-   U16            cntr;
+   uint16_t            cntr;
    RlcCb     *tRlcCb;
 
    tRlcCb =  RLC_GET_RLCCB(pst->dstInst);
@@ -1320,17 +1228,7 @@ U8             measType;
  *    -# LCM_REASON_MEM_NOAVAIL 
  *    -# LCM_REASON_RECONFIG_FAIL 
  */
-#ifdef ANSI
-PRIVATE S16 rlcLmmCfgKwuSap
-(
-RlcCb       *gCb,
-RlcSapCfg   *cfg                
-)
-#else
-PRIVATE S16 rlcLmmCfgKwuSap(gCb,cfg)
-RlcCb       *gCb;
-RlcSapCfg   *cfg;               
-#endif
+static S16 rlcLmmCfgKwuSap(RlcCb *gCb,RlcSapCfg *cfg)
 {
    RlcKwuSapCb   *rlcKwuSapCb;
 
@@ -1376,17 +1274,7 @@ RlcSapCfg   *cfg;
  *    -# LCM_REASON_INVALID_SAP 
  *    -# LCM_REASON_RECONFIG_FAIL 
  */
-#ifdef ANSI
-PRIVATE S16 rlcLmmCfgCkwSap 
-(
-RlcCb       *gCb,
-RlcSapCfg   *cfg             
-)
-#else
-PRIVATE S16 rlcLmmCfgCkwSap(gCb,cfg)
-RlcCb       *gCb;
-RlcSapCfg   *cfg;             
-#endif
+static S16 rlcLmmCfgCkwSap(RlcCb  *gCb,RlcSapCfg *cfg)
 {
    RlcCkwSapCb  *ckwSap;
    
@@ -1434,17 +1322,7 @@ RlcSapCfg   *cfg;
  *    -# LCM_REASON_INVALID_SAP
  *    -# LCM_REASON_RECONFIG_FAIL
  */
-#ifdef ANSI
-PRIVATE S16 rlcLmmCfgUdxSap 
-(
-RlcCb       *gCb,
-RlcSapCfg   *cfg         
-)
-#else
-PRIVATE S16 rlcLmmCfgUdxSap(gCb,cfg)
-RlcCb       *gCb;
-RlcSapCfg   *cfg;       
-#endif
+static S16 rlcLmmCfgUdxSap(RlcCb *gCb,RlcSapCfg *cfg)
 {
    RlcUdxDlSapCb   *udxDlSap;
    RlcUdxUlSapCb   *udxUlSap;
@@ -1508,17 +1386,7 @@ RlcSapCfg   *cfg;
  *    -# LCM_REASON_INVALID_SAP
  *    -# LCM_REASON_RECONFIG_FAIL
  */
-#ifdef ANSI
-PRIVATE S16 rlcLmmCfgRguSap 
-(
-RlcCb       *gCb,
-RlcSapCfg   *cfg               
-)
-#else
-PRIVATE S16 rlcLmmCfgRguSap(gCb,cfg)
-RlcCb       *gCb;
-RlcSapCfg   *cfg;             
-#endif
+static S16 rlcLmmCfgRguSap(RlcCb *gCb,RlcSapCfg *cfg)
 {
    RlcRguSapCb   *rguSap;
 
@@ -1569,18 +1437,10 @@ RlcSapCfg   *cfg;
  *    -# LCM_REASON_INVALID_SUBACTION
  *    -# LCM_REASON_INVALID_ACTION
  */
-#ifdef ANSI
-PRIVATE S16 rlcLmmValidateGenCntrl
-(
-RlcMngmt   *cntrl                 
-)
-#else
-PRIVATE S16 rlcLmmValidateGenCntrl(cntrl)
-RlcMngmt   *cntrl;                
-#endif
+static S16 rlcLmmValidateGenCntrl(RlcMngmt   *cntrl)
 {
-   S16   reason;    /* reason for failure */
-   U8    sAction;   /* subaction field */
+   S16     reason;    /* reason for failure */
+   uint8_t sAction;   /* subaction field */
 
    reason = LCM_REASON_NOT_APPL;
    sAction = cntrl->t.cntrl.subAction;
@@ -1614,15 +1474,7 @@ RlcMngmt   *cntrl;
  * 
  * @return  Void
  */
-#ifdef ANSI
-PRIVATE Void rlcLmmCleanGblRsrcs
-(
-RlcCb   *gCb
-)
-#else
-PRIVATE Void rlcLmmCleanGblRsrcs(gCb)
-RlcCb   *gCb;
-#endif
+static Void rlcLmmCleanGblRsrcs(RlcCb *gCb)
 {
    Size   rlcSapSize;
    Size   rlcUdxSapSize;
@@ -1703,7 +1555,7 @@ RlcCb   *gCb;
       gCb->init.usta = FALSE;
    }
 
-   RETVOID;
+   return;
 }
 
 /**
@@ -1721,18 +1573,10 @@ RlcCb   *gCb;
  *    -# LCM_REASON_NOT_APPL (SUCCESS)
  *    -# LCM_REASON_HASHING_FAILED 
  */
-#ifdef ANSI
-PRIVATE S16 rlcLmmShutdown
-(
-RlcCb   *gCb
-)
-#else
-PRIVATE S16 rlcLmmShutdown(gCb)
-RlcCb   *gCb;
-#endif
+static S16 rlcLmmShutdown(RlcCb *gCb)
 {
    RlcRguSapCb   *rguSap;
-   U32          idx;
+   uint32_t          idx;
 
    if (gCb->genCfg.rlcMode == LKW_RLC_MODE_DL)
    {
@@ -1785,17 +1629,7 @@ RlcCb   *gCb;
  *    -# LCM_REASON_INVALID_SUBACTION
  *    -# LCM_REASON_INVALID_ACTION
  */
-#ifdef ANSI
-PRIVATE S16 rlcLmmGenCntrl
-(
-RlcCb *gCb,
-RlcMngmt *cntrl       
-)
-#else
-PRIVATE S16 rlcLmmGenCntrl(gCb,cntrl)
-RlcCb    *gCb;
-RlcMngmt *cntrl;     
-#endif
+static S16 rlcLmmGenCntrl(RlcCb *gCb,RlcMngmt *cntrl)
 {
    RlcTrcCntrl *trcCntrl; /* trace */
 #ifdef DEBUGP
@@ -1890,17 +1724,7 @@ RlcMngmt *cntrl;
  *    -# LCM_REASON_INVALID_STATE
  *    -# LCM_REASON_INVALID_ACTION 
  */
-#ifdef ANSI
-PRIVATE S16 rlcLmmUdxSapCntrl
-(
-RlcCb      *gCb,
-RlcMngmt   *cntrl               
-)
-#else
-PRIVATE S16 rlcLmmUdxSapCntrl(gCb,cntrl)
-RlcCb      *gCb;
-RlcMngmt   *cntrl;               
-#endif
+static S16 rlcLmmUdxSapCntrl(RlcCb *gCb,RlcMngmt *cntrl)
 {
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
@@ -1933,7 +1757,7 @@ RlcMngmt   *cntrl;
          if(UDX_SAP.state != RLC_SAP_BND)
          {
             /* start timer to wait for bind confirm */
-            rlcStartTmr(gCb,(PTR)(&UDX_SAP), RLC_EVT_WAIT_BNDCFM);
+            rlcStartTmr(gCb,(PTR)(&UDX_SAP), EVENT_RLC_WAIT_BNDCFM);
             UDX_SAP.state = RLC_SAP_BINDING;
             rlcUlUdxBndReq(&(UDX_SAP.pst), UDX_SAP.suId, UDX_SAP.spId);
          }
@@ -1971,17 +1795,7 @@ RlcMngmt   *cntrl;
  *    -# LCM_REASON_INVALID_STATE
  *    -# LCM_REASON_INVALID_ACTION 
  */
-#ifdef ANSI
-PRIVATE S16 rlcLmmLSapCntrl
-(
-RlcCb      *gCb,
-RlcMngmt   *cntrl 
-)
-#else
-PRIVATE S16 rlcLmmLSapCntrl(gCb,cntrl)
-RlcCb      *gCb;
-RlcMngmt   *cntrl; 
-#endif
+static S16 rlcLmmLSapCntrl(RlcCb *gCb,RlcMngmt *cntrl)
 {
    RlcRguSapCb   *rguSap;   /* rgu sap pointer */
 
@@ -2015,7 +1829,7 @@ RlcMngmt   *cntrl;
          if(rguSap->state != RLC_SAP_BND)
          {
             /* start timer to wait for bind confirm */
-            rlcStartTmr(gCb,(PTR)(rguSap), RLC_EVT_WAIT_BNDCFM);
+            rlcStartTmr(gCb,(PTR)(rguSap), EVENT_RLC_WAIT_BNDCFM);
             rguSap->state = RLC_SAP_BINDING;
             rguSap->spId = cntrl->t.cntrl.s.sapCntrl.spId;
             rguSap->suId = cntrl->t.cntrl.s.sapCntrl.suId;
@@ -2054,17 +1868,7 @@ RlcMngmt   *cntrl;
  *    -# LCM_REASON_NOT_APPL       (SUCCESS)
  *    -# LCM_REASON_INVALID_PAR_VAL(FAILURE)
  */
-#ifdef ANSI
-PRIVATE S16 rlcLmmGetKwuSapSta 
-(
-RlcCb          *gCb,
-RlcKwuSapSta   *sta         
-)
-#else
-PRIVATE S16 rlcLmmGetKwuSapSta(gCb,sta)
-RlcCb          *gCb;
-RlcKwuSapSta   *sta;         
-#endif
+static S16 rlcLmmGetKwuSapSta (RlcCb *gCb,RlcKwuSapSta *sta)
 {
    RlcKwuSapCb   *rlcKwSapCb;
    
@@ -2097,17 +1901,7 @@ RlcKwuSapSta   *sta;
  *    -# LCM_REASON_NOT_APPL       (SUCCESS) 
  *    -# LCM_REASON_INVALID_PAR_VAL(FAILURE) 
  */
-#ifdef ANSI
-PRIVATE S16 rlcLmmGetRguSapSta 
-(
-RlcCb          *gCb,
-RlcRguSapSta   *sta         
-)
-#else
-PRIVATE S16 rlcLmmGetRguSapSta(gCb,sta)
-RlcCb          *gCb;
-RlcRguSapSta   *sta;       
-#endif
+static S16 rlcLmmGetRguSapSta(RlcCb *gCb,RlcRguSapSta *sta)
 {
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
@@ -2135,17 +1929,7 @@ RlcRguSapSta   *sta;
  *    -# LCM_REASON_NOT_APPL       (SUCCESS)
  *    -# LCM_REASON_INVALID_PAR_VAL(FAILURE)
  */
-#ifdef ANSI
-PRIVATE S16 rlcLmmGetCkwCntSapSta
-(
-RlcCb             *gCb,
-RlcCkwCntSapSta   *sta     
-)
-#else
-PRIVATE S16 rlcLmmGetCkwCntSapSta(gCb,sta)
-rlcCb             *gCb,
-RlcCkwCntSapSta   *sta;   
-#endif
+static S16 rlcLmmGetCkwCntSapSta(RlcCb *gCb,RlcCkwCntSapSta *sta)
 {
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
@@ -2174,19 +1958,7 @@ RlcCkwCntSapSta   *sta;
  *    -# LCM_REASON_NOT_APPL       (SUCCESS)
  *    -# LCM_REASON_INVALID_PAR_VAL(FAILURE)
  */
-#ifdef ANSI
-PRIVATE S16 rlcLmmGetGenSts
-(
-RlcCb       *gCb,
-RlcGenSts   *sts,       
-Action     action         
-)
-#else
-PRIVATE S16 rlcLmmGetGenSts(gCb,sts, action)
-RlcCb       *gCb;
-RlcGenSts   *sts;          
-Action     action;         
-#endif
+static S16 rlcLmmGetGenSts(RlcCb *gCb,RlcGenSts *sts,Action action)
 {
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
@@ -2220,21 +1992,7 @@ Action     action;
  *    -# LCM_REASON_NOT_APPL (SUCCESS)
  *    -# LCM_REASON_INVALID_PAR_VAL (FAIL)
  */
-#ifdef ANSI
-PRIVATE S16 rlcLmmGetSapSts
-(
-RlcCb      *gCb,
-RlcMngmt   *sts,               
-Elmnt     elmnt,               
-Action    action             
-)
-#else
-PRIVATE S16 rlcLmmGetSapSts(sts, elmnt, action)
-RlcCb      *gCb;
-RlcMngmt   *sts;            
-Elmnt     elmnt;            
-Action    action;         
-#endif
+static S16 rlcLmmGetSapSts(RlcCb *gCb,RlcMngmt *sts,Elmnt elmnt, Action action)
 {
 
    /* Validate protocol parameters */
@@ -2307,54 +2065,33 @@ Action    action;
  * @return  Void
  */
 #ifdef LTE_L2_MEAS
-#ifdef ANSI
 Void rlcLmmSendAlarm
 (
-RlcCb   *gCb,
-U16    category,  
-U16    event,    
-U16    cause,   
-SuId   suId,   
-U32    ueId,  
-U8     qci   
+RlcCb      *gCb,
+uint16_t    category,  
+uint16_t    event,    
+uint16_t    cause,   
+SuId        suId,   
+uint32_t    ueId,  
+uint8_t     qci   
 )
-#else
-Void rlcLmmSendAlarm(category, event, cause, suId, ueId, qci)
-RlcCb   *gCb;
-U16    category; 
-U16    event;   
-U16    cause;  
-SuId   suId;  
-U32    ueId; 
-U8     qci;    
-#endif
 #else /* LTE_L2_MEAS */
-#ifdef ANSI
 Void rlcLmmSendAlarm
 (
-RlcCb   *gCb,
-U16    category, 
-U16    event,   
-U16    cause,  
-SuId   suId,  
-U32    ueId  
+RlcCb       *gCb,
+uint16_t    category, 
+uint16_t    event,   
+uint16_t    cause,  
+SuId        suId,  
+uint32_t    ueId  
 )
-#else
-Void rlcLmmSendAlarm(category, event, cause, suId, ueId)
-RlcCb   *gCb;
-U16    category; 
-U16    event;   
-U16    cause;  
-SuId   suId;  
-U32    ueId; 
-#endif
 #endif /* LTE_L2_MEAS */
 {
    RlcMngmt   usta;   /* Rlc Management Structure */
 
    if(gCb->init.usta == FALSE)
    {
-      RETVOID;
+      return;
    }
 
    usta.hdr.elmId.elmnt = STGEN;
@@ -2381,7 +2118,7 @@ U32    ueId;
 
    RlcMiLkwStaInd(&(gCb->init.lmPst), &usta);
 
-   RETVOID;
+   return;
 
 } 
 
@@ -2397,19 +2134,7 @@ U32    ueId;
  *    -# ROK 
  *    -# RFAILED 
  */
-#ifdef ANSI
-S16 rlcLmmSendTrc
-(
-RlcCb     *gCb,
-Event    event,     
-Buffer   *mBuf     
-)
-#else
-S16 rlcLmmSendTrc(gCb,event, mBuf)
-RlcCb     *gCb;
-Event    event;   
-Buffer   *mBuf;  
-#endif
+S16 rlcLmmSendTrc(RlcCb *gCb,Event event,Buffer *mBuf)
 {
    RlcMngmt   trc;              /* RLC management control block */
    Buffer    *dstMbuf;   
@@ -2537,17 +2262,7 @@ Buffer   *mBuf;
  *
  */
  
-#ifdef ANSI
-S16 rlcActvTmr
-(
-Ent    ent,
-Inst   inst
-)
-#else
-S16 rlcActvTmr(ent,inst)
-Ent    ent;
-Inst   inst;
-#endif
+S16 rlcActvTmr(Ent ent,Inst inst)
 {
    RlcCb   *gCb;