Merge "Added a new Flag ODU_LWR_MAC_DEBUG in the code"

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

diff --git a/src/5gnrsch/rg_sch_mga.c b/src/5gnrsch/rg_sch_mga.c
index abcffc2..a8e3392 100755 (executable)
--- a/src/5gnrsch/rg_sch_mga.c
+++ b/src/5gnrsch/rg_sch_mga.c
@@ -125,23 +125,20 @@ U8                *noSubfrms));
  **/
 
 #ifdef ANSI
-PUBLIC S16 rgSCHMeasGapANRepUeCfg
+S16 rgSCHMeasGapANRepUeCfg
 (
 RgSchCellCb *cell,
 RgSchUeCb   *ue,
 RgrUeCfg    *ueCfg
 )
 #else
-PUBLIC S16 rgSCHMeasGapANRepUeCfg(cell, ue, ueCfg)
+S16 rgSCHMeasGapANRepUeCfg(cell, ue, ueCfg)
 RgSchCellCb *cell;
 RgSchUeCb   *ue;
 RgrUeCfg    *ueCfg;
 #endif
 {
 
-   TRC2(rgSCHMeasGapANRepUeCfg);
-
-
    ue->measGapCb.isMesGapEnabled = ueCfg->ueMesGapCfg.isMesGapEnabled;
 
    if (ueCfg->ueMesGapCfg.isMesGapEnabled)
@@ -201,14 +198,14 @@ RgrUeCfg    *ueCfg;
  **/
 
 #ifdef ANSI
-PUBLIC S16 rgSCHMeasGapANRepUeRecfg
+S16 rgSCHMeasGapANRepUeRecfg
 (
 RgSchCellCb    *cell,
 RgSchUeCb      *ue,
 RgrUeRecfg     *ueRecfg
 )
 #else
-PUBLIC S16 rgSCHMeasGapANRepUeRecfg(cell, ue, ueRecfg)
+S16 rgSCHMeasGapANRepUeRecfg(cell, ue, ueRecfg)
 RgSchCellCb    *cell;
 RgSchUeCb      *ue;
 RgrUeRecfg     *ueRecfg;
@@ -219,9 +216,6 @@ RgrUeRecfg     *ueRecfg;
    RgrUeAckNackRepCfg      *ackNackReCfg = &(ueRecfg->ueAckNackRecfg);
    RgSchUeAckNakRepCb      *ackNakRepCb = &(ue->ackNakRepCb);
 
-   TRC2(rgSCHMeasGapANRepUeRecfg);
-
-
    reCfg    = &(ueRecfg->ueMeasGapRecfg);
    ueMeasCb = &(ue->measGapCb);
 
@@ -322,8 +316,6 @@ RgrUeMeasGapCfg      *cfg;
 #endif
 {
 
-   TRC2(rgSCHMeasGapANRepUtlAddUe);
-
    switch (cfg->gapPrd)
    {
       case RG_MEAS_GAPPRD_40:
@@ -374,8 +366,6 @@ RgSchUeCb          *ue;
 #endif
 {
 
-   TRC2(rgSCHMeasGapANRepUtlRmvUe);
-
    switch (ue->measGapCb.gapPrd)
    {
       case RG_MEAS_GAPPRD_40:
@@ -424,23 +414,20 @@ RgSchUeCb          *ue;
  **/
 
 #ifdef ANSI
-PUBLIC Void rgSCHMeasGapANRepUeDel
+Void rgSCHMeasGapANRepUeDel
 (
 RgSchCellCb *cell,
 RgSchUeCb   *ue,
 Bool        isUeDel
 )
 #else
-PUBLIC Void rgSCHMeasGapANRepUeDel(cell, ue, isUeDel)
+Void rgSCHMeasGapANRepUeDel(cell, ue, isUeDel)
 RgSchCellCb *cell;
 RgSchUeCb   *ue;
 Bool        isUeDel;
 #endif
 {
 
-
-   TRC2(rgSCHMeasGapANRepUeDel);
-
    if (ue->measGapCb.isMesGapEnabled)
    {
       rgSCHMeasGapANRepUtlRmvUe (cell, ue);
@@ -525,8 +512,6 @@ PRIVATE S16 rgSchAckNackRepUtlRmvUe (cell, ue)
 
    RgSchDlHqEnt          *hqEnt = RG_SCH_CMN_GET_UE_HQE(ue, cell);
 
-   TRC3(rgSchAckNackRepUtlRmvUe);
-
    for (hqIdx = 0; hqIdx < hqEnt->numHqPrcs; hqIdx++)
    {
       hqP = &hqEnt->procs[hqIdx];
@@ -618,12 +603,12 @@ PRIVATE S16 rgSchAckNackRepUtlRmvUe (cell, ue)
  **/
 
 #ifdef ANSI
-PUBLIC S16 rgSCHMeasGapANRepTtiHndl
+S16 rgSCHMeasGapANRepTtiHndl
 (
 RgSchCellCb *cell
 )
 #else
-PUBLIC S16 rgSCHMeasGapANRepTtiHndl(cell)
+S16 rgSCHMeasGapANRepTtiHndl(cell)
 RgSchCellCb *cell;
 #endif
 {
@@ -632,8 +617,6 @@ RgSchCellCb *cell;
    RgSchDlSf        *dlSf;
    CmLteTimingInfo   repTime;
 
-   TRC2(rgSCHMeasGapANRepTtiHndl);
-
    /* Measurement GAP Starts at offSet - however at MAC we are concerned at
     * subframe + TFU_DELTA.
     */
@@ -714,8 +697,6 @@ CmLListCp   *ackNackRepQ;
    CmLList           *node;
    RgSchUeCb         *ue;
 
-   TRC2(rgSchAckNackRepUtlHdlTti);
-
    node = ackNackRepQ->first;
    while (node)
    {
@@ -761,8 +742,6 @@ CmLListCp   *measGapQ;
    CmLList           *node;
    RgSchUeCb         *ue;
 
-   TRC2(rgSCHMeasGapANRepUtlHdlTti);
-
    node = measGapQ->first;
    while (node)
    {
@@ -822,13 +801,13 @@ CmLListCp   *measGapQ;
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 rgSCHMeasGapANRepGetDlInactvUe
+S16 rgSCHMeasGapANRepGetDlInactvUe
 (
 RgSchCellCb *cell,
 CmLListCp   *dlInactvUeLst
 )
 #else
-PUBLIC S16 rgSCHMeasGapANRepGetDlInactvUe(cell, dlInactvUeLst)
+S16 rgSCHMeasGapANRepGetDlInactvUe(cell, dlInactvUeLst)
 RgSchCellCb *cell;
 CmLListCp   *dlInactvUeLst;
 #endif
@@ -849,8 +828,6 @@ CmLListCp   *dlInactvUeLst;
    RgSchDlHqTbCb     *tbCb;
    U32               i;
 
-   TRC2(rgSCHMeasGapANRepGetDlInactvUe);
-
    schedTime = cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G + cell->crntTime.slot + RG_DL_DELTA; 
 
 #ifdef LTE_TDD
@@ -1029,13 +1006,13 @@ CmLListCp   *dlInactvUeLst;
  **/
 
 #ifdef ANSI
-PUBLIC S16 rgSCHMeasGapANRepGetUlInactvUe
+S16 rgSCHMeasGapANRepGetUlInactvUe
 (
 RgSchCellCb *cell,
 CmLListCp   *ulInactvUeLst
 )
 #else
-PUBLIC S16 rgSCHMeasGapANRepGetUlInactvUe(cell, ulInactvUeLst)
+S16 rgSCHMeasGapANRepGetUlInactvUe(cell, ulInactvUeLst)
 RgSchCellCb *cell;
 CmLListCp   *ulInactvUeLst;
 #endif
@@ -1058,8 +1035,6 @@ CmLListCp   *ulInactvUeLst;
    RgSchDlHqTbCb     *tbCb;
    U32               i;
 
-   TRC2(rgSCHMeasGapANRepGetUlInactvUe);
-
    /*ccpu00139481- Meas Gap should be monitored in UL with TFU_ULCNTRL_DLDELTA*/
    schedTime = cell->crntTime.sfn * RGSCH_NUM_SUB_FRAMES_5G + cell->crntTime.slot + \
                TFU_ULCNTRL_DLDELTA;
@@ -1208,20 +1183,19 @@ CmLListCp   *ulInactvUeLst;
  **/
 
 #ifdef ANSI
-PUBLIC Void rgSCHMeasGapANRepDlInactvTmrExpry
+Void rgSCHMeasGapANRepDlInactvTmrExpry
 (
 RgSchUeCb *ue,
 U8         tmrEvnt
 )
 #else
-PUBLIC Void rgSCHMeasGapANRepDlInactvTmrExpry(ue, tmrEvnt)
+Void rgSCHMeasGapANRepDlInactvTmrExpry(ue, tmrEvnt)
 RgSchUeCb *ue;
 U8         tmrEvnt;
 #endif
 {
 
    RgSchCellCb    *cell = ue->cell;
-   TRC2(rgSCHMeasGapANRepDlInactvTmrExpry);
 
    switch (tmrEvnt)
    {
@@ -1268,19 +1242,18 @@ U8         tmrEvnt;
  **/
 
 #ifdef ANSI
-PUBLIC Void rgSCHMeasGapANRepUlInactvTmrExpry
+Void rgSCHMeasGapANRepUlInactvTmrExpry
 (
 RgSchUeCb *ue,
 U8         tmrEvnt
 )
 #else
-PUBLIC Void rgSCHMeasGapANRepUlInactvTmrExpry(ue, tmrEvnt)
+Void rgSCHMeasGapANRepUlInactvTmrExpry(ue, tmrEvnt)
 RgSchUeCb *ue;
 U8         tmrEvnt;
 #endif
 {
    RgSchCellCb       *cell = ue->cell;
-   TRC2(rgSCHMeasGapANRepUlInactvTmrExpry);
 
    switch (tmrEvnt)
    {
@@ -1322,18 +1295,16 @@ U8         tmrEvnt;
  **/
 
 #ifdef ANSI
-PUBLIC Void rgSCHMeasGapANRepTmrExpry
+Void rgSCHMeasGapANRepTmrExpry
 (
 RgSchUeCb *ue
 )
 #else
-PUBLIC Void rgSCHMeasGapANRepTmrExpry(ue)
+Void rgSCHMeasGapANRepTmrExpry(ue)
 RgSchUeCb *ue;
 #endif
 {
 
-   TRC2(rgSCHMeasGapANRepTmrExpry);
-
    ue->measGapCb.isMeasuring = FALSE;
    cmInitTimers (&ue->measGapCb.measGapTmr, 1);
 
@@ -1363,18 +1334,16 @@ RgSchUeCb *ue;
  **/
 
 #ifdef ANSI
-PUBLIC Void rgSCHAckNakRepTmrExpry
+Void rgSCHAckNakRepTmrExpry
 (
 RgSchUeCb *ue
 )
 #else
-PUBLIC Void rgSCHAckNakRepTmrExpry(ue)
+Void rgSCHAckNakRepTmrExpry(ue)
 RgSchUeCb *ue;
 #endif
 {
 
-   TRC2(rgSCHAckNakRepTmrExpry);
-
    ue->ackNakRepCb.isAckNakRep = FALSE;
    cmInitTimers (&ue->ackNakRepCb.ackNakRepTmr, 1);
 
@@ -1414,13 +1383,13 @@ RgSchUeCb *ue;
  **/
 
 #ifdef ANSI
-PUBLIC Void rgSCHAckNakRepAddToQ
+Void rgSCHAckNakRepAddToQ
 (
 RgSchCellCb       *cell,
 RgSchDlSf         *crntDlSf
 )
 #else
-PUBLIC Void rgSCHAckNakRepAddToQ(cell, crntDlSf)
+Void rgSCHAckNakRepAddToQ(cell, crntDlSf)
 RgSchCellCb          *cell;
 RgSchDlSf            *crntDlSf;
 #endif
@@ -1432,8 +1401,6 @@ RgSchDlSf            *crntDlSf;
    RgSchDlHqTbCb     *tbCb;
    U32               i;
 
-   TRC2(rgSCHAckNakRepAddToQ);
-
    node = crntDlSf->ueLst.first;
    while (node)
    {
@@ -1505,7 +1472,6 @@ U8                repCnt;
    S16   idx;
    S8                diff;
 
-   TRC2(rgSCHAckNakRepFindUlDuration)
    rgSCHAckNakRepGetUlOffsetFrmDl(dlSf, repTime, &noSubfrms);
    RG_SCH_ADD_TO_CRNT_TIME(repTime, ulfrm, noSubfrms);
    diff = repCnt-1;
@@ -1558,7 +1524,6 @@ CmLteTimingInfo   crntDlTime;
 U8                *noSubfrms;
 #endif
          {
-   TRC2(rgSCHAckNakRepGetUlOffsetFrmDl)
 
    if(dlSf->dlFdbkInfo.sfnOffset != 0)
             {