X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_l2m.c;h=2a618a476d895a0f80609c65311d082e907fdab8;hb=refs%2Fchanges%2F77%2F4377%2F11;hp=7ecdafabcd7667992e0b99d8aa53b4270aa574bc;hpb=d1ead035ab3b543810f1838b2519904bf84477ec;p=o-du%2Fl2.git

diff --git a/src/5gnrmac/rg_l2m.c b/src/5gnrmac/rg_l2m.c
index 7ecdafabc..2a618a476 100755
--- a/src/5gnrmac/rg_l2m.c
+++ b/src/5gnrmac/rg_l2m.c
@@ -33,15 +33,7 @@
 */
 
 /* 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_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 "crg.h"        
 #include "rgr.h"
@@ -53,15 +45,6 @@
 #include "rg.h"
 
 /* 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 "rgu.x"           /* RGU types */
 #include "tfu.x"           /* TFU types */
 #include "lrg.x"           /* layer management typedefs for MAC */
@@ -69,7 +52,7 @@
 #include "crg.x"           /* layer management typedefs for MAC */
 #include "rg_sch_inf.x"    /* typedefs for Scheduler */
 #include "rg_prg.x"        /* typedefs for PRG interface */
-#include "mac_interface.h"
+#include "du_app_mac_inf.h"
 #include "rg.x"            /* MAC types */
 
 #ifdef LTE_L2_MEAS
@@ -622,7 +605,7 @@ RgCellCb  *cell;
       node = node->next;
       crntTime = cell->crntTime;
 
-      if(cell->crntTime.sfn == 0 && (cell->crntTime.subframe % RG_NUM_SUB_FRAMES) == 0)
+      if(cell->crntTime.sfn == 0 && (cell->crntTime.slot % RG_NUM_SUB_FRAMES) == 0)
       {
          measCb->sfnCycle++;
       }