X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Frg_sch_tmr.c;h=34f5c39a25160c8bca1d0847f46e2057e05d4b70;hb=3330932565e15a749fd5dd5039cdea2862ca51cc;hp=06215ce4813248523254166f2295da4a24024b67;hpb=def50dc175cebc67238db5f1acd5ff322a2279bd;p=o-du%2Fl2.git

diff --git a/src/5gnrsch/rg_sch_tmr.c b/src/5gnrsch/rg_sch_tmr.c
index 06215ce48..34f5c39a2 100755
--- a/src/5gnrsch/rg_sch_tmr.c
+++ b/src/5gnrsch/rg_sch_tmr.c
@@ -31,9 +31,6 @@
 /** @file rg_sch_tmr.c 
 @brief This module does processing related to timers for the scheduler.
 */
-static const char* RLOG_MODULE_NAME="MAC";
-static int RLOG_MODULE_ID=4096;
-static int RLOG_FILE_ID=175;
 
 /* header include files -- defines (.h) */
 #include "common_def.h"
@@ -44,8 +41,6 @@ static int RLOG_FILE_ID=175;
 #include "rg_sch_err.h"            /* defines and macros for MAC */
 #include "rg_sch_inf.h"            /* defines and macros for MAC */
 #include "rg_sch.h"            /* defines and macros for MAC */
-#include "rl_interface.h"
-#include "rl_common.h"
 
 
 /* header/extern include files (.x) */
@@ -56,7 +51,7 @@ static int RLOG_FILE_ID=175;
 #include "rg_sch.x"            /* typedefs for MAC */
 
 #ifdef LTE_ADV
-EXTERN Void rgSCHSCellActivation ARGS((
+Void rgSCHSCellActivation ARGS((
 RgSchUeCellInfo  *sCell
 ));
 #endif
@@ -76,21 +71,7 @@ RgSchUeCellInfo  *sCell
   *   @param[in]  uint32_t            tmrVal
   *   @return  Void
   */
-#ifdef ANSI
-Void rgSCHTmrStartTmr
-(
-RgSchCellCb *cell,
-Ptr         cb,
-S16         tmrEvnt,
-uint32_t         tmrVal
-)
-#else
-Void rgSCHTmrStartTmr (cell, cb, tmrEvnt, tmrVal)
-RgSchCellCb *cell;
-Ptr         cb;
-S16         tmrEvnt;
-uint32_t         tmrVal;
-#endif
+Void rgSCHTmrStartTmr(RgSchCellCb *cell,Ptr cb,S16 tmrEvnt,uint32_t tmrVal)
 {
    CmTmrArg          arg;
    RgSchUeCb         *ue;
@@ -115,8 +96,7 @@ uint32_t         tmrVal;
    {
       case RG_SCH_TMR_ACKNACK_REP:
          arg.timers = &(ue->ackNakRepCb.ackNakRepTmr);
-         RLOG_ARG0(L_ERROR,DBG_INSTID,cell->instIdx, 
-            "Hit AckNackRep timer");
+           DU_LOG("\nINFO  -->  SCH : Hit AckNackRep timer");
          break;
       case RG_SCH_TMR_MEASGAP:
          arg.timers = &(ue->measGapCb.measGapTmr);
@@ -172,8 +152,7 @@ uint32_t         tmrVal;
          }
 #endif
       default:
-         RLOG_ARG0(L_ERROR,DBG_INSTID,cell->instIdx,  
-            "rgSCHTmrStartTmr() Incorrect Timer event");
+         DU_LOG("\nERROR  -->  SCH : rgSCHTmrStartTmr() Incorrect Timer event");
          return;
    }
 
@@ -203,19 +182,7 @@ uint32_t         tmrVal;
   *   @param[in]  Ptr            cb
   *   @return  Void
   */
-#ifdef ANSI
-Void rgSCHTmrStopTmr
-(
-RgSchCellCb   *cell,
-S16           tmrEvnt,
-Ptr           cb
-)
-#else
-Void rgSCHTmrStopTmr (cell, tmrEvnt, cb)
-RgSchCellCb   *cell;
-S16           tmrEvnt;
-Ptr           cb;
-#endif
+Void rgSCHTmrStopTmr(RgSchCellCb *cell,S16 tmrEvnt,Ptr cb)
 {
    CmTmrArg          arg;
    RgSchUeCb         *ue;
@@ -298,8 +265,7 @@ Ptr           cb;
 #endif
 
       default:
-         RLOG_ARG0(L_ERROR,DBG_INSTID,cell->instIdx,  
-            "rgSCHTmrStopTmr() Incorrect Timer event");
+         DU_LOG("\nERROR  -->  SCH : rgSCHTmrStopTmr() Incorrect Timer event");
          return;
    }
 
@@ -327,17 +293,7 @@ Ptr           cb;
   *   @param[in]  S16            tmrEvnt
   *   @return  Void
   */
-#ifdef ANSI
-Void rgSCHTmrProcTmr 
-(
-Ptr         cb,
-S16         tmrEvnt
-)
-#else
-Void rgSCHTmrProcTmr (cb, tmrEvnt)
-Ptr         cb;
-S16         tmrEvnt;
-#endif
+Void rgSCHTmrProcTmr(Ptr cb,S16 tmrEvnt)
 {
    RgSchUeCb      *ue = NULLP;
 #ifdef LTE_ADV
@@ -379,7 +335,7 @@ S16         tmrEvnt;
          /*TODO Needto handle TA Timer expiry for EMTC UE*/
          if(TRUE == ue->isEmtcUe)
          {
-            RLOG0(L_INFO,"TA Timer Expiry is not handled for EMTC UE\n");
+            DU_LOG("\nINFO  -->  SCH : TA Timer Expiry is not handled for EMTC UE\n");
             break;
          }
 #endif
@@ -421,8 +377,7 @@ S16         tmrEvnt;
       default:
         if(ue)
         {
-           RLOG_ARG0(L_ERROR,DBG_INSTID,ue->cell->instIdx,  
-                 "rgSCHTmrProcTmr() Incorrect Timer event");
+            DU_LOG("\nERROR  -->  SCH : rgSCHTmrProcTmr() Incorrect Timer event");
         }
          return;
    }