RLC UeCb Changes
[o-du/l2.git] / src / 5gnrrlc / kw_dl.x
index 913ac35..2a401ea 100755 (executable)
@@ -46,7 +46,7 @@ extern "C" {
 #include "l2_tenb_stats.x"
 #endif
 #endif
-typedef struct kwDlUeCb KwDlUeCb;
+typedef struct rlcDlUeCb RlcDlUeCb;
 
 /** 
  * @brief  Structure to hold the SN of the PDU onto which a SDU is mapped
@@ -273,7 +273,7 @@ typedef struct kwRetx
  *    - KwSduMap :SDU map info for this PDU 
  *
 */
-typedef struct kwDlPduInfo
+typedef struct rlcDlPduInfo
 {
    CmLList   lstEnt;               /*!< List entry for PDU list */
    Buffer     *pdu;                /*!< Buffer of PDU */
@@ -282,7 +282,7 @@ typedef struct kwDlPduInfo
    KwAmHdr    amHdr;               /*!< AM header Info */
    KwSduMap   sduMap;              /*!< SDU info for this PDU */
 
-}KwDlPduInfo;
+}RlcDlPduInfo;
 
 /** 
  * @brief  Structure to hold info about a PDU that has been transmitted
@@ -398,11 +398,11 @@ typedef struct kwAmDl
  *    - rlsLnk         : Link list used to free the RbCb
  *    - cleanupStarted : Whether cleanup of RB is in progress or not
 */
-typedef struct _kwDlRbCb
+typedef struct _rlcDlRbCb
 {
    U8              qci;                /*!< qci of the RB */
 #ifdef LTE_L2_MEAS
-   KwDlUeCb        *ueCb;              /*!< Pointer to UeCb  */
+   RlcDlUeCb        *ueCb;              /*!< Pointer to UeCb  */
    KwL2MeasRbCb    rbL2Cb;             /*!< RB measurement L2 Cb */
    CmLListCp       sduSnMapQ;          /*!< SDU SN map queue for UM */
 
@@ -434,7 +434,7 @@ typedef struct _kwDlRbCb
    Bool      cleanupStarted; /*!< Whether cleanup of RB is in progress or not */
    U32       lastRprtdBoToMac; /*!< Last Reported BO to MAC Layer */
    U32       boUnRprtdCnt; /*!< Count to keep track of periodic BO Update */
-}KwDlRbCb;
+}RlcDlRbCb;
 
 /** 
  * @brief  Structure to hold mapping between logical channel and Radio Bearer
@@ -442,10 +442,10 @@ typedef struct _kwDlRbCb
  * @details
  *    - dlRbCb   : Pointer to the downlink Radio Bearer
 */
-typedef struct kwDlLch
+typedef struct rlcDlLch
 {
-   KwDlRbCb *dlRbCb;   /*!< Pointer to Downlink RbCb */
-}KwDlLch;                                  
+   RlcDlRbCb *dlRbCb;   /*!< Pointer to Downlink RbCb */
+}RlcDlLch;                                  
 
 /** 
  * @brief  Structure to hold information about the Cells
@@ -457,13 +457,13 @@ typedef struct kwDlLch
  *    - rbCb      : Radio Bearers in the cell
  *    - lCh       : Logical Channels in the cell
 */
-typedef struct kwDlCellCb
+typedef struct rlcDlCellCb
 {
    CmHashListEnt   cellHlEnt;                 /*!< Hash list entry for CellCb */
    CmLteCellId     cellId;                    /*!< Cell Id */
-   KwDlRbCb        *rbCb[KW_MAX_RB_PER_CELL]; /*!< RbCbs within a Cell */
-   KwDlLch         lCh[KW_MAX_LCH_PER_CELL];  /*!< Array of Logical channels */
-}KwDlCellCb;
+   RlcDlRbCb        *rbCb[KW_MAX_RB_PER_CELL]; /*!< RbCbs within a Cell */
+   RlcDlLch         lCh[KW_MAX_LCH_PER_CELL];  /*!< Array of Logical channels */
+}RlcDlCellCb;
 
 #ifdef LTE_L2_MEAS
 /** @struct KwContSduLst
@@ -515,14 +515,14 @@ typedef struct kwL2MeasTb
  *    - drbCb   : Data Radio Bearers configured for the UE
  *    - lCh     : Logical Channels in the UE
 */
-struct kwDlUeCb
+struct rlcDlUeCb
 {
    CmHashListEnt   ueHlEnt;                   /*!< Hash list entry for UeCb */
    CmLteRnti     ueId;     /*!< UE Id */
    CmLteCellId   cellId;   /*!< Cell Id */
-   KwDlRbCb        *srbCb[KW_MAX_SRB_PER_UE]; /*!< SRB RbCbs within a UE */ 
-   KwDlRbCb        *drbCb[KW_MAX_DRB_PER_UE]; /*!< DRB RbCbs within a UE */ 
-   KwDlLch         lCh[KW_MAX_LCH_PER_UE];    /*!< Array of Logical channels */
+   RlcDlRbCb        *srbCb[KW_MAX_SRB_PER_UE]; /*!< SRB RbCbs within a UE */ 
+   RlcDlRbCb        *drbCb[KW_MAX_DRB_PER_UE]; /*!< DRB RbCbs within a UE */ 
+   RlcDlLch         lCh[KW_MAX_LCH_PER_UE];    /*!< Array of Logical channels */
 /* kw005.201 added support for L2 Measurement */
 #ifdef LTE_L2_MEAS
    U16           numActRb[LKW_MAX_QCI];     /*!< number of RBs Active */
@@ -540,43 +540,43 @@ struct kwDlUeCb
 /****************************************************************************
  *                    Configuration Functions 
  ***************************************************************************/ 
-EXTERN S16 kwCfgAddDlRb ARGS ((KwCb *gCb, 
+EXTERN S16 rlcCfgAddDlRb ARGS ((RlcCb *gCb, 
                               CmLteRnti ueId, 
                               CmLteCellId cellId, 
-                              CkwEntCfgInfo *entCfg, 
-                              CkwEntCfgCfmInfo *entCfm));
+                              RlcEntCfgInfo *entCfg, 
+                              RlcEntCfgCfmInfo *entCfm));
 
-EXTERN S16 kwCfgReCfgDlRb ARGS ((KwCb *gCb, 
+EXTERN S16 rlcCfgReCfgDlRb ARGS ((RlcCb *gCb, 
                                  CmLteRnti ueId, 
                                  CmLteCellId cellId, 
-                                 CkwEntCfgInfo *entCfg, 
-                                 CkwEntCfgCfmInfo *entCfm));
+                                 RlcEntCfgInfo *entCfg, 
+                                 RlcEntCfgCfmInfo *entCfm));
 
-EXTERN S16 kwCfgDelDlRb ARGS ((KwCb *gCb, 
+EXTERN S16 rlcCfgDelDlRb ARGS ((RlcCb *gCb, 
                                CmLteRnti ueId, 
                                CmLteCellId cellId, 
-                               CkwEntCfgInfo *entCfg, 
-                               CkwEntCfgCfmInfo *entCfm));
+                               RlcEntCfgInfo *entCfg, 
+                               RlcEntCfgCfmInfo *entCfm));
 
-EXTERN S16 kwCfgDelDlUe ARGS ((KwCb *gCb, 
+EXTERN S16 rlcCfgDelDlUe ARGS ((RlcCb *gCb, 
                                CmLteRnti ueId, 
                                CmLteCellId cellId, 
-                               CkwEntCfgInfo *entCfg, 
-                               CkwEntCfgCfmInfo *entCfm));
+                               RlcEntCfgInfo *entCfg, 
+                               RlcEntCfgCfmInfo *entCfm));
 
-EXTERN S16 kwCfgReEstDlRb ARGS ((KwCb *gCb, 
+EXTERN S16 rlcCfgReEstDlRb ARGS ((RlcCb *gCb, 
                                  CmLteRnti ueId, 
                                  CmLteCellId cellId, 
                                  Bool sndReEst,
-                                 CkwEntCfgInfo *entCfg, 
-                                 CkwEntCfgCfmInfo *entCfm));
+                                 RlcEntCfgInfo *entCfg, 
+                                 RlcEntCfgCfmInfo *entCfm));
 
-EXTERN S16 kwCfgDelDlCell ARGS ((KwCb *gCb, 
+EXTERN S16 rlcCfgDelDlCell ARGS ((RlcCb *gCb, 
                                  CmLteCellId cellId, 
-                                 CkwEntCfgInfo *entCfg,
-                                 CkwEntCfgCfmInfo *entCfm));
+                                 RlcEntCfgInfo *entCfg,
+                                 RlcEntCfgCfmInfo *entCfm));
 
-EXTERN S16 kwCfgDlUeIdChng ARGS ((KwCb *gCb, 
+EXTERN S16 rlcCfgDlUeIdChng ARGS ((RlcCb *gCb, 
                                   CkwUeInfo *ueInfo, 
                                   CkwUeInfo *newUeInfo, 
                                   CmStatus  *status));
@@ -584,91 +584,91 @@ EXTERN S16 kwCfgDlUeIdChng ARGS ((KwCb *gCb,
 /****************************************************************************
  *                    DBM module Functions 
  ***************************************************************************/
-EXTERN S16 kwDbmDlInit ARGS ((KwCb *gCb));
+EXTERN S16 kwDbmDlInit ARGS ((RlcCb *gCb));
 
-EXTERN Void kwDbmDlDeInit ARGS ((KwCb *gCb));
+EXTERN Void kwDbmDlDeInit ARGS ((RlcCb *gCb));
 
-EXTERN S16 kwDbmCreateDlUeCb ARGS ((KwCb *gCb,     
+EXTERN S16 kwDbmCreateDlUeCb ARGS ((RlcCb *gCb,     
                                     CmLteRnti ueId,   
                                     CmLteCellId cellId,
-                                    KwDlUeCb **ueCb));
+                                    RlcDlUeCb **ueCb));
 
-EXTERN S16 kwDbmFetchDlUeCb ARGS ((KwCb *gCb,        
+EXTERN S16 kwDbmFetchDlUeCb ARGS ((RlcCb *gCb,        
                                    CmLteRnti ueId,      
                                    CmLteCellId cellId,     
-                                   KwDlUeCb **ueCb));
+                                   RlcDlUeCb **ueCb));
 
-EXTERN Void kwDbmDelDlUeCb ARGS ((KwCb *gCb,       
-                                  KwDlUeCb *ueCb, 
+EXTERN Void kwDbmDelDlUeCb ARGS ((RlcCb *gCb,       
+                                  RlcDlUeCb *ueCb, 
                                   Bool abortFlag));
 
-EXTERN Void kwDbmDelAllDlUe ARGS ((KwCb *gCb));
+EXTERN Void kwDbmDelAllDlUe ARGS ((RlcCb *gCb));
 
-EXTERN S16 kwDbmCreateDlCellCb ARGS ((KwCb *gCb,      
+EXTERN S16 kwDbmCreateDlCellCb ARGS ((RlcCb *gCb,      
                                       CmLteCellId cellId,   
-                                      KwDlCellCb **cellCb));
+                                      RlcDlCellCb **cellCb));
 
-EXTERN S16 kwDbmFetchDlCellCb ARGS ((KwCb *gCb, 
+EXTERN S16 kwDbmFetchDlCellCb ARGS ((RlcCb *gCb, 
                                      CmLteCellId cellId, 
-                                     KwDlCellCb **cellCb));
+                                     RlcDlCellCb **cellCb));
 
-EXTERN Void kwDbmDelDlCellCb ARGS ((KwCb *gCb, KwDlCellCb *cellCb));
+EXTERN Void kwDbmDelDlCellCb ARGS ((RlcCb *gCb, RlcDlCellCb *cellCb));
 
-EXTERN Void kwDbmDelAllDlCell ARGS ((KwCb *gCb));
+EXTERN Void kwDbmDelAllDlCell ARGS ((RlcCb *gCb));
 
-EXTERN Void kwDbmFetchDlRbCbByRbId ARGS ((KwCb *gCb, 
+EXTERN Void kwDbmFetchDlRbCbByRbId ARGS ((RlcCb *gCb, 
                                           CmLteRlcId *rlcId, 
-                                          KwDlRbCb **rbCb));
+                                          RlcDlRbCb **rbCb));
 
-EXTERN Void kwDbmFetchDlRbCbFromLchId ARGS ((KwCb *gCb,       
+EXTERN Void kwDbmFetchDlRbCbFromLchId ARGS ((RlcCb *gCb,       
                                              CmLteRnti ueId,     
                                              CmLteCellId cellId,    
                                              CmLteLcId lcId,      
-                                             KwDlRbCb **rbCb));
+                                             RlcDlRbCb **rbCb));
 
-EXTERN Void kwDbmDelAllDlRb ARGS ((KwCb *gCb, KwDlRbCb **rbCbLst, U8 numRbCb));
+EXTERN Void kwDbmDelAllDlRb ARGS ((RlcCb *gCb, RlcDlRbCb **rbCbLst, U8 numRbCb));
 
-EXTERN S16 kwDbmDlShutdown ARGS ((KwCb *gCb));
+EXTERN S16 kwDbmDlShutdown ARGS ((RlcCb *gCb));
 
 EXTERN Void kwUtlGetCurrTime ARGS((U32 *time));
-EXTERN PUBLIC Void kwUtlTrigPdbFlowCntrl ARGS((KwCb *gCb, KwDlRbCb *rbCb, U32 pktAdmitCnt ));
+EXTERN PUBLIC Void kwUtlTrigPdbFlowCntrl ARGS((RlcCb *gCb, RlcDlRbCb *rbCb, U32 pktAdmitCnt ));
 #ifdef LTE_L2_MEAS
-EXTERN Void kwDbmDelAllDlL2MeasTbFrmUe ARGS ((KwCb *gCb, KwDlUeCb *ueCb));
+EXTERN Void kwDbmDelAllDlL2MeasTbFrmUe ARGS ((RlcCb *gCb, RlcDlUeCb *ueCb));
 
 #endif
 
 /****************************************************************************
  *                    Transparent Mode Functions 
  ***************************************************************************/
-EXTERN Void kwTmmQSdu ARGS ((KwCb *gCb,
-                            KwDlRbCb *rbCb,
+EXTERN Void kwTmmQSdu ARGS ((RlcCb *gCb,
+                            RlcDlRbCb *rbCb,
                             KwuDatReqInfo *datReqInfo,
                             Buffer *mBuf));
-EXTERN Void kwTmmSndToLi ARGS ((KwCb     *gCb,
+EXTERN Void kwTmmSndToLi ARGS ((RlcCb     *gCb,
                                 SuId     suId,
-                                KwDlRbCb *rbCb, 
+                                RlcDlRbCb *rbCb, 
                                 RguCStaIndInfo *staInd));
 
-EXTERN Void kwDlTmmReEstablish ARGS ((KwCb *gCb, KwDlRbCb *rbCb));
+EXTERN Void rlcDlTmmReEstablish ARGS ((RlcCb *gCb, RlcDlRbCb *rbCb));
 
 /****************************************************************************
  *                    Unacknowledged Mode Functions 
  ***************************************************************************/
-EXTERN Void kwUmmQSdu ARGS ((KwCb *gCb, 
-                             KwDlRbCb *rbCb,
+EXTERN Void kwUmmQSdu ARGS ((RlcCb *gCb, 
+                             RlcDlRbCb *rbCb,
                              KwuDatReqInfo *datReq, 
                              Buffer *mBuf));
 
-EXTERN Void kwUmmDiscSdu ARGS ((KwCb *gCb, KwDlRbCb *rbCb, U32 sduId));
+EXTERN Void kwUmmDiscSdu ARGS ((RlcCb *gCb, RlcDlRbCb *rbCb, U32 sduId));
 
-EXTERN Void kwDlUmmReEstablish ARGS ((KwCb *gCb, 
+EXTERN Void rlcDlUmmReEstablish ARGS ((RlcCb *gCb, 
                                       CmLteRlcId rlcId, 
                                       Bool sndReEst,
-                                      KwDlRbCb *rbCb));
+                                      RlcDlRbCb *rbCb));
 
-EXTERN Void kwUmmProcessSdus ARGS ((KwCb *gCb,KwDlRbCb *rbCb,KwDatReq *datReq));
+EXTERN Void kwUmmProcessSdus ARGS ((RlcCb *gCb,RlcDlRbCb *rbCb,KwDatReq *datReq));
 
-EXTERN Void kwUmmFreeDlRbCb ARGS ((KwCb *gCb, KwDlRbCb *rbCb));
+EXTERN Void kwUmmFreeDlRbCb ARGS ((RlcCb *gCb, RlcDlRbCb *rbCb));
 
 /****************************************************************************
  *                    Acknowledged Mode Functions 
@@ -676,31 +676,31 @@ EXTERN Void kwUmmFreeDlRbCb ARGS ((KwCb *gCb, KwDlRbCb *rbCb));
 
 EXTERN S32 kwAmmCalculateBo ARGS ((KwAmDl *amDl));
 
-EXTERN Void kwAmmSendDStaRsp ARGS ((KwCb *gCb, KwDlRbCb *rbCb, KwAmDl *amDl));
+EXTERN Void kwAmmSendDStaRsp ARGS ((RlcCb *gCb, RlcDlRbCb *rbCb, KwAmDl *amDl));
 
-EXTERN Void kwAmmQSdu ARGS((KwCb *gCb,
-                            KwDlRbCb *rbCb,
+EXTERN Void kwAmmQSdu ARGS((RlcCb *gCb,
+                            RlcDlRbCb *rbCb,
                             Buffer *mBuf, 
                             KwuDatReqInfo *datReq));
 
-EXTERN Void kwAmmProcessSdus ARGS((KwCb *gCb, 
-                                   KwDlRbCb *rbCb, 
+EXTERN Void kwAmmProcessSdus ARGS((RlcCb *gCb, 
+                                   RlcDlRbCb *rbCb, 
                                    KwDatReq *kwDatReq,
                                    Bool staPduPres));
 
-EXTERN Void kwAmmDlReEstablish ARGS((KwCb *gCb, 
+EXTERN Void kwAmmDlReEstablish ARGS((RlcCb *gCb, 
                                      CmLteRlcId rlcId, 
-                                     KwDlRbCb *rbCb));
+                                     RlcDlRbCb *rbCb));
 
-EXTERN Void kwAmmDlHndlStatusPdu ARGS ((KwCb  *gCb,
-                                        KwDlRbCb  *rbCb,
+EXTERN Void kwAmmDlHndlStatusPdu ARGS ((RlcCb  *gCb,
+                                        RlcDlRbCb  *rbCb,
                                         KwUdxStaPdu *pStaPdu));
 
-EXTERN S16 kwAmmDiscSdu ARGS((KwCb *gCb, KwDlRbCb *rbCb, U32 sduId));
+EXTERN S16 kwAmmDiscSdu ARGS((RlcCb *gCb, RlcDlRbCb *rbCb, U32 sduId));
 
-EXTERN Void kwAmmPollRetxTmrExp ARGS((KwCb *gCB, KwDlRbCb *rbCb));
+EXTERN Void kwAmmPollRetxTmrExp ARGS((RlcCb *gCB, RlcDlRbCb *rbCb));
 
-EXTERN Void kwAmmFreeDlRbCb ARGS ((KwCb *gCb, KwDlRbCb *rbCb));
+EXTERN Void kwAmmFreeDlRbCb ARGS ((RlcCb *gCb, RlcDlRbCb *rbCb));
 
 /****************************************************************************
  *                    Utility Functions 
@@ -715,54 +715,54 @@ EXTERN KwTx* kwUtlGetTxBuf ARGS ((CmLListCp        *txBufLst,
                                   ));
 EXTERN Void kwUtlDelTxBuf ARGS ((CmLListCp        *txBufLst,
                                   KwTx            *txBuf,
-                                  KwCb              *gCb
+                                  RlcCb              *gCb
                                   ));
 EXTERN Void kwUtlRemovTxBuf ARGS ((CmLListCp      *txBufLst,
                                   KwTx            *txBuf,
-                                  KwCb              *gCb
+                                  RlcCb              *gCb
                                   ));
 
-EXTERN S16 kwUtlSndDStaRsp ARGS ((KwCb *gCb,
-                                  KwDlRbCb *rbCb,
+EXTERN S16 kwUtlSndDStaRsp ARGS ((RlcCb *gCb,
+                                  RlcDlRbCb *rbCb,
                                   S32 bo,
                                   S32 estHdrSz,
                                   Bool staPduPrsnt,
                                   U32 staPduBo));
 
 #ifdef LTE_L2_MEAS_RLC
-EXTERN Void kwUtlEmptySduQ ARGS ((KwCb *gCb, KwDlRbCb *rbCb, CmLListCp *sduQ));
+EXTERN Void kwUtlEmptySduQ ARGS ((RlcCb *gCb, RlcDlRbCb *rbCb, CmLListCp *sduQ));
 #else /* LTE_L2_MEAS */
-EXTERN Void kwUtlEmptySduQ ARGS ((KwCb *gCb,CmLListCp *sduQ));
+EXTERN Void kwUtlEmptySduQ ARGS ((RlcCb *gCb,CmLListCp *sduQ));
 #endif /* LTE_L2_MEAS */
 
-EXTERN Void kwUtlCalcLiForSdu ARGS ((KwCb *gCb,
+EXTERN Void kwUtlCalcLiForSdu ARGS ((RlcCb *gCb,
                                      U16 numLi, 
                                      MsgLen msgLen,
                                      S16 *pduSz));
 
-EXTERN S16 kwUtlSndToLi ARGS ((KwCb *gCb, SuId suId, KwDStaIndInfo *staIndInfo));
+EXTERN S16 kwUtlSndToLi ARGS ((RlcCb *gCb, SuId suId, KwDStaIndInfo *staIndInfo));
 
 EXTERN Void kwUtlIncrementKwuStsSduTx ARGS((KwKwuSapCb *kwuSap));
 
 EXTERN Void kwUtlIncrementGenStsBytesAndPdusSent ARGS((KwGenSts *genSts, 
                                                        Buffer *pdu));
 
-EXTERN Void kwUtlFreeDlMemory ARGS ((KwCb *gCb));
+EXTERN Void kwUtlFreeDlMemory ARGS ((RlcCb *gCb));
 
-EXTERN Void kwUtlInitToBeFreed ARGS ((KwCb *gCb, KwDlDataToBeFreed *toBeFreed));
+EXTERN Void kwUtlInitToBeFreed ARGS ((RlcCb *gCb, RlcDlDataToBeFreed *toBeFreed));
 
-EXTERN Void kwUtlInitializeSelfPst ARGS((KwCb *gCb));
+EXTERN Void kwUtlInitializeSelfPst ARGS((RlcCb *gCb));
 
-EXTERN Void kwUtlRaiseDlCleanupEvent ARGS((KwCb *gCb));
+EXTERN Void kwUtlRaiseDlCleanupEvent ARGS((RlcCb *gCb));
 
-EXTERN Void kwUtlAddSduToBeFreedQueue ARGS((KwCb *gCb, KwSdu *sdu));
+EXTERN Void kwUtlAddSduToBeFreedQueue ARGS((RlcCb *gCb, KwSdu *sdu));
 
-EXTERN Void kwUtlAddReTxPduToBeFreedQueue ARGS((KwCb *gCb, KwRetx *retx));
+EXTERN Void kwUtlAddReTxPduToBeFreedQueue ARGS((RlcCb *gCb, KwRetx *retx));
 
-EXTERN Void kwUtlAddTxPduToBeFreedQueue ARGS((KwCb *gCb, KwTx *pdu));
+EXTERN Void kwUtlAddTxPduToBeFreedQueue ARGS((RlcCb *gCb, KwTx *pdu));
 
 #ifdef LTE_L2_MEAS
-EXTERN S16 kwUtlL2MeasDlInit ARGS((KwCb *gCb));
+EXTERN S16 kwUtlL2MeasDlInit ARGS((RlcCb *gCb));
 #endif
 
 /****************************************************************************
@@ -777,19 +777,19 @@ EXTERN Void DumpRLCDlDebugInformation ARGS((Void));
 /****************************************************************************
  *                    Activation Functions 
  ***************************************************************************/
-EXTERN S16 kwDlActvInit ARGS ((Ent ent,Inst inst,Region region,Reason reason)); 
+EXTERN S16 rlcDlActvInit ARGS ((Ent ent,Inst inst,Region region,Reason reason)); 
 
-EXTERN S16 kwDlActvTsk ARGS ((Pst *pst, Buffer *mBuf));
+EXTERN S16 rlcDlActvTsk ARGS ((Pst *pst, Buffer *mBuf));
 
-EXTERN Bool kwDlUtlIsReestInProgress ARGS ((KwDlRbCb *rbCb));
+EXTERN Bool rlcDlUtlIsReestInProgress ARGS ((RlcDlRbCb *rbCb));
 
-EXTERN Void kwDlUtlResetReestInProgress ARGS ((KwDlRbCb *rbCb));
+EXTERN Void rlcDlUtlResetReestInProgress ARGS ((RlcDlRbCb *rbCb));
 
-EXTERN Void kwDlUtlResetReestInProgress ARGS (( KwDlRbCb *rbCb));
+EXTERN Void rlcDlUtlResetReestInProgress ARGS (( RlcDlRbCb *rbCb));
 
-EXTERN Void kwDlUtlSetReestInProgressForAllRBs ARGS ((KwCb *gCb, KwDlUeCb
+EXTERN Void rlcDlUtlSetReestInProgressForAllRBs ARGS ((RlcCb *gCb, RlcDlUeCb
          *ueCb));
-EXTERN Void kwDlUtlSetReestInProgressForRB ARGS (( KwCb *gCb, KwDlRbCb *rbCb));
+EXTERN Void rlcDlUtlSetReestInProgressForRB ARGS (( RlcCb *gCb, RlcDlRbCb *rbCb));
 
 #ifdef LTE_L2_MEAS
 EXTERN Void kwUtlUpdateContainedSduLst ARGS ((
@@ -804,27 +804,27 @@ U32              sduId,
 Bool             newIdx
 ));
 EXTERN Void kwUtlUpdateBurstSdus ARGS((
-KwCb            *gCb,         
-KwDlRbCb        *rbCb,
+RlcCb            *gCb,         
+RlcDlRbCb        *rbCb,
 KwContSduLst    *contSduLst,
 S32             dataVol,
 U32             schPduSz
 ));
 
 EXTERN KwL2MeasTb * kwUtlGetCurMeasTb ARGS((
-KwCb     *gCb,
-KwDlRbCb *rbCb
+RlcCb     *gCb,
+RlcDlRbCb *rbCb
 ));
 
-EXTERN S16 kwUtlSndDlL2MeasNCfm ARGS((KwCb *gCb,
+EXTERN S16 kwUtlSndDlL2MeasNCfm ARGS((RlcCb *gCb,
                                       KwL2MeasReqEvt *measReqEvt,
                                       KwL2MeasCfmEvt *measCfmEvt));
 
-EXTERN S16 kwUtlSndDlL2MeasCfm  ARGS ((KwCb *gCb, KwL2MeasEvtCb *measEvtCb));
+EXTERN S16 kwUtlSndDlL2MeasCfm  ARGS ((RlcCb *gCb, KwL2MeasEvtCb *measEvtCb));
 
-EXTERN S16 kwUtlProcHarqInd  ARGS (( KwCb *gCb, RguHarqStatusInd *staInd, KwDlUeCb *ueCb, 
+EXTERN S16 kwUtlProcHarqInd  ARGS (( RlcCb *gCb, RguHarqStatusInd *staInd, RlcDlUeCb *ueCb, 
                                      U8 tbIdx));
-EXTERN Void kwUtlResetDlL2MeasInKwRb ARGS ((KwCb *gCb,
+EXTERN Void kwUtlResetDlL2MeasInKwRb ARGS ((RlcCb *gCb,
                                             KwL2MeasCb *measCb,
                                             U8 measType));