U8, U16, U32 data type changes

[o-du/l2.git] / src / 5gnrrlc / kw_uim.c

diff --git a/src/5gnrrlc/kw_uim.c b/src/5gnrrlc/kw_uim.c
index 0bb8e36..f768821 100755 (executable)
--- a/src/5gnrrlc/kw_uim.c
+++ b/src/5gnrrlc/kw_uim.c
@@ -31,7 +31,7 @@
 
         --RlcUiKwuBndReq
         --RlcUiKwuUbndReq
-        --RlcUiKwuDatReq
+        --rlcProcDlData
         --RlcUiKwuDiscSduReq 
 
      File:     kw_uim.c
@@ -114,8 +114,6 @@ SpId   spId;
    RlcCkwSapCb   *ckwSap;  
    RlcCb         *tRlcCb;
 
-   TRC3(RlcUiCkwBndReq);
-
 #if (ERRCLASS & ERRCLS_INT_PAR)
    if (pst->dstInst >= MAX_RLC_INSTANCES)
    {
@@ -220,8 +218,6 @@ Reason   reason;
 {
    RlcCb *tRlcCb;
 
-   TRC3(RlcUiCkwUbndReq)
-
 #if (ERRCLASS & ERRCLS_INT_PAR)
    if (pst->dstInst >= MAX_RLC_INSTANCES)
    {
@@ -279,11 +275,8 @@ RlcCfgInfo   *cfg;
    RlcCb        *tRlcCb;
    RlcUlCfgTmpData   *cfgTmpData;
 
-   static U32  transCount;
+   static uint32_t  transCount;
 
-
-   TRC3(RlcProcCfgReq)
-      
 #if (ERRCLASS & ERRCLS_INT_PAR)
    if (pst->dstInst >= MAX_RLC_INSTANCES)
    {
@@ -307,6 +300,7 @@ RlcCfgInfo   *cfg;
    cfgTmpData->cfgInfo  = cfg;
 
  
+   tRlcCb->u.ulCb->rlcUlUdxEventType = pst->event;
    if (rlcDbmAddUlTransaction(tRlcCb, cfgTmpData) != ROK)
    {
       RLOG0(L_ERROR, "Addition to UL transId Lst Failed");
@@ -345,7 +339,7 @@ S16 RlcUiCkwUeIdChgReq
 (
 Pst         *pst, 
 SpId        spId, 
-U32         transId, 
+uint32_t    transId, 
 CkwUeInfo   *ueInfo,
 CkwUeInfo   *newUeInfo
 )
@@ -353,7 +347,7 @@ CkwUeInfo   *newUeInfo
 S16 RlcUiCkwUeIdChgReq(pst, spId, transId, ueInfo, newUeInfo)
 Pst         *pst;
 SpId        spId;
-U32         transId;
+uint32_t    transId;
 CkwUeInfo   *ueInfo;
 CkwUeInfo   *newUeInfo;
 #endif
@@ -362,8 +356,6 @@ CkwUeInfo   *newUeInfo;
    RlcCb             *tRlcCb;
    RlcUlCfgTmpData   *cfgTmpData = NULLP;
 
-   TRC3(RlcUiCkwUeIdChgReq)
-
    do
    {
 #if (ERRCLASS & ERRCLS_INT_PAR)
@@ -464,9 +456,7 @@ RlcUlCfgTmpData   *cfgTmpData;
 RlcCfgInfo       *cfg;
 #endif
 {
-   U8   idx;  
-
-   TRC3(rlcUlHdlCfgReq)
+   uint8_t   idx;  
 
    cfgTmpData->ueId = cfg->ueId;
    cfgTmpData->cellId = cfg->cellId;
@@ -579,7 +569,7 @@ RlcCfgInfo       *cfg;
          }
       }/* switch end */
    }/* for end */
-   RETVOID;
+   return;
 }
 
 \f
@@ -623,8 +613,6 @@ SpId   spId;
    RlcKwuSapCb   *rlckwuSap;     /* SAP Config Block */
    RlcCb         *tRlcCb;
    
-   TRC3(RlcUiKwuBndReq)
-
 #if (ERRCLASS & ERRCLS_INT_PAR)
    if (pst->dstInst >= MAX_RLC_INSTANCES)
    {
@@ -742,8 +730,6 @@ Reason   reason;
    RlcKwuSapCb   *rlckwuSap;   /* KWU SAP control block */
    RlcCb         *tRlcCb;
 
-   TRC3(RlcUiKwuUbndReq)
-
 #if (ERRCLASS & ERRCLS_INT_PAR)
    if ((pst->dstInst >= MAX_RLC_INSTANCES) ||
        (spId >= (S16) rlcCb[pst->dstInst]->genCfg.maxKwuSaps) ||
@@ -781,36 +767,22 @@ Reason   reason;
  * @param[in] datreq  Data Request Information
  * @param[in] mBuf        Data Buffer (SDU) 
  *
- * @return  S16
+ * @return  uint8_t
  *    -# ROK 
  *    -# RFAILED
  */
-#ifdef ANSI
-S16 RlcUiKwuDatReq
-(
-Pst             *pst,   
-KwuDatReqInfo   *datReq, 
-Buffer          *mBuf   
-)
-#else
-S16 RlcUiKwuDatReq(pst, datReq, mBuf)
-Pst             *pst;  
-KwuDatReqInfo   *datReq; 
-Buffer          *mBuf;  
-#endif
+uint8_t rlcProcDlData(Pst *pst, KwuDatReqInfo *datReq, Buffer *mBuf)
 {
-   S16          ret = ROK;   /* Return Value */
+   uint8_t       ret = ROK;   /* Return Value */
    RlcDlRbCb     *rbCb;       /* RB Control Block */
    RlcCb         *tRlcCb;
 
-   TRC3(RlcUiKwuDatReq)
-
    DU_LOG("\nRLC : Received DL Data");
 
 #if (ERRCLASS & ERRCLS_INT_PAR)
    if(pst->dstInst >= MAX_RLC_INSTANCES)
    {
-      SPutMsg(mBuf);
+      ODU_PUT_MSG_BUF(mBuf);
       return RFAILED;
    }
 #endif
@@ -821,7 +793,7 @@ Buffer          *mBuf;
    rlcDbmFetchDlRbCbByRbId(tRlcCb, &datReq->rlcId, &rbCb);
    if(!rbCb)
    {
-      RLOG_ARG2(L_WARNING, DBG_UEID,datReq->rlcId.ueId, "CellId[%u]:DL RbId [%d] not found",
+      DU_LOG("\nRLC : CellId[%u]:DL RbId [%d] not found",
             datReq->rlcId.cellId,datReq->rlcId.rbId);
       RLC_FREE_BUF(mBuf);
 
@@ -860,11 +832,11 @@ Buffer          *mBuf;
       }
       default:
       {
-         RLOG0(L_ERROR, "Invalid RB Mode");
+         DU_LOG("\nRLC : Invalid RB Mode");
          break;
       }
    }
-   return (ret);
+   return ret;
 } 
 
 \f