X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Frg_sch_mga.c;h=8b363354c47070ba145fb46e6a28ac4a7199981e;hb=65443172dd60a6ea312bd3a15959dbf54ad7f045;hp=a8e339270f16c3d0ae3cae43bd3dcfc0dc7a9aa2;hpb=5d74fef7c9fe6b65a965ceac6bfe812872dab323;p=o-du%2Fl2.git

diff --git a/src/5gnrsch/rg_sch_mga.c b/src/5gnrsch/rg_sch_mga.c
index a8e339270..8b363354c 100755
--- a/src/5gnrsch/rg_sch_mga.c
+++ b/src/5gnrsch/rg_sch_mga.c
@@ -56,36 +56,36 @@ static int RLOG_FILE_ID=169;
 #include "rg_sch.x"        /* typedefs for Scheduler */
 
 /* local defines */
-PRIVATE S16 rgSCHMeasGapANRepUtlAddUe ARGS((
+static S16 rgSCHMeasGapANRepUtlAddUe ARGS((
 RgSchCellCb       *cell,
 RgSchUeCb          *ue,
 RgrUeMeasGapCfg    *cfg));
 
-PRIVATE S16 rgSCHMeasGapANRepUtlRmvUe ARGS((
+static S16 rgSCHMeasGapANRepUtlRmvUe ARGS((
 RgSchCellCb       *cell,
 RgSchUeCb          *ue));
 
-PRIVATE S16 rgSchAckNackRepUtlRmvUe ARGS((
+static S16 rgSchAckNackRepUtlRmvUe ARGS((
  RgSchCellCb      *cell,
  RgSchUeCb        *ue));
 
-PRIVATE Void rgSchAckNackRepUtlHdlTti ARGS((
+static Void rgSchAckNackRepUtlHdlTti ARGS((
 RgSchCellCb *cell,
 CmLListCp   *ackNackRepQ));
 
-PRIVATE Void rgSCHMeasGapANRepUtlHdlTti ARGS((
+static Void rgSCHMeasGapANRepUtlHdlTti ARGS((
 RgSchCellCb *cell,
 CmLListCp   *measGapQ));
 #ifdef LTE_TDD
-PRIVATE U8 rgSCHAckNakRepFindUlDuration ARGS((
+static uint8_t rgSCHAckNakRepFindUlDuration ARGS((
 RgSchCellCb       *cell,
 RgSchDlSf         *dlSf,
 CmLteTimingInfo   repTime,
-U8                repCnt));
-PRIVATE Void rgSCHAckNakRepGetUlOffsetFrmDl ARGS((
+uint8_t                repCnt));
+static Void rgSCHAckNakRepGetUlOffsetFrmDl ARGS((
 RgSchDlSf         *dlSf,
 CmLteTimingInfo   crntDlTime,
-U8                *noSubfrms));
+uint8_t                *noSubfrms));
 #endif
 
 /**
@@ -302,14 +302,14 @@ RgrUeRecfg     *ueRecfg;
   * @return 
   */
 #ifdef ANSI
-PRIVATE S16 rgSCHMeasGapANRepUtlAddUe 
+static S16 rgSCHMeasGapANRepUtlAddUe 
 (
 RgSchCellCb       *cell,
 RgSchUeCb          *ue,
 RgrUeMeasGapCfg    *cfg
 )
 #else
-PRIVATE S16 rgSCHMeasGapANRepUtlAddUe (cell, ue, cfg)
+static S16 rgSCHMeasGapANRepUtlAddUe (cell, ue, cfg)
 RgSchCellCb         *cell;
 RgSchUeCb            *ue;
 RgrUeMeasGapCfg      *cfg;
@@ -354,13 +354,13 @@ RgrUeMeasGapCfg      *cfg;
   * @return 
   */
 #ifdef ANSI
-PRIVATE S16 rgSCHMeasGapANRepUtlRmvUe 
+static S16 rgSCHMeasGapANRepUtlRmvUe 
 (
 RgSchCellCb       *cell,
 RgSchUeCb          *ue
 )
 #else
-PRIVATE S16 rgSCHMeasGapANRepUtlRmvUe (cell, ue)
+static S16 rgSCHMeasGapANRepUtlRmvUe (cell, ue)
 RgSchCellCb       *cell;
 RgSchUeCb          *ue;
 #endif
@@ -472,7 +472,7 @@ Bool        isUeDel;
       rgSCHTmrStopTmr (cell, RG_SCH_TMR_ACKNACK_REP, ue);
       rgSchAckNackRepUtlRmvUe (cell, ue);
    }
-   RETVOID;
+   return;
 }
 
  /** @brief This function deletes the UEs information related to ACK NACK
@@ -492,23 +492,23 @@ Bool        isUeDel;
   * @return 
   */
 #ifdef ANSI
-PRIVATE S16 rgSchAckNackRepUtlRmvUe
+static S16 rgSchAckNackRepUtlRmvUe
 (
  RgSchCellCb      *cell,
  RgSchUeCb        *ue
  )
 #else
-PRIVATE S16 rgSchAckNackRepUtlRmvUe (cell, ue)
+static S16 rgSchAckNackRepUtlRmvUe (cell, ue)
  RgSchCellCb      *cell;
  RgSchUeCb        *ue;
 #endif
 {
 
 
-   U8                hqIdx;
-   U8                repIdx;
+   uint8_t                hqIdx;
+   uint8_t                repIdx;
    RgSchDlHqProcCb   *hqP;
-   U8                tbCnt;
+   uint8_t                tbCnt;
 
    RgSchDlHqEnt          *hqEnt = RG_SCH_CMN_GET_UE_HQE(ue, cell);
 
@@ -612,7 +612,7 @@ S16 rgSCHMeasGapANRepTtiHndl(cell)
 RgSchCellCb *cell;
 #endif
 {
-   U8               offset;
+   uint8_t               offset;
    CmLListCp        *queue;
    RgSchDlSf        *dlSf;
    CmLteTimingInfo   repTime;
@@ -683,13 +683,13 @@ RgSchCellCb *cell;
   * @return Void
   */
 #ifdef ANSI
-PRIVATE Void rgSchAckNackRepUtlHdlTti
+static Void rgSchAckNackRepUtlHdlTti
 (
 RgSchCellCb *cell,
 CmLListCp   *ackNackRepQ
 )
 #else
-PRIVATE Void rgSchAckNackRepUtlHdlTti (cell, ackNackRepQ)
+static Void rgSchAckNackRepUtlHdlTti (cell, ackNackRepQ)
 RgSchCellCb *cell;
 CmLListCp   *ackNackRepQ;
 #endif
@@ -709,7 +709,7 @@ CmLListCp   *ackNackRepQ;
       }
       node = node->next;
    } /* end of while */
-   RETVOID;
+   return;
 } /* end of */ 
 
 
@@ -728,13 +728,13 @@ CmLListCp   *ackNackRepQ;
   * @return 
   */
 #ifdef ANSI
-PRIVATE Void rgSCHMeasGapANRepUtlHdlTti
+static Void rgSCHMeasGapANRepUtlHdlTti
 (
 RgSchCellCb *cell,
 CmLListCp   *measGapQ
 )
 #else
-PRIVATE Void rgSCHMeasGapANRepUtlHdlTti (cell, measGapQ)
+static Void rgSCHMeasGapANRepUtlHdlTti (cell, measGapQ)
 RgSchCellCb *cell;
 CmLListCp   *measGapQ;
 #endif
@@ -750,7 +750,7 @@ CmLListCp   *measGapQ;
       rgSCHTmrStartTmr (cell, ue, RG_SCH_TMR_MEASGAP, RG_SCH_MEAS_GAP_LEN);
       node = node->next;
    } /* end of while */
-   RETVOID;
+   return;
 } /* end of */ 
 
 
@@ -812,21 +812,21 @@ RgSchCellCb *cell;
 CmLListCp   *dlInactvUeLst;
 #endif
 {
-   U8                offset;
+   uint8_t                offset;
    CmLList           *node;
    CmLList           *hqNode;
    CmLListCp         *queue;
    RgSchUeCb         *ue;
    RgSchDlSf         *dlSf;
    CmLteTimingInfo   ackNakTime;
-   U16               schedTime;
-   U8                harqFdbkOffset;
+   uint16_t               schedTime;
+   uint8_t                harqFdbkOffset;
 #ifdef LTE_TDD
-   U8                repCntr;
+   uint8_t                repCntr;
 #endif
    RgSchDlHqProcCb   *hqP;
    RgSchDlHqTbCb     *tbCb;
-   U32               i;
+   uint32_t               i;
 
    schedTime = cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G + cell->crntTime.slot + RG_DL_DELTA; 
 
@@ -947,7 +947,7 @@ CmLListCp   *dlInactvUeLst;
                /* Start timer */
 #ifdef LTE_TDD
                repCntr = rgSCHAckNakRepFindUlDuration(cell, dlSf, ackNakTime, 
-                     (U8)(ue->ackNakRepCb.repCntr - 1));
+                     (uint8_t)(ue->ackNakRepCb.repCntr - 1));
                rgSCHTmrStartTmr (cell, ue, RG_SCH_TMR_DL_ACKNACK, repCntr);
 #else
                rgSCHTmrStartTmr (cell, ue, RG_SCH_TMR_DL_ACKNACK, 
@@ -1018,22 +1018,22 @@ CmLListCp   *ulInactvUeLst;
 #endif
 {
 
-   U8                offset;
+   uint8_t                offset;
    CmLList           *node;
    CmLList           *hqNode;
    CmLListCp         *queue;
    RgSchUeCb         *ue;
    CmLteTimingInfo   ackNakTime;
    RgSchDlSf         *dlSf;
-   U16               schedTime;
-   U8                pdcchToPuschGap;
-   U8                idx=0;
+   uint16_t               schedTime;
+   uint8_t                pdcchToPuschGap;
+   uint8_t                idx=0;
 #ifdef LTE_TDD
-   U8                repCntr;
+   uint8_t                repCntr;
 #endif
    RgSchDlHqProcCb   *hqP;
    RgSchDlHqTbCb     *tbCb;
-   U32               i;
+   uint32_t               i;
 
    /*ccpu00139481- Meas Gap should be monitored in UL with TFU_ULCNTRL_DLDELTA*/
    schedTime = cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G + cell->crntTime.slot + \
@@ -1186,12 +1186,12 @@ CmLListCp   *ulInactvUeLst;
 Void rgSCHMeasGapANRepDlInactvTmrExpry
 (
 RgSchUeCb *ue,
-U8         tmrEvnt
+uint8_t         tmrEvnt
 )
 #else
 Void rgSCHMeasGapANRepDlInactvTmrExpry(ue, tmrEvnt)
 RgSchUeCb *ue;
-U8         tmrEvnt;
+uint8_t         tmrEvnt;
 #endif
 {
 
@@ -1211,7 +1211,7 @@ U8         tmrEvnt;
       cmInitTimers (&ue->measGapCb.measGapDlInactvTmr, 1);
       cmInitTimers (&ue->ackNakRepCb.ackNakRepDlInactvTmr, 1);
    }
-   RETVOID;
+   return;
 }
 
 /**
@@ -1245,12 +1245,12 @@ U8         tmrEvnt;
 Void rgSCHMeasGapANRepUlInactvTmrExpry
 (
 RgSchUeCb *ue,
-U8         tmrEvnt
+uint8_t         tmrEvnt
 )
 #else
 Void rgSCHMeasGapANRepUlInactvTmrExpry(ue, tmrEvnt)
 RgSchUeCb *ue;
-U8         tmrEvnt;
+uint8_t         tmrEvnt;
 #endif
 {
    RgSchCellCb       *cell = ue->cell;
@@ -1269,7 +1269,7 @@ U8         tmrEvnt;
       cmInitTimers (&ue->measGapCb.measGapUlInactvTmr, 1);
       cmInitTimers (&ue->ackNakRepCb.ackNakRepUlInactvTmr, 1);
    }
-   RETVOID;
+   return;
 }
 
 /**
@@ -1308,7 +1308,7 @@ RgSchUeCb *ue;
    ue->measGapCb.isMeasuring = FALSE;
    cmInitTimers (&ue->measGapCb.measGapTmr, 1);
 
-   RETVOID;
+   return;
 }
 
 /**
@@ -1347,7 +1347,7 @@ RgSchUeCb *ue;
    ue->ackNakRepCb.isAckNakRep = FALSE;
    cmInitTimers (&ue->ackNakRepCb.ackNakRepTmr, 1);
 
-   RETVOID; 
+   return; 
 }
 
 
@@ -1399,7 +1399,7 @@ RgSchDlSf            *crntDlSf;
    CmLList           *hqNode;
    RgSchDlHqProcCb   *hqP;
    RgSchDlHqTbCb     *tbCb;
-   U32               i;
+   uint32_t               i;
 
    node = crntDlSf->ueLst.first;
    while (node)
@@ -1425,7 +1425,7 @@ RgSchDlSf            *crntDlSf;
          }
       }
    }
-   RETVOID;
+   return;
 }
 
 
@@ -1443,31 +1443,31 @@ RgSchDlSf            *crntDlSf;
  *  @param[in]  RgSchCellCb  *cell
  *  @param[in]  RgSchDlSf        *dlSf
  *  @param[in]  CmLteTimingInfo  repTime
- *  @param[in]  U8           repCnt
+ *  @param[in]  uint8_t           repCnt
  *
- *  @return  U8
+ *  @return  uint8_t
  *      
  **/
 
 #ifdef ANSI
-PRIVATE U8 rgSCHAckNakRepFindUlDuration
+static uint8_t rgSCHAckNakRepFindUlDuration
 (
 RgSchCellCb       *cell,
 RgSchDlSf         *dlSf,
 CmLteTimingInfo   repTime,
-U8                repCnt
+uint8_t                repCnt
 )
 #else
-PRIVATE U8 rgSCHAckNakRepFindUlDuration(cell, dlSf, repTime, repCnt)
+static uint8_t rgSCHAckNakRepFindUlDuration(cell, dlSf, repTime, repCnt)
 RgSchCellCb       *cell;
 RgSchDlSf         *dlSf;
 CmLteTimingInfo   repTime;
-U8                repCnt;
+uint8_t                repCnt;
 #endif
 {
    CmLteTimingInfo   ulfrm;
-   U8    noSubfrms = 0;
-   U16   ulDlCfgIdx = cell->ulDlCfgIdx;
+   uint8_t    noSubfrms = 0;
+   uint16_t   ulDlCfgIdx = cell->ulDlCfgIdx;
    S16               rem = 0;
    S16   idx;
    S8                diff;
@@ -1504,24 +1504,24 @@ U8                repCnt;
  *
  *  @param[in]  RgSchDlSf        *dlSf
  *  @param[in]  CmLteTimingInfo  crntDlTime
- *  @param[in]  U8               *noSubfrms
+ *  @param[in]  uint8_t               *noSubfrms
  *
- *  @return  U8
+ *  @return  uint8_t
  *      
  **/
 
 #ifdef ANSI
-PRIVATE Void rgSCHAckNakRepGetUlOffsetFrmDl 
+static Void rgSCHAckNakRepGetUlOffsetFrmDl 
 (
 RgSchDlSf         *dlSf,
 CmLteTimingInfo   crntDlTime,
-U8                *noSubfrms 
+uint8_t                *noSubfrms 
 )
 #else
-PRIVATE Void rgSCHAckNakRepGetUlOffsetFrmDl(dlSf, crntDlTime, noSubfrms)
+static Void rgSCHAckNakRepGetUlOffsetFrmDl(dlSf, crntDlTime, noSubfrms)
 RgSchDlSf         *dlSf;
 CmLteTimingInfo   crntDlTime;
-U8                *noSubfrms;
+uint8_t                *noSubfrms;
 #endif
          {
 
@@ -1535,7 +1535,7 @@ U8                *noSubfrms;
    {
       *noSubfrms = dlSf->dlFdbkInfo.subframe - crntDlTime.subframe;
    }
-   RETVOID;
+   return;
 }
 #endif