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

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

diff --git a/src/5gnrsch/rg_sch_ex_ms.c b/src/5gnrsch/rg_sch_ex_ms.c
index e6015b4..ffebfb5 100755 (executable)
--- a/src/5gnrsch/rg_sch_ex_ms.c
+++ b/src/5gnrsch/rg_sch_ex_ms.c
@@ -33,17 +33,7 @@
 registered with SSI during the LTE MAC Task initialization.
 */
 /* 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 services */
-#include "cm5.h"           /* common timers defines */
-#include "cm_hash.h"       /* common hash list defines */
-#include "cm_llist.h"      /* common linked list defines */
-#include "cm_mblk.h"       /* memory management */
-#include "cm_tkns.h"       /* common tokens */
-#include "cm_lte.h"       /* common tokens */
+#include "common_def.h"
 #include "tfu.h"           /* RGU defines */
 #include "lrg.h"           /* layer management defines for LTE-MAC */
 #include "rgr.h"           /* layer management defines for LTE-MAC */
@@ -55,22 +45,13 @@ registered with SSI during the LTE MAC Task initialization.
 
 
 /* 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 "tfu.x"           /* RGU types */
 #include "lrg.x"           /* layer management typedefs for MAC */
 #include "rgr.x"           /* layer management typedefs for MAC */
 #include "rgm.x"           /* layer management typedefs for MAC */
 #include "rg_sch_inf.x"        /* typedefs for Scheduler */
 #include "rg_sch.x"        /* typedefs for Scheduler */
-
+#include "mac_sch_interface.h"
 
 
 \f
@@ -116,7 +97,7 @@ Buffer  *mBuf;                      /* message buffer       */
 #ifdef LCRGMILRG
             case EVTMACSCHGENCFGREQ:
                /* Process a config. request */
-               cmUnpkLrgSchCfgReq(HandleSchGenCfgReq, pst, mBuf);
+               cmUnpkLrgSchCfgReq(SchProcGenCfgReq, pst, mBuf);
                break;
             case EVTLRGSCHCNTRLREQ:
                /* Process a control request */
@@ -261,7 +242,7 @@ Buffer  *mBuf;                      /* message buffer       */
 #endif
 #endif            
             case EVENT_SLOT_IND_TO_SCH:
-               cmUnpackMacSchSlotInd(macSchSlotInd, pst, mBuf);
+               unpackMacSchSlotInd(macSchSlotInd, pst, mBuf);
                break;
             default:
                RGSCH_FREE_MSG(mBuf);