X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Frg_sch_l2m.c;h=d69e38805ecc3979d8dd3eb41ec8b0170f2bb720;hb=3330932565e15a749fd5dd5039cdea2862ca51cc;hp=d5668f1c0d77f2735939dc91fac56bd6a440ec02;hpb=e8126b742c458158da117396d52ace22d59e9d47;p=o-du%2Fl2.git

diff --git a/src/5gnrsch/rg_sch_l2m.c b/src/5gnrsch/rg_sch_l2m.c
index d5668f1c0..d69e38805 100755
--- a/src/5gnrsch/rg_sch_l2m.c
+++ b/src/5gnrsch/rg_sch_l2m.c
@@ -43,8 +43,6 @@
 #include "rg_sch_cmn.h"
 #include "rg_sch_inf.h"         /* typedefs for Scheduler */
 #include "rg_sch_err.h"
-#include "rl_interface.h"
-#include "rl_common.h"
 
 /* header/extern include files (.x) */
 #include "tfu.x"           /* TFU types */
@@ -58,9 +56,6 @@
 uint32_t dlPrbCnt;
 #ifdef LTE_L2_MEAS
 
-static const char* RLOG_MODULE_NAME="MAC";
-static int RLOG_MODULE_ID=4096;
-static int RLOG_FILE_ID=166;
 
 static S16 rgSchL2mInsertMeasCb ARGS((
          RgSchCellCb       *cell,
@@ -182,8 +177,7 @@ uint32_t          measTime
                    cell->qciArray[qciVal].dlTotal_UeCount / sampOc;
                 cfm->numUeQciDlCfm.numActvUeQci[idx].qciValue = qciVal;
                 
-                RLOG_ARG3(L_DEBUG,DBG_CELLID,cell->cellId,
-                      "L2_MEAS:CFM DL QCI %u TOTAL Count %lu Active UE %d ",
+                DU_LOG("\nDEBUG  -->  SCH : L2_MEAS:CFM DL QCI %u TOTAL Count %lu Active UE %d ",
                       qciVal,cell->qciArray[qciVal].dlTotal_UeCount,
                       cfm->numUeQciDlCfm.numActvUeQci[idx].numActvUeQci);
                 
@@ -204,8 +198,7 @@ uint32_t          measTime
                       cell->qciArray[qciVal].dlTotal_UeCount / sampOc;
                    cfm->numUeQciDlCfm.numActvUeQci[idx].qciValue = qciVal;
 
-                   RLOG_ARG3(L_DEBUG,DBG_CELLID,cell->cellId,
-                         "L2_MEAS:CFM DL QCI %u TOTAL Count %lu Active UE %d ",
+                   DU_LOG("\nDEBUG  -->  SCH : L2_MEAS:CFM DL QCI %u TOTAL Count %lu Active UE %d ",
                          qciVal,cell->qciArray[qciVal].dlTotal_UeCount,
                          cfm->numUeQciDlCfm.numActvUeQci[idx].numActvUeQci);
 
@@ -236,8 +229,7 @@ uint32_t          measTime
                    cell->qciArray[qciVal].ulTotal_UeCount/ sampOc;
                 cfm->numUeQciUlCfm.numActvUeQci[idx].qciValue = qciVal;
                 
-                RLOG_ARG3(L_DEBUG,DBG_CELLID,cell->cellId,
-                      "L2_MEAS:CFM UL QCI %d TOTAL Count %lu Active UE %d ",
+                DU_LOG("\nDEBUG  -->  SCH : L2_MEAS:CFM UL QCI %d TOTAL Count %lu Active UE %d ",
                       qciVal,cell->qciArray[qciVal].ulTotal_UeCount,
                       cfm->numUeQciUlCfm.numActvUeQci[idx].numActvUeQci);
                 
@@ -257,8 +249,7 @@ uint32_t          measTime
                       cell->qciArray[qciVal].ulTotal_UeCount/ sampOc;
                    cfm->numUeQciUlCfm.numActvUeQci[idx].qciValue = qciVal;
 
-                   RLOG_ARG3(L_DEBUG,DBG_CELLID,cell->cellId,
-                         "L2_MEAS:CFM UL QCI %d TOTAL Count %lu Active UE %d ",
+                   DU_LOG("\nDEBUG  -->  SCH : L2_MEAS:CFM UL QCI %d TOTAL Count %lu Active UE %d ",
                          qciVal,cell->qciArray[qciVal].ulTotal_UeCount,
                          cfm->numUeQciUlCfm.numActvUeQci[idx].numActvUeQci);
 
@@ -516,8 +507,7 @@ RgSchErrInfo      err
    if((rgSCHUtlAllocSBuf(inst, (Data **)&measCb,
                    sizeof(RgSchL2MeasCb))) == RFAILED)
    {
-      RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"rgSchL2mAllocMeasCb():"
-                  "Allocation of RgSchL2MeasCb failed");
+      DU_LOG("\nERROR  -->  SCH : Allocation of RgSchL2MeasCb failed");
       return (NULLP);
    }
    memcpy(&measCb->measReq, measInfo, sizeof(LrgSchMeasReqInfo));
@@ -565,8 +555,7 @@ RgSchErrInfo      err
    {
        RGSCHFILLERR(err, RGSCHERR_L2M_MEASREQ,
                     RGSCHERR_SCH_ALLOC_FAILED);
-       RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "rgSchL2mMeasReq():"
-                "Allocation of RgSchL2MeasCb failed");
+       DU_LOG("\nERROR  -->  SCH : Allocation of RgSchL2MeasCb failed");
        return RFAILED;
    }
    /*memcpy(&measCb->measReq, measInfo,\