U8, U16, U32 data type changes

[o-du/l2.git] / src / cm / kwu.x

diff --git a/src/cm/kwu.x b/src/cm/kwu.x
index ee40f9b..ba32990 100755 (executable)
--- a/src/cm/kwu.x
+++ b/src/cm/kwu.x
@@ -48,12 +48,12 @@ EXTERN "C" {
 typedef struct kwuDatReqInfo
 {
    CmLteRlcId        rlcId;               /*!< RLC ID */
-   U32               sduId;               /*!< SDU ID */
+   uint32_t               sduId;               /*!< SDU ID */
 #ifdef CCPU_OPT
    CmLteLcType       lcType;              /*!<Logical Channel Type */ 
 #ifdef EMTC_ENABLE
-   U8                emtcDiReason;    /* !< DI reason */
-   U8                pnb;                  /*!<paging narrowBand on which Ue perform Paging Reception*/
+   uint8_t                emtcDiReason;    /* !< DI reason */
+   uint8_t                pnb;                  /*!<paging narrowBand on which Ue perform Paging Reception*/
 #endif
    union
    {
@@ -78,8 +78,8 @@ typedef struct kwuDatIndInfo
 typedef struct kwuDatCfmInfo
 {
   CmLteRlcId         rlcId;          /*!< RLC ID */
-  U32                numSduIds;      /*!< Number of Id's in the sudIds array */
-  U32                sduIds[KWU_MAX_DAT_CFM];    /*!< SDU Ids */
+  uint32_t                numSduIds;      /*!< Number of Id's in the sudIds array */
+  uint32_t                sduIds[KWU_MAX_DAT_CFM];    /*!< SDU Ids */
 }KwuDatCfmInfo;
 
 /** @brief Discard SDU Request Information from PDCP to RLC */
@@ -89,14 +89,14 @@ typedef KwuDatCfmInfo KwuDiscSduInfo;
 typedef struct kwuStaIndInfo
 {
    CmLteRlcId        rlcId;               /*!< RLC ID */
-   U32               numSdu;              /*!< Number of SDUs */
-   U32               sduId[KWU_MAX_STA_IND_SDU]; /*!< SDU Id Array */
+   uint32_t               numSdu;              /*!< Number of SDUs */
+   uint32_t               sduId[KWU_MAX_STA_IND_SDU]; /*!< SDU Id Array */
 }KwuStaIndInfo;
 
 typedef struct kwuFlowCntrlIndInfo
 {
    CmLteRlcId   rlcId; 
-   U32          pktAdmitCnt;
+   uint32_t          pktAdmitCnt;
 }KwuFlowCntrlIndInfo;
 /* kwu_x_001.main_3 Added support for L2 Measurement */
 #ifdef LTE_L2_MEAS
@@ -104,7 +104,7 @@ typedef struct kwuFlowCntrlIndInfo
 typedef struct kwuDatAckInfo
 {
    CmLteRlcId        rlcId;               /*!< RLC ID */
-   U32               sduId;               /*!< SDU Id Array */
+   uint32_t               sduId;               /*!< SDU Id Array */
 }KwuDatAckInfo;
 #endif /* LTE_L2_MEAS */
 
@@ -115,18 +115,18 @@ typedef struct kwuDatReqDetl
   Buffer       *mBuf;
   CmLteLcType  lcType;
   Ticks        arrTime; 
-  U32          sduId;
+  uint32_t          sduId;
   CmLteRlcId   rlcId;
 }KwuDatReqDetl;
 #endif 
 
 /* Control primitives towards LTE RRC */
 typedef S16 (*KwuBndReq)      ARGS((Pst *pst, SuId suId,  SpId spId));
-typedef S16 (*KwuBndCfm)      ARGS((Pst *pst, SuId suId, U8 status));
+typedef S16 (*KwuBndCfm)      ARGS((Pst *pst, SuId suId, uint8_t status));
 typedef S16 (*KwuUbndReq)     ARGS((Pst *pst, SuId suId, Reason reason));
 
 typedef S16 (*KwuDatReq)      ARGS((Pst *pst, KwuDatReqInfo* datReq, Buffer *mBuf));
-typedef S16 (*KwuDatInd)      ARGS((Pst *pst, KwuDatIndInfo* datInd,
+typedef uint8_t (*KwuDatInd)      ARGS((Pst *pst, KwuDatIndInfo* datInd,
          Buffer *mBuf));
 typedef S16 (*KwuDatCfm)      ARGS((Pst *pst, SuId suId, KwuDatCfmInfo* datCfm));
 typedef S16 (*KwuDiscSduReq)  ARGS((Pst *pst, SpId spId, KwuDiscSduInfo* discSdu));
@@ -144,7 +144,7 @@ typedef S16 (*KwuDiscSduCfm) ARGS((Pst *pst, SuId suId, KwuDiscSduInfo *discCfmI
  * @details This primitive binds the RLC service user entity to the RLC product.
  * The RLC service user must bind each KWU SAP individually before sending any
  * other request. RLC acknowledges the receipt of the bind request by sending
- * a KwUiKwuBndCfm primitive.
+ * a RlcUiKwuBndCfm primitive.
 
  * @param[in] pst    -  For the bind request, the event field in the Pst structure is set to
 EVTKWUBNDREQ
@@ -156,13 +156,13 @@ Allowable values: 0 to 32767.
  *    -# ROK
  *    -# RFAILED
  */
-EXTERN S16 KwUiKwuBndReq ARGS((Pst *pst,
+EXTERN S16 RlcUiKwuBndReq ARGS((Pst *pst,
          SuId suId,
          SpId spId));
 
 /** 
  * @details RLC invokes the bind confirm primitive to acknowledge the receipt
- * of the KwUiKwuBndReq primitive from the service user. The status field
+ * of the RlcUiKwuBndReq primitive from the service user. The status field
  * indicates whether the bind request succeeded or failed. The bind request
  * may fail due to invalid parameters in the bind request from the
  * service user (for example, an invalid spId).
@@ -178,9 +178,9 @@ CM_BND_NOK: Error encountered during the processing of the bind request.
  *    -# ROK
  *    -# RFAILED
  */
-EXTERN S16 KwUiKwuBndCfm ARGS((Pst *pst,
+EXTERN S16 RlcUiKwuBndCfm ARGS((Pst *pst,
          SuId suId,
-         U8 status));
+         uint8_t status));
 
 /** 
  * @details The RLC service user initiates this primitive for performing
@@ -196,28 +196,10 @@ disassociated from its service user SAP. Allowable values: 0 to 32767.
  *    -# ROK
  *    -# RFAILED
  */
-EXTERN S16 KwUiKwuUbndReq ARGS((Pst *pst,
+EXTERN S16 RlcUiKwuUbndReq ARGS((Pst *pst,
          SpId spId,
          Reason reason));
 
-/**
- *@details This primitive is used by RRC to transfer the SDU data to the RLC.
- RLC will send the data to logical channels in the form of PDUs by assembling 
- [concatenating/segmenting/retransmission (in case of AM), concatenating if
- required (in case of UM)] SDUs received from the service user (RRC/PDCP).
-
- * @param[in] pst    -  Pointer to the pst structure
- * @param[in] spId   -  Service provider ID
- * @param[in] datReq -  Data request parameter
- * @param[in] buf    -  RLC SDU
- * @return  S16 
- *   -# ROK
- *   -# RFAILED
- */
-EXTERN S16 KwUiKwuDatReq ARGS((Pst *pst,
-         KwuDatReqInfo* datReq,
-         Buffer *buf));
-
 /**
  *@details This primitive is used by RLC to transfer the SDU data to the service
  user (RRC/PDCP) recieved from the peer RLC. RLC will send the data to service
@@ -231,12 +213,12 @@ EXTERN S16 KwUiKwuDatReq ARGS((Pst *pst,
  *   -# ROK
  *   -# RFAILED
  */
-EXTERN S16 KwUiKwuDatInd ARGS((Pst *pst,
-         KwuDatIndInfo* datInd,
-         Buffer *mBuf));
+EXTERN S16 rlcSendUlDataToDu ARGS((Pst *pst,
+       KwuDatIndInfo* datInd,
+       Buffer *mBuf));
 
 /**
- *@details This primitive is used by RLC as the confirmation for the KwUiKwuDatReq
+ *@details This primitive is used by RLC as the confirmation for the RlcProcDlData
  to the service user (RLC/PDCP). It is used only in AM mode data transfers for
  RLC.
 
@@ -247,7 +229,7 @@ EXTERN S16 KwUiKwuDatInd ARGS((Pst *pst,
  *   -# ROK
  *   -# RFAILED 
  */
-EXTERN S16 KwUiKwuDatCfm ARGS((Pst *pst,
+EXTERN S16 RlcUiKwuDatCfm ARGS((Pst *pst,
          SuId suId,
          KwuDatCfmInfo* datCfm));
 
@@ -263,7 +245,7 @@ EXTERN S16 KwUiKwuDatCfm ARGS((Pst *pst,
  *   -# ROK
  *   -# RFAILED
  */
-EXTERN S16 KwUiKwuDiscSduReq ARGS((Pst *pst,
+EXTERN S16 RlcUiKwuDiscSduReq ARGS((Pst *pst,
          SpId spId,
          KwuDiscSduInfo* discSdu));
 
@@ -279,7 +261,7 @@ EXTERN S16 KwUiKwuDiscSduReq ARGS((Pst *pst,
  *   -# ROK
  *   -# RFAILED
  */
-EXTERN S16 KwUiKwuStaInd ARGS((Pst *pst,
+EXTERN S16 RlcUiKwuStaInd ARGS((Pst *pst,
          SuId suId,
          KwuStaIndInfo* staInd));
 
@@ -295,7 +277,7 @@ EXTERN S16 KwUiKwuStaInd ARGS((Pst *pst,
  *   -# ROK
  *   -# RFAILED
  */
-EXTERN S16 KwUiKwuDiscSduCfm ARGS((Pst *pst,
+EXTERN S16 RlcUiKwuDiscSduCfm ARGS((Pst *pst,
          SpId spId,
          KwuDiscSduInfo* discCfmSdu));
 
@@ -310,7 +292,7 @@ EXTERN S16 KwUiKwuDiscSduCfm ARGS((Pst *pst,
  *   -# ROK
  *   -# RFAILED
  */
-EXTERN S16 KwUiKwuFlowCntrlInd ARGS((Pst *pst,
+EXTERN S16 RlcUiKwuFlowCntrlInd ARGS((Pst *pst,
          SuId suId,
          KwuFlowCntrlIndInfo* flowCntrlIndInfo));
 #ifdef LTE_L2_MEAS
@@ -326,12 +308,12 @@ EXTERN S16 KwUiKwuFlowCntrlInd ARGS((Pst *pst,
  *   -# ROK
  *   -# RFAILED
  */
-EXTERN S16 KwUiKwuDatAckInd ARGS((Pst *pst,
+EXTERN S16 RlcUiKwuDatAckInd ARGS((Pst *pst,
          SuId suId,
          KwuDatAckInfo* ackInd));
 #endif /* LTE_L2_MEAS */
 
-EXTERN S16 KwUiKwuReEstCmpInd ARGS((Pst *pst,
+EXTERN S16 RlcUiKwuReEstCmpInd ARGS((Pst *pst,
          SuId suId,
          CmLteRlcId rlcId
 ));
@@ -344,7 +326,7 @@ EXTERN S16 NhLiKwuBndReq ARGS((Pst *pst,
 
 EXTERN S16 NhLiKwuBndCfm ARGS((Pst *pst,
          SuId suId,
-         U8 status));
+         uint8_t status));
 
 EXTERN S16 NhLiKwuUbndReq ARGS((Pst *pst,
          SpId spId,
@@ -368,7 +350,7 @@ EXTERN S16 DmUiKwuBndReq ARGS((Pst *pst,
 
 EXTERN S16 DmUiKwuBndCfm ARGS((Pst *pst,
          SuId suId,
-         U8 status));
+         uint8_t status));
 
 EXTERN S16 DmUiKwuUbndReq ARGS((Pst *pst,
          SpId spId,
@@ -397,7 +379,7 @@ EXTERN S16 PjLiKwuBndReq ARGS((Pst *pst,
 
 EXTERN S16 PjLiKwuBndCfm ARGS((Pst *pst,
          SuId suId,
-         U8 status));
+         uint8_t status));
 
 EXTERN S16 PjLiKwuUbndReq ARGS((Pst *pst,
          SpId spId,
@@ -443,19 +425,19 @@ EXTERN S16 PjLiKwuDatAckInd ARGS((Pst *pst,
 
 #endif /* PJ */
 #ifdef MAC_RLC_UL_RBUF
-EXTERN S16 kwUlBatchProc ARGS((Void));
+EXTERN S16 rlcUlBatchProc ARGS((Void));
 #endif 
 /*****************************************************************************
  *                      PACK/UNPACK FUNCTIONS
  ****************************************************************************/
 #ifdef LCKWU
 /* Packing Functions */
-EXTERN S16 cmPkKwuDatReqInfo ARGS ((
+EXTERN uint8_t cmPkKwuDatReqInfo ARGS ((
 KwuDatReqInfo *param,
 Buffer *mBuf
 ));
 
-EXTERN S16 cmPkKwuDatIndInfo ARGS ((
+EXTERN uint8_t cmPkKwuDatIndInfo ARGS ((
 KwuDatIndInfo *param,
 Buffer *mBuf
 ));
@@ -485,16 +467,16 @@ Reason reason
 EXTERN S16 cmPkKwuBndCfm ARGS ((
 Pst * pst,
 SuId suId,
-U8 status
+uint8_t status
 ));
 
-EXTERN S16 cmPkKwuDatReq ARGS ((
+EXTERN uint8_t cmPkKwuDatReq ARGS ((
 Pst * pst,
 KwuDatReqInfo* datReq,
 Buffer * mBuf
 ));
 
-EXTERN S16 cmPkKwuDatInd ARGS ((
+EXTERN uint8_t cmPkKwuDatInd ARGS ((
 Pst * pst,
 KwuDatIndInfo* datInd,
 Buffer * mBuf
@@ -556,7 +538,7 @@ KwuDatReqInfo *param,
 Buffer *mBuf
 ));
 
-EXTERN S16 cmUnpkKwuDatIndInfo ARGS ((
+EXTERN uint8_t cmUnpkKwuDatIndInfo ARGS ((
 KwuDatIndInfo *param,
 Buffer *mBuf
 ));
@@ -595,7 +577,7 @@ Pst *pst,
 Buffer *mBuf
 ));
 
-EXTERN S16 cmUnpkKwuDatInd ARGS ((
+EXTERN uint8_t cmUnpkKwuDatInd ARGS ((
 KwuDatInd func,
 Pst *pst,
 Buffer *mBuf