Deleted the rlog folder

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

diff --git a/src/5gnrrlc/kw_dl.x b/src/5gnrrlc/kw_dl.x
index c745c5c..e686fae 100755 (executable)
--- a/src/5gnrrlc/kw_dl.x
+++ b/src/5gnrrlc/kw_dl.x
@@ -18,12 +18,12 @@
 
 /********************************************************************20**
   
-        Name:    LTE RLC file 
+        Name:    NR RLC file      
     
         Type:    C include file
   
         Desc:    This file contains all the data structures and 
-                 prototypes for LTE RLC.
+                 prototypes for RLC.
  
         File:    kw_dl.x
   
@@ -151,9 +151,9 @@ typedef struct rlcTm
 */
 typedef struct rlcBoRep
 {
-   S32      bo;            /*!< Buffer occupancy */
+   int32_t  bo;            /*!< Buffer occupancy */
    uint16_t estHdrSz;      /*!< Estimated header size for the bo */
-   Bool     staPduPrsnt;   /*!< Indicate control bo present or not */
+   bool     staPduPrsnt;   /*!< Indicate control bo present or not */
    uint32_t staPduBo;     /*!< Indicate bo for control PDU */
    uint32_t oldestSduArrTime;
 } RlcBoRep;
@@ -192,25 +192,18 @@ typedef struct rlcDatReq
  *                    as 1 for 5 bit sequence numbers and 
  *                    2 for 10 bit sequence numbers
  *    - bo          : Current buffer occupancy for this RB
- *    - estHdrSz    : Estimated size of headers required to send 
- *                    all the SDUs in the queue
- *    - vtUs        : VT(US)
+ *    - TX_Next     : SN to be allocated to next SDU
  *    - modBitMask  : Bitmask used to do modulus operations to wrap around 
- *                    state variables, value is 0x1f or 
- *                    0x3ff for 5-bit and 10-bit sequence numbers respectively
- *    - numLi       : Number of length indicators to be sent in the next pdu
- *    - li          : Values of the lenght indicators
+ *                    state variables, value is 0x3f or 
+ *                    0xfff for 6-bit and 12-bit sequence numbers respectively
 */
 typedef struct rlcUmDl
 {
    CmLListCp   sduQ;            /*!< SDU queue for UM */
    uint8_t     snLen;           /*!< Sequence number length */
-   S32         bo;              /*!< Buffer occupancy */
-   S32         estHdrSz;        /*!< Estimated header size for BO */
-   RlcSn       vtUs;            /*!< VT(US) */
+   int32_t     bo;              /*!< Buffer occupancy */
+   RlcSn       txNext;          /*!< TX_Next */
    uint16_t    modBitMask;      /*!< Bitmask for modulus to wrap around vars*/   
-   uint16_t    numLi;           /*!< Number of LIs */
-   uint16_t    li[RLC_MAX_LI];   /*!< Length Indicator array */
 }RlcUmDl;
 
 /** 
@@ -342,13 +335,13 @@ typedef struct rlcAmDl
    RlcSdu           *nxtTx;           /*!< Next SDU to be transmitted */
    CmTimer          pollRetxTmr;      /*!< T_poll_retransmit Timer */
    uint16_t         pollRetxTmrInt;   /*!< Timer Interval */
-   S16              pollPdu;          /*!< Poll_PDU */
-   S32              pollByte;         /*!< Poll_Byte */
+   int16_t          pollPdu;          /*!< Poll_PDU */
+   int32_t          pollByte;         /*!< Poll_Byte */
    uint8_t          maxRetx;          /*!< Max_Retx_Threshold */
-   S32              cntrlBo;          /*!< BO of control pdu */ 
-   S32              retxBo;           /*!< BO of Retransmission PDUs */ 
+   int32_t          cntrlBo;          /*!< BO of control pdu */ 
+   int32_t          retxBo;           /*!< BO of Retransmission PDUs */ 
    uint32_t         estHdrSz;         /*!< Estimated header size for the BO */
-   S32              bo;               /*!< BO of new PDUs */
+   int32_t          bo;               /*!< BO of new PDUs */
 #ifndef LTE_TDD 
    CmLListCp        *txBufLst;       /*!< Transmission buffer list of type RlcTx */
 #else
@@ -358,8 +351,8 @@ typedef struct rlcAmDl
    RlcRetx          *nxtRetx;         /*!< Next node to be retransmitted */
    RlcSn            txNext;           /*!< 5GNR: TX_Next, in LTE  VT(S) */
    RlcSn            txNextAck;        /*!< 5GNR: TX_Next_Ack, in LTE VT(A)*/ 
-   S16              pduWoPoll;        /*!< PDU without poll bit counter */
-   S32              byteWoPoll;       /*!< Byte without poll bit counter */
+   int16_t          pduWoPoll;        /*!< PDU without poll bit counter */
+   int32_t          byteWoPoll;       /*!< Byte without poll bit counter */
    RlcSn            pollSn;           /*!< Poll SN */
    Buffer           *mBuf;            /*!< this can be removed later 
                                            Stores the Control Pdu */
@@ -535,7 +528,7 @@ struct rlcDlUeCb
 };
 
 /****************************************************************************
- *                      EXTERN Declarations
+ *                      Declarations
  ***************************************************************************/
 /****************************************************************************
  *                    Configuration Functions 
@@ -642,7 +635,7 @@ Void rlcDbmDelAllDlL2MeasTbFrmUe ARGS ((RlcCb *gCb, RlcDlUeCb *ueCb));
  ***************************************************************************/
 Void rlcTmmQSdu ARGS ((RlcCb *gCb,
                             RlcDlRbCb *rbCb,
-                            KwuDatReqInfo *datReqInfo,
+                            RlcDatReqInfo *datReqInfo,
                             Buffer *mBuf));
 Void rlcTmmSendToMac ARGS ((RlcCb     *gCb,
                                 SuId     suId,
@@ -656,7 +649,7 @@ Void rlcDlTmmReEstablish ARGS ((RlcCb *gCb, RlcDlRbCb *rbCb));
  ***************************************************************************/
 Void rlcUmmQSdu ARGS ((RlcCb *gCb, 
                              RlcDlRbCb *rbCb,
-                             KwuDatReqInfo *datReq, 
+                             RlcDatReqInfo *datReq, 
                              Buffer *mBuf));
 
 Void rlcUmmDiscSdu ARGS ((RlcCb *gCb, RlcDlRbCb *rbCb, uint32_t sduId));
@@ -681,7 +674,7 @@ Void rlcAmmSendDedLcBoStatus ARGS ((RlcCb *gCb, RlcDlRbCb *rbCb, RlcAmDl *amDl))
 Void rlcAmmQSdu ARGS((RlcCb *gCb,
                             RlcDlRbCb *rbCb,
                             Buffer *mBuf, 
-                            KwuDatReqInfo *datReq));
+                            RlcDatReqInfo *datReq));
 
 void rlcAmmProcessSdus ARGS((RlcCb *gCb, 
                                    RlcDlRbCb *rbCb, 
@@ -725,7 +718,7 @@ Void rlcUtlRemovTxBuf ARGS ((CmLListCp      *txBufLst,
 uint8_t rlcUtlSendDedLcBoStatus ARGS ((RlcCb *gCb,
                                   RlcDlRbCb *rbCb,
                                   int32_t bo,
-                                  int32_t estHdrSz,
+                                 int32_t estHdrSz,
                                   bool staPduPrsnt,
                                   uint32_t staPduBo));
 
@@ -735,11 +728,6 @@ Void rlcUtlEmptySduQ ARGS ((RlcCb *gCb, RlcDlRbCb *rbCb, CmLListCp *sduQ));
 Void rlcUtlEmptySduQ ARGS ((RlcCb *gCb,CmLListCp *sduQ));
 #endif /* LTE_L2_MEAS */
 
-Void rlcUtlCalcLiForSdu ARGS ((RlcCb *gCb,
-                                     uint16_t numLi, 
-                                     MsgLen msgLen,
-                                     S16 *pduSz));
-
 uint8_t rlcUtlSendToMac ARGS ((RlcCb *gCb, SuId suId, KwDStaIndInfo *staIndInfo));
 
 Void rlcUtlIncrementKwuStsSduTx ARGS((RlcKwuSapCb *rlckwuSap));
@@ -843,7 +831,7 @@ S16 rlcUtlNotifyMacUlIp ARGS ((RlcL2MeasCb *measCb,uint16_t ueIdx, Bool enable,
                                     CmLteLcId  *lChId, uint8_t *numLCh));
 #endif
 
-uint8_t rlcProcDlData(Pst *pst, KwuDatReqInfo* datReq, Buffer *buf);
+uint8_t rlcProcDlData(Pst *pst, RlcDatReqInfo* datReq, Buffer *buf);
 uint8_t rlcProcCommLcSchedRpt(Pst *pst, SuId suId, RguCStaIndInfo  *staInd);
 uint8_t rlcProcDedLcSchedRpt(Pst *pst, SuId suId, RguDStaIndInfo  *staInd);