MAC Clean-up [Issue-ID: ODUHIGH-212]

[o-du/l2.git] / src / 5gnrmac / rg_mux.c

diff --git a/src/5gnrmac/rg_mux.c b/src/5gnrmac/rg_mux.c
index 748ccd1..40ce1c7 100755 (executable)
--- a/src/5gnrmac/rg_mux.c
+++ b/src/5gnrmac/rg_mux.c
@@ -37,19 +37,7 @@ static int RLOG_FILE_ID=229;
 static int RLOG_MODULE_ID=4096;
 
 /* header include files -- defines (.h) */
-#include "envopt.h"        /* environment options */
-#include "envdep.h"        /* environment dependent */
-#include "envind.h"        /* environment independent */
-  
-#include "gen.h"           /* general */
-#include "ssi.h"           /* system services */
-
-#include "cm_tkns.h"       /* Common Token Defines */
-#include "cm_llist.h"      /* Common Link List Defines */
-#include "cm_hash.h"       /* Common Hash List Defines */
-#include "cm_mblk.h"       /* memory management */
-#include "cm_lte.h"        /* Common LTE Defines */
-
+#include "common_def.h"
 #include "rg_env.h"        /* MAC Environment Defines */
 #include "tfu.h"           /* TFU Interface defines */
 #include "crg.h"           /* CRG Interface defines */
@@ -61,15 +49,6 @@ static int RLOG_MODULE_ID=4096;
 #include "rg.h"            /* MAC defines */
 
 /* header/extern include files (.x) */
-#include "gen.x"           /* general */
-#include "ssi.x"           /* system services */
-#include "cm5.x"           /* system services */
-#include "cm_tkns.x"       /* Common Token Definitions */
-#include "cm_llist.x"      /* Common Link List Definitions */
-#include "cm_lib.x"        /* Common Library Definitions */
-#include "cm_hash.x"       /* Common Hash List Definitions */
-#include "cm_mblk.x"       /* memory management */
-#include "cm_lte.x"        /* Common LTE Definitions */
 
 #include "rgu.x"           /* RGU Interface includes */
 #include "tfu.x"           /* CRG Interface includes */
@@ -79,7 +58,7 @@ static int RLOG_MODULE_ID=4096;
 #include "rgu.x"           /* RGU Interface includes */
 #include "lrg.x"           /* LRG Interface includes */
 
-#include "mac_interface.h"
+#include "du_app_mac_inf.h"
 #include "rg.x"            /* MAC includes */
 #include "ss_queue.h"
 #include "ss_queue.x"
@@ -632,8 +611,6 @@ RgErrInfo      *err;
          }
          break;
 
-      case EVTTFUTTIIND:
-         break;
       default:
          break;
    } /* End of switch(reqType) */
@@ -931,7 +908,7 @@ RgErrInfo           *err;
          }
          break;
 
-      case EVTTFUTTIIND:
+      case EVENT_SLOT_IND_TO_MAC:
          break;
       default:
          break;