Deleted the rlog folder
[o-du/l2.git] / src / 5gnrrlc / kw_udx_dl.c
index cf29078..8a27900 100755 (executable)
@@ -18,7 +18,7 @@
 
 /**********************************************************************
  
-    Name:   LTE RLC layer
+    Name:   NR RLC layer
  
     Type:   C include file
  
@@ -27,9 +27,6 @@
     File:   kw_udx_dl.c
 
 **********************************************************************/
-static const char* RLOG_MODULE_NAME="UDX";
-static int RLOG_MODULE_ID=262144;
-static int RLOG_FILE_ID=203;
 
 /* header include files (.h) */
 #include "common_def.h"
@@ -55,11 +52,11 @@ static int RLOG_FILE_ID=203;
 #include "kw_dl.x"
 
 
-#define KW_MODULE KW_DBGMASK_UDX
+#define RLC_MODULE RLC_DBGMASK_UDX
 /* local defines */
 
-EXTERN S16 rlcDlmHndlStaRsp ARGS (( RlcCb  *gCb,RlcDlRbCb  *rbCb,
-                KwUdxStaPdu *pStaPdu, KwUdxBufLst  *rlsPduLst));
+S16 rlcDlmHndlStaRsp ARGS (( RlcCb  *gCb,RlcDlRbCb  *rbCb,
+                RlcUdxStaPdu *pStaPdu, RlcUdxBufLst  *rlsPduLst));
 
 
 
@@ -82,34 +79,25 @@ EXTERN S16 rlcDlmHndlStaRsp ARGS (( RlcCb  *gCb,RlcDlRbCb  *rbCb,
  *    -# ROK 
  *    -# RFAILED
  */
-#ifdef ANSI
-PUBLIC S16 rlcDlUdxBndReq 
+S16 rlcDlUdxBndReq 
 (
 Pst    *pst,  
 SuId   suId, 
 SpId   spId 
 )
-#else
-PUBLIC S16 rlcDlUdxBndReq (pst, suId, spId)
-Pst    *pst;   
-SuId   suId;  
-SpId   spId; 
-#endif
 {
-   KwUdxDlSapCb   *udxSap;            /* pointer to session SAP */
+   RlcUdxDlSapCb   *udxSap;            /* pointer to session SAP */
    RlcCb           *tRlcCb;
 
-   TRC3(rlcDlUdxBndReq);
-
 #if (ERRCLASS & ERRCLS_INT_PAR)
    if (pst->dstInst >= MAX_RLC_INSTANCES)
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif
    tRlcCb = RLC_GET_RLCCB(pst->dstInst);
 
-   KWDBGP_BRIEF(tRlcCb, "rlcDlUdxBndReq(spId(%d), suId(%d))\n", 
+   RLCDBGP_BRIEF(tRlcCb, "rlcDlUdxBndReq(spId(%d), suId(%d))\n", 
                 spId, suId);
 
    udxSap = (tRlcCb->u.dlCb->udxDlSap + spId);
@@ -118,8 +106,8 @@ SpId   spId;
    switch(udxSap->state)
    {
       /* SAP is configured but not bound */
-      case KW_SAP_CFG:
-      case KW_SAP_UBND:
+      case RLC_SAP_CFG:
+      case RLC_SAP_UBND:
       {
          /* copy bind configuration parameters in SSAP sap */
          udxSap->suId = suId;
@@ -128,13 +116,13 @@ SpId   spId;
          udxSap->pst.dstInst = pst->srcInst;
 
          /* Update the State */
-         udxSap->state = KW_SAP_BND;
+         udxSap->state = RLC_SAP_BND;
 
-         RLOG1(L_INFO, "UDX SAP state [%d]", udxSap->state);
+         DU_LOG("\nINFO   --> RLC_DL : UDX SAP state [%d]", udxSap->state);
          break;
       }
       /* SAP is already bound */
-      case KW_SAP_BND:
+      case RLC_SAP_BND:
       {
          /* 
           * Sap is already bound check source, destination Entity and 
@@ -145,10 +133,10 @@ SpId   spId;
                || udxSap->pst.dstInst != pst->srcInst
                || udxSap->suId != suId)
          {
-            KW_SEND_SAPID_ALARM(tRlcCb, spId, 
+            RLC_SEND_SAPID_ALARM(tRlcCb, spId, 
                                 LKW_EVENT_UDX_BND_REQ, LCM_CAUSE_INV_PAR_VAL);
 
-            RLOG0(L_ERROR, "UDX SAP already Bound");
+            DU_LOG("\nERROR  --> RLC_DL : UDX SAP already Bound");
             rlcDlUdxBndCfm(&(udxSap->pst), udxSap->suId, CM_BND_NOK);
          }
          break;
@@ -157,16 +145,16 @@ SpId   spId;
      default:
       {
 #if (ERRCLASS & ERRCLS_INT_PAR)
-         KW_SEND_SAPID_ALARM(tRlcCb,spId, 
+         RLC_SEND_SAPID_ALARM(tRlcCb,spId, 
                              LKW_EVENT_CKW_BND_REQ, LCM_CAUSE_INV_STATE);
 #endif /* ERRCLASS & ERRCLS_INT_PAR */
-         RLOG0(L_ERROR, "Invalid UDX SAP State in Bind Req");
+         DU_LOG("\nERROR  --> RLC_DL : Invalid UDX SAP State in Bind Req");
          rlcDlUdxBndCfm(&(udxSap->pst), udxSap->suId, CM_BND_NOK);
          break;
       }
    }
    rlcDlUdxBndCfm(&(udxSap->pst), udxSap->suId, CM_BND_OK);
-   RETVALUE(ROK);
+   return ROK;
 } 
 
 \f
@@ -181,45 +169,36 @@ SpId   spId;
  *  @return  S16
  *      -# ROK 
  */
-#ifdef ANSI
-PUBLIC S16 rlcDlUdxUbndReq
+S16 rlcDlUdxUbndReq
 (
 Pst      *pst,    
 SpId     spId,   
 Reason   reason 
 )
-#else
-PUBLIC S16 rlcDlUdxUbndReq(pst, spId, reason)
-Pst      *pst;   
-SpId     spId;   
-Reason   reason; 
-#endif
 {
-   KwUdxDlSapCb   *udxSap; 
+   RlcUdxDlSapCb   *udxSap; 
    RlcCb           *tRlcCb;
 
-   TRC3(rlcDlUdxUbndReq)
-
 #if (ERRCLASS & ERRCLS_INT_PAR)
    if (pst->dstInst >= MAX_RLC_INSTANCES)
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif
 
    tRlcCb = RLC_GET_RLCCB(pst->dstInst);
 
-   RLOG2(L_DEBUG,"Unbind Req for spId[%d], reason[%d]", 
+   DU_LOG("\nDEBUG  --> RLC_DL : Unbind Req for spId[%d], reason[%d]", 
                 spId, reason);
    UNUSED(reason);
    /* disable upper sap (CKW) */
    udxSap = (tRlcCb->u.dlCb->udxDlSap + spId);
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
-   KW_GET_AND_VALIDATE_UDXSAP(tRlcCb,udxSap, EKW208, "KwUiDlUdxndReq");
+   RLC_GET_AND_VALIDATE_UDXSAP(tRlcCb,udxSap, EKW208, "KwUiDlUdxndReq");
 #endif /* ERRCLASS & ERRCLS_INT_PAR */
-   udxSap->state = KW_SAP_CFG;
-   RETVALUE(ROK);
+   udxSap->state = RLC_SAP_CFG;
+   return ROK;
 }
 
 \f
@@ -244,38 +223,29 @@ Reason   reason;
  *    -# ROK 
  *    -# RFAILED
  */
-#ifdef ANSI
-PUBLIC S16 rlcDlUdxCfgReq
+S16 rlcDlUdxCfgReq
 (
 Pst          *pst,
 SpId         spId,
 RlcCfgInfo   *cfg
 )
-#else
-PUBLIC S16 rlcDlUdxCfgReq(pst, spId, cfg)
-Pst          *pst;
-SpId         spId;
-RlcCfgInfo   *cfg;
-#endif
 {
    RlcCfgCfmInfo   *cfgCfm; 
-   U8              idx;    
-   RlcCb            *tRlcCb;
+   uint8_t         idx;    
+   RlcCb           *tRlcCb;
    Pst             *pstUdxCfm;
 
-   TRC3(rlcDlUdxCfgReq)
-
 #if (ERRCLASS & ERRCLS_INT_PAR)
    if (pst->dstInst >= MAX_RLC_INSTANCES)
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif
 
    tRlcCb = RLC_GET_RLCCB(pst->dstInst);
 
    pstUdxCfm = &(tRlcCb->u.dlCb->udxDlSap[spId].pst);
-   KWDBGP_BRIEF(tRlcCb,"spId(%d)\n", spId);
+   RLCDBGP_BRIEF(tRlcCb,"spId(%d)\n", spId);
    /* Allocate memory and memset to 0 for cfmInfo */
    RLC_ALLOC_SHRABL_BUF_WC(pstUdxCfm->region,
                           pstUdxCfm->pool,
@@ -285,10 +255,10 @@ RlcCfgInfo   *cfg;
 #if (ERRCLASS & ERRCLS_ADD_RES)
    if (cfgCfm == NULLP)
    {
-      RLOG0(L_FATAL,"Memory Allocation Failed.");
+      DU_LOG("\nERROR  --> RLC_DL : Memory Allocation Failed.");
       /* kw002.201 Freeing from proper region */
       /* RLC_PST_FREE(pst->region, pst->pool, cfg, sizeof(RlcCfgInfo)); */
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif /* ERRCLASS & ERRCLS_ADD_RES */
 
@@ -305,13 +275,13 @@ RlcCfgInfo   *cfg;
       {
          case CKW_CFG_ADD:
             {
-               if (entCfg->dir & KW_DIR_DL)
+               if (entCfg->dir & RLC_DIR_DL)
                { 
                   /* Add a new RB entity configuration */
                   if (rlcCfgAddDlRb(tRlcCb,cfg->ueId, cfg->cellId,\
                               entCfg, entCfgCfm) != ROK)
                   {
-                     RLOG_ARG1(L_ERROR,DBG_RBID,cfg->entCfg[idx].rbId,"Addition Failed due to[%d]",
+                     DU_LOG("\nERROR  --> RLC_DL : Addition Failed due to[%d]",
                            entCfgCfm->status.reason);
                   }
                }
@@ -319,13 +289,13 @@ RlcCfgInfo   *cfg;
             }
          case CKW_CFG_MODIFY:
             {
-               if (entCfg->dir & KW_DIR_DL)
+               if (entCfg->dir & RLC_DIR_DL)
                {
                   /* Re-configure the existing RB entity configuration */
                   if (rlcCfgReCfgDlRb(tRlcCb,cfg->ueId, cfg->cellId,\
                            entCfg, entCfgCfm) != ROK)
                   {
-                     RLOG_ARG1(L_ERROR,DBG_RBID,cfg->entCfg[idx].rbId,"ReCfg Failed due to[%d]",
+                     DU_LOG("\nERROR  --> RLC_DL : ReCfg Failed due to[%d]",
                            entCfgCfm->status.reason);
                   }
                }
@@ -334,13 +304,13 @@ RlcCfgInfo   *cfg;
 
          case CKW_CFG_DELETE:
             {
-               if (entCfg->dir & KW_DIR_DL)
+               if (entCfg->dir & RLC_DIR_DL)
                {
                   /* Delete the existing RB entity configuration */
                   if (rlcCfgDelDlRb(tRlcCb,cfg->ueId, cfg->cellId,\
                         entCfg, entCfgCfm) != ROK)
                   {
-                     RLOG_ARG1(L_ERROR,DBG_RBID,cfg->entCfg[idx].rbId,"Deletion Failed due to[%d]",
+                     DU_LOG("\nERROR  --> RLC_DL : Deletion Failed due to[%d]",
                            entCfgCfm->status.reason);
                   } 
                }
@@ -349,13 +319,13 @@ RlcCfgInfo   *cfg;
 
          case CKW_CFG_REESTABLISH:
             {
-               if (entCfg->dir & KW_DIR_DL)
+               if (entCfg->dir & RLC_DIR_DL)
                {
                   /*if direction is both then, re-establishment end indication
                    * should be sent only from the UL instance, only if DIR is
                    * DL only then DL instance will send indication.*/
                   Bool sndReEst = TRUE;
-                  if (entCfg->dir & KW_DIR_UL)
+                  if (entCfg->dir & RLC_DIR_UL)
                   {
                      sndReEst = FALSE;
                   }
@@ -363,7 +333,7 @@ RlcCfgInfo   *cfg;
                   if (rlcCfgReEstDlRb(tRlcCb,cfg->ueId, cfg->cellId,
                                      sndReEst,entCfg, entCfgCfm) != ROK)
                   {
-                     RLOG_ARG1(L_ERROR,DBG_RBID,cfg->entCfg[idx].rbId,"Reest Failed due to[%d]",
+                     DU_LOG("\nERROR  --> RLC_DL : Reest Failed due to[%d]",
                            entCfgCfm->status.reason);
                   }
                }
@@ -376,7 +346,7 @@ RlcCfgInfo   *cfg;
                if (rlcCfgDelDlUe(tRlcCb,cfg->ueId, cfg->cellId,
                                 entCfg, entCfgCfm) != ROK)
                {
-                  RLOG_ARG1(L_ERROR,DBG_UEID,cfg->ueId,"deletion Failed due to[%d]",
+                  DU_LOG("\nERROR  --> RLC_DL : deletion Failed due to[%d]",
                            entCfgCfm->status.reason);
                }
                break;
@@ -386,7 +356,7 @@ RlcCfgInfo   *cfg;
                if (rlcCfgDelDlCell(tRlcCb,cfg->cellId,entCfg,entCfgCfm) 
                                                                 != ROK )
                {
-                  RLOG_ARG1(L_ERROR,DBG_CELLID,cfg->cellId,"deletion Failed due to[%d]",
+                  DU_LOG("\nERROR  --> RLC_DL : deletion Failed due to[%d]",
                            entCfgCfm->status.reason);
                } 
                break;
@@ -394,9 +364,9 @@ RlcCfgInfo   *cfg;
 
          default:
             {
-               KW_CFG_FILL_CFG_CFM(entCfgCfm, entCfg->rbId, entCfg->rbType,\
+               RLC_CFG_FILL_CFG_CFM(entCfgCfm, entCfg->rbId, entCfg->rbType,\
                                    CKW_CFG_CFM_NOK, CKW_CFG_REAS_INVALID_CFG);
-               RLOG0(L_ERROR, "Invalid CfgType");
+               DU_LOG("\nERROR  --> RLC_DL : Invalid CfgType");
             }
       }
    }
@@ -414,7 +384,7 @@ RlcCfgInfo   *cfg;
                  tRlcCb->u.dlCb->udxDlSap[spId].suId, 
                  cfgCfm);
 
-   RETVALUE(ROK);
+   return ROK;
 } 
 
 /**
@@ -433,42 +403,31 @@ RlcCfgInfo   *cfg;
  *    -# ROK
  *    -# RFAILED
  */
-#ifdef ANSI
-PUBLIC S16 rlcDlUdxUeIdChgReq
+S16 rlcDlUdxUeIdChgReq
 (
 Pst         *pst, 
 SpId        spId, 
-U32         transId, 
+uint32_t    transId, 
 CkwUeInfo   *ueInfo,
 CkwUeInfo   *newUeInfo
 )
-#else
-PUBLIC S16 rlcDlUdxUeIdChgReq(pst,spId,transId,ueInfo,newUeInfo)
-Pst         *pst;
-SpId        spId;
-U32         transId;
-CkwUeInfo   *ueInfo;
-CkwUeInfo   *newUeInfo;
-#endif
 {
    CmStatus       status;
    RlcCb           *tRlcCb;
 
-   TRC3(rlcDlUdxUeIdChgReq)
-
 #if (ERRCLASS & ERRCLS_INT_PAR)
    if (pst->dstInst >= MAX_RLC_INSTANCES)
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif
 
    tRlcCb = RLC_GET_RLCCB(pst->dstInst);
 #ifndef ALIGN_64BIT
-   KWDBGP_BRIEF(tRlcCb, "(spId(%d), transId(%ld))\n", 
+   RLCDBGP_BRIEF(tRlcCb, "(spId(%d), transId(%ld))\n", 
                 spId, transId);
 #else
-   KWDBGP_BRIEF(tRlcCb, "(spId(%d), transId(%d))\n", 
+   RLCDBGP_BRIEF(tRlcCb, "(spId(%d), transId(%d))\n", 
                 spId, transId);
 #endif
 
@@ -477,7 +436,7 @@ CkwUeInfo   *newUeInfo;
    
    if (rlcCfgDlUeIdChng(tRlcCb, ueInfo, newUeInfo, &status) != ROK)
    {
-      RLOG_ARG1(L_ERROR,DBG_CELLID,newUeInfo->cellId,"Failure due to[%d]",
+      DU_LOG("\nERROR  --> RLC_DL : Failure due to[%d]",
              status.reason);
    }
    rlcDlUdxUeIdChgCfm(&(tRlcCb->u.dlCb->udxDlSap[spId].pst),
@@ -485,7 +444,7 @@ CkwUeInfo   *newUeInfo;
                      transId, 
                      status);
 
-   RETVALUE(ROK);
+   return ROK;
 } 
 
 /**
@@ -501,54 +460,46 @@ CkwUeInfo   *newUeInfo;
 *    -# ROK
 *    -# RFAILED
 **/
-#ifdef ANSI
-PUBLIC S16  rlcDlUdxStaPduReq
+S16  rlcDlUdxStaPduReq
 (
 Pst             *pst,
 SpId            spId,
 CmLteRlcId      *rlcId,
-KwUdxDlStaPdu   *pStaPdu
+RlcUdxDlStaPdu   *pStaPdu
 )
-#else
-PUBLIC S16  rlcDlUdxStaPduReq(pst, spId, rlcId, pStaPdu)
-Pst             *pst;
-SpId            spId;
-CmLteRlcId      *rlcId;
-KwUdxDlStaPdu   *pStaPdu;
-#endif
 {
    RlcDlRbCb   *rbCb;
    RlcCb       *tRlcCb;
 
    tRlcCb =  RLC_GET_RLCCB (pst->dstInst);
 
-   kwDbmFetchDlRbCbByRbId(tRlcCb, rlcId, &rbCb); /* Fetch DBM RbCb */
+   rlcDbmFetchDlRbCbByRbId(tRlcCb, rlcId, &rbCb); /* Fetch DBM RbCb */
    if (!rbCb)
    {
-      RLOG_ARG2(L_ERROR, DBG_UEID,rlcId->ueId, "CellId [%u]:RbId[%d] not found",
+      DU_LOG("\nERROR  --> RLC_DL : CellId [%u]:RbId[%d] not found",
             rlcId->cellId,rlcId->rbId);
       RLC_FREE_SHRABL_BUF(pst->region, 
                         pst->pool, 
                         pStaPdu, 
-                        sizeof(KwUdxDlStaPdu));
-      RETVALUE(RFAILED);
+                        sizeof(RlcUdxDlStaPdu));
+      return RFAILED;
    }
 
-   AMDL.cntrlBo = pStaPdu->controlBo;
+   RLC_AMDL.cntrlBo = pStaPdu->controlBo;
    /* If there already exists a STAUS PDU, free it and take the new one
       into account */
-   if(AMDL.pStaPdu)
+   if(RLC_AMDL.pStaPdu)
    {
       RLC_FREE_SHRABL_BUF(pst->region, 
                         pst->pool, 
-                        AMDL.pStaPdu, 
-                        sizeof(KwUdxDlStaPdu));
+                        RLC_AMDL.pStaPdu, 
+                        sizeof(RlcUdxDlStaPdu));
    }
    
-   AMDL.pStaPdu = pStaPdu;
-   kwAmmSendDStaRsp(tRlcCb, rbCb, &AMDL);             
+   RLC_AMDL.pStaPdu = pStaPdu;
+   rlcAmmSendDedLcBoStatus(tRlcCb, rbCb, &RLC_AMDL);             
 
-   RETVALUE (ROK);
+   return  (ROK);
 }
 
 /**
@@ -564,67 +515,51 @@ KwUdxDlStaPdu   *pStaPdu;
 *    -# ROK
 *    -# RFAILED
 **/
-#ifdef ANSI
-PUBLIC S16  rlcDlUdxStaUpdReq
+S16  rlcDlUdxStaUpdReq
 (
 Pst*          pst,
 SpId          spId,
 CmLteRlcId    *rlcId,
-KwUdxStaPdu   *pStaPdu
+RlcUdxStaPdu   *pStaPdu
 )
-#else
-PUBLIC S16 rlcDlUdxStaUpdReq(pst, spId, rlcId,pStaPdu)
-Pst*          pst;
-SpId          spId;
-CmLteRlcId    *rlcId;
-KwUdxStaPdu   *pStaPdu;
-#endif
 {
    RlcCb          *tRlcCb;
    RlcDlRbCb      *rbCb;
 
    tRlcCb = RLC_GET_RLCCB(pst->dstInst);
 
-   kwDbmFetchDlRbCbByRbId(tRlcCb, rlcId, &rbCb);
+   rlcDbmFetchDlRbCbByRbId(tRlcCb, rlcId, &rbCb);
    if (!rbCb)
    {
-      RLOG_ARG2(L_ERROR, DBG_UEID,rlcId->ueId, "CellId [%u]:RbId[%d] not found",
+      DU_LOG("\nERROR  --> RLC_DL : CellId [%u]:RbId[%d] not found",
             rlcId->cellId,rlcId->rbId);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
-   kwAmmDlHndlStatusPdu(tRlcCb, rbCb, pStaPdu);
+   rlcAmmDlHndlStatusPdu(tRlcCb, rbCb, pStaPdu);
 
    RLC_FREE_SHRABL_BUF(pst->region,
                      pst->pool, 
                      pStaPdu, 
-                     sizeof(KwUdxStaPdu));
+                     sizeof(RlcUdxStaPdu));
 
-   RETVALUE(ROK);
+   return ROK;
 }
 
 #ifdef LTE_L2_MEAS
 /**
 */
-#ifdef ANSI
-PUBLIC S16 rlcDlUdxL2MeasReq 
+S16 rlcDlUdxL2MeasReq 
 (
 Pst            *pst, 
-KwL2MeasReqEvt *measReqEvt 
+RlcL2MeasReqEvt *measReqEvt 
 )
-#else
-PUBLIC S16 rlcDlUdxL2MeasReq (pst, measReqEvt)
-Pst            *pst; 
-KwL2MeasReqEvt *measReqEvt;
-#endif
 {
-   U32            cntr;
-   U8             measType;
-   VOLATILE U32     startTime = 0;
+   uint32_t  cntr;
+   uint8_t   measType;
+   volatile uint32_t     startTime = 0;
    RlcCb     *tRlcCb;
 
-   TRC3(rlcDlUdxL2MeasReq);
-
    /*starting Task*/
    SStartTask(&startTime, PID_RLC_MEAS_START);
 
@@ -642,23 +577,23 @@ KwL2MeasReqEvt *measReqEvt;
       /* if measurement is for DL IP enable for all QCI */
       for(cntr = 0; cntr < LKW_MAX_QCI; cntr++)
       {
-         tRlcCb->u.dlCb->kwL2Cb.measOn[cntr] |= LKW_L2MEAS_DL_IP;
+         tRlcCb->u.dlCb->rlcL2Cb.measOn[cntr] |= LKW_L2MEAS_DL_IP;
       }
    }
    else
    {
       /* for nonIpThroughput meas, enable only for the sent QCIs */
-      U32 i;
+      uint32_t i;
       for(i = 0; i < LKW_MAX_QCI; i++)
       {
-         tRlcCb->u.dlCb->kwL2Cb.measOn[i] |= measType;
+         tRlcCb->u.dlCb->rlcL2Cb.measOn[i] |= measType;
       }
    }
 
    /* We need to copy the transId for sending back confirms later */
    for(cntr = 0; cntr < LKW_MAX_L2MEAS; cntr++)
    {
-      KwL2MeasEvtCb* measEvtCb = &(tRlcCb->u.dlCb->kwL2Cb.kwL2EvtCb[cntr]);
+      RlcL2MeasEvtCb* measEvtCb = &(tRlcCb->u.dlCb->rlcL2Cb.rlcL2EvtCb[cntr]);
       if(measEvtCb->measCb.measType & measType)
       {
          measEvtCb->transId= measReqEvt->transId;
@@ -667,7 +602,7 @@ KwL2MeasReqEvt *measReqEvt;
 
    /*stopping Task*/
    SStopTask(startTime, PID_RLC_MEAS_START);
-   RETVALUE(ROK);
+   return ROK;
 } /* rlcDlUdxMeasReq */
 
 /**
@@ -681,39 +616,32 @@ After receving this request, RLC stops L2 Measurement
  *      -# Failure : RFAILED
 */
 
-#ifdef ANSI
-PUBLIC S16 rlcDlUdxL2MeasStopReq
+S16 rlcDlUdxL2MeasStopReq
 (
 Pst            *pst,
-U8             measType
+uint8_t         measType
 )
-#else
-PUBLIC S16 rlcDlUdxL2MeasStopReq (pst, measType)
-Pst            *pst;
-U8             measType;
-#endif
 {
   /* S16 ret = ROK;*/
-   KwL2MeasEvtCb *measEvtCb = NULLP;
-   U16            cntr;
-   U8             status = ROK;
-/*   KwL2MeasCfmEvt          measCfmEvt;  */
-   VOLATILE U32     startTime = 0;
+   RlcL2MeasEvtCb *measEvtCb = NULLP;
+   uint16_t        cntr;
+   uint8_t         status = ROK;
+/*   RlcL2MeasCfmEvt          measCfmEvt;  */
+   volatile uint32_t     startTime = 0;
    RlcCb     *tRlcCb=NULLP;
-   TRC3(rlcDlUdxMeasStopReq);
    
    /*starting Task*/
    SStartTask(&startTime, PID_RLC_MEAS_STOP);
 
    tRlcCb =  RLC_GET_RLCCB(pst->dstInst);
-/*   cmMemset((U8*)&measCfmEvt, 0, sizeof(KwL2MeasCfmEvt)); */
+/*   memset(&measCfmEvt, 0, sizeof(RlcL2MeasCfmEvt)); */
    /* reset the counters for the measurement type passed */
    for(cntr = 0; cntr < LKW_MAX_L2MEAS; cntr++)
    {
-      measEvtCb = &(tRlcCb->u.dlCb->kwL2Cb.kwL2EvtCb[cntr]);
+      measEvtCb = &(tRlcCb->u.dlCb->rlcL2Cb.rlcL2EvtCb[cntr]);
       if(measEvtCb->measCb.measType & measType)
       {
-         kwUtlResetDlL2MeasInKwRb(tRlcCb, &measEvtCb->measCb, measType);
+         rlcUtlResetDlL2MeasInRlcRb(tRlcCb, &measEvtCb->measCb, measType);
 
       }
    }
@@ -721,7 +649,7 @@ U8             measType;
    /* switch off the measurements for the type passed */
    for(cntr = 0; cntr < LKW_MAX_QCI; cntr++)
    {
-      tRlcCb->u.dlCb->kwL2Cb.measOn[cntr] &= ~measType;
+      tRlcCb->u.dlCb->rlcL2Cb.measOn[cntr] &= ~measType;
    }
    
    status = LCM_PRIM_OK;
@@ -730,7 +658,7 @@ U8             measType;
    /*stopping Task*/
    SStopTask(startTime, PID_RLC_MEAS_STOP);
 
-   RETVALUE(ROK);
+   return ROK;
 }
 /**
 @brief 
@@ -743,42 +671,34 @@ After receving this request, RLC sends L2 Measurement
  *      -# Failure : RFAILED
 */
 
-#ifdef ANSI
-PUBLIC S16 rlcDlUdxL2MeasSendReq
+S16 rlcDlUdxL2MeasSendReq
 (
 Pst            *pst,
-U8             measType
+uint8_t         measType
 )
-#else
-PUBLIC S16 rlcDlUdxL2MeasSendReq (pst, measType)
-Pst            *pst;
-U8             measType;
-#endif
 {
-   KwL2MeasEvtCb *measEvtCb;
-   U16            cntr;
-   
-   VOLATILE U32     startTime = 0;
+   RlcL2MeasEvtCb *measEvtCb;
+   uint16_t            cntr;
+   volatile uint32_t     startTime = 0;
    RlcCb     *tRlcCb;
-   TRC3(rlcDlUdxMeasSendReq);
 
    tRlcCb =  RLC_GET_RLCCB(pst->dstInst);
    for(cntr = 0; cntr < LKW_MAX_L2MEAS; cntr++)
    {
-      measEvtCb = &(tRlcCb->u.dlCb->kwL2Cb.kwL2EvtCb[cntr]);
+      measEvtCb = &(tRlcCb->u.dlCb->rlcL2Cb.rlcL2EvtCb[cntr]);
       if(measEvtCb->measCb.measType & measType)
       {
          /*starting Task*/
          SStartTask(&startTime, PID_RLC_MEAS_REPORT);
 
-         kwUtlSndDlL2MeasCfm(tRlcCb, measEvtCb);
+         rlcUtlSndDlL2MeasCfm(tRlcCb, measEvtCb);
 
          /*stopping Task*/
          SStopTask(startTime, PID_RLC_MEAS_REPORT);
       }
    }
 
-   RETVALUE(ROK);
+   return ROK;
 }
 #endif /* LTE_L2_MEAS */