Merge "DL throughput calculation for UM [Issue-ID: ODUHIGH-319]"

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

diff --git a/src/5gnrrlc/kw_cfg_dl.c b/src/5gnrrlc/kw_cfg_dl.c
index 4e58f68..e8f6ccc 100755 (executable)
--- a/src/5gnrrlc/kw_cfg_dl.c
+++ b/src/5gnrrlc/kw_cfg_dl.c
@@ -18,7 +18,7 @@
 
 /********************************************************************20**
 
-        Name:    LTE RLC - Configuration Manager file
+        Name:    NR RLC - Configuration Manager file
 
         Type:    C source file
 
@@ -36,9 +36,6 @@
         File:    kw_cfg_dl.c
 
 *********************************************************************21*/
-static const char* RLOG_MODULE_NAME="CFG";
-static int RLOG_MODULE_ID=2048;
-static int RLOG_FILE_ID=191;
 
 /** @file kw_cfg_dl.c
 @brief RLC Downlink Configuration Module
@@ -47,6 +44,7 @@ static int RLOG_FILE_ID=191;
 \f
 /* header (.h) include files */
 #include "common_def.h"
+#include "math.h"
 #include "lkw.h"           /* LKW defines */
 #include "ckw.h"           /* CKW defines */
 #include "kwu.h"           /* KWU defines */
@@ -66,6 +64,7 @@ static int RLOG_FILE_ID=191;
 #include "kw.x"
 #include "kw_udx.x"
 #include "kw_dl.x"
+#include "du_app_rlc_inf.h"
 
 #define RLC_MODULE RLC_DBGMASK_CFG
 /*Added for adding new Ue in onging L2 Meas*/
@@ -301,6 +300,7 @@ static S16 rlcAddToDlL2Meas(RlcCb *gCb, RlcDlRbCb *rlcRbCb,uint8_t cellId,uint8_
    return ROK;
 }/*rlcAddToDlL2Meas*/ 
 #endif /*LTE_L2_MEAS*/
+
 \f
 /** 
  * @brief
@@ -318,8 +318,7 @@ static S16 rlcAddToDlL2Meas(RlcCb *gCb, RlcDlRbCb *rlcRbCb,uint8_t cellId,uint8_
 static S16 rlcCfgFillDlRbCb(RlcCb *gCb,RlcDlRbCb *rbCb,RlcDlUeCb *ueCb,RlcEntCfgInfo *entCfg)
 {
 
-   RLOG_ARG3(L_DEBUG,DBG_RBID,entCfg->rbId,
-         "rlcCfgFillRbCb(ueId(%d),cellId(%d) rbType(%d))",
+   DU_LOG("\nDEBUG  -->  RLC_DL : rlcCfgFillRbCb(ueId(%d),cellId(%d) rbType(%d))",
                 rbCb->rlcId.ueId,
                 rbCb->rlcId.cellId, 
                 entCfg->rbType);
@@ -365,8 +364,9 @@ static S16 rlcCfgFillDlRbCb(RlcCb *gCb,RlcDlRbCb *rbCb,RlcDlUeCb *ueCb,RlcEntCfg
          rbCb->lch.lChId  = entCfg->lCh[0].lChId;
          rbCb->lch.lChType = entCfg->lCh[0].type;
          rbCb->dir = RLC_DIR_BOTH;
+
          rbCb->m.amDl.pollPdu = entCfg->m.amInfo.dl.pollPdu;
-         rbCb->m.amDl.pollByte = entCfg->m.amInfo.dl.pollByte;
+        rbCb->m.amDl.pollByte = entCfg->m.amInfo.dl.pollByte;
          rbCb->m.amDl.maxRetx = entCfg->m.amInfo.dl.maxRetx;
          rbCb->m.amDl.pollRetxTmrInt = entCfg->m.amInfo.dl.pollRetxTmr;
          rbCb->m.amDl.snLen = entCfg->m.amInfo.dl.snLen;
@@ -381,8 +381,6 @@ static S16 rlcCfgFillDlRbCb(RlcCb *gCb,RlcDlRbCb *rbCb,RlcDlUeCb *ueCb,RlcEntCfg
          }
 
          cmInitTimers(&(rbCb->m.amDl.pollRetxTmr), 1);
-      
-        
          ueCb->lCh[rbCb->lch.lChId - 1].dlRbCb = rbCb;
        
 #ifndef LTE_TDD 
@@ -399,8 +397,7 @@ static S16 rlcCfgFillDlRbCb(RlcCb *gCb,RlcDlRbCb *rbCb,RlcDlUeCb *ueCb,RlcEntCfg
       }
       default:
       {
-         RLOG_ARG2(L_ERROR,DBG_RBID,entCfg->rbId, 
-                  "Invalid RB Mode ueId(%d),cellId(%d)",
+         DU_LOG("\nERROR  -->  RLC_DL : Invalid RB Mode ueId(%d),cellId(%d)",
                   rbCb->rlcId.ueId,
                   rbCb->rlcId.cellId);
          return RFAILED;
@@ -436,8 +433,7 @@ RlcEntCfgInfo   *entCfg
    
    if (rbCb->mode != entCfg->entMode)
    {
-      RLOG_ARG4(L_ERROR,DBG_RBID,rbCb->rlcId.rbId,
-            "RB Mode Mismatch : exp [%d] rcv [%d] UEID:%d CELLID:%d", 
+      DU_LOG("\nERROR  -->  RLC_DL : RB Mode Mismatch : exp [%d] rcv [%d] UEID:%d CELLID:%d", 
             rbCb->mode, 
             entCfg->entMode,
             rbCb->rlcId.ueId,
@@ -546,8 +542,7 @@ RlcEntCfgCfmInfo   *entCfm
    RlcDlRbCb     *rlcRbCb;         /* KW RB Control Block */
    uint8_t       reason;          /* Rb Identifier */
 
-   RLOG_ARG3(L_DEBUG,DBG_RBID,entCfg->rbId, 
-         "rlcCfgAddRb(cellId(%d),UEID:%d cfgType(%d))",
+   DU_LOG("\nDEBUG  -->  RLC_DL : rlcCfgAddRb(cellId(%d),UEID:%d cfgType(%d))",
                 cellId, 
                 ueId,
                 entCfg->cfgType);
@@ -557,8 +552,7 @@ RlcEntCfgCfmInfo   *entCfm
       /* Fill entCfm structure */
       RLC_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK,
                           CKW_CFG_REAS_CELL_UNKWN);
-      RLOG_ARG1(L_ERROR,DBG_RBID,entCfg->rbId,
-               "Add DLRb,CellId is 0 for UEID:%d",
+      DU_LOG("\nERROR  -->  RLC_DL : Add DLRb,CellId is 0 for UEID:%d",
                ueId);
       return RFAILED;
    }
@@ -579,8 +573,7 @@ RlcEntCfgCfmInfo   *entCfm
          RLC_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, 
                              CKW_CFG_CFM_NOK,
                              CKW_CFG_REAS_RB_UNKWN);
-         RLOG_ARG3(L_ERROR,DBG_RBID,entCfg->rbId,
-                  "Invalid RbId ,Max is [%d] CELLID:%d UEID:%d",
+         DU_LOG("\nERROR  -->  RLC_DL : Invalid RbId ,Max is [%d] CELLID:%d UEID:%d",
                   RLC_MAX_RB_PER_CELL,
                   cellId,
                   ueId);
@@ -603,8 +596,7 @@ RlcEntCfgCfmInfo   *entCfm
                RLC_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, 
                                    CKW_CFG_CFM_NOK,
                                    CKW_CFG_REAS_RB_PRSNT);
-               RLOG_ARG2(L_WARNING, DBG_CELLID,cellId, 
-                        "RbId [%d] already exists UEID:%d",
+               DU_LOG("\nERROR  -->  RLC_DL : RbId [%d] already exists UEID:%d",
                         entCfg->rbId,
                         ueId);
                return RFAILED;
@@ -619,8 +611,7 @@ RlcEntCfgCfmInfo   *entCfm
                RLC_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, 
                                    CKW_CFG_CFM_NOK,
                                    CKW_CFG_REAS_CELL_CREAT_FAIL);
-               RLOG_ARG2(L_ERROR,DBG_CELLID,cellId,
-                        "cellCb Creation failed RBID:%d UEID:%d",
+               DU_LOG("\nERROR  -->  RLC_DL : cellCb Creation failed RBID:%d UEID:%d",
                         entCfg->rbId,
                         ueId);
                return RFAILED;
@@ -630,8 +621,7 @@ RlcEntCfgCfmInfo   *entCfm
          /* Validate LChId */
          if(entCfg->lCh[0].lChId <= 0)
          {
-            RLOG_ARG3(L_ERROR,DBG_LCID,entCfg->lCh[0].lChId ,
-                     "Invalid LcId CELLID:%d UEID:%d RBID:%d",
+            DU_LOG("\nERROR  -->  RLC_DL : Invalid LcId CELLID:%d UEID:%d RBID:%d",
                      cellId,
                      ueId,
                      entCfg->rbId);
@@ -645,8 +635,7 @@ RlcEntCfgCfmInfo   *entCfm
          RLC_ALLOC(gCb,rlcRbCb, sizeof (RlcDlRbCb));
          if (!rlcRbCb)
          {
-            RLOG_ARG2(L_FATAL,DBG_UEID,ueId,
-                     "Memory allocation failed for rbId:%d CELLID:%d",
+            DU_LOG("\nERROR  -->  RLC_DL : Memory allocation failed for rbId:%d CELLID:%d",
                      entCfg->rbId,
                      ueId);
             /* Fill entCfm structure */                           
@@ -676,8 +665,7 @@ RlcEntCfgCfmInfo   *entCfm
          /* Fill entCfm structure */
          RLC_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK,
                CKW_CFG_REAS_RB_UNKWN);
-         RLOG_ARG2(L_ERROR,DBG_RBID, entCfg->rbId,
-                  "Invalid RbId for RbType[%d] UEID:%d", 
+         DU_LOG("\nERROR  -->  RLC_DL : Invalid RbId for RbType[%d] UEID:%d", 
                   entCfg->rbType,
                   ueId);
          return RFAILED;
@@ -700,8 +688,7 @@ RlcEntCfgCfmInfo   *entCfm
                /* Fill entCfm structure */
                RLC_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK,
                      CKW_CFG_REAS_RB_PRSNT);
-               RLOG_ARG2(L_WARNING, DBG_UEID, ueId,
-                        "CellId[%u]:rbId [%d] already exists",
+               DU_LOG("\nERROR  -->  RLC_DL : CellId[%u]:rbId [%d] already exists",
                         cellId,
                         entCfg->rbId);
                return RFAILED;
@@ -715,12 +702,21 @@ RlcEntCfgCfmInfo   *entCfm
                /* Fill entCfm structure */
                RLC_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK,
                      CKW_CFG_REAS_UE_CREAT_FAIL);
-               RLOG_ARG2(L_WARNING, DBG_CELLID,cellId,
-                        "UeId [%u]:ueCb Creation Failed RBID:%d",
+               DU_LOG("\nERROR  -->  RLC_DL : UeId [%u]:ueCb Creation Failed RBID:%d",
                         ueId,
                         entCfg->rbId);
                return RFAILED;
             }
+            /* Start throughput calculation for this UE */
+            gCb->rlcThpt.thptPerUe[gCb->rlcThpt.numActvUe].ueIdx = ueId;
+            gCb->rlcThpt.thptPerUe[gCb->rlcThpt.numActvUe].dataVol = 0;
+            gCb->rlcThpt.numActvUe++;
+            
+            if((rlcChkTmr(gCb, (PTR)(&gCb->rlcThpt), EVENT_RLC_THROUGHPUT_TMR)) == FALSE)
+            {
+               printf("\nHLAL Starting Throughput timer");
+               rlcStartTmr(gCb, (PTR)(&gCb->rlcThpt), EVENT_RLC_THROUGHPUT_TMR);
+            }
          }
 
          /* Validate LChId for UM and AM modes */
@@ -741,8 +737,7 @@ RlcEntCfgCfmInfo   *entCfm
             /* Fill entCfm structure */                           
             RLC_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType,CKW_CFG_CFM_NOK,
                                     CKW_CFG_REAS_RB_CREAT_FAIL); 
-            RLOG_ARG2(L_FATAL,DBG_UEID,ueId,
-                     "Memory allocation failed RBID:%d CELLID:%d",
+            DU_LOG("\nERROR  -->  RLC_DL : Memory allocation failed RBID:%d CELLID:%d",
                      entCfg->rbId,
                      cellId);
             return RFAILED; 
@@ -794,8 +789,7 @@ RlcEntCfgCfmInfo   *entCfm
 
       /* Delete RB CB created */
       RLC_FREE(gCb,rlcRbCb, sizeof(RlcDlRbCb));
-      RLOG_ARG2(L_ERROR,DBG_RBID, entCfg->rbId,
-               "Filling of RbCb failed UEID:%d CELLID:%d",
+      DU_LOG("\nERROR  -->  RLC_DL : Filling of RbCb failed UEID:%d CELLID:%d",
                ueId,
                cellId);
       return RFAILED;
@@ -863,8 +857,7 @@ RlcEntCfgCfmInfo   *entCfm
    RlcDlUeCb     *ueCb;     /* Ue Control Block */
    uint8_t       ret;
 
-   RLOG_ARG3(L_DEBUG,DBG_UEID,ueId,
-             "rlcCfgReCfgRb(cellId(%d), cfgType(%d)) RBID:%d",
+   DU_LOG("\nDEBUG  -->  RLC_DL : rlcCfgReCfgRb(cellId(%d), cfgType(%d)) RBID:%d",
             cellId, entCfg->cfgType,entCfg->rbId);
 
 
@@ -876,8 +869,7 @@ RlcEntCfgCfmInfo   *entCfm
          /* Fill entCfm structure */
          RLC_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK,
                              CKW_CFG_REAS_RB_UNKWN);
-         RLOG_ARG3(L_ERROR,DBG_RBID,entCfg->rbId,
-                  "Invalid RbId , Max is [%d] UEID:%d CELLID:%d",
+         DU_LOG("\nERROR  -->  RLC_DL : Invalid RbId , Max is [%d] UEID:%d CELLID:%d",
                   RLC_MAX_RB_PER_CELL,
                   ueId,
                   cellId);
@@ -890,8 +882,7 @@ RlcEntCfgCfmInfo   *entCfm
          /* Fill entCfm structure */
          RLC_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK,
                              CKW_CFG_REAS_CELL_UNKWN);
-         RLOG_ARG3(L_ERROR,DBG_CELLID,cellId,
-                  "CellCb not found ueId:%d RBID:%d CELLID:%d",
+         DU_LOG("\nERROR  -->  RLC_DL : CellCb not found ueId:%d RBID:%d CELLID:%d",
                   ueId,
                   entCfg->rbId,
                   cellId);
@@ -906,8 +897,7 @@ RlcEntCfgCfmInfo   *entCfm
          /* Fill entCfm structure */
          RLC_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK,
                CKW_CFG_REAS_RB_UNKWN);
-         RLOG_ARG2(L_ERROR,DBG_UEID,ueId,
-                  "CELLID:%d RBID:%d not found",
+         DU_LOG("\nERROR  -->  RLC_DL : CELLID:%d RBID:%d not found",
                   cellId,
                   entCfg->rbId);
          return RFAILED;
@@ -929,8 +919,7 @@ RlcEntCfgCfmInfo   *entCfm
                              CKW_CFG_CFM_NOK,
                              ret);
 
-         RLOG_ARG2(L_ERROR,DBG_UEID,ueId,
-                  "CELLID:%u RBID:%d updation failed",
+         DU_LOG("\nERROR  -->  RLC_DL : CELLID:%u RBID:%d updation failed",
                   cellId,
                   entCfg->rbId);
          memcpy(rbCb, &tRbCb, sizeof(RlcDlRbCb));
@@ -945,8 +934,7 @@ RlcEntCfgCfmInfo   *entCfm
          /* Fill entCfm structure */
          RLC_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK,
                CKW_CFG_REAS_RB_UNKWN);
-         RLOG_ARG3(L_ERROR,DBG_UEID,ueId,
-                  "CELLID:%d Invalid RBID:%d for RbType[%d]",
+         DU_LOG("\nERROR  -->  RLC_DL : CELLID:%d Invalid RBID:%d for RbType[%d]",
                   cellId,
                   entCfg->rbId,
                   entCfg->rbType);
@@ -959,8 +947,7 @@ RlcEntCfgCfmInfo   *entCfm
          /* Fill entCfm structure */
          RLC_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, 
                              CKW_CFG_CFM_NOK, CKW_CFG_REAS_UE_UNKWN);
-         RLOG_ARG2(L_ERROR,DBG_CELLID, cellId,
-                  "UEID:%d UeCb not found RBID:%d",
+         DU_LOG("\nERROR  -->  RLC_DL : UEID:%d UeCb not found RBID:%d",
                   ueId,
                   entCfg->rbId);
          return (ret);
@@ -974,8 +961,7 @@ RlcEntCfgCfmInfo   *entCfm
          /* Fill entCfm structure */
          RLC_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK,
                CKW_CFG_REAS_RB_UNKWN);
-         RLOG_ARG2(L_ERROR, DBG_UEID,ueId, 
-                  "CELLID:%d RBID:%d not found",
+         DU_LOG("\nERROR  -->  RLC_DL : CELLID:%d RBID:%d not found",
                   cellId,
                   entCfg->rbId);
          return (ret);
@@ -993,8 +979,7 @@ RlcEntCfgCfmInfo   *entCfm
          /* Fill entCfm structure */
          RLC_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK,
                ret);
-         RLOG_ARG2(L_ERROR,DBG_UEID,ueId,
-                  "CELLID:%d RBID:%d updation failed",
+        DU_LOG("\nERROR  -->  RLC_DL : CELLID:%d RBID:%d updation failed",
                   cellId,
                   entCfg->rbId);
          memcpy(rbCb, &tRbCb, sizeof(RlcDlRbCb));
@@ -1054,8 +1039,7 @@ RlcEntCfgCfmInfo   *entCfm
    RlcDlCellCb   *cellCb;   /* UE Control Block */
    RlcDlRbCb     *rlcRbCb;   /* KW RB Control Block */
 
-   RLOG_ARG3(L_DEBUG,DBG_UEID,ueId, 
-            "rlcCfgDelRb(RBID(%d), cellId(%d), cfgType(%d))",
+   DU_LOG("\nDEBUG  -->  RLC_DL : rlcCfgDelRb(RBID(%d), cellId(%d), cfgType(%d))",
             entCfg->rbId, 
             cellId, 
             entCfg->cfgType);
@@ -1070,8 +1054,7 @@ RlcEntCfgCfmInfo   *entCfm
          /* Fill entCfm structure */
          RLC_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, 
                              CKW_CFG_CFM_NOK, CKW_CFG_REAS_RB_UNKWN);
-         RLOG_ARG3(L_ERROR,DBG_RBID,entCfg->rbId ,
-                  "Invalid RbId, Max is [%d] UEID:%d CELLID:%d",
+         DU_LOG("\nERROR  -->  RLC_DL : Invalid RbId, Max is [%d] UEID:%d CELLID:%d",
                   RLC_MAX_RB_PER_CELL,
                   ueId,
                   cellId);
@@ -1084,8 +1067,7 @@ RlcEntCfgCfmInfo   *entCfm
          /* Fill entCfm structure */
          RLC_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, 
                              CKW_CFG_CFM_NOK, CKW_CFG_REAS_RB_UNKWN);
-         RLOG_ARG2(L_ERROR,DBG_CELLID,cellId,
-                  "CellCb not found UEID:%d RBID:%d",
+         DU_LOG("\nERROR  -->  RLC_DL : CellCb not found UEID:%d RBID:%d",
                   ueId,
                   entCfg->rbId);
          return (ret);
@@ -1099,8 +1081,7 @@ RlcEntCfgCfmInfo   *entCfm
          /* Fill entCfm structure */
          RLC_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, 
                              CKW_CFG_CFM_NOK, CKW_CFG_REAS_RB_UNKWN);
-         RLOG_ARG2(L_ERROR, DBG_UEID,ueId,
-                  "CellId[%u]:RbId[%d] not found",
+         DU_LOG("\nERROR  -->  RLC_DL : CellId[%u]:RbId[%d] not found",
                   cellId,
                   entCfg->rbId);
          return (ret);
@@ -1122,8 +1103,7 @@ RlcEntCfgCfmInfo   *entCfm
          /* Fill entCfm structure */
          RLC_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, 
                              CKW_CFG_CFM_NOK, CKW_CFG_REAS_RB_UNKWN);
-         RLOG_ARG3(L_ERROR,DBG_RBID, entCfg->rbId,
-                  "Invalid RbId for RbType[%d] UEID:%d CELLID:%d", 
+         DU_LOG("\nERROR  -->  RLC_DL : Invalid RbId for RbType[%d] UEID:%d CELLID:%d", 
                   entCfg->rbType,
                   ueId,
                   cellId);
@@ -1137,8 +1117,7 @@ RlcEntCfgCfmInfo   *entCfm
          /* Fill entCfm structure */
          RLC_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, 
                              CKW_CFG_CFM_NOK, CKW_CFG_REAS_UE_UNKWN);
-         RLOG_ARG2(L_ERROR,DBG_CELLID, cellId,
-                  "UeId [%d]: UeCb not found RBID:%d",
+          DU_LOG("\nERROR  -->  RLC_DL : UeId [%d]: UeCb not found RBID:%d",
                   ueId,
                   entCfg->rbId);
          return (ret);
@@ -1152,8 +1131,7 @@ RlcEntCfgCfmInfo   *entCfm
          /* Fill entCfm structure */
          RLC_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType, CKW_CFG_CFM_NOK,
                CKW_CFG_REAS_RB_UNKWN);
-         RLOG_ARG2(L_ERROR, DBG_UEID,ueId,
-                  "CellId[%u]:RbId[%d] not found",
+         DU_LOG("\nERROR  -->  RLC_DL : CellId[%u]:RbId[%d] not found",
                   cellId,
                   entCfg->rbId);
          return (ret);
@@ -1238,8 +1216,7 @@ RlcEntCfgCfmInfo   *entCfm
    RlcDlRbCb     *rbCb;   /* RB Control Block */
    CmLteRlcId   rlcId;   /* RLC Identifier */
 
-   RLOG_ARG3(L_DEBUG,DBG_RBID,entCfg->rbId,
-            "rlcCfgReEstDlRb(ueId(%d), cellId(%d), cfgType(%d))",
+   DU_LOG("\nDEBUG  -->  RLC_DL : rlcCfgReEstDlRb(ueId(%d), cellId(%d), cfgType(%d))",
             ueId, 
             cellId, 
             entCfg->cfgType);
@@ -1256,8 +1233,7 @@ RlcEntCfgCfmInfo   *entCfm
       /* Fill entCfm structure */
       RLC_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, rlcId.rbType, CKW_CFG_CFM_NOK,
             CKW_CFG_REAS_RB_UNKWN);
-      RLOG_ARG2(L_ERROR, DBG_UEID,ueId,
-               "CellId[%u]:RbId[%d] not found",
+      DU_LOG("\nERROR  -->  RLC_DL : CellId[%u]:RbId[%d] not found",
                cellId,
                entCfg->rbId);
       return RFAILED;
@@ -1328,8 +1304,7 @@ RlcEntCfgCfmInfo   *entCfm
    S16        ret;     /* Return Value */
    RlcDlUeCb   *ueCb;   /* UE Control Block */
 
-   RLOG_ARG3(L_DEBUG,DBG_RBID,entCfg->rbId,
-             "rlcCfgDelUe(ueId(%d), cellId(%d), cfgType(%d))",
+   DU_LOG("\nDEBUG  -->  RLC_DL : rlcCfgDelUe(ueId(%d), cellId(%d), cfgType(%d))",
             ueId, 
             cellId, 
             entCfg->cfgType);
@@ -1342,8 +1317,7 @@ RlcEntCfgCfmInfo   *entCfm
       /* Fill entCfm structure */
       RLC_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType,
           CKW_CFG_CFM_NOK, CKW_CFG_REAS_UE_UNKWN);
-      RLOG_ARG2(L_ERROR,DBG_RBID,entCfg->rbId,
-               "ueId(%d), cellId(%d)",
+      DU_LOG("\nERROR  -->  RLC_DL : ueId(%d), cellId(%d)",
                ueId, 
                cellId);
       return RFAILED;
@@ -1356,8 +1330,7 @@ RlcEntCfgCfmInfo   *entCfm
       /* Fill entCfm structure */
       RLC_CFG_FILL_CFG_CFM(entCfm, entCfg->rbId, entCfg->rbType,
          CKW_CFG_CFM_NOK, CKW_CFG_REAS_UE_UNKWN);
-      RLOG_ARG2(L_ERROR,DBG_CELLID, cellId,
-               "UEID:%d UeCb not found RBID:%d",
+      DU_LOG("\nERROR  -->  RLC_DL : UEID:%d UeCb not found RBID:%d",
                ueId,
                entCfg->rbId);
       return RFAILED;
@@ -1409,8 +1382,7 @@ RlcEntCfgCfmInfo   *entCfm
    RlcDlCellCb   *cellCb;   /* UE Control Block */
    uint8_t       rbId;      /* RB Identifier */
 
-   RLOG_ARG2(L_DEBUG,DBG_RBID,entCfg->rbId,
-         "rlcCfgDelCell( cellId(%d), cfgType(%d)",
+   DU_LOG("\nDEBUG  -->  RLC_DL : rlcCfgDelCell( cellId(%d), cfgType(%d)",
          cellId, 
          entCfg->cfgType);
 
@@ -1423,8 +1395,7 @@ RlcEntCfgCfmInfo   *entCfm
       /* Fill entCfm structure */
       RLC_CFG_FILL_CFG_CFM(entCfm, rbId, entCfg->rbType, CKW_CFG_CFM_NOK,
             CKW_CFG_REAS_CELL_UNKWN);
-      RLOG_ARG1(L_DEBUG,DBG_RBID,entCfg->rbId,
-               "cellId is 0 (%d) ",
+      DU_LOG("\nERROR  -->  RLC_DL : cellId is 0 (%d) ",
                cellId);
       return RFAILED;
    }
@@ -1436,8 +1407,7 @@ RlcEntCfgCfmInfo   *entCfm
       /* Fill entCfm structure */
       RLC_CFG_FILL_CFG_CFM(entCfm, rbId, entCfg->rbType, CKW_CFG_CFM_NOK,
             CKW_CFG_REAS_CELL_UNKWN);
-      RLOG_ARG1(L_ERROR, DBG_CELLID,cellId,
-               "CellCb not found for RBID:%d",
+      DU_LOG("\nERROR  -->  RLC_DL : CellCb not found for RBID:%d",
                entCfg->rbId);
       return RFAILED;
    }
@@ -1483,15 +1453,14 @@ CmStatus    *status
 )
 {
    RlcDlUeCb *ueCb;
-/*kw004.201 Adding of Missing Trace in LTE RLC PDCP*/
+/*kw004.201 Adding of Missing Trace in RLC PDCP*/
 
    if ( (ueInfo->ueId == newUeInfo->ueId) && 
         (ueInfo->cellId == newUeInfo->cellId))
    {
       status->reason = CKW_CFG_REAS_SAME_UEID;
       status->status = CKW_CFG_CFM_NOK; 
-      RLOG_ARG2(L_ERROR,DBG_CELLID,ueInfo->cellId,
-            "Old UeId[%d] same as new UeId[%d]",
+      DU_LOG("\nERROR  -->  RLC_DL : Old UeId[%d] same as new UeId[%d]",
             ueInfo->ueId,
             newUeInfo->ueId);
       return RFAILED;
@@ -1499,8 +1468,7 @@ CmStatus    *status
    
    if(ROK == rlcDbmFetchDlUeCb(gCb,newUeInfo->ueId, newUeInfo->cellId, &ueCb))
    {
-      RLOG_ARG1(L_ERROR, DBG_CELLID, newUeInfo->cellId, 
-            "NewUeId[%d]:ueCb already exists",
+      DU_LOG("\nERROR  -->  RLC_DL : NewUeId[%d]:ueCb already exists",
             newUeInfo->ueId);
       status->reason = CKW_CFG_REAS_UE_EXISTS;
       status->status = CKW_CFG_CFM_NOK;
@@ -1510,8 +1478,7 @@ CmStatus    *status
    if(ROK != rlcDbmFetchDlUeCb(gCb,ueInfo->ueId, ueInfo->cellId, &ueCb))
    {
 
-      RLOG_ARG1(L_ERROR,DBG_CELLID,ueInfo->cellId,
-            "UeId [%d]: UeCb not found",
+      DU_LOG("\nERROR  -->  RLC_DL : UeId [%d]: UeCb not found",
             ueInfo->ueId);
       status->reason = CKW_CFG_REAS_UE_UNKWN;
       status->status = CKW_CFG_CFM_NOK;
@@ -1523,8 +1490,7 @@ CmStatus    *status
 #endif   
    if(ROK != cmHashListDelete(&(gCb->u.dlCb->ueLstCp), (PTR) ueCb))
    {
-      RLOG_ARG1(L_ERROR,DBG_CELLID,ueInfo->cellId,
-            "UeId[%u] HashList Deletion Failed",
+      DU_LOG("\nERROR  -->  RLC_DL : UeId[%u] HashList Deletion Failed",
             ueInfo->ueId);
       status->reason = CKW_CFG_REAS_UE_CREAT_FAIL;
       status->status = CKW_CFG_CFM_NOK;
@@ -1540,8 +1506,7 @@ CmStatus    *status
                               (uint16_t) sizeof(CmLteRnti)))
 
    {
-      RLOG_ARG1(L_ERROR,DBG_CELLID,newUeInfo->cellId,
-            "UeId[%u] HashList Insertion Failed",
+      DU_LOG("\nERROR  -->  RLC_DL : UeId[%u] HashList Insertion Failed",
             newUeInfo->ueId);
       status->reason = CKW_CFG_REAS_UE_CREAT_FAIL;
       status->status = CKW_CFG_CFM_NOK;