X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrrlc%2Fkw_amm_dl.c;h=54b4b6d801495937dd9003d4d2f9bd3cbe4c9f2a;hb=aee73991f728cc127d1ed76d5a52571d916235a4;hp=0b613fa0496eb02f33776ccd139569e7347238de;hpb=105199ef642ffe9736ea24a01d4546578fa25e60;p=o-du%2Fl2.git

diff --git a/src/5gnrrlc/kw_amm_dl.c b/src/5gnrrlc/kw_amm_dl.c
index 0b613fa04..54b4b6d80 100755
--- a/src/5gnrrlc/kw_amm_dl.c
+++ b/src/5gnrrlc/kw_amm_dl.c
@@ -81,8 +81,8 @@ U32 kwStatusPduCnt, kwStatusAckCnt, kwStatusNcnt, kwSduSndCnt;
 /* local externs */
 
 /* forward references */
-EXTERN Void kwAmmDlHndlStatusPdu ARGS ((KwCb  *gCb,
-                                        KwDlRbCb  *rbCb,
+EXTERN Void kwAmmDlHndlStatusPdu ARGS ((RlcCb  *gCb,
+                                        RlcDlRbCb  *rbCb,
                                         KwUdxStaPdu *pStaPdu));
 
 /* public variable declarations */
@@ -96,7 +96,7 @@ EXTERN Void kwAmmDlHndlStatusPdu ARGS ((KwCb  *gCb,
   {\
      Buffer    *_pduInfo; \
      SSegMsg((_retx)->seg, (_retx)->hdrSz, &_pduInfo); \
-     KW_FREE_BUF((_retx)->seg); \
+     RLC_FREE_BUF((_retx)->seg); \
      (_retx)->seg = _pduInfo; \
   }\
   (_rbCb)->m.amDl.estHdrSz -= retx->hdrSz;\
@@ -104,70 +104,70 @@ EXTERN Void kwAmmDlHndlStatusPdu ARGS ((KwCb  *gCb,
 
 /* private function declarations */
 
-PRIVATE Void  kwResegRetxPdus ARGS ((KwCb *gCb,
-                                     KwDlRbCb *rbCb, 
+PRIVATE Void  kwResegRetxPdus ARGS ((RlcCb *gCb,
+                                     RlcDlRbCb *rbCb, 
                                      KwDatReq *kwDatReq));
 
-PRIVATE Void kwRemRetxPdu ARGS ((KwCb *gCb, 
-                                 KwDlRbCb *rbCb, 
+PRIVATE Void kwRemRetxPdu ARGS ((RlcCb *gCb, 
+                                 RlcDlRbCb *rbCb, 
                                  KwRetx *retx));
 
-PRIVATE Void kwAmmCreateStatusPdu ARGS ((KwCb *gCb, 
-                                         KwDlRbCb *rbCb,
+PRIVATE Void kwAmmCreateStatusPdu ARGS ((RlcCb *gCb, 
+                                         RlcDlRbCb *rbCb,
                                          KwDatReq *kwDatReq));
 
-PRIVATE Void kwAmmDlMarkPduForReTx ARGS ((KwCb *gCb,
-                                          KwDlRbCb *rbCb,
+PRIVATE Void kwAmmDlMarkPduForReTx ARGS ((RlcCb *gCb,
+                                          RlcDlRbCb *rbCb,
                                           KwRetx *retx));
 
-PRIVATE Void kwAmmDlProcessSuccessfulTxPdu ARGS((KwCb *gCb, 
-                                                 KwDlRbCb *rbCb,
+PRIVATE Void kwAmmDlProcessSuccessfulTxPdu ARGS((RlcCb *gCb, 
+                                                 RlcDlRbCb *rbCb,
                                                  KwSn  sn,
                                                  KwuDatCfmInfo **datCfm));
 
 PRIVATE Void kwAmmDlSetTxNextAck ARGS((KwAmDl *amDl, KwSn sn));
 
-PRIVATE Void kwAmmDlCheckAndStopPollTmr ARGS((KwCb *gCb,
-                                              KwDlRbCb *rbCb,
+PRIVATE Void kwAmmDlCheckAndStopPollTmr ARGS((RlcCb *gCb,
+                                              RlcDlRbCb *rbCb,
                                               KwSn mAckSn));
 
-PRIVATE Void  kwAssembleSdus ARGS ((KwCb *gCb,
-                                    KwDlRbCb *rbCb, 
+PRIVATE Void  kwAssembleSdus ARGS ((RlcCb *gCb,
+                                    RlcDlRbCb *rbCb, 
                                     KwDatReq *kwDatReq));
 
-PRIVATE Bool kwAmmDlCheckAndSetPoll ARGS ((KwCb *gCb,
-                                           KwDlRbCb *rbCb, 
+PRIVATE Bool kwAmmDlCheckAndSetPoll ARGS ((RlcCb *gCb,
+                                           RlcDlRbCb *rbCb, 
                                            Bool newPdu, 
                                            MsgLen bufSz));
 
-PRIVATE Void kwAmmCreatePdu ARGS ((KwCb *gCb,
-                                   KwDlRbCb *rbCb, 
+PRIVATE Void kwAmmCreatePdu ARGS ((RlcCb *gCb,
+                                   RlcDlRbCb *rbCb, 
                                    KwAmHdr *amHdr, 
-                                   KwDlPduInfo *pduInfo,
+                                   RlcDlPduInfo *pduInfo,
                                    Buffer *pdu));
 
-PRIVATE Void kwAmmSndStaInd ARGS ((KwCb *gCb,KwDlRbCb *rbCb, KwRetx *retx));
+PRIVATE Void kwAmmSndStaInd ARGS ((RlcCb *gCb,RlcDlRbCb *rbCb, KwRetx *retx));
 
-PRIVATE Void kwGetNxtRetx ARGS ((KwCb *gCb, KwRetx **retx));
+PRIVATE Void kwGetNxtRetx ARGS ((RlcCb *gCb, KwRetx **retx));
 
 PRIVATE Void kwConstructAmHdr ARGS ((KwAmHdr *amHdr, 
                                      U8 *hdr,
                                      U8  snLen,
                                      U16 *idx));
 
-PRIVATE Void kwAmmDlUpdateTxAndReTxBufForAckSn ARGS ((KwCb *gCb,
-                                                      KwDlRbCb *rbCb, 
+PRIVATE Void kwAmmDlUpdateTxAndReTxBufForAckSn ARGS ((RlcCb *gCb,
+                                                      RlcDlRbCb *rbCb, 
                                                       KwSn mAckSn,
                                                       CmLList *retx,
                                                       KwuDatCfmInfo **datCfm));
 
-PRIVATE Void kwAmmDlMoveFrmTxtoRetxBuffer ARGS ((KwCb *gCb,
+PRIVATE Void kwAmmDlMoveFrmTxtoRetxBuffer ARGS ((RlcCb *gCb,
                                                  KwAmDl *amDl, 
                                                  KwRetx **retx, 
                                                  KwSn sn));
  
-PRIVATE Void kwAmmDlCheckIsSDUDelivered ARGS((KwCb *gCb,
-                                              KwDlRbCb *rbCb, 
+PRIVATE Void kwAmmDlCheckIsSDUDelivered ARGS((RlcCb *gCb,
+                                              RlcDlRbCb *rbCb, 
                                               KwSduMap *sduMap, 
                                               KwuDatCfmInfo **datCfm));
 
@@ -176,16 +176,16 @@ PRIVATE Void kwAmmAddPduToRetxLst ARGS((KwAmDl   *amDl,
 
 PRIVATE Void kwAmmDlMoveSduByteSegFrmTxtoRetxBuffer ARGS(
 (
-KwCb          *gCb,
+RlcCb          *gCb,
 KwAmDl        *amDl,
 KwRetx        **retx,
-KwDlPduInfo   *pduInfo
+RlcDlPduInfo   *pduInfo
 ));
 
 PRIVATE Void kwAmmDlHndlStatus4SduByteSegInTxBuf ARGS(
 (
-KwCb          *gCb,
-KwDlRbCb      *rbCb,
+RlcCb          *gCb,
+RlcDlRbCb      *rbCb,
 KwNackInfo    *nackSnInfo,
 KwRetx        **retx,
 KwuDatCfmInfo **datCfm
@@ -193,14 +193,14 @@ KwuDatCfmInfo **datCfm
 
 PRIVATE Void kwAmmDlUpdateTxAndReTxBufForNackSn ARGS(
 (
- KwCb          *gCb,
- KwDlRbCb      *rbCb,
+ RlcCb          *gCb,
+ RlcDlRbCb      *rbCb,
  KwNackInfo    *nackSnInfo,
  CmLList       **retxNode,
  KwuDatCfmInfo **datCfm
  ));
 
-PRIVATE Void KwDlAmmGetNackSnInfoFrmNackRangeIdx ARGS(
+PRIVATE Void RlcDlAmmGetNackSnInfoFrmNackRangeIdx ARGS(
 (
 KwAmDl        *amDl,
 KwNackInfo    *nackInfo,
@@ -211,8 +211,8 @@ U8            idx
 
 PRIVATE Void kwAmmDlUpdTxAndReTxBufForLessThanNackSn ARGS(
 (
-KwCb            *gCb,
-KwDlRbCb        *rbCb,
+RlcCb            *gCb,
+RlcDlRbCb        *rbCb,
 KwSn            sn,
 KwSn            mNackSn,
 CmLList         **retxNode,
@@ -229,7 +229,7 @@ KwuDatCfmInfo   **datCfm
      -  kwAssembleSdus
      -  kwAmmDlCheckAndSetPoll
   -  kwAmmProcessPdus
-     -  kwDlmHndlStaRsp
+     -  rlcDlmHndlStaRsp
      -  kwTriggerStatus
      -  kwReassembleSdus
    
@@ -254,14 +254,14 @@ KwuDatCfmInfo   **datCfm
 #ifdef ANSI
 PUBLIC Void kwAmmSendDStaRsp
 (
-KwCb       *gCb,
-KwDlRbCb   *rbCb,
+RlcCb       *gCb,
+RlcDlRbCb   *rbCb,
 KwAmDl     *amDl
 )
 #else
 PUBLIC Void kwAmmSendDStaRsp(gCb, rbCb, amDl)
-KwCb       *gCb;
-KwDlRbCb   *rbCb;
+RlcCb       *gCb;
+RlcDlRbCb   *rbCb;
 KwAmDl     *amDl;
 #endif
 {
@@ -288,14 +288,14 @@ KwAmDl     *amDl;
 #ifdef ANSI
 PRIVATE Void kwAmmDlCheckAndStopPollTmr
 (
-KwCb       *gCb,
-KwDlRbCb   *rbCb,
+RlcCb       *gCb,
+RlcDlRbCb   *rbCb,
 KwSn       mAckSn
 )
 #else
 PRIVATE Void kwAmmDlCheckAndStopPollTmr(gCb, rbCb, mAckSn)
-KwCb       *gCb;
-KwDlRbCb   *rbCb;
+RlcCb       *gCb;
+RlcDlRbCb   *rbCb;
 KwSn       mAckSn;
 #endif
 {
@@ -355,15 +355,15 @@ KwSn     sn
 #ifdef ANSI
 PRIVATE Void kwAmmDlProcessSuccessfulReTx
 (
-KwCb            *gCb,
-KwDlRbCb        *rbCb,
+RlcCb            *gCb,
+RlcDlRbCb        *rbCb,
 KwRetx          *retx,
 KwuDatCfmInfo   **datCfm
 )
 #else
 PRIVATE Void kwAmmDlProcessSuccessfulReTx(gCb, rbCb, retx, datCfm)
-KwCb            *gCb;
-KwDlRbCb        *rbCb;
+RlcCb            *gCb;
+RlcDlRbCb        *rbCb;
 KwRetx          *retx;
 KwuDatCfmInfo   **datCfm;
 #endif
@@ -381,11 +381,11 @@ KwuDatCfmInfo   **datCfm;
  * @details
  *    This function is used to move the PDU from the txBuf to re-transmit buffer
  *
- * @param[in]KwCb   *gCb           RLC instance control block
+ * @param[in]RlcCb   *gCb           RLC instance control block
  * @param[in]KwAmDl *amDl          AM Downlink Control Block 
  * @param[in]KwRetx **retx         node in the reTx buffer to be moved to, allocated by
  *                                 this function
- * @param[in]KwDlPduInfo *pduInfo  TX PDU which needs to be moved
+ * @param[in]RlcDlPduInfo *pduInfo  TX PDU which needs to be moved
  * 
  * @return Void
  *            
@@ -394,23 +394,23 @@ KwuDatCfmInfo   **datCfm;
 #ifdef ANSI
 PRIVATE Void kwAmmDlMoveSduByteSegFrmTxtoRetxBuffer
 (
-KwCb          *gCb,
+RlcCb          *gCb,
 KwAmDl        *amDl,
 KwRetx        **retx,
-KwDlPduInfo   *pduInfo
+RlcDlPduInfo   *pduInfo
 )
 #else
 PRIVATE Void kwAmmDlMoveSduByteSegFrmTxtoRetxBuffer(gCb, amDl, retx, pduInfo)
-KwCb          *gCb;
+RlcCb          *gCb;
 KwAmDl        *amDl;
 KwRetx        **retx;
-KwDlPduInfo   *pduInfo;
+RlcDlPduInfo   *pduInfo;
 #endif
 {
    TRC2(kwAmmDlMoveSduByteSegFrmTxtoRetxBuffer);
 
 
-   KW_ALLOC_WC(gCb,*retx, sizeof(KwRetx));
+   RLC_ALLOC_WC(gCb,*retx, sizeof(KwRetx));
 
 #if (ERRCLASS & ERRCLS_ADD_RES)
    if (*retx == NULLP)
@@ -456,8 +456,8 @@ KwDlPduInfo   *pduInfo;
  * @details
  *    This function is used to move the PDU from the txBuf to re-transmit buffer
  *
- * @param[in]KwCb       *gCb          RLC instance control block
- * @param[in]KwDlRbCb   *rbCb         AM Downlink Control Block 
+ * @param[in]RlcCb       *gCb          RLC instance control block
+ * @param[in]RlcDlRbCb   *rbCb         AM Downlink Control Block 
  * @param[in]KwNackInfo *nackSnInfo   Nack Information of a NACK_SN 
  * @param[in]KwRetx     **retx        node in the reTx buffer to be moved to, allocated by
  *                                    this function
@@ -470,8 +470,8 @@ KwDlPduInfo   *pduInfo;
 #ifdef ANSI
 PRIVATE Void kwAmmDlHndlStatus4SduByteSegInTxBuf
 (
-KwCb          *gCb,
-KwDlRbCb      *rbCb,
+RlcCb          *gCb,
+RlcDlRbCb      *rbCb,
 KwNackInfo    *nackSnInfo,
 KwRetx        **retx,
 KwuDatCfmInfo ** datCfm
@@ -479,8 +479,8 @@ KwuDatCfmInfo ** datCfm
 #else
 PRIVATE Void kwAmmDlHndlStatus4SduByteSegInTxBuf(gCb, rbCb, nackSnInfo, retx, datCfm)
 (
-KwCb          *gCb;
-KwDlRbCb      *rbCb;
+RlcCb          *gCb;
+RlcDlRbCb      *rbCb;
 KwNackInfo    *nackSnInfo;
 KwRetx        **retx;
 KwuDatCfmInfo **datCfm;
@@ -501,7 +501,7 @@ KwuDatCfmInfo **datCfm;
    lnk = txBuf->pduLst.first;
    while(lnk)
    {
-      KwDlPduInfo *pduInfo = (KwDlPduInfo *)(lnk->node);
+      RlcDlPduInfo *pduInfo = (RlcDlPduInfo *)(lnk->node);
       KwSn        pduSoEnd = (pduInfo->amHdr.so + pduInfo->sduMap.sduSz - 1);
 
       /* If So of Sdu byte segment(pduInfo/seg) is < status pdu
@@ -530,7 +530,7 @@ KwuDatCfmInfo **datCfm;
       nextLnk = lnk->next;
       /* Delete node from the txBuf Pdu lst */
       cmLListDelFrm(&txBuf->pduLst, lnk);
-      KW_FREE_WC(gCb, pduInfo, sizeof(KwDlPduInfo));
+      RLC_FREE_WC(gCb, pduInfo, sizeof(RlcDlPduInfo));
       lnk = nextLnk;
    }
    if(!txBuf->pduLst.count)
@@ -548,8 +548,8 @@ KwuDatCfmInfo **datCfm;
  * @details
  *    This function is used to move the PDU from the txBuf to re-transmit buffer
  *
- * @param[in]KwCb   *gCb            RLC instance control block
- * @param[in]KwDlRbCb *rbCb         AM Downlink Control Block 
+ * @param[in]RlcCb   *gCb            RLC instance control block
+ * @param[in]RlcDlRbCb *rbCb         AM Downlink Control Block 
  * @param[in]KwNackInfo *nackSnInfo Nack Information of a NACK_SN
  * @param[in]KwRetx **retx          node in the reTx buffer to be moved to, allocated by
  *                                  this function
@@ -561,8 +561,8 @@ KwuDatCfmInfo **datCfm;
 #ifdef ANSI
 PRIVATE Void kwAmmDlUpdateTxAndReTxBufForNackSn
 (
- KwCb          *gCb,
- KwDlRbCb      *rbCb,
+ RlcCb          *gCb,
+ RlcDlRbCb      *rbCb,
  KwNackInfo    *nackSnInfo,
  CmLList        **retxNode,
  KwuDatCfmInfo **datCfm
@@ -570,8 +570,8 @@ PRIVATE Void kwAmmDlUpdateTxAndReTxBufForNackSn
 #else
 PRIVATE Void kwAmmDlUpdateTxAndReTxBufForNackSn(gCb, rbCb, nackSnInfo, retxNode, datCfm)
 (
- KwCb          *gCb;
- KwDlRbCb      *rbCb;
+ RlcCb          *gCb;
+ RlcDlRbCb      *rbCb;
  KwNackInfo    *nackSnInfo;
  CmLList       **retxNode;
  KwuDatCfmInfo **datCfm;
@@ -681,7 +681,7 @@ PRIVATE Void kwAmmDlUpdateTxAndReTxBufForNackSn(gCb, rbCb, nackSnInfo, retxNode,
  *            
  */
 #ifdef ANSI
-PRIVATE Void KwDlAmmGetNackSnInfoFrmNackRangeIdx
+PRIVATE Void RlcDlAmmGetNackSnInfoFrmNackRangeIdx
 (
 KwAmDl        *amDl,
 KwNackInfo    *nackInfo,
@@ -690,7 +690,7 @@ KwNackInfo    *nackSnInfo,
 U8            idx
 )
 #else
-PRIVATE Void KwDlAmmGetNackSnInfoFrmNackRangeIdx(amDl, nackInfo, retxNode, nackSnInfo, idx)
+PRIVATE Void RlcDlAmmGetNackSnInfoFrmNackRangeIdx(amDl, nackInfo, retxNode, nackSnInfo, idx)
 (
 KwAmDl        *amDl;
 KwNackInfo    *nackInfo;
@@ -704,7 +704,7 @@ U8            idx;
    KwRetx   *retx;
    CmLList  *node;
 
-   TRC2(KwDlAmmGetNackSnInfoFrmNackRangeIdx)
+   TRC2(RlcDlAmmGetNackSnInfoFrmNackRangeIdx)
 
    nackSnInfo->isSegment = FALSE;
 
@@ -720,7 +720,7 @@ U8            idx;
       node = txBuf->pduLst.first;
       while(node)
       {
-         KwDlPduInfo *pduInfo = (KwDlPduInfo *)(node->node);
+         RlcDlPduInfo *pduInfo = (RlcDlPduInfo *)(node->node);
          U16         pduSoEnd = pduInfo->amHdr.so + pduInfo->sduMap.sduSz - 1; 
          if((!idx) && (pduInfo->amHdr.so == nackInfo->soStart))
          {
@@ -796,14 +796,14 @@ U8            idx;
 #ifdef ANSI
 PUBLIC Void kwAmmDlHndlStatusPdu
 (
-KwCb          *gCb,
-KwDlRbCb      *rbCb,
+RlcCb          *gCb,
+RlcDlRbCb      *rbCb,
 KwUdxStaPdu   *pStaPdu
 )
 #else
 PUBLIC Void kwAmmDlHndlStatusPdu(gCb, rbCb, pStaPdu)
-KwCb          *gCb;
-KwDlRbCb      *rbCb;
+RlcCb          *gCb;
+RlcDlRbCb      *rbCb;
 KwUdxStaPdu   *pStaPdu;
 #endif
 {
@@ -823,7 +823,7 @@ KwUdxStaPdu   *pStaPdu;
    oldRetxBo = AMDL.retxBo;
 
    /* Allocate memory for datCfm Info */
-   KW_SHRABL_STATIC_BUF_ALLOC(kwuSap->pst.region, kwuSap->pst.pool, datCfm, sizeof(KwuDatCfmInfo));
+   RLC_SHRABL_STATIC_BUF_ALLOC(kwuSap->pst.region, kwuSap->pst.pool, datCfm, sizeof(KwuDatCfmInfo));
 
 #if (ERRCLASS & ERRCLS_ADD_RES)
    if (datCfm == NULLP)
@@ -832,7 +832,7 @@ KwUdxStaPdu   *pStaPdu;
                "Memory allocation failed UEID:%d CELLID:%d",
                rbCb->rlcId.ueId,
                rbCb->rlcId.cellId);
-      KW_SHRABL_STATIC_BUF_FREE(kwuSap->pst.region, kwuSap->pst.pool, datCfm, sizeof(KwuDatCfmInfo));
+      RLC_SHRABL_STATIC_BUF_FREE(kwuSap->pst.region, kwuSap->pst.pool, datCfm, sizeof(KwuDatCfmInfo));
       RETVOID;
    }
 #endif /* ERRCLASS & ERRCLS_RES */
@@ -852,8 +852,8 @@ KwUdxStaPdu   *pStaPdu;
                AMDL.txNextAck,
                rbCb->rlcId.ueId,
                rbCb->rlcId.cellId);
-/*      KW_SHRABL_STATIC_BUF_ALLOC(kwuSap->pst.region, kwuSap->pst.pool, datCfm, sizeof(KwuDatCfmInfo)); */
-      KW_SHRABL_STATIC_BUF_FREE(kwuSap->pst.region, kwuSap->pst.pool, datCfm, sizeof(KwuDatCfmInfo));
+/*      RLC_SHRABL_STATIC_BUF_ALLOC(kwuSap->pst.region, kwuSap->pst.pool, datCfm, sizeof(KwuDatCfmInfo)); */
+      RLC_SHRABL_STATIC_BUF_FREE(kwuSap->pst.region, kwuSap->pst.pool, datCfm, sizeof(KwuDatCfmInfo));
       RETVOID;
    }
  
@@ -916,7 +916,7 @@ KwUdxStaPdu   *pStaPdu;
                      "Status Pdu is not correct UEID:%d CELLID:%d",
                      rbCb->rlcId.ueId,
                      rbCb->rlcId.cellId);
-            KW_SHRABL_STATIC_BUF_FREE(kwuSap->pst.region, kwuSap->pst.pool, datCfm, sizeof(KwuDatCfmInfo));
+            RLC_SHRABL_STATIC_BUF_FREE(kwuSap->pst.region, kwuSap->pst.pool, datCfm, sizeof(KwuDatCfmInfo));
             RETVOID;
          }
 
@@ -936,7 +936,7 @@ KwUdxStaPdu   *pStaPdu;
              * nack sn*/
             do
             {
-               KwDlAmmGetNackSnInfoFrmNackRangeIdx(&AMDL, &pStaPdu->nackInfo[idx],
+               RlcDlAmmGetNackSnInfoFrmNackRangeIdx(&AMDL, &pStaPdu->nackInfo[idx],
                                                    retxNode, &nackSnInfo, idx1);
                
                kwAmmDlUpdateTxAndReTxBufForNackSn(gCb, rbCb, &nackSnInfo,
@@ -992,7 +992,7 @@ KwUdxStaPdu   *pStaPdu;
    }
    else
    {
-      KW_SHRABL_STATIC_BUF_FREE(kwuSap->pst.region, kwuSap->pst.pool, datCfm, sizeof(KwuDatCfmInfo));
+      RLC_SHRABL_STATIC_BUF_FREE(kwuSap->pst.region, kwuSap->pst.pool, datCfm, sizeof(KwuDatCfmInfo));
    }
 
    /* Fix for memory corruption */
@@ -1086,15 +1086,15 @@ U32 kwRxSdu;
 #ifdef ANSI
 PUBLIC Void kwAmmQSdu
 (
-KwCb            *gCb,
-KwDlRbCb        *rbCb,
+RlcCb            *gCb,
+RlcDlRbCb        *rbCb,
 Buffer          *mBuf,
 KwuDatReqInfo   *datReq
 )
 #else
 PUBLIC Void kwAmmQSdu(gCb, rbCb, mBuf, datReq)
-KwCb            *gCb;
-KwDlRbCb        *rbCb;
+RlcCb            *gCb;
+RlcDlRbCb        *rbCb;
 Buffer          *mBuf;
 KwuDatReqInfo   *datReq;
 #endif
@@ -1110,7 +1110,7 @@ KwuDatReqInfo   *datReq;
    TRC2(kwAmmQSdu)
 
    /* Allocate sdu */
-   KW_ALLOC_WC(gCb,sdu, sizeof(KwSdu)); 
+   RLC_ALLOC_WC(gCb,sdu, sizeof(KwSdu)); 
 
 #if (ERRCLASS & ERRCLS_ADD_RES)
    if (sdu == NULLP)
@@ -1197,7 +1197,7 @@ dlrate_kwu += sdu->sduSz;
    }
 #endif
 
-   if(!kwDlUtlIsReestInProgress(rbCb))
+   if(!rlcDlUtlIsReestInProgress(rbCb))
    {
       kwAmmSendDStaRsp(gCb, rbCb, &AMDL);
    }
@@ -1224,14 +1224,14 @@ dlrate_kwu += sdu->sduSz;
 #ifdef ANSI
 PRIVATE Void kwAmmDlAssembleCntrlInfo 
 (
-KwCb       *gCb,
-KwDlRbCb   *rbCb,
+RlcCb       *gCb,
+RlcDlRbCb   *rbCb,
 KwDatReq   *kwDatReq
 )
 #else
 PRIVATE Void kwAmmDlAssembleCntrlInfo(gCb, rbCb, kwDatReq)
-KwCb       *gCb;
-KwDlRbCb   *rbCb;
+RlcCb       *gCb;
+RlcDlRbCb   *rbCb;
 KwDatReq   *kwDatReq;
 #endif
 {
@@ -1255,7 +1255,7 @@ KwDatReq   *kwDatReq;
       kwAmmCreateStatusPdu(gCb,rbCb,kwDatReq);
 
       sapCb = KW_GET_DL_SAPCB(gCb, rbCb);
-	   KwDlUdxStaProhTmrStart(&(gCb->u.dlCb->udxDlSap->pst), 
+	   rlcDlUdxStaProhTmrStart(&(gCb->u.dlCb->udxDlSap->pst), 
                              sapCb->suId, &(rbCb->rlcId));
 	  
       /* Update number of pdus in pduInfo */
@@ -1263,7 +1263,7 @@ KwDatReq   *kwDatReq;
       kwDatReq->pduInfo.numPdu++;
       gRlcStats.amRlcStats.numDLStaPduSent++;
 
-      KW_FREE_SHRABL_BUF(gCb->u.dlCb->udxDlSap->pst.region, 
+      RLC_FREE_SHRABL_BUF(gCb->u.dlCb->udxDlSap->pst.region, 
                          gCb->u.dlCb->udxDlSap->pst.pool,
                          AMDL.pStaPdu,
                          sizeof(KwUdxDlStaPdu));
@@ -1306,15 +1306,15 @@ KwDatReq   *kwDatReq;
 #ifdef ANSI
 PUBLIC Void kwAmmProcessSdus
 (
-KwCb       *gCb,
-KwDlRbCb   *rbCb,
+RlcCb       *gCb,
+RlcDlRbCb   *rbCb,
 KwDatReq   *kwDatReq,
 Bool       fillCtrlPdu
 )
 #else
 PUBLIC Void kwAmmProcessSdus(gCb, rbCb, kwDatReq,fillCtrlPdu)
-KwCb       *gCb;
-KwDlRbCb   *rbCb;
+RlcCb       *gCb;
+RlcDlRbCb   *rbCb;
 KwDatReq   *kwDatReq;
 Bool       fillCtrlPdu;
 #endif    
@@ -1405,16 +1405,16 @@ Bool       fillCtrlPdu;
 #ifdef ANSI
 PRIVATE Void kwSplitPdu
 (
-KwCb       *gCb,
-KwDlRbCb   *rbCb,
+RlcCb       *gCb,
+RlcDlRbCb   *rbCb,
 KwRetx     *crnt,
 KwRetx     *next,
 U16        size
 )
 #else
 PRIVATE Void kwSplitPdu(gCb, rbCb, crnt, next, size)
-KwCb       *gCb;
-KwDlRbCb   *rbCb;
+RlcCb       *gCb;
+RlcDlRbCb   *rbCb;
 KwRetx     *crnt;
 KwRetx     *next;
 U16        size;
@@ -1527,14 +1527,14 @@ U16        size;
 #ifdef ANSI
 PRIVATE Void kwResegRetxPdus 
 (
-KwCb       *gCb,
-KwDlRbCb   *rbCb,
+RlcCb       *gCb,
+RlcDlRbCb   *rbCb,
 KwDatReq   *kwDatReq
 )
 #else
 PRIVATE Void kwResegRetxPdus(gCb, rbCb, kwDatReq)
-KwCb       *gCb;
-KwDlRbCb   *rbCb;
+RlcCb       *gCb;
+RlcDlRbCb   *rbCb;
 KwDatReq   *kwDatReq;
 #endif
 {
@@ -1680,7 +1680,7 @@ KwDatReq   *kwDatReq;
          }
 
          /* Allocate memory for tracking a new segment */
-         KW_ALLOC_WC(gCb,tNode, sizeof(KwRetx)); 
+         RLC_ALLOC_WC(gCb,tNode, sizeof(KwRetx)); 
 #if (ERRCLASS & ERRCLS_ADD_RES)
          if (tNode == NULLP)
          {
@@ -1788,14 +1788,14 @@ KwDatReq   *kwDatReq;
 #ifdef ANSI
 PRIVATE Void kwAssembleSdus 
 (
-KwCb       *gCb,
-KwDlRbCb   *rbCb,
+RlcCb       *gCb,
+RlcDlRbCb   *rbCb,
 KwDatReq   *kwDatReq
 )
 #else
 PRIVATE Void kwAssembleSdus (gCb, rbCb, kwDatReq)
-KwCb       *gCb;
-KwDlRbCb   *rbCb;
+RlcCb       *gCb;
+RlcDlRbCb   *rbCb;
 KwDatReq   *kwDatReq;
 #endif
 {
@@ -1835,7 +1835,7 @@ KwDatReq   *kwDatReq;
    U32                  fixedHdrSz;
    U32                  pduSz;
    KwAmHdr              *amHdr = NULLP;
-   KwDlPduInfo          *pduInfo = NULLP;
+   RlcDlPduInfo          *pduInfo = NULLP;
 
    TRC2(kwAssembleSdus)
 
@@ -1849,7 +1849,7 @@ KwDatReq   *kwDatReq;
 #endif
    /* Discard new changes starts */
    /* Allocate memory for discSdu Info */
-   KW_SHRABL_STATIC_BUF_ALLOC(kwuSap->pst.region,
+   RLC_SHRABL_STATIC_BUF_ALLOC(kwuSap->pst.region,
                               kwuSap->pst.pool,
                               discSduInfo, 
                               sizeof(KwuDiscSduInfo));
@@ -1985,7 +1985,7 @@ KwDatReq   *kwDatReq;
       if (!sdu->mode.am.isSegmented)
       {
          /* Update txBuf */
-         KW_ALLOC_WC(gCb,txBuf, sizeof(KwTx));
+         RLC_ALLOC_WC(gCb,txBuf, sizeof(KwTx));
 
          cmLListInit(&txBuf->pduLst);
 
@@ -2009,7 +2009,7 @@ KwDatReq   *kwDatReq;
          txBuf = kwUtlGetTxBuf(amDl->txBufLst, amDl->txNext);
       }
 
-      KW_ALLOC_WC(gCb,pduInfo, sizeof(KwDlPduInfo));
+      RLC_ALLOC_WC(gCb,pduInfo, sizeof(RlcDlPduInfo));
 #if (ERRCLASS & ERRCLS_ADD_RES)
       if (pduInfo == NULLP)
       {
@@ -2264,7 +2264,7 @@ KwDatReq   *kwDatReq;
    }
    else
    {
-      KW_SHRABL_STATIC_BUF_FREE(kwuSap->pst.region, kwuSap->pst.pool, discSduInfo, sizeof(KwuDiscSduInfo));
+      RLC_SHRABL_STATIC_BUF_FREE(kwuSap->pst.region, kwuSap->pst.pool, discSduInfo, sizeof(KwuDiscSduInfo));
    }
 
 
@@ -2311,15 +2311,15 @@ KwDatReq   *kwDatReq;
 #ifdef ANSI
 PRIVATE Bool kwAmmDlCheckAndSetPoll
 (
-KwCb       *gCb,
-KwDlRbCb   *rbCb,
+RlcCb       *gCb,
+RlcDlRbCb   *rbCb,
 Bool       newPdu,
 MsgLen     bufSz
 )
 #else
 PRIVATE Bool kwAmmDlCheckAndSetPoll(gCb, rbCb, newPdu, bufSz)
-KwCb       *gCb;
-KwDlRbCb   *rbCb;
+RlcCb       *gCb;
+RlcDlRbCb   *rbCb;
 Bool       newPdu;
 MsgLen     bufSz;
 #endif
@@ -2378,7 +2378,7 @@ MsgLen     bufSz;
       kwStartTmr(gCb,(PTR)rbCb, KW_EVT_AMDL_POLL_RETX_TMR);
    }
 
-   RETVALUE(pollBit);
+   return (pollBit);
 }
 
 /**
@@ -2391,7 +2391,7 @@ MsgLen     bufSz;
  * @param[in]  gCB         RLC instance control block
  * @param[in]  rbCb        Downlink RB control block
  * @param[in]  amHdr       AM header
- * @param[in]  KwDlPduInfo Pointer to PduInfo
+ * @param[in]  RlcDlPduInfo Pointer to PduInfo
  * @param[in]  pdu         PDU buffer 
  *
  *  @return  Void
@@ -2400,18 +2400,18 @@ MsgLen     bufSz;
 #ifdef ANSI
 PRIVATE Void kwAmmCreatePdu
 (  
-KwCb       *gCb,
-KwDlRbCb   *rbCb,
+RlcCb       *gCb,
+RlcDlRbCb   *rbCb,
 KwAmHdr    *amHdr,
-KwDlPduInfo *pduInfo,
+RlcDlPduInfo *pduInfo,
 Buffer     *pdu
 )
 #else
 PRIVATE Void kwAmmCreatePdu(gCb, rbCb, pduInfo, amHdr, pdu)
-KwCb       *gCb;
-KwDlRbCb   *rbCb;
+RlcCb       *gCb;
+RlcDlRbCb   *rbCb;
 KwAmHdr    *amHdr;
-KwDlPduInfo *pduInfo;
+RlcDlPduInfo *pduInfo;
 Buffer     *pdu;
 #endif
 {
@@ -2486,14 +2486,14 @@ Buffer     *pdu;
 #ifdef ANSI
 PRIVATE Void kwRemRetxPdu
 (  
-KwCb          *gCb,
-KwDlRbCb      *rbCb,
+RlcCb          *gCb,
+RlcDlRbCb      *rbCb,
 KwRetx        *retx
 )
 #else
 PRIVATE Void kwRemRetxPdu(gCb, rbCb, retx)
-KwCb          *gCb;
-KwDlRbCb      *rbCb;
+RlcCb          *gCb;
+RlcDlRbCb      *rbCb;
 KwRetx        *retx;
 #endif
 {
@@ -2537,14 +2537,14 @@ KwRetx        *retx;
 #ifdef ANSI
 PRIVATE Void kwAmmDlMarkPduForReTx
 (
-KwCb          *gCb,
-KwDlRbCb      *rbCb,
+RlcCb          *gCb,
+RlcDlRbCb      *rbCb,
 KwRetx        *retx
 )
 #else
 PRIVATE Void kwAmmDlMarkPduForReTx(*gCb, rbCb, retx)
-KwCb          *gCb;
-KwDlRbCb      *rbCb;
+RlcCb          *gCb;
+RlcDlRbCb      *rbCb;
 KwRetx        *retx;
 #endif
 {
@@ -2617,15 +2617,15 @@ KwRetx        *retx;
 #ifdef ANSI
 PRIVATE Void kwAmmDlCheckIsSDUDelivered
 (
-KwCb            *gCb,
-KwDlRbCb        *rbCb,
+RlcCb            *gCb,
+RlcDlRbCb        *rbCb,
 KwSduMap        *sduMap,
 KwuDatCfmInfo   **datCfm
 )
 #else
 PRIVATE Void kwAmmDlCheckIsSDUDelivered(gCb, rbCb, sduMap, datCfm)
-KwCb            *gCb;
-KwDlRbCb        *rbCb;
+RlcCb            *gCb;
+RlcDlRbCb        *rbCb;
 KwSduMap        *sduMap;
 KwuDatCfmInfo   **datCfm;
 #endif
@@ -2657,7 +2657,7 @@ KwuDatCfmInfo   **datCfm;
          kwuSap = gCb->u.dlCb->kwuDlSap + KW_UI_PDCP;
          KwUiKwuDatCfm(&kwuSap->pst, kwuSap->suId, *datCfm);
 
-         KW_SHRABL_STATIC_BUF_ALLOC(kwuSap->pst.region, kwuSap->pst.pool, *datCfm, sizeof(KwuDatCfmInfo));
+         RLC_SHRABL_STATIC_BUF_ALLOC(kwuSap->pst.region, kwuSap->pst.pool, *datCfm, sizeof(KwuDatCfmInfo));
 
 #if (ERRCLASS & ERRCLS_ADD_RES)
          if (*datCfm == NULLP)
@@ -2704,15 +2704,15 @@ KwuDatCfmInfo   **datCfm;
 #ifdef ANSI
 PRIVATE Void kwAmmDlProcessSuccessfulTxPdu
 (
-KwCb            *gCb,
-KwDlRbCb        *rbCb,
+RlcCb            *gCb,
+RlcDlRbCb        *rbCb,
 KwSn            sn,
 KwuDatCfmInfo   **datCfm
 )
 #else
 PRIVATE Void kwAmmDlProcessSuccessfulTxPdu(gCb, rbCb, sn, datCfm)
-KwCb            *gCb;
-KwDlRbCb        *rbCb;
+RlcCb            *gCb;
+RlcDlRbCb        *rbCb;
 KwSn            sn;
 KwuDatCfmInfo   **datCfm;
 #endif
@@ -2729,7 +2729,7 @@ KwuDatCfmInfo   **datCfm;
    pduNode = txBuf->pduLst.first;
    while(pduNode)
    {
-      KwDlPduInfo *pduInfo = (KwDlPduInfo *)(pduNode->node);
+      RlcDlPduInfo *pduInfo = (RlcDlPduInfo *)(pduNode->node);
       kwAmmDlCheckIsSDUDelivered(gCb,
                               rbCb,  
                               &(pduInfo->sduMap), 
@@ -2762,14 +2762,14 @@ KwuDatCfmInfo   **datCfm;
 #ifdef ANSI
 PRIVATE Void kwAmmSndStaInd
 (
-KwCb       *gCb,
-KwDlRbCb   *rbCb,
+RlcCb       *gCb,
+RlcDlRbCb   *rbCb,
 KwRetx     *retx
 )
 #else
 PRIVATE Void kwAmmSndStaInd(gCb, rbCb, retx)
-KwCb       *gCb;
-KwDlRbCb   *rbCb;
+RlcCb       *gCb;
+RlcDlRbCb   *rbCb;
 KwRetx     *retx;
 #endif
 {
@@ -2783,7 +2783,7 @@ KwRetx     *retx;
    kwuSap = gCb->u.dlCb->kwuDlSap + KW_UI_PDCP;
 
    /* Allocate memory for staInd Info */
-   KW_SHRABL_STATIC_BUF_ALLOC(kwuSap->pst.region, kwuSap->pst.pool, staInd, sizeof(KwuStaIndInfo));
+   RLC_SHRABL_STATIC_BUF_ALLOC(kwuSap->pst.region, kwuSap->pst.pool, staInd, sizeof(KwuStaIndInfo));
 
 #if (ERRCLASS & ERRCLS_ADD_RES)
    if (staInd == NULLP)
@@ -2827,12 +2827,12 @@ KwRetx     *retx;
 #ifdef ANSI
 PRIVATE Void kwGetNxtRetx 
 (
-KwCb     *gCb,
+RlcCb     *gCb,
 KwRetx   **retx
 )
 #else
 PRIVATE Void kwGetNxtRetx(gCb, retx)
-KwCb     *gCb;
+RlcCb     *gCb;
 KwRetx   **retx;
 #endif
 {
@@ -2874,23 +2874,23 @@ KwRetx   **retx;
 #ifdef ANSI
 PUBLIC Void kwAmmDlReEstablish
 (
-KwCb         *gCb,
+RlcCb         *gCb,
 CmLteRlcId   rlcId,
-KwDlRbCb     *rbCb
+RlcDlRbCb     *rbCb
 )
 #else
 PUBLIC Void kwAmmDlReEstablish(gCb, rlcId, rbCb)
-KwCb         *gCb;
+RlcCb         *gCb;
 CmLteRlcId   rlcId;
-KwDlRbCb     *rbCb;
+RlcDlRbCb     *rbCb;
 #endif
 {
    /* create a new AM DL RB, reset it and replace in the UeCb*/
-   KwDlUeCb   *ueCb;
-   KwDlRbCb   *resetRb;
+   RlcDlUeCb   *ueCb;
+   RlcDlRbCb   *resetRb;
    KwAmDl* newAmDl;
    KwAmDl* oldAmDl;
-   KW_ALLOC(gCb, resetRb, sizeof(KwDlRbCb));
+   RLC_ALLOC(gCb, resetRb, sizeof(RlcDlRbCb));
    
    /* ccpu00135170 Removing KLOCK warning */
    if(resetRb == NULLP)
@@ -2898,8 +2898,8 @@ KwDlRbCb     *rbCb;
       RETVOID;
    }
 
-   KW_MEM_CPY(resetRb, rbCb, sizeof(KwDlRbCb));
-   KW_MEM_SET(&resetRb->m.amDl, 0 , sizeof(KwAmDl));
+   KW_MEM_CPY(resetRb, rbCb, sizeof(RlcDlRbCb));
+   RLC_MEM_SET(&resetRb->m.amDl, 0 , sizeof(KwAmDl));
 
 /* AGHOSH changes start */
    /* restore the old AM values */
@@ -2941,17 +2941,17 @@ KwDlRbCb     *rbCb;
                 &&(resetRb->rlcId.rbId == 1))
    {
       /* To stop the traffic on SRB2 and other DRBs*/
-      kwDlUtlSetReestInProgressForAllRBs(gCb, ueCb);
+      rlcDlUtlSetReestInProgressForAllRBs(gCb, ueCb);
    }
    else 
    {
-      kwDlUtlSetReestInProgressForRB(gCb, resetRb);      
+      rlcDlUtlSetReestInProgressForRB(gCb, resetRb);      
    }
 
    /* allocate the TX array again */
 #ifndef  LTE_TDD
    U32 hashIndex;
-   KW_ALLOC(gCb,
+   RLC_ALLOC(gCb,
 		   resetRb->m.amDl.txBufLst,
 		   (KW_TX_BUF_BIN_SIZE * sizeof(CmLListCp)));
    for(hashIndex = 0; hashIndex < KW_TX_BUF_BIN_SIZE; hashIndex++)
@@ -2968,11 +2968,11 @@ KwDlRbCb     *rbCb;
       There should be a proper intreface to resume the RBs */
    if(rlcId.rbType == CM_LTE_SRB)
    {
-      kwDlUtlResetReestInProgress(ueCb->srbCb[rlcId.rbId]);
+      rlcDlUtlResetReestInProgress(ueCb->srbCb[rlcId.rbId]);
    }
    else
    {
-      kwDlUtlResetReestInProgress(ueCb->drbCb[rlcId.rbId]);
+      rlcDlUtlResetReestInProgress(ueCb->drbCb[rlcId.rbId]);
    }      
       
    RETVOID;
@@ -2997,19 +2997,19 @@ KwDlRbCb     *rbCb;
 #ifdef ANSI
 PUBLIC S16 kwAmmDiscSdu
 (
-KwCb       *gCb,
-KwDlRbCb   *rbCb,
+RlcCb       *gCb,
+RlcDlRbCb   *rbCb,
 U32        sduId 
 )
 #else
 PUBLIC S16 kwAmmDiscSdu(gCb, rbCb, sduId)
-KwCb       *gCb;
-KwDlRbCb   *rbCb;  
+RlcCb       *gCb;
+RlcDlRbCb   *rbCb;  
 U32        sduId; 
 #endif
 {
    TRC2(kwAmmDiscSdu);
-   RETVALUE(RFAILED);
+   return RFAILED;
 } 
 
 /**
@@ -3027,13 +3027,13 @@ U32        sduId;
 #ifdef ANSI
 PUBLIC Void kwAmmPollRetxTmrExp
 (
-KwCb       *gCb,
-KwDlRbCb   *rbCb
+RlcCb       *gCb,
+RlcDlRbCb   *rbCb
 )
 #else
 PUBLIC Void kwAmmPollRetxTmrExp(gCb, rbCb)
-KwCb       *gCb;
-KwDlRbCb   *rbCb;
+RlcCb       *gCb;
+RlcDlRbCb   *rbCb;
 #endif
 {
    KwRetx        *retx; 
@@ -3112,16 +3112,16 @@ KwDlRbCb   *rbCb;
 #ifdef ANSI
 PRIVATE Void kwAmmDlUpdateTxAndReTxBufForAckSn
 (
-KwCb            *gCb,
-KwDlRbCb        *rbCb,
+RlcCb            *gCb,
+RlcDlRbCb        *rbCb,
 KwSn            mAckSn,
 CmLList         *retxNode,
 KwuDatCfmInfo   **datCfm
 )
 #else
 PRIVATE Void kwAmmDlUpdateTxAndReTxBufForAckSn(gCb, rbCb, mAckSn, retxNode, datCfm)
-KwCb            *gCb;
-KwDlRbCb        *rbCb;
+RlcCb            *gCb;
+RlcDlRbCb        *rbCb;
 KwSn            mAckSn;
 CmLList         *retxNode;
 KwuDatCfmInfo   **datCfm;
@@ -3194,8 +3194,8 @@ KwuDatCfmInfo   **datCfm;
 #ifdef ANSI
 PRIVATE Void kwAmmDlUpdTxAndReTxBufForLessThanNackSn
 (
-KwCb            *gCb,
-KwDlRbCb        *rbCb,
+RlcCb            *gCb,
+RlcDlRbCb        *rbCb,
 KwSn            sn,
 KwSn            mNackSn,
 CmLList         **retxNode,
@@ -3203,8 +3203,8 @@ KwuDatCfmInfo   **datCfm
 )
 #else
 PRIVATE Void kwAmmDlUpdTxAndReTxBufForLessThanNackSn(gCb, rbCb, sn, mNackSn, retxNode, datCfm)
-KwCb            *gCb;
-KwDlRbCb        *rbCb;
+RlcCb            *gCb;
+RlcDlRbCb        *rbCb;
 KwSn            sn;
 KwSn            mNackSn;
 CmLList         **retxNode;
@@ -3412,14 +3412,14 @@ KwRetx   *retx;
 #ifdef ANSI
 PRIVATE Void kwAmmDlMoveFrmTxtoRetxBuffer
 (
-KwCb          *gCb,
+RlcCb          *gCb,
 KwAmDl        *amDl,
 KwRetx        **retx,
 KwSn          sn
 )
 #else
 PRIVATE Void kwAmmDlMoveFrmTxtoRetxBuffer(gCb, amDl, retx, sn)
-KwCb          *gCb;
+RlcCb          *gCb;
 KwAmDl        *amDl;
 KwRetx        **retx;
 KwSn          sn; 
@@ -3434,8 +3434,8 @@ KwSn          sn;
    }
    while(txBuf->pduLst.first)
    {
-      KwDlPduInfo *pduInfo = (KwDlPduInfo *)(txBuf->pduLst.first->node);
-      KW_ALLOC_WC(gCb,*retx, sizeof(KwRetx));
+      RlcDlPduInfo *pduInfo = (RlcDlPduInfo *)(txBuf->pduLst.first->node);
+      RLC_ALLOC_WC(gCb,*retx, sizeof(KwRetx));
 
 #if (ERRCLASS & ERRCLS_ADD_RES)
       if (*retx == NULLP)
@@ -3453,7 +3453,7 @@ KwSn          sn;
       
       /* Delete node from the txBuf Pdu lst */
       cmLListDelFrm(&txBuf->pduLst, txBuf->pduLst.first);
-      KW_FREE_WC(gCb, pduInfo, sizeof(KwDlPduInfo));
+      RLC_FREE_WC(gCb, pduInfo, sizeof(RlcDlPduInfo));
    }
    /* Remove PDU from txBuf */
    kwUtlDelTxBuf(amDl->txBufLst, txBuf,gCb); 
@@ -3479,13 +3479,13 @@ KwSn          sn;
 #ifdef ANSI
 PUBLIC Void kwAmmFreeDlRbCb
 (
-KwCb       *gCb,
-KwDlRbCb   *rbCb
+RlcCb       *gCb,
+RlcDlRbCb   *rbCb
 )
 #else
 PUBLIC Void kwAmmFreeDlRbCb(gCb,rbCb)
-KwCb       *gCb;
-KwDlRbCb   *rbCb;
+RlcCb       *gCb;
+RlcDlRbCb   *rbCb;
 #endif
 {
    /* stop the re-transmission timer */
@@ -3522,14 +3522,14 @@ KwDlRbCb   *rbCb;
 #ifdef ANSI
 PRIVATE Void kwAmmCreateStatusPdu
 (
-KwCb       *gCb,
-KwDlRbCb   *rbCb,
+RlcCb       *gCb,
+RlcDlRbCb   *rbCb,
 KwDatReq   *kwDatReq
 )
 #else
 PRIVATE Void kwAmmCreateStatusPdu(gCb, rbCb, kwDatReq)
-KwCb       *gCb;
-KwDlRbCb   *rbCb;
+RlcCb       *gCb;
+RlcDlRbCb   *rbCb;
 KwDatReq   *kwDatReq;
 #endif
 {
@@ -3842,13 +3842,13 @@ S16 kwProcDlStatusPdu(Pst *udxPst,SuId suId,
 #ifdef ANSI
 PRIVATE Void rgAmmExtractElmnt
 (
-KwCb       *gCb,
+RlcCb       *gCb,
 Buffer     *pdu,
 KwExtHdr   *hdrInfo
 )
 #else
 PRIVATE Void rgAmmExtractElmnt(gCb, pdu, hdrInfo)
-KwCb       *gCb;
+RlcCb       *gCb;
 Buffer     *pdu;
 KwExtHdr   *hdrInfo;
 #endif
@@ -3926,8 +3926,8 @@ PRIVATE Void rgAmmUlHndlStatusPdu
 (
 Pst        *udxPst,
 SuId       suId,
-KwCb       *gCb,
-KwDlRbCb   *rbCb,
+RlcCb       *gCb,
+RlcDlRbCb   *rbCb,
 Buffer     *cntrlPdu,
 U8         *fByte
 )
@@ -3935,8 +3935,8 @@ U8         *fByte
 PRIVATE Void rgAmmUlHndlStatusPdu(udxPst,suId,gCb, rbCb, cntrlPdu, fByte)
 Pst        *udxPst;
 SuId       suId;
-KwCb       *gCb;
-KwDlRbCb   *rbCb;
+RlcCb       *gCb;
+RlcDlRbCb   *rbCb;
 Buffer     *cntrlPdu;
 U8         *fByte;
 #endif
@@ -3968,7 +3968,7 @@ U8         *fByte;
       RETVOID;
    }
 
-   KW_ALLOC_SHRABL_BUF(udxPst->region, 
+   RLC_ALLOC_SHRABL_BUF(udxPst->region, 
                        udxPst->pool, 
                        pStaPdu, 
                        sizeof(KwUdxStaPdu));
@@ -4099,8 +4099,8 @@ U8         *fByte;
 
 
    /* Parse & send Status PDU to RLC-DL */
-   //KwUlUdxStaUpdReq(&(sapCb->pst), sapCb->spId, &rbCb->rlcId, pStaPdu);
-   KwUlUdxStaUpdReq(udxPst, suId, &rbCb->rlcId, pStaPdu);
+   //rlcUlUdxStaUpdReq(&(sapCb->pst), sapCb->spId, &rbCb->rlcId, pStaPdu);
+   rlcUlUdxStaUpdReq(udxPst, suId, &rbCb->rlcId, pStaPdu);
 
    RETVOID;
 }
@@ -4108,20 +4108,20 @@ U8         *fByte;
 PUBLIC S16 kwProcDlStatusPdu(Pst *udxPst,SuId suId,
       CmLteCellId cellId,CmLteRnti rnti,CmLteLcId lcId,Buffer *rlcSdu)
 {
-   KwDlRbCb      *rbCb = NULLP;   
-   KwDlUeCb      *ueCb = NULLP; 
+   RlcDlRbCb      *rbCb = NULLP;   
+   RlcDlUeCb      *ueCb = NULLP; 
    U8        fByte;
    U8        temp;
    S16       retVal = RFAILED;
-   KwCb      *gCb;
+   RlcCb      *gCb;
    Pst       dlRlcPst = *udxPst;
 
-   gCb = KW_GET_KWCB(1); /* DL RLC instance */
+   gCb = RLC_GET_RLCCB(1); /* DL RLC instance */
 
    if( ROK != kwDbmFetchDlUeCb(gCb,rnti,cellId,&(ueCb)))
    {
      printf("\n RLC UECb Not found...\n");
-     RETVALUE(RFAILED);
+     return RFAILED;
    }
 
 
@@ -4130,14 +4130,14 @@ PUBLIC S16 kwProcDlStatusPdu(Pst *udxPst,SuId suId,
    /* Skip if mode is not AM */
    if((rbCb ==  NULLP) || (rbCb->mode != CM_LTE_MODE_AM))
    {
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    if(ROK != SExamMsg((Data *)(&fByte),
             rlcSdu, 0))
    {
       printf("\n Failure in Rlc Hdr SExamMsg\n");
-      RETVALUE(RFAILED);
+      return RFAILED;
    }
 
    if(KW_CNTRL_PDU == ((fByte & KW_DC_POS) >> KW_DC_SHT))
@@ -4148,7 +4148,7 @@ PUBLIC S16 kwProcDlStatusPdu(Pst *udxPst,SuId suId,
       retVal = ROK;
    }
 
-   RETVALUE(retVal);
+   return (retVal);
 }