Merge "Get alarm-list implementation.[Issue-Id: ODUHIGH-230]"

[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 350f1bd..068e8b1 100755 (executable)
--- a/src/5gnrsch/rg_sch_tmr.c
+++ b/src/5gnrsch/rg_sch_tmr.c
@@ -36,17 +36,7 @@ static int RLOG_MODULE_ID=4096;
 static int RLOG_FILE_ID=175;
 
 /* header include files -- defines (.h) */
-#include "envopt.h"        /* environment options */
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
-#include "gen.h"           /* general layer */
-#include "ssi.h"           /* system services */
-#include "cm5.h"           /* common timers defines */
-#include "cm_hash.h"       /* common hash list defines */
-#include "cm_llist.h"      /* common linked list defines */
-#include "cm_mblk.h"       /* memory management */
-#include "cm_tkns.h"       /* common tokens */
-#include "cm_lte.h"       /* common tokens */
+#include "common_def.h"
 #include "tfu.h"           /* RGU defines */
 #include "lrg.h"           /* layer management defines for LTE-MAC */
 #include "rgr.h"           /* layer management defines for LTE-MAC */
@@ -59,15 +49,6 @@ static int RLOG_FILE_ID=175;
 
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general layer typedefs */
-#include "ssi.x"           /* system services typedefs */
-#include "cm5.x"           /* common timers */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_lib.x"        /* common library */
-#include "cm_llist.x"      /* common linked list */
-#include "cm_mblk.x"       /* memory management */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_lte.x"       /* common tokens */
 #include "tfu.x"           /* RGU types */
 #include "lrg.x"           /* layer management typedefs for MAC */
 #include "rgr.x"           /* layer management typedefs for MAC */
@@ -75,7 +56,7 @@ static int RLOG_FILE_ID=175;
 #include "rg_sch.x"            /* typedefs for MAC */
 
 #ifdef LTE_ADV
-EXTERN PUBLIC Void rgSCHSCellActivation ARGS((
+Void rgSCHSCellActivation ARGS((
 RgSchUeCellInfo  *sCell
 ));
 #endif
@@ -92,24 +73,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
-PUBLIC Void rgSCHTmrStartTmr
-(
-RgSchCellCb *cell,
-Ptr         cb,
-S16         tmrEvnt,
-U32         tmrVal
-)
-#else
-PUBLIC 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;
@@ -117,9 +84,6 @@ U32         tmrVal;
    RgSchUeCellInfo *sCellCb = NULLP;
 #endif
 
-   TRC2(rgSCHTmrStartTmr);
-
-
 #ifndef LTE_ADV
    ue = (RgSchUeCb*)cb;
 #else
@@ -169,7 +133,7 @@ U32         tmrVal;
       case RG_SCH_TMR_BSR:
          {
 #ifdef NO_BSR_SR_5GTF
-            RETVOID;
+            return;
 #endif
             arg.timers = &(ue->bsrTmr);
             break;
@@ -196,7 +160,7 @@ U32         tmrVal;
       default:
          RLOG_ARG0(L_ERROR,DBG_INSTID,cell->instIdx,  
             "rgSCHTmrStartTmr() Incorrect Timer event");
-         RETVOID;
+         return;
    }
 
    arg.tqCp = &(cell->tqCp);
@@ -207,7 +171,7 @@ U32         tmrVal;
    arg.max  = 1;
    arg.tNum = NOTUSED;
    cmPlcCbTq(&arg);
-   RETVOID;
+   return;
 
 } /* end of */ 
 
@@ -225,19 +189,7 @@ U32         tmrVal;
   *   @param[in]  Ptr            cb
   *   @return  Void
   */
-#ifdef ANSI
-PUBLIC Void rgSCHTmrStopTmr
-(
-RgSchCellCb   *cell,
-S16           tmrEvnt,
-Ptr           cb
-)
-#else
-PUBLIC Void rgSCHTmrStopTmr (cell, tmrEvnt, cb)
-RgSchCellCb   *cell;
-S16           tmrEvnt;
-Ptr           cb;
-#endif
+Void rgSCHTmrStopTmr(RgSchCellCb *cell,S16 tmrEvnt,Ptr cb)
 {
    CmTmrArg          arg;
    RgSchUeCb         *ue;
@@ -245,9 +197,6 @@ Ptr           cb;
    RgSchUeCellInfo *sCellCb = NULLP;
 #endif
 
-   TRC2(rgSCHTmrStopTmr);
-
-
 #ifndef LTE_ADV
    ue = (RgSchUeCb*)cb;
 #else
@@ -296,7 +245,7 @@ Ptr           cb;
       case RG_SCH_TMR_BSR:
          {
 #ifdef NO_BSR_SR_5GTF
-            RETVOID;
+            return;
 #endif
             arg.timers = &(ue->bsrTmr);
             break;
@@ -325,7 +274,7 @@ Ptr           cb;
       default:
          RLOG_ARG0(L_ERROR,DBG_INSTID,cell->instIdx,  
             "rgSCHTmrStopTmr() Incorrect Timer event");
-         RETVOID;
+         return;
    }
 
    arg.tqCp = &(cell->tqCp);
@@ -336,7 +285,7 @@ Ptr           cb;
    arg.max  = 0;
    arg.tNum = NOTUSED;
    cmRmvCbTq(&arg);
-   RETVOID;
+   return;
 } /* end of */ 
 
  /** @brief This function handles timer expiry.
@@ -352,25 +301,13 @@ Ptr           cb;
   *   @param[in]  S16            tmrEvnt
   *   @return  Void
   */
-#ifdef ANSI
-PUBLIC Void rgSCHTmrProcTmr 
-(
-Ptr         cb,
-S16         tmrEvnt
-)
-#else
-PUBLIC Void rgSCHTmrProcTmr (cb, tmrEvnt)
-Ptr         cb;
-S16         tmrEvnt;
-#endif
+Void rgSCHTmrProcTmr(Ptr cb,S16 tmrEvnt)
 {
    RgSchUeCb      *ue = NULLP;
 #ifdef LTE_ADV
    RgSchUeCellInfo *sCellCb = NULLP;
 #endif
 
-   TRC2(rgSCHTmrProcTmr);
-
 #ifndef LTE_ADV
    ue = (RgSchUeCb*)cb;
 #else
@@ -395,11 +332,11 @@ 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
@@ -451,9 +388,9 @@ S16         tmrEvnt;
            RLOG_ARG0(L_ERROR,DBG_INSTID,ue->cell->instIdx,  
                  "rgSCHTmrProcTmr() Incorrect Timer event");
         }
-         RETVOID;
+         return;
    }
-   RETVOID;
+   return;
 } /* end of */ 
 
 \f