fix ODUHIGH-182 updating code to be compatible with latest available fapi_inetrface...

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

diff --git a/src/5gnrsch/rg_sch_gom.c b/src/5gnrsch/rg_sch_gom.c
index ad26f49..ce66f67 100755 (executable)
--- a/src/5gnrsch/rg_sch_gom.c
+++ b/src/5gnrsch/rg_sch_gom.c
@@ -38,16 +38,7 @@ static int RLOG_MODULE_ID=4096;
 static int RLOG_FILE_ID=164;
 
 /* 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 service interface */
-#include "cm_hash.h"       /* common hash list */
-#include "cm_mblk.h"       /* common memory link list library */
-#include "cm_llist.h"      /* common linked list library */
-#include "cm_err.h"        /* common error */
-#include "cm_lte.h"        /* common LTE */
+#include "common_def.h"
 #include "lrg.h"
 #include "rgr.h"
 #include "tfu.h"
@@ -59,15 +50,6 @@ static int RLOG_FILE_ID=164;
 #include "rl_common.h"
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general layer */
-#include "ssi.x"           /* system service interface */
-#include "cm5.x"           /* common timers */
-#include "cm_lib.x"        /* common library */
-#include "cm_hash.x"       /* common hash list */
-#include "cm_llist.x"      /* common linked list library */
-#include "cm_mblk.x"       /* memory management */
-#include "cm_tkns.x"       /* common tokens */
-#include "cm_lte.x"        /* common LTE */
 #include "lrg.x"
 #include "rgr.x"
 #include "tfu.x"
@@ -442,12 +424,12 @@ RgrCfgReqInfo *rgrCfgReq;
 
       /* Check if the activation time is valid */
       if (actvTime.sfn >= RGSCH_MAX_SFN 
-            || actvTime.subframe >= RGSCH_NUM_SUB_FRAMES_5G)
+            || actvTime.slot >= RGSCH_NUM_SUB_FRAMES_5G)
       {
          RLOG_ARG4(L_ERROR,DBG_CELLID,cell->cellId, "Invalid activation time for RGR "
-           "config request: activation sfn %d activation subframe %d current "
-           "sfn %d current subframe %d", actvTime.sfn, actvTime.subframe, 
-           cell->crntTime.sfn, cell->crntTime.subframe);
+           "config request: activation sfn %d activation slot %d current "
+           "sfn %d current slot %d", actvTime.sfn, actvTime.slot, 
+           cell->crntTime.sfn, cell->crntTime.slot);
          /* ccpu00117052 - MOD - Passing double pointer
          for proper NULLP assignment*/
          rgSCHUtlFreeSBuf(inst, (Data **)&rgrCfgElem, sizeof(*rgrCfgElem));
@@ -459,9 +441,9 @@ RgrCfgReqInfo *rgrCfgReq;
       if (sfDiff > (RGR_ACTV_WIN_SIZE * RGSCH_NUM_SUB_FRAMES_5G))
       {
          RLOG_ARG4(L_ERROR,DBG_CELLID,cell->cellId,"Invalid activation time for RGR"
-              " config request: activation sfn %d activation subframe %d "
-              "current sfn %d current subframe %d", actvTime.sfn,
-              actvTime.subframe, cell->crntTime.sfn, cell->crntTime.subframe);
+              " config request: activation sfn %d activation slot %d "
+              "current sfn %d current slot %d", actvTime.sfn,
+              actvTime.slot, cell->crntTime.sfn, cell->crntTime.slot);
          /* ccpu00117052 - MOD - Passing double pointer
          for proper NULLP assignment*/
          rgSCHUtlFreeSBuf(inst, (Data **)&rgrCfgElem, sizeof(*rgrCfgElem));
@@ -1849,7 +1831,7 @@ PUBLIC S16 rgSCHGomHndlLoadInf(reg, pool, instCb, spId, transId, loadInfReq)
    }
    /* Update the RNTP info rcvd in the respective cell centre pool so that Phigh can be
       sent for the UEs scheduled in that particular RB range*/
-   for(i = 0; i < RGSCH_NUM_DL_SUBFRAMES; i++)
+   for(i = 0; i < RGSCH_NUM_DL_slotS; i++)
    {
       if((rgSchUpdtRNTPInfo(cell, cell->subFrms[i], loadInfReq) != ROK))
       {