[Epic-ID: ODUHIGH-464][Task-ID: ODUHIGH-483] Memeory related fix in FDD and TDD mode

[o-du/l2.git] / src / 5gnrsch / rg_sch_tmr.c

diff --git a/src/5gnrsch/rg_sch_tmr.c b/src/5gnrsch/rg_sch_tmr.c
index c0452c1..34f5c39 100755 (executable)
--- 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
@@ -73,24 +68,10 @@ RgSchUeCellInfo  *sCell
   *   @param[in]  RgSchCellCb    *cell
   *   @param[in]  Ptr            cb
   *   @param[in]  S16            tmrEvnt
-  *   @param[in]  U32            tmrVal
+  *   @param[in]  uint32_t            tmrVal
   *   @return  Void
   */
-#ifdef ANSI
-Void rgSCHTmrStartTmr
-(
-RgSchCellCb *cell,
-Ptr         cb,
-S16         tmrEvnt,
-U32         tmrVal
-)
-#else
-Void rgSCHTmrStartTmr (cell, cb, tmrEvnt, tmrVal)
-RgSchCellCb *cell;
-Ptr         cb;
-S16         tmrEvnt;
-U32         tmrVal;
-#endif
+Void rgSCHTmrStartTmr(RgSchCellCb *cell,Ptr cb,S16 tmrEvnt,uint32_t tmrVal)
 {
    CmTmrArg          arg;
    RgSchUeCb         *ue;
@@ -115,8 +96,7 @@ U32         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);
@@ -147,7 +127,7 @@ U32         tmrVal;
       case RG_SCH_TMR_BSR:
          {
 #ifdef NO_BSR_SR_5GTF
-            RETVOID;
+            return;
 #endif
             arg.timers = &(ue->bsrTmr);
             break;
@@ -172,9 +152,8 @@ U32         tmrVal;
          }
 #endif
       default:
-         RLOG_ARG0(L_ERROR,DBG_INSTID,cell->instIdx,  
-            "rgSCHTmrStartTmr() Incorrect Timer event");
-         RETVOID;
+         DU_LOG("\nERROR  -->  SCH : rgSCHTmrStartTmr() Incorrect Timer event");
+         return;
    }
 
    arg.tqCp = &(cell->tqCp);
@@ -185,7 +164,7 @@ U32         tmrVal;
    arg.max  = 1;
    arg.tNum = NOTUSED;
    cmPlcCbTq(&arg);
-   RETVOID;
+   return;
 
 } /* end of */ 
 
@@ -203,19 +182,7 @@ U32         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;
@@ -271,7 +238,7 @@ Ptr           cb;
       case RG_SCH_TMR_BSR:
          {
 #ifdef NO_BSR_SR_5GTF
-            RETVOID;
+            return;
 #endif
             arg.timers = &(ue->bsrTmr);
             break;
@@ -298,9 +265,8 @@ Ptr           cb;
 #endif
 
       default:
-         RLOG_ARG0(L_ERROR,DBG_INSTID,cell->instIdx,  
-            "rgSCHTmrStopTmr() Incorrect Timer event");
-         RETVOID;
+         DU_LOG("\nERROR  -->  SCH : rgSCHTmrStopTmr() Incorrect Timer event");
+         return;
    }
 
    arg.tqCp = &(cell->tqCp);
@@ -311,7 +277,7 @@ Ptr           cb;
    arg.max  = 0;
    arg.tNum = NOTUSED;
    cmRmvCbTq(&arg);
-   RETVOID;
+   return;
 } /* end of */ 
 
  /** @brief This function handles timer expiry.
@@ -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
@@ -368,18 +324,18 @@ S16         tmrEvnt;
          break;
       case RG_SCH_TMR_UL_MEASGAP:
       case RG_SCH_TMR_UL_ACKNACK:
-         rgSCHMeasGapANRepUlInactvTmrExpry (ue, (U8)tmrEvnt);
+         rgSCHMeasGapANRepUlInactvTmrExpry (ue, (uint8_t)tmrEvnt);
          break;
       case RG_SCH_TMR_DL_ACKNACK:
       case RG_SCH_TMR_DL_MEASGAP:
-         rgSCHMeasGapANRepDlInactvTmrExpry (ue, (U8)tmrEvnt);
+         rgSCHMeasGapANRepDlInactvTmrExpry (ue, (uint8_t)tmrEvnt);
          break;
       case RG_SCH_TMR_TA:
 #ifdef EMTC_ENABLE
          /*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,12 +377,11 @@ 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");
         }
-         RETVOID;
+         return;
    }
-   RETVOID;
+   return;
 } /* end of */ 
 
 \f