RLC UeCb Changes

[o-du/l2.git] / src / 5gnrrlc / kw.x

diff --git a/src/5gnrrlc/kw.x b/src/5gnrrlc/kw.x
index 72a52a8..b34fad1 100755 (executable)
--- a/src/5gnrrlc/kw.x
+++ b/src/5gnrrlc/kw.x
@@ -507,13 +507,13 @@ typedef struct kwUdxDlSapCb
  *    - reTxLst : Stores to be released AM Re TX PDU's
  *    - rbLst   : List of AM DL RBs to be freed 
 */
-typedef struct kwDlDataToBeFreed
+typedef struct rlcDlDataToBeFreed
 {
    CmLListCp   sduLst;     /*!< Queue of SDU's to be freed  */
    CmLListCp   txLst;     /*!< Stores to be released TX PDUs */
    CmLListCp   reTxLst;   /*!< Stores to be released ReTX PDUs */
    CmLListCp   rbLst;     /*!< List of AM DL RBs to be freed */
-}KwDlDataToBeFreed;
+}RlcDlDataToBeFreed;
 
 /** 
  * @brief  Structure to hold an information about DL RLC instance
@@ -530,7 +530,7 @@ typedef struct kwDlDataToBeFreed
  *    - shutdownReveived  : Request for shutdown recevied or not
  *    - eventInQueue      : Event for cleanup exists in queue or not
  */
-typedef struct _kwDlCb
+typedef struct rlcDlCb
 {
    U8                  numKwuSaps;         /*!< Number of RLC Data Saps */
    U8                  numUdxSaps;         /*!< Number of RLC Data Saps */
@@ -539,7 +539,7 @@ typedef struct _kwDlCb
    KwRguSapCb          *rguDlSap;          /*!< RGU Sap Control Block */
    CmHashListCp        cellLstCp;          /*!< Hashlist of CellCb */
    CmHashListCp        ueLstCp;            /*!< Hashlist of UeCb */
-   KwDlDataToBeFreed   toBeFreed;          /*!< Pointer to data to be freed */        
+   RlcDlDataToBeFreed   toBeFreed;          /*!< Pointer to data to be freed */        
    Pst                 selfPst;            /*!< Pst to post events to self */
    Buffer              *selfPstMBuf;       /*!< Buffer used for self post */
    Bool                shutdownReceived;   /*!< Request for shutdown recevied */
@@ -547,7 +547,7 @@ typedef struct _kwDlCb
 #ifdef LTE_L2_MEAS
    KwL2Cb              kwL2Cb; /*!< Control Block for L2 Measurements in RLC */
 #endif /* LTE_L2_MEAS */
-}KwDlCb;
+}RlcDlCb;
 
 /** 
  * @brief  Structure to hold an information about UL RLC instance
@@ -563,7 +563,7 @@ typedef struct _kwDlCb
  *    - ueLstCp      : Hashlist of UeCb 
  *    - transIdLstCp : Hashlist of cfg trans
  */
-typedef struct _kwUlCb
+typedef struct rlcUlCb
 {
    KwCkwSapCb     ckwSap;         /*!< CKW Sap Conrol Block */ 
    U8             numKwuSaps;     /*!< Number of RLC Data Saps */
@@ -578,7 +578,7 @@ typedef struct _kwUlCb
 #ifdef LTE_L2_MEAS
    KwL2Cb        kwL2Cb; /*!< Control Block for L2 Measurements in RLC */
 #endif /* LTE_L2_MEAS */
-}KwUlCb;
+}RlcUlCb;
 
 
 /** 
@@ -596,7 +596,7 @@ typedef struct _kwUlCb
  *      - ulCb  : UL instance Control Block
  *      - dlCb  : DL instance Control Block
  */
-typedef struct _kwCb
+typedef struct rlcCb
 {
    TskInit    init;               /*!< Task Initialization Info */
    KwGenCfg   genCfg;             /*!< General Configuration Structure */
@@ -607,12 +607,12 @@ typedef struct _kwCb
    CmTqCp     kwTqCp;             /*!< Timer queue control point */
    union 
    {
-      KwUlCb   *ulCb;   /*!< Ul Control Block */
-      KwDlCb   *dlCb;   /*!< Dl Control Block */
+      RlcUlCb   *ulCb;   /*!< Ul Control Block */
+      RlcDlCb   *dlCb;   /*!< Dl Control Block */
    } u;
-}KwCb;
+}RlcCb;
 
-EXTERN KwCb *kwCb[KW_MAX_RLC_INSTANCES];   /*!< RLC global control block */
+EXTERN RlcCb *rlcCb[MAX_RLC_INSTANCES];   /*!< RLC global control block */
 
 /****************************************************************************
  *                      EXTERN Declarations
@@ -621,16 +621,16 @@ EXTERN S16 kwGetSId ARGS((SystemId *s));
 
 EXTERN Void kwTmrExpiry ARGS((PTR cb, S16 tmrEvnt));
 
-EXTERN S16 kwLmmSendTrc ARGS ((KwCb *gCb, Event event, Buffer *mBuf));
+EXTERN S16 kwLmmSendTrc ARGS ((RlcCb *gCb, Event event, Buffer *mBuf));
 
-EXTERN Void kwStartTmr ARGS((KwCb *gCb, PTR cb, S16 tmrEvnt));
+EXTERN Void kwStartTmr ARGS((RlcCb *gCb, PTR cb, S16 tmrEvnt));
 
-EXTERN Void kwStopTmr  ARGS((KwCb *gCb, PTR cb, U8 tmrType));
+EXTERN Void kwStopTmr  ARGS((RlcCb *gCb, PTR cb, U8 tmrType));
 
-EXTERN Bool kwChkTmr ARGS((KwCb *gCb,PTR cb, S16 tmrEvnt));
+EXTERN Bool kwChkTmr ARGS((RlcCb *gCb,PTR cb, S16 tmrEvnt));
 
 #ifdef LTE_L2_MEAS
-EXTERN Void kwLmmSendAlarm ARGS (( KwCb *gCb,
+EXTERN Void kwLmmSendAlarm ARGS (( RlcCb *gCb,
                                    U16 category, 
                                    U16 event, 
                                    U16 cause, 
@@ -638,17 +638,17 @@ EXTERN Void kwLmmSendAlarm ARGS (( KwCb *gCb,
                                    U32 ueId, 
                                    U8 qci));
 
-EXTERN S16 KwMiLkwDlL2MeasReq ARGS (( Pst *pst, KwL2MeasReqEvt *measReqEvt ));
-EXTERN S16 KwMiLkwDlL2MeasSendReq ARGS((Pst *pst,U8 measType));
-EXTERN S16 KwMiLkwDlL2MeasStopReq ARGS((Pst *pst,U8 measType));
-EXTERN S16 KwMiLkwUlL2MeasReq ARGS (( Pst *pst, KwL2MeasReqEvt *measReqEvt ));
-EXTERN S16 KwMiLkwUlL2MeasSendReq ARGS((Pst *pst,U8 measType));
-EXTERN S16 KwMiLkwUlL2MeasStopReq ARGS((Pst *pst,U8 measType));
+EXTERN S16 KwMiRlcDlL2MeasReq ARGS (( Pst *pst, KwL2MeasReqEvt *measReqEvt ));
+EXTERN S16 KwMiRlcDlL2MeasSendReq ARGS((Pst *pst,U8 measType));
+EXTERN S16 KwMiRlcDlL2MeasStopReq ARGS((Pst *pst,U8 measType));
+EXTERN S16 KwMiRlcUlL2MeasReq ARGS (( Pst *pst, KwL2MeasReqEvt *measReqEvt ));
+EXTERN S16 KwMiRlcUlL2MeasSendReq ARGS((Pst *pst,U8 measType));
+EXTERN S16 KwMiRlcUlL2MeasStopReq ARGS((Pst *pst,U8 measType));
 EXTERN Void kwUtlPlcMeasDatInL2Sts ARGS((KwL2Cntr *measData, 
                                          KwL2MeasRbCb *rbL2Cb,
                                          U8 measType));
 #else /* LTE_L2_MEAS */
-EXTERN Void kwLmmSendAlarm ARGS ((KwCb *gCb,
+EXTERN Void kwLmmSendAlarm ARGS ((RlcCb *gCb,
                                   U16 category, 
                                   U16 event, 
                                   U16 cause,