X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrrlc%2Fkw_uim.c;h=7910ebbe60d96477f02d7f6864749a05e18dec7f;hb=3275b4a8aec68cc23c20062f157c9f3a494d6271;hp=daf15f8d73bc85c2a308674c4178ad1fb01ca731;hpb=2193e4cf01012809495be026097e8d7eacb9f0ac;p=o-du%2Fl2.git

diff --git a/src/5gnrrlc/kw_uim.c b/src/5gnrrlc/kw_uim.c
index daf15f8d7..7910ebbe6 100755
--- a/src/5gnrrlc/kw_uim.c
+++ b/src/5gnrrlc/kw_uim.c
@@ -97,25 +97,16 @@ static int RLOG_FILE_ID=205;
  *    -# RFAILED
  *
 */
-#ifdef ANSI
 S16 RlcUiCkwBndReq 
 (
 Pst    *pst,
 SuId   suId,
 SpId   spId 
 )
-#else
-S16 RlcUiCkwBndReq (pst, suId, spId)
-Pst    *pst; 
-SuId   suId;
-SpId   spId;
-#endif
 {
    RlcCkwSapCb   *ckwSap;  
    RlcCb         *tRlcCb;
 
-   TRC3(RlcUiCkwBndReq);
-
 #if (ERRCLASS & ERRCLS_INT_PAR)
    if (pst->dstInst >= MAX_RLC_INSTANCES)
    {
@@ -204,24 +195,15 @@ SpId   spId;
  *    -# ROK 
  *    -# RFAILED
 */ 
-#ifdef ANSI
 S16 RlcUiCkwUbndReq
 (
 Pst      *pst,   
 SpId     spId,  
 Reason   reason 
 )
-#else
-S16 RlcUiCkwUbndReq(pst, spId, reason)
-Pst      *pst; 
-SpId     spId; 
-Reason   reason;
-#endif
 {
    RlcCb *tRlcCb;
 
-   TRC3(RlcUiCkwUbndReq)
-
 #if (ERRCLASS & ERRCLS_INT_PAR)
    if (pst->dstInst >= MAX_RLC_INSTANCES)
    {
@@ -264,26 +246,17 @@ Reason   reason;
  *      -# ROK 
  *      -# RFAILED
  */
-#ifdef ANSI
 S16 RlcProcCfgReq
 (
 Pst          *pst,
 RlcCfgInfo   *cfg
 )
-#else
-S16 RlcProcCfgReq(pst, cfg)
-Pst          *pst;
-RlcCfgInfo   *cfg;
-#endif
 {
    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 +280,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");
@@ -340,30 +314,19 @@ RlcCfgInfo   *cfg;
  *    -# ROK
  *    -# RFAILED
  */
-#ifdef ANSI
 S16 RlcUiCkwUeIdChgReq
 (
 Pst         *pst, 
 SpId        spId, 
-U32         transId, 
+uint32_t    transId, 
 CkwUeInfo   *ueInfo,
 CkwUeInfo   *newUeInfo
 )
-#else
-S16 RlcUiCkwUeIdChgReq(pst, spId, transId, ueInfo, newUeInfo)
-Pst         *pst;
-SpId        spId;
-U32         transId;
-CkwUeInfo   *ueInfo;
-CkwUeInfo   *newUeInfo;
-#endif
 {
    S16              ret = ROK;
    RlcCb             *tRlcCb;
    RlcUlCfgTmpData   *cfgTmpData = NULLP;
 
-   TRC3(RlcUiCkwUeIdChgReq)
-
    do
    {
 #if (ERRCLASS & ERRCLS_INT_PAR)
@@ -450,23 +413,14 @@ CkwUeInfo   *newUeInfo;
  *    -# ROK 
  *    -# RFAILED
  */
-#ifdef ANSI
 Void rlcUlHdlCfgReq
 (
-RlcCb             *gCb,
-RlcUlCfgTmpData   *cfgTmpData,
-RlcCfgInfo       *cfg
+RlcCb           *gCb,
+RlcUlCfgTmpData *cfgTmpData,
+RlcCfgInfo      *cfg
 )
-#else
-Void rlcUlHdlCfgReq(gCb, cfgTmpData, cfg)
-RlcCb             *gCb;
-RlcUlCfgTmpData   *cfgTmpData;
-RlcCfgInfo       *cfg;
-#endif
 {
-   U8   idx;  
-
-   TRC3(rlcUlHdlCfgReq)
+   uint8_t   idx;  
 
    cfgTmpData->ueId = cfg->ueId;
    cfgTmpData->cellId = cfg->cellId;
@@ -579,7 +533,7 @@ RlcCfgInfo       *cfg;
          }
       }/* switch end */
    }/* for end */
-   RETVOID;
+   return;
 }
 
 
@@ -606,25 +560,16 @@ RlcCfgInfo       *cfg;
  *    -# RFAILED
  *
  */
-#ifdef ANSI
 S16 RlcUiKwuBndReq 
 (
 Pst    *pst,  
 SuId   suId, 
 SpId   spId 
 )
-#else
-S16 RlcUiKwuBndReq (pst, suId, spId)
-Pst    *pst;  
-SuId   suId; 
-SpId   spId; 
-#endif
 {
    RlcKwuSapCb   *rlckwuSap;     /* SAP Config Block */
    RlcCb         *tRlcCb;
    
-   TRC3(RlcUiKwuBndReq)
-
 #if (ERRCLASS & ERRCLS_INT_PAR)
    if (pst->dstInst >= MAX_RLC_INSTANCES)
    {
@@ -725,25 +670,16 @@ SpId   spId;
  *     -# ROK 
  *     -# RFAILED
  */
-#ifdef ANSI
 S16 RlcUiKwuUbndReq
 (
 Pst      *pst,  
 SpId     spId, 
 Reason   reason 
 )
-#else
-S16 RlcUiKwuUbndReq(pst, spId, reason)
-Pst      *pst; 
-SpId     spId; 
-Reason   reason; 
-#endif
 {
    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) ||
@@ -809,7 +745,7 @@ uint8_t rlcProcDlData(Pst *pst, KwuDatReqInfo *datReq, Buffer *mBuf)
    {
       DU_LOG("\nRLC : CellId[%u]:DL RbId [%d] not found",
             datReq->rlcId.cellId,datReq->rlcId.rbId);
-      RLC_FREE_BUF(mBuf);
+      ODU_PUT_MSG_BUF(mBuf);
 
       return RFAILED;
    }
@@ -817,7 +753,7 @@ uint8_t rlcProcDlData(Pst *pst, KwuDatReqInfo *datReq, Buffer *mBuf)
    /* Dispatch according to mode of the rbCb */
    switch (rbCb->mode)
    {
-      case CM_LTE_MODE_TM:
+      case RLC_MODE_TM:
       {
          /* Verify the user */
          if (pst->srcEnt != ENTNH)
@@ -825,7 +761,7 @@ uint8_t rlcProcDlData(Pst *pst, KwuDatReqInfo *datReq, Buffer *mBuf)
             /* kw002.201 Freeing from proper region */
             RLC_SHRABL_STATIC_BUF_FREE(pst->region, pst->pool, datReq, 
                         sizeof(KwuDatReqInfo));
-            RLC_FREE_BUF(mBuf);
+            ODU_PUT_MSG_BUF(mBuf);
              
             return RFAILED;
          }
@@ -833,13 +769,13 @@ uint8_t rlcProcDlData(Pst *pst, KwuDatReqInfo *datReq, Buffer *mBuf)
          rlcTmmQSdu(tRlcCb,rbCb, datReq, mBuf);
          break;
       }
-      case CM_LTE_MODE_UM:
+      case RLC_MODE_UM:
       {
          rlcUmmQSdu(tRlcCb,rbCb, datReq, mBuf);
 
          break;
       }
-      case CM_LTE_MODE_AM:
+      case RLC_MODE_AM:
       {
          rlcAmmQSdu(tRlcCb,rbCb, mBuf, datReq);
          break;
@@ -872,19 +808,12 @@ uint8_t rlcProcDlData(Pst *pst, KwuDatReqInfo *datReq, Buffer *mBuf)
  *    -# ROK 
  *    -# RFAILED
  */
-#ifdef ANSI
 S16 RlcUiKwuDiscSduReq 
 (
 Pst              *pst,   
 SpId             spId,  
 KwuDiscSduInfo   *discSdu 
 )
-#else
-S16 RlcUiKwuDiscSduReq(pst, spId, discSdu)
-Pst              *pst;   
-SpId             spId;  
-KwuDiscSduInfo   *discSdu; 
-#endif
 {
    RLC_SHRABL_STATIC_BUF_FREE(pst->region, pst->pool, discSdu, sizeof(KwuDiscSduInfo));
    return ROK;