X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrrlc%2Fkw_dbm_dl.c;h=373df48fa7577f83e80469bd9d61311faa23d424;hb=0a26c487f1b6bbb5217e47b15fa8273b2e749283;hp=8acc01ee8ecfa0a3e72f6e47bdbb8187c0d576e5;hpb=105199ef642ffe9736ea24a01d4546578fa25e60;p=o-du%2Fl2.git

diff --git a/src/5gnrrlc/kw_dbm_dl.c b/src/5gnrrlc/kw_dbm_dl.c
index 8acc01ee8..373df48fa 100755
--- a/src/5gnrrlc/kw_dbm_dl.c
+++ b/src/5gnrrlc/kw_dbm_dl.c
@@ -24,7 +24,7 @@
   
         Desc:    Source code for Database Module functions such as, 
 
-                 - kwDbmInit
+                 - rlcDbmInit
                  - kwDbmDeInit
                  - kwDbmCreateRbCb
                  - kwDbmFetchRbCb 
@@ -81,7 +81,7 @@ EXTERN TSL2UeStatsCb* TSL2MapUeStatsBlk (U16 rnti);
  * @file gp_dbm_dl.c
  * @brief RLC Downlink database module
 */
-#define KW_MODULE KW_DBGMASK_DUT
+#define RLC_MODULE RLC_DBGMASK_DUT
 
 
 /**
@@ -95,80 +95,80 @@ EXTERN TSL2UeStatsCb* TSL2MapUeStatsBlk (U16 rnti);
  *     -# RFAILED 
 */
 #ifdef ANSI
-PUBLIC S16 kwDbmDlInit
+S16 rlcDbmDlInit
 (
-KwCb *gCb
+RlcCb *gCb
 )
 #else
-PUBLIC S16 kwDbmDlInit(gCb)
-KwCb *gCb;
+S16 rlcDbmDlInit(gCb)
+RlcCb *gCb;
 #endif
 {
-   TRC3(kwDbmDlInit)
+   TRC3(rlcDbmDlInit)
 
    /* Initialize ueCb Hash List */
    if(ROK != cmHashListInit(&(gCb->u.dlCb->ueLstCp), 
-                            (U16) KW_UE_LIST_BUCKET_SIZE,
+                            (U16) RLC_UE_LIST_BUCKET_SIZE,
                             (U16) 0, 
                             (Bool) FALSE, 
                             (U16) CM_HASH_KEYTYPE_CONID,
-                            KW_GET_MEM_REGION(gCb), 
-                            KW_GET_MEM_POOL(gCb)))
+                            RLC_GET_MEM_REGION(gCb), 
+                            RLC_GET_MEM_POOL(gCb)))
    {   
       RLOG0(L_ERROR, "UeLstCp Initialization Failed");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    /* Initialize cellCb Hash List */
    if(ROK != cmHashListInit(&(gCb->u.dlCb->cellLstCp), 
-                            (U16) KW_CELL_LIST_BUCKET_SIZE,
+                            (U16) RLC_CELL_LIST_BUCKET_SIZE,
                             (U16) 0, 
                             (Bool) FALSE, 
                             (U16) CM_HASH_KEYTYPE_CONID,
-                            KW_GET_MEM_REGION(gCb), 
-                            KW_GET_MEM_POOL(gCb)))
+                            RLC_GET_MEM_REGION(gCb), 
+                            RLC_GET_MEM_POOL(gCb)))
    {
       cmHashListDeinit(&gCb->u.dlCb->ueLstCp);
       RLOG0(L_ERROR, "CellLstCp Initialization Failed");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
 /* kw005.201 added support for L2 Measurement */         
 #ifdef LTE_L2_MEAS_RLC
    /* Initialize qcI Hash List */
-   if(ROK != cmHashListInit(&(kwCb.kwL2Cb.qciHlCp), 
-                            (U16) KW_QCI_LIST_BUCKET_SIZE,
+   if(ROK != cmHashListInit(&(rlcCb.rlcL2Cb.qciHlCp), 
+                            (U16) RLC_QCI_LIST_BUCKET_SIZE,
                             (U16) 0, 
                             (Bool) TRUE, 
                             (U16) CM_HASH_KEYTYPE_DEF,
-                            kwCb.init.region, 
-                            kwCb.init.pool))
+                            rlcCb.init.region, 
+                            rlcCb.init.pool))
    {
       cmHashListDeinit(&gCb->u.dlCb->cellLstCp);
       cmHashListDeinit(&gCb->u.dlCb->ueLstCp);
-      RLOG0(L_ERROR, "kwDbmInit: cmHashListInit Failed for kwCb.qciHlCp");
-      RETVALUE(RFAILED);
+      RLOG0(L_ERROR, "rlcDbmInit: cmHashListInit Failed for rlcCb.qciHlCp");
+      return RFAILED;
    }
    
    /* Initialize tbHlCp Hash List */
-   if(ROK != cmHashListInit(&(kwCb.kwL2Cb.tbHlCp), 
-                            (U16) KW_TB_LIST_BUCKET_SIZE,
+   if(ROK != cmHashListInit(&(rlcCb.rlcL2Cb.tbHlCp), 
+                            (U16) RLC_TB_LIST_BUCKET_SIZE,
                             (U16) 0, 
                             (Bool) FALSE, 
                             (U16) CM_HASH_KEYTYPE_DEF,
-                            kwCb.init.region, 
-                            kwCb.init.pool))
+                            rlcCb.init.region, 
+                            rlcCb.init.pool))
    {
-      cmHashListDeinit(&kwCb.kwL2Cb.qciHlCp);
+      cmHashListDeinit(&rlcCb.rlcL2Cb.qciHlCp);
       cmHashListDeinit(&gCb->u.dlCb->cellLstCp);
       cmHashListDeinit(&gCb->u.dlCb->ueLstCp);
-      RLOG0(L_ERROR, "kwDbmInit: cmHashListInit Failed for kwCb.tbHlCp");
-      RETVALUE(RFAILED);
+      RLOG0(L_ERROR, "rlcDbmInit: cmHashListInit Failed for rlcCb.tbHlCp");
+      return RFAILED;
    }
 #endif /* LTE_L2_MEAS */
 
-   RETVALUE(ROK);
-} /* kwDbmDlInit */
+   return ROK;
+} /* rlcDbmDlInit */
 
 
 /**
@@ -179,16 +179,16 @@ KwCb *gCb;
  * @return  Void
 */
 #ifdef ANSI
-PUBLIC Void kwDbmDlDeInit
+Void rlcDbmDlDeInit
 (
-KwCb *gCb
+RlcCb *gCb
 )
 #else
-PUBLIC Void kwDbmDlDeInit(gCb)
-KwCb *gCb;
+Void rlcDbmDlDeInit(gCb)
+RlcCb *gCb;
 #endif
 {
-   TRC3(kwDbmDlDeInit);
+   TRC3(rlcDbmDlDeInit);
 
 
    /* De Initialize ueCb Hash List */
@@ -200,15 +200,15 @@ KwCb *gCb;
 /* kw005.201 added support for L2 Measurement */         
 #ifdef LTE_L2_MEAS_RLC
    /* De Initialize qciCb Hash List */
-   cmHashListDeinit(&(kwCb.kwL2Cb.qciHlCp));
+   cmHashListDeinit(&(rlcCb.rlcL2Cb.qciHlCp));
 
    /* De Initialize tbHlCp Hash List */
-   cmHashListDeinit(&(kwCb.kwL2Cb.tbHlCp));
+   cmHashListDeinit(&(rlcCb.rlcL2Cb.tbHlCp));
    
 #endif /* LTE_L2_MEAS */
 
    RETVOID;
-} /* kwDbmDlDeInit */
+} /* rlcDbmDlDeInit */
 
 
 /**
@@ -225,39 +225,39 @@ KwCb *gCb;
  *  @return  Void
 */
 #ifdef ANSI
-PUBLIC Void kwDbmFetchDlRbCbByRbId
+Void rlcDbmFetchDlRbCbByRbId
 (
-KwCb         *gCb,
+RlcCb         *gCb,
 CmLteRlcId   *rlcId,
-KwDlRbCb     **rbCb
+RlcDlRbCb     **rbCb
 )
 #else
-PUBLIC Void kwDbmFetchDlRbCbByRbId(gCb, rlcId, rbCb)
-KwCb         *gCb;
+Void rlcDbmFetchDlRbCbByRbId(gCb, rlcId, rbCb)
+RlcCb         *gCb;
 CmLteRlcId   *rlcId;
-KwDlRbCb     **rbCb;
+RlcDlRbCb     **rbCb;
 #endif
 {
-   TRC3(kwDbmFetchDlRbCbByRbId)
+   TRC3(rlcDbmFetchDlRbCbByRbId)
 
    *rbCb= NULLP;
    
    /* Check for UE CB or CELL CB */
    if (rlcId->ueId == 0)
    {
-      KwDlCellCb *cellCb;
+      RlcDlCellCb *cellCb;
       
-      if(rlcId->rbId >= KW_MAX_RB_PER_CELL)
+      if(rlcId->rbId >= RLC_MAX_RB_PER_CELL)
       {
          RLOG_ARG3(L_ERROR,DBG_RBID,rlcId->rbId ,
                "Invalid RbId, Max is [%d] UEID:%d CELLID:%d",
-               KW_MAX_RB_PER_CELL,
+               RLC_MAX_RB_PER_CELL,
                rlcId->ueId,
                rlcId->cellId);
          RETVOID;
       }
 
-      kwDbmFetchDlCellCb(gCb,rlcId->cellId, &cellCb);
+      rlcDbmFetchDlCellCb(gCb,rlcId->cellId, &cellCb);
       if(!cellCb)
       {
          RLOG_ARG2(L_ERROR,DBG_CELLID,rlcId->cellId,
@@ -271,8 +271,8 @@ KwDlRbCb     **rbCb;
    }
    else
    {
-      KwDlUeCb *ueCb;
-      if (!(KW_VALIDATE_UE_RBID(rlcId->rbType, rlcId->rbId)))
+      RlcDlUeCb *ueCb;
+      if (!(RLC_VALIDATE_UE_RBID(rlcId->rbType, rlcId->rbId)))
       {
          RLOG_ARG3(L_ERROR,DBG_RBID, rlcId->rbId,
                "Invalid RbId for RbType[%d] RBID:%d CELLID:%d",
@@ -282,7 +282,7 @@ KwDlRbCb     **rbCb;
          RETVOID;
       }
       
-      if (ROK != kwDbmFetchDlUeCb(gCb,rlcId->ueId, rlcId->cellId, &ueCb))
+      if (ROK != rlcDbmFetchDlUeCb(gCb,rlcId->ueId, rlcId->cellId, &ueCb))
       {
          RLOG_ARG2(L_ERROR,DBG_CELLID, rlcId->cellId,
                "UeId [%d]: UeCb not found RBID:%d",
@@ -291,11 +291,11 @@ KwDlRbCb     **rbCb;
          RETVOID;
       }
 
-      KW_DBM_GET_RBCB_FROM_UECB(rlcId->rbId, rlcId->rbType, ueCb, *rbCb);
+      RLC_DBM_GET_RBCB_FROM_UECB(rlcId->rbId, rlcId->rbType, ueCb, *rbCb);
    }
 
    RETVOID;
-} /* kwDbmFetchDlRbCbByRbId */
+} /* rlcDbmFetchDlRbCbByRbId */
 
 
 /**
@@ -315,34 +315,34 @@ KwDlRbCb     **rbCb;
  *
 */
 #ifdef ANSI
-PUBLIC Void kwDbmFetchDlRbCbFromLchId
+Void rlcDbmFetchDlRbCbFromLchId
 (
-KwCb          *gCb,
+RlcCb          *gCb,
 CmLteRnti     ueId,  
 CmLteCellId   cellId,
 CmLteLcId     lcId,  
-KwDlRbCb      **rbCb
+RlcDlRbCb      **rbCb
 )
 #else
-PUBLIC Void kwDbmFetchDlRbCbFromLchId(gCb, ueId, cellId, lcId, rbCb)
-KwCb          *gCb;
+Void rlcDbmFetchDlRbCbFromLchId(gCb, ueId, cellId, lcId, rbCb)
+RlcCb          *gCb;
 CmLteRnti     ueId;  
 CmLteCellId   cellId;
 CmLteLcId     lcId; 
-KwDlRbCb      **rbCb; 
+RlcDlRbCb      **rbCb; 
 #endif
 {
-   KwDlUeCb *ueCb;
+   RlcDlUeCb *ueCb;
    
-   TRC3(kwDbmFetchDlRbCbFromLchId)
+   TRC3(rlcDbmFetchDlRbCbFromLchId)
 
 
    /* Check for UE CB or CELL CB */
    if (ueId == 0)
    {
-      KwDlCellCb *cellCb;
+      RlcDlCellCb *cellCb;
       
-      kwDbmFetchDlCellCb(gCb, cellId, &cellCb);
+      rlcDbmFetchDlCellCb(gCb, cellId, &cellCb);
       if(!cellCb)
       {
          RLOG_ARG1(L_ERROR,DBG_CELLID,cellId,"CellCb not found UEID:%d",ueId);
@@ -353,7 +353,7 @@ KwDlRbCb      **rbCb;
       RETVOID;
    }
 
-   if (kwDbmFetchDlUeCb(gCb, ueId, cellId, &ueCb) != ROK)
+   if (rlcDbmFetchDlUeCb(gCb, ueId, cellId, &ueCb) != ROK)
    {
       RLOG_ARG1(L_ERROR,DBG_CELLID, cellId,"UeId [%d]: UeCb not found",ueId);
       RETVOID;
@@ -362,7 +362,7 @@ KwDlRbCb      **rbCb;
    *rbCb = ueCb->lCh[lcId - 1].dlRbCb;
 
    RETVOID;
-} /* kwDbmFetchDlRbCbFromLchId */
+} /* rlcDbmFetchDlRbCbFromLchId */
 
 
 /**
@@ -379,22 +379,22 @@ KwDlRbCb      **rbCb;
  *
 */
 #ifdef ANSI
-PUBLIC Void kwDbmDelAllDlRb
+Void rlcDbmDelAllDlRb
 (
-KwCb       *gCb,
-KwDlRbCb   **rbCbLst,
+RlcCb       *gCb,
+RlcDlRbCb   **rbCbLst,
 U8         numRbCb 
 )
 #else
-PUBLIC Void kwDbmDelAllDlRb(gCb, rbCbLst, numRbCb)
-KwCb       *gCb;
-KwDlRbCb   **rbCbLst;
+Void rlcDbmDelAllDlRb(gCb, rbCbLst, numRbCb)
+RlcCb       *gCb;
+RlcDlRbCb   **rbCbLst;
 U8         numRbCb;   
 #endif
 {
    U32 idx;
 
-   TRC3(kwDbmDelAllDlRb)
+   TRC3(rlcDbmDelAllDlRb)
 
 
    for (idx = 0; idx < numRbCb; idx++)
@@ -402,23 +402,23 @@ U8         numRbCb;
       if (rbCbLst[idx] != NULLP)
       {
 #ifdef LTE_L2_MEAS
-         KW_UPD_L2_DECR_NONIP_PER_QCI_RB_COUNT(gCb, (rbCbLst[idx]));
+         RLC_UPD_L2_DECR_NONIP_PER_QCI_RB_COUNT(gCb, (rbCbLst[idx]));
 #endif
          if( CM_LTE_MODE_UM == rbCbLst[idx]->mode)
          {
-            kwUmmFreeDlRbCb(gCb,rbCbLst[idx]);
+            rlcUmmFreeDlRbCb(gCb,rbCbLst[idx]);
 
-            KW_FREE (gCb,rbCbLst[idx], sizeof (KwDlRbCb));       
+            RLC_FREE (gCb,rbCbLst[idx], sizeof (RlcDlRbCb));       
          }
          else if( CM_LTE_MODE_AM == rbCbLst[idx]->mode)
          {
-            kwAmmFreeDlRbCb(gCb,rbCbLst[idx]);
+            rlcAmmFreeDlRbCb(gCb,rbCbLst[idx]);
          }
          /* ccpu00136940 */
          else if(CM_LTE_MODE_TM == rbCbLst[idx]->mode)
          {
             cmLListCatLList(&(gCb->u.dlCb->toBeFreed.sduLst),&(rbCbLst[idx]->m.tm.sduQ));
-            KW_FREE (gCb,rbCbLst[idx], sizeof (KwDlRbCb));       
+            RLC_FREE (gCb,rbCbLst[idx], sizeof (RlcDlRbCb));       
          }
 
       }
@@ -426,7 +426,7 @@ U8         numRbCb;
    }
 
    RETVOID;
-} /* kwDbmDelAllDlRb */
+} /* rlcDbmDelAllDlRb */
 
 
 /**
@@ -434,7 +434,7 @@ U8         numRbCb;
  *
  * @details  
  *    This function is invoked by CFG to create UeCb and insert into the 
- *    Ue hashlist of KwCb.
+ *    Ue hashlist of RlcCb.
  *
  * @param[in] gCb       RLC Instance Control Block
  * @param[in] ueId      UE Identifier 
@@ -447,27 +447,27 @@ U8         numRbCb;
  *
 */
 #ifdef ANSI
-PUBLIC S16 kwDbmCreateDlUeCb
+S16 rlcDbmCreateDlUeCb
 (
-KwCb          *gCb,
+RlcCb          *gCb,
 CmLteRnti     ueId,  
 CmLteCellId   cellId,
-KwDlUeCb      **ueCb 
+RlcDlUeCb      **ueCb 
 )
 #else
-PUBLIC S16 kwDbmCreateDlUeCb(gCb,ueId, cellId, ueCb)
-KwCb          *gCb;
+S16 rlcDbmCreateDlUeCb(gCb,ueId, cellId, ueCb)
+RlcCb          *gCb;
 CmLteRnti     ueId;
 CmLteCellId   cellId;
-KwDlUeCb      **ueCb;
+RlcDlUeCb      **ueCb;
 #endif
 {
-   KwDlUeCb *tUeCb;        
+   RlcDlUeCb *tUeCb;        
 
-   TRC3(kwDbmCreateDlUeCb)
+   TRC3(rlcDbmCreateDlUeCb)
 
 
-   KW_ALLOC(gCb,*ueCb, sizeof(KwDlUeCb));
+   RLC_ALLOC(gCb,*ueCb, sizeof(RlcDlUeCb));
 
 #if (ERRCLASS & ERRCLS_ADD_RES)
    if (*ueCb == NULLP)
@@ -475,7 +475,7 @@ KwDlUeCb      **ueCb;
       RLOG_ARG1(L_FATAL,DBG_UEID,ueId,
             "Memory allocation failed cellID:%d",
             cellId);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif /* ERRCLASS & ERRCLS_ADD_RES */
 
@@ -491,13 +491,13 @@ KwDlUeCb      **ueCb;
       RLOG_ARG1(L_ERROR,DBG_CELLID,cellId,
             "UeId[%u] HashList Insertion Failed",
             ueId);
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
    /* kw005.201 ccpu00117318, updating the statistics */
    gCb->genSts.numUe++;
 
 
-   RETVALUE(ROK);
+   return ROK;
 } /* kwDbmCreateUeCb */
 
 
@@ -506,7 +506,7 @@ KwDlUeCb      **ueCb;
  *
  * @details
  *    This function is invoked by CFG to fetch UeCb from the Ue hashlist 
- *    of KwCb.
+ *    of RlcCb.
  *
  * @param[in]    gCb       RLC Instance Control Block 
  * @param[in]    ueId      UE Identifier 
@@ -518,31 +518,31 @@ KwDlUeCb      **ueCb;
  *    -# RFAILED 
 */
 #ifdef ANSI
-PUBLIC S16 kwDbmFetchDlUeCb
+S16 rlcDbmFetchDlUeCb
 (
-KwCb          *gCb,
+RlcCb          *gCb,
 CmLteRnti     ueId, 
 CmLteCellId   cellId,
-KwDlUeCb      **ueCb
+RlcDlUeCb      **ueCb
 )
 #else
-PUBLIC S16 kwDbmFetchDlUeCb(gCb,ueId, cellId, ueCb)
-KwCb          *gCb;
+S16 rlcDbmFetchDlUeCb(gCb,ueId, cellId, ueCb)
+RlcCb          *gCb;
 CmLteRnti     ueId;  
 CmLteCellId   cellId;
-KwDlUeCb      **ueCb;
+RlcDlUeCb      **ueCb;
 #endif
 {
 
-   TRC3(kwDbmFetchDlUeCb)
+   TRC3(rlcDbmFetchDlUeCb)
 
 
-   RETVALUE(cmHashListFind(&(gCb->u.dlCb->ueLstCp), 
+   return (cmHashListFind(&(gCb->u.dlCb->ueLstCp), 
                            (U8 *)&(ueId), 
                            sizeof(CmLteRnti),
-                           KW_DEF_SEQ_NUM, 
+                           RLC_DEF_SEQ_NUM, 
                            (PTR *) ueCb));
-} /* kwDbmFetchDlUeCb */
+} /* rlcDbmFetchDlUeCb */
 
 
 /**
@@ -550,7 +550,7 @@ KwDlUeCb      **ueCb;
  *
  * @details
  *    This function is invoked by CFG to delete UeCb from the Ue hashlist 
- *    of KwCb.
+ *    of RlcCb.
  *
  *
  * @param[in] gCb      RLC Instance Control Block
@@ -561,20 +561,20 @@ KwDlUeCb      **ueCb;
  *
 */
 #ifdef ANSI
-PUBLIC Void kwDbmDelDlUeCb
+Void rlcDbmDelDlUeCb
 (
-KwCb       *gCb,
-KwDlUeCb   *ueCb,   
+RlcCb       *gCb,
+RlcDlUeCb   *ueCb,   
 Bool       abortFlag 
 )
 #else
-PUBLIC Void kwDbmDelDlUeCb(gCb,eCb, abortFlag)
-KwCb       *gCb;
-KwDlUeCb   *ueCb; 
+Void rlcDbmDelDlUeCb(gCb,eCb, abortFlag)
+RlcCb       *gCb;
+RlcDlUeCb   *ueCb; 
 Bool       abortFlag;
 #endif
 {
-   TRC3(kwDbmDelDlUeCb)
+   TRC3(rlcDbmDelDlUeCb)
 
 
 #if  (!defined(KW_PDCP) || !(defined(PJ_SEC_ASYNC) || defined(PJ_CMP_ASYNC)))
@@ -583,13 +583,13 @@ Bool       abortFlag;
           defined(PJ_CMP_ASYNC)))*/
 
    /* Delete all logical channels */
-   KW_MEM_ZERO(ueCb->lCh,sizeof(KwDlLch) * KW_MAX_LCH_PER_UE);
+   RLC_MEM_ZERO(ueCb->lCh,sizeof(RlcDlLch) * RLC_MAX_LCH_PER_UE);
 
    /* Delete all SRB RbCbs in UeCb */
-   kwDbmDelAllDlRb(gCb,ueCb->srbCb, KW_MAX_SRB_PER_UE);
+   rlcDbmDelAllDlRb(gCb,ueCb->srbCb, RLC_MAX_SRB_PER_UE);
 
    /* Delete all DRB RbCbs in UeCb */
-   kwDbmDelAllDlRb(gCb,ueCb->drbCb, KW_MAX_DRB_PER_UE);
+   rlcDbmDelAllDlRb(gCb,ueCb->drbCb, RLC_MAX_DRB_PER_UE);
 
    /* Delete ueCb entry from ueLstCp */
    if(ROK != cmHashListDelete(&(gCb->u.dlCb->ueLstCp), (PTR) ueCb))
@@ -602,7 +602,7 @@ Bool       abortFlag;
    gCb->genSts.numUe--;
    
    /* Deallocate ueCb */
-   KW_FREE(gCb,ueCb, sizeof(KwDlUeCb));
+   RLC_FREE(gCb,ueCb, sizeof(RlcDlUeCb));
 
    RETVOID;
 } /* kwDbmDelUeCb */
@@ -613,25 +613,25 @@ Bool       abortFlag;
  *
  * @details
  *    This function is invoked by CFG to delete all UeCbs from the Ue 
- *    hashlist of KwCb.
+ *    hashlist of RlcCb.
  *
  * @param[in] gCb      RLC Instance Control Block
  *
  * @return  Void
 */
 #ifdef ANSI
-PUBLIC Void kwDbmDelAllDlUe
+Void rlcDbmDelAllDlUe
 (
-KwCb  *gCb
+RlcCb  *gCb
 )
 #else
-PUBLIC Void kwDbmDelAllDlUe(gCb)
-KwCb  *gCb;
+Void rlcDbmDelAllDlUe(gCb)
+RlcCb  *gCb;
 #endif
 {
-   KwDlUeCb *ueCb = NULLP; 
+   RlcDlUeCb *ueCb = NULLP; 
 
-   TRC3(kwDbmDelAllDlUe)
+   TRC3(rlcDbmDelAllDlUe)
 
 
    /* Until no more ueCb is ueLstCp hash list get and delete ueCb */
@@ -640,7 +640,7 @@ KwCb  *gCb;
                                    (PTR *)&ueCb))
    {
       /* Delete ueCb */
-      kwDbmDelDlUeCb(gCb,ueCb, TRUE);
+      rlcDbmDelDlUeCb(gCb,ueCb, TRUE);
 
       ueCb = NULLP;
    }
@@ -651,25 +651,25 @@ KwCb  *gCb;
 /* kw005.201 added support for L2 Measurement */         
 #ifdef LTE_L2_MEAS
 #ifdef ANSI
-PUBLIC Void kwDbmDelAllDlL2MeasTbFrmUe
+Void rlcDbmDelAllDlL2MeasTbFrmUe
 (
-KwCb      *gCb,
-KwDlUeCb  *ueCb
+RlcCb      *gCb,
+RlcDlUeCb  *ueCb
 )
 #else
-PUBLIC Void kwDbmDelAllDlL2MeasTbFrmUe(gCb,ueCb)
-KwCb      *gCb;
-KwDlUeCb  *ueCb;
+Void rlcDbmDelAllDlL2MeasTbFrmUe(gCb,ueCb)
+RlcCb      *gCb;
+RlcDlUeCb  *ueCb;
 #endif
 {
    U8           tbIdx;
-   KwL2MeasTb   *l2MeasTb = NULLP;
-   for(tbIdx = 0; tbIdx < KW_MAX_TB_PER_UE; tbIdx++)
+   RlcL2MeasTb   *l2MeasTb = NULLP;
+   for(tbIdx = 0; tbIdx < RLC_MAX_TB_PER_UE; tbIdx++)
    { 
        l2MeasTb = ueCb->l2MeasTbCb[tbIdx];
        if(l2MeasTb != NULLP)
        {
-          KW_FREE(gCb,l2MeasTb, sizeof(KwL2MeasTb));
+          RLC_FREE(gCb,l2MeasTb, sizeof(RlcL2MeasTb));
           ueCb->l2MeasTbCb[tbIdx] = NULLP;
        }       
    }  
@@ -682,7 +682,7 @@ KwDlUeCb  *ueCb;
  *
  * @details
  *    This function is invoked by CFG to create CellCb and insert into
- *    the Cell hashlist of KwCb.
+ *    the Cell hashlist of RlcCb.
  *
  *  @param[in] gCb      RLC Instance Control Block
  *  @param[in] cellId   Cell Identifier 
@@ -693,29 +693,29 @@ KwDlUeCb  *ueCb;
  *     -# RFAILED 
 */
 #ifdef ANSI
-PUBLIC S16 kwDbmCreateDlCellCb
+S16 rlcDbmCreateDlCellCb
 (
-KwCb          *gCb,
+RlcCb          *gCb,
 CmLteCellId   cellId, 
-KwDlCellCb    **cellCb 
+RlcDlCellCb    **cellCb 
 )
 #else
-PUBLIC S16 kwDbmCreateDlCellCb(gCb,cellId, cellCb)
-KwCb          *gCb;
+S16 rlcDbmCreateDlCellCb(gCb,cellId, cellCb)
+RlcCb          *gCb;
 CmLteCellId   cellId;   
-KwDlCellCb    **cellCb;
+RlcDlCellCb    **cellCb;
 #endif
 {
-   KwDlCellCb *tCellCb; 
+   RlcDlCellCb *tCellCb; 
    
-   TRC3(kwDbmCreateDlCellCb)
+   TRC3(rlcDbmCreateDlCellCb)
 
-   KW_ALLOC(gCb,*cellCb, sizeof(KwDlCellCb));
+   RLC_ALLOC(gCb,*cellCb, sizeof(RlcDlCellCb));
 #if (ERRCLASS & ERRCLS_ADD_RES)
    if (*cellCb == NULLP)
    {
       RLOG_ARG0(L_FATAL, DBG_CELLID,cellId,"Memory allocation failed");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 #endif /* ERRCLASS & ERRCLS_ADD_RES */
 
@@ -728,11 +728,11 @@ KwDlCellCb    **cellCb;
                               (U16) sizeof(CmLteCellId)))
    {
       RLOG_ARG0(L_ERROR,DBG_CELLID,cellId,"HashList Insertion Failed");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
-   RETVALUE(ROK);
-} /* kwDbmCreateDlCellCb */
+   return (ROK);
+} /* rlcDbmCreateDlCellCb */
 
 
 /**
@@ -740,7 +740,7 @@ KwDlCellCb    **cellCb;
  *       
  * @details
  *    This function is invoked by CFG to fetch UeCb from the Ue hashlist 
- *    of KwCb.
+ *    of RlcCb.
  *
  * @param[in]    gCb      RLC Instance Control Block
  * @param[in]    cellId   Cell Identifier 
@@ -752,20 +752,20 @@ KwDlCellCb    **cellCb;
  *
 */
 #ifdef ANSI
-PUBLIC S16 kwDbmFetchDlCellCb
+S16 rlcDbmFetchDlCellCb
 (
-KwCb          *gCb,
+RlcCb          *gCb,
 CmLteCellId   cellId, 
-KwDlCellCb    **cellCb
+RlcDlCellCb    **cellCb
 )
 #else
-PUBLIC S16 kwDbmFetchDlCellCb(gCb,cellId, cellCb)
-KwCb          *gCb;
+S16 rlcDbmFetchDlCellCb(gCb,cellId, cellCb)
+RlcCb          *gCb;
 CmLteCellId   cellId;  
-KwDlCellCb    **cellCb;
+RlcDlCellCb    **cellCb;
 #endif
 {
-   TRC3(kwDbmFetchDlCellCb)
+   TRC3(rlcDbmFetchDlCellCb)
 
 
    *cellCb = NULLP;
@@ -773,14 +773,14 @@ KwDlCellCb    **cellCb;
    if(ROK != cmHashListFind(&(gCb->u.dlCb->cellLstCp), 
                             (U8 *)&(cellId),
                             sizeof(CmLteCellId), 
-                            KW_DEF_SEQ_NUM, 
+                            RLC_DEF_SEQ_NUM, 
                             (PTR*) cellCb))
    {
       RLOG_ARG0(L_ERROR,DBG_CELLID, cellId,"CellCb not found");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
-   RETVALUE(ROK);
+   return ROK;
 } /* kwDbmFetchCellCb */
 
 
@@ -789,7 +789,7 @@ KwDlCellCb    **cellCb;
  *
  * @details
  *    This function is invoked by CFG to delete CellCb from the Cell hashlist 
- *    of KwCb.
+ *    of RlcCb.
  *
  *  @param[in] gCb      RLC Instance Control Block
  *  @param[in] cellCb   Cell Control Block
@@ -797,22 +797,22 @@ KwDlCellCb    **cellCb;
  *  @return  Void
 */
 #ifdef ANSI
-PUBLIC Void kwDbmDelDlCellCb
+Void rlcDbmDelDlCellCb
 (
-KwCb         *gCb,
-KwDlCellCb   *cellCb  
+RlcCb         *gCb,
+RlcDlCellCb   *cellCb  
 )
 #else
-PUBLIC Void kwDbmDelDlCellCb(gCb,cellCb)
-KwCb         *gCb;
-KwDlCellCb   *cellCb;
+Void rlcDbmDelDlCellCb(gCb,cellCb)
+RlcCb         *gCb;
+RlcDlCellCb   *cellCb;
 #endif
 {
-   TRC3(kwDbmDelDlCellCb)
+   TRC3(rlcDbmDelDlCellCb)
 
 
    /* Delete all rbCbs in cellCb */
-   kwDbmDelAllDlRb(gCb,cellCb->rbCb, KW_MAX_RB_PER_CELL);
+   rlcDbmDelAllDlRb(gCb,cellCb->rbCb, RLC_MAX_RB_PER_CELL);
    
    /* Delete cellCb entry in hash list cellLstCp */
    if(ROK != cmHashListDelete(&(gCb->u.dlCb->cellLstCp), (PTR) cellCb))
@@ -821,7 +821,7 @@ KwDlCellCb   *cellCb;
    }
 
    /* Deallocate cellCb */
-   KW_FREE(gCb, cellCb, sizeof(KwDlCellCb));
+   RLC_FREE(gCb, cellCb, sizeof(RlcDlCellCb));
 
    RETVOID;
 } /* kwDbmDelCellCb */
@@ -832,24 +832,24 @@ KwDlCellCb   *cellCb;
  *       
  * @details
  *    This function is invoked by CFG to delete all UeCbs from the Ue
- *    hashlist of KwCb.
+ *    hashlist of RlcCb.
  * @param[in] gCb      RLC Instance Control Block
  *
  * @return  Void
 */
 #ifdef ANSI
-PUBLIC Void kwDbmDelAllDlCell
+Void rlcDbmDelAllDlCell
 (
-KwCb *gCb
+RlcCb *gCb
 )
 #else
-PUBLIC Void kwDbmDelAllDlCell(gCb)
-KwCb *gCb;
+Void rlcDbmDelAllDlCell(gCb)
+RlcCb *gCb;
 #endif
 {
-   KwDlCellCb *cellCb = NULLP;
+   RlcDlCellCb *cellCb = NULLP;
 
-   TRC3(kwDbmDelAllDlCell)
+   TRC3(rlcDbmDelAllDlCell)
 
 
    /* Until no more cellCb is ueLstCp hash list get and delete cellCb */
@@ -857,13 +857,13 @@ KwCb *gCb;
                                    (PTR) cellCb, 
                                    (PTR *)&cellCb))
    {
-      kwDbmDelDlCellCb(gCb, cellCb);
+      rlcDbmDelDlCellCb(gCb, cellCb);
       
       cellCb = NULLP;
    }
 
    RETVOID;
-} /* kwDbmDelAllDlCell */
+} /* rlcDbmDelAllDlCell */
 
 
 /**
@@ -871,32 +871,32 @@ KwCb *gCb;
  *       
  * @details
  *    This function is invoked by LMM to delete all UeCbs from the Ue
- *    hashlist of KwCb and cellCbs from the Cell hashlist of kwCb.
+ *    hashlist of RlcCb and cellCbs from the Cell hashlist of rlcCb.
  * 
  * @param[in] gCb      RLC Instance Control Block
  *
  * @return  Void
 */
 #ifdef ANSI
-PUBLIC S16 kwDbmDlShutdown
+S16 rlcDbmDlShutdown
 (
-KwCb *gCb
+RlcCb *gCb
 )
 #else
-PUBLIC S16 kwDbmDlShutdown(gCb)
-KwCb *gCb;
+S16 rlcDbmDlShutdown(gCb)
+RlcCb *gCb;
 #endif
 {
-   TRC3(kwDbmDlShutdown)
+   TRC3(rlcDbmDlShutdown)
 
-   kwDbmDelAllDlCell(gCb);
+   rlcDbmDelAllDlCell(gCb);
 
-   kwDbmDelAllDlUe(gCb);
+   rlcDbmDelAllDlUe(gCb);
 
-   kwDbmDlDeInit(gCb);
+   rlcDbmDlDeInit(gCb);
 
 
-   RETVALUE(ROK);
+   return ROK;
 } /* kwDbmShutdown */