X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrrlc%2Fkw_lmm.c;h=b52f54205d3ce099e0a136b5fedafc88bc4caf90;hb=2b5e7ba18453db526316b51476673c1ea69c1a94;hp=5ffe0506eb6d3cc2b2ad1578f76e20107a7384b7;hpb=0a26c487f1b6bbb5217e47b15fa8273b2e749283;p=o-du%2Fl2.git

diff --git a/src/5gnrrlc/kw_lmm.c b/src/5gnrrlc/kw_lmm.c
index 5ffe0506e..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;
@@ -140,8 +130,6 @@ RlcGenCfg   *cfg;
    CmTqCp   *rlcTqCp;
    Size     rguSapSize;
 
-   TRC2(rlcLmmGenCfg)
-
    if(cfg->maxUe > RLC_MAX_UE) 
    {
 #if (ERRCLASS & ERRCLS_INT_PAR)
@@ -262,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);
@@ -363,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);
@@ -374,7 +361,7 @@ RlcGenCfg   *cfg;
 
          return (LCM_REASON_REGTMR_FAIL);
       }
-#endif
+
 #ifdef LTE_L2_MEAS
       rlcUtlL2MeasUlInit(gCb);
 #endif
@@ -390,7 +377,7 @@ RlcGenCfg   *cfg;
    /* Timer Initialization  */
    gCb->rlcTqCp.tmrLen = RLC_TMR_LEN;
 
-   cmMemset((U8*)gCb->rlcTq, NULLP, sizeof(CmTqType) * RLC_TMR_LEN);
+   memset(gCb->rlcTq, NULLP, sizeof(CmTqType) * RLC_TMR_LEN);
 
    RLC_MEM_CPY(&(gCb->init.lmPst), &cfg->lmPst, sizeof(Pst));
 
@@ -424,28 +411,17 @@ 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 */
 
-   TRC2(rlcLmmSendCfm);
-
    RLC_MEM_SET(&rPst, 0, sizeof(Pst));   
  
    /* reply post structure for confirmation */
@@ -505,7 +481,7 @@ Header    *hdr;
          break;
    }
 
-   RETVOID; 
+   return; 
 } 
 
 
@@ -565,23 +541,11 @@ Header    *hdr;
  *    -# Failure : RFAILED
  */
 
-#ifdef ANSI
-S16 RlcMiRlcConfigReq 
-(
-Pst       *pst, 
-RlcMngmt   *cfg
-)
-#else
-S16 RlcMiRlcConfigReq (pst, cfg)
-Pst       *pst;
-RlcMngmt   *cfg;
-#endif
+uint8_t RlcMiRlcConfigReq (Pst *pst,RlcMngmt *cfg)
 {
    Reason   reason;   /* failure reason */
    RlcCb     *tRlcCb=NULLP;
 
-   TRC3(RlcMiRlcConfigReq);
-
 #if (ERRCLASS & ERRCLS_INT_PAR)
    /* Check if the instance is configured */
    if (pst->dstInst >= MAX_RLC_INSTANCES)
@@ -721,23 +685,11 @@ RlcMngmt   *cfg;
  *    -# ROK
  *    -# RFAILED
  */
-#ifdef ANSI
-S16 RlcMiLkwCntrlReq
-(
-Pst       *pst, 
-RlcMngmt   *cntrl
-)
-#else
-S16 RlcMiLkwCntrlReq(pst, cntrl)
-Pst       *pst;
-RlcMngmt   *cntrl;
-#endif
+uint8_t RlcMiLkwCntrlReq(Pst *pst, RlcMngmt *cntrl)
 {
    Reason   reason;   /* failure reason */
    RlcCb     *tRlcCb=NULLP;
 
-   TRC3(RlcMiLkwCntrlReq)
-
 #if (ERRCLASS & ERRCLS_INT_PAR)
    /* Check if the instance is configured */
    if (pst->dstInst >= MAX_RLC_INSTANCES)
@@ -829,24 +781,12 @@ 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 */
    RlcCb      *tRlcCb=NULLP;
 
-   TRC3(RlcMiLkwStaReq);
-
 #if (ERRCLASS & ERRCLS_INT_PAR)
    /* Check if the instance is configured */
    if (pst->dstInst >= MAX_RLC_INSTANCES)
@@ -963,26 +903,12 @@ 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 */
    RlcCb     *tRlcCb=NULLP;
 
-   TRC3(RlcMiLkwStsReq);
-
 #if (ERRCLASS & ERRCLS_INT_PAR)
    /* Check if the instance is configured */
    if (pst->dstInst >= MAX_RLC_INSTANCES)
@@ -1081,27 +1007,15 @@ 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;
 
-   TRC3(RlcMiLkwL2MeasReq);
-
    tRlcCb =  RLC_GET_RLCCB(pst->dstInst);
 
    /* Initialize measCfmEvt */
@@ -1175,7 +1089,7 @@ RlcL2MeasReqEvt *measReqEvt;
          return RFAILED;
       }   
 #endif      
-      cmMemcpy((Void*)measEvt, (Void*)measReqEvt, sizeof(RlcL2MeasReqEvt));
+      memcpy(measEvt, measReqEvt, sizeof(RlcL2MeasReqEvt));
       /*Redirect the request to DL task */
       /* NOTE:As of today, there are no cases where the Req will fail at DL
          as long as it reached the DL, so we don't wait for a confirmation from
@@ -1210,27 +1124,15 @@ 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;
 
-   TRC3(RlcMiLkwL2MeasStopReq);
-
    tRlcCb =  RLC_GET_RLCCB(pst->dstInst);
 
    /* reset the counter values for the measurement that is stopped */
@@ -1260,7 +1162,7 @@ U8             measType;
       rlcUlUdxL2MeasStopReq(&(RLC_GET_UDX_SAP(tRlcCb)->pst),measType);
       /*return ROK;*/
    }
-   /*cmMemset((U8*)&measCfmEvt, 0, sizeof(RlcL2MeasCfmEvt)); */
+   /*memset(&measCfmEvt, 0, sizeof(RlcL2MeasCfmEvt)); */
 
    status = LCM_PRIM_OK; 
    RlcMiLkwL2MeasStopCfm(&tRlcCb->genCfg.lmPst, measType,status); 
@@ -1278,23 +1180,12 @@ 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;
-   TRC3(RlcMiLkwL2MeasSendReq);
 
    tRlcCb =  RLC_GET_RLCCB(pst->dstInst);
    
@@ -1337,20 +1228,9 @@ 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;
-   TRC2(rlcLmmCfgKwuSap)
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
    /* Validate the protocol parameters */
@@ -1394,22 +1274,10 @@ 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;
    
-   TRC2(rlcLmmCfgCkwSap)
-
 #if (ERRCLASS & ERRCLS_INT_PAR)
    /* Validate config parameters */
    if ((cfg->sapId >= RLC_MAX_CKWSAPS) || (cfg->sapId < 0) )
@@ -1454,23 +1322,11 @@ 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;
 
-   TRC2(rlcLmmCfgUdxSap);
-   
 #if (ERRCLASS & ERRCLS_INT_PAR)
    /* Validate the protocol parameters */
    if((cfg->sapId >= RLC_MAX_UDXSAPS) || (cfg->sapId < 0))
@@ -1530,22 +1386,10 @@ 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;
 
-   TRC2(rlcLmmCfgRguSap);
-   
 #if (ERRCLASS & ERRCLS_INT_PAR)
    /* Validate the protocol parameters */
    if((cfg->sapId >= gCb->genCfg.maxRguSaps) || \
@@ -1593,20 +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 */
-
-   TRC2(rlcLmmValidateGenCntrl);
+   S16     reason;    /* reason for failure */
+   uint8_t sAction;   /* subaction field */
 
    reason = LCM_REASON_NOT_APPL;
    sAction = cntrl->t.cntrl.subAction;
@@ -1640,21 +1474,11 @@ 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;
  
-   TRC2(rlcLmmCleanGblRsrcs)   
- 
    if (gCb->init.cfgDone)
    {
       /* Deregister the timers */
@@ -1731,7 +1555,7 @@ RlcCb   *gCb;
       gCb->init.usta = FALSE;
    }
 
-   RETVOID;
+   return;
 }
 
 /**
@@ -1749,20 +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;
-
-   TRC2(rlcLmmShutdown)
+   uint32_t          idx;
 
    if (gCb->genCfg.rlcMode == LKW_RLC_MODE_DL)
    {
@@ -1815,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
@@ -1833,8 +1637,6 @@ RlcMngmt *cntrl;
 #endif /* DEBUGP */
    S16   reason;         /* reason for failure */
    
-   TRC2(rlcLmmGenCntrl);
-
    /* Validate control parameters */
    reason = rlcLmmValidateGenCntrl (cntrl);
 
@@ -1922,19 +1724,8 @@ 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)
 {
-   TRC2(rlcLmmUdxSapCntrl)
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
    if (gCb->genCfg.rlcMode == LKW_RLC_MODE_DL)
@@ -1966,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);
          }
@@ -2004,22 +1795,10 @@ 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 */
 
-   TRC2(rlcLmmLSapCntrl)
-
 #if (ERRCLASS & ERRCLS_INT_PAR)
    /* validate SuId */
    if((cntrl->t.cntrl.s.sapCntrl.suId < 0) || 
@@ -2050,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;
@@ -2089,22 +1868,10 @@ 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;
    
-   TRC2(rlcLmmGetKwuSapSta);
-
 #if (ERRCLASS & ERRCLS_INT_PAR)
    /* Validate the protocol parameters */
    if ((sta->spId >= (S16)gCb->genCfg.maxKwuSaps)||
@@ -2134,19 +1901,8 @@ 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)
 {
-   TRC2(rlcLmmGetRguSapSta);
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
    /* Validate the protocol parameters */
@@ -2173,19 +1929,8 @@ 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)
 {
-   TRC2(rlcLmmGetCkwCntSapSta);
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
    /* Validate config parameters */
@@ -2213,21 +1958,8 @@ 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)
 {
-   TRC2(rlcLmmGetGenSts);
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
    /* Validate protocol parameters */
@@ -2260,23 +1992,8 @@ 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)
 {
-   TRC2(rlcLmmGetSapSts);
 
    /* Validate protocol parameters */
    if (action != LKW_ZEROSTS && action != LKW_NOZEROSTS)
@@ -2348,56 +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 */
 
-   TRC2(rlcLmmSendAlarm);
-
    if(gCb->init.usta == FALSE)
    {
-      RETVOID;
+      return;
    }
 
    usta.hdr.elmId.elmnt = STGEN;
@@ -2424,7 +2118,7 @@ U32    ueId;
 
    RlcMiLkwStaInd(&(gCb->init.lmPst), &usta);
 
-   RETVOID;
+   return;
 
 } 
 
@@ -2440,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;   
@@ -2461,13 +2143,11 @@ Buffer   *mBuf;
    MsgLen    tempCnt;
    Pst       pst;
 
-   TRC2(rlcLmmSendTrc)
-
    RLOG2(L_DEBUG, "rlcLmmSendTrc(): Trace for event=%d, gCb->trcLen=%d",
                      event,
                      gCb->trcLen);
 
-   cmMemset((U8 *)&trc, 0, sizeof(RlcMngmt));
+   memset(&trc, 0, sizeof(RlcMngmt));
 
    pst = gCb->init.lmPst;
 
@@ -2582,20 +2262,9 @@ 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; 
-   TRC2(rlcActvTmr)
 
    if (inst >= MAX_RLC_INSTANCES)
    {