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

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

diff --git a/src/5gnrmac/rg_ex_ms.c b/src/5gnrmac/rg_ex_ms.c
index 6ca817a..79d69e5 100755 (executable)
--- a/src/5gnrmac/rg_ex_ms.c
+++ b/src/5gnrmac/rg_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 "rgu.h"           /* RGU defines */
 #include "tfu.h"           /* RGU defines */
 #include "lrg.h"           /* layer management defines for LTE-MAC */
@@ -57,15 +47,6 @@ 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 "rgu.x"           /* RGU types */
 #include "tfu.x"           /* RGU types */
 #include "lrg.x"           /* layer management typedefs for MAC */
@@ -75,7 +56,6 @@ registered with SSI during the LTE MAC Task initialization.
 #include "rg_prg.x"        /*PRG interface includes*/
 #include "du_app_mac_inf.h"
 #include "rg.x"            /* typedefs for MAC */
-int unpackDuMacCellCfg(DuMacCellCfgReq func,Pst *pst,Buffer *mBuf);
 
 /**
  * @brief Task Activation callback function Entity SM. 
@@ -131,23 +111,23 @@ Buffer  *mBuf;                      /* message buffer       */
 #endif /* LCRGMILRG */
       case EVENT_MAC_CELL_CONFIG_REQ:
          /* Process MAC cell config */
-         unpackDuMacCellCfg(MacHdlCellCfgReq, pst, mBuf);
+         unpackDuMacCellCfg(MacProcCellCfgReq, pst, mBuf);
          break;
       case EVENT_MAC_CELL_START_REQ:
          /* Process MAC cell start request */
-         unpackMacCellStartReq(MacHdlCellStartReq, pst, mBuf);
+         unpackMacCellStartReq(MacProcCellStartReq, pst, mBuf);
          break;
                case EVENT_MAC_CELL_STOP_REQ:
                        /* Process MAC cell stop request */
-                       unpackMacCellStopReq(MacHdlCellStopReq, pst, mBuf);
+                       unpackMacCellStopReq(MacProcCellStopReq, pst, mBuf);
                        break;
                case EVENT_MAC_DL_CCCH_IND:
                        /* Process DL CCCH Ind */
-                       unpackMacDlCcchInd(MacHdlDlCcchInd, pst, mBuf);
+                       unpackMacDlCcchInd(MacProcDlCcchInd, pst, mBuf);
                        break;
                case EVENT_MAC_UE_CREATE_REQ:
                   /* Process Ue Create Request */
-                       unpackMacUeCreateReq(MacHdlUeCreateReq, pst, mBuf);
+                       unpackMacUeCreateReq(MacProcUeCreateReq, pst, mBuf);
                        break;
       default:
          RG_FREE_MSG(mBuf);
@@ -297,9 +277,6 @@ Buffer  *mBuf;                      /* message buffer       */
       case EVTTFUDATIND:
          cmUnpkTfuDatInd(RgLiTfuDatInd, pst, mBuf);
          break;
-      case EVENT_SLOT_IND_TO_MAC:
-         cmUnpackSlotInd(fapiMacSlotInd, pst, mBuf);
-         break;
 #if defined(TENB_T2K3K_SPECIFIC_CHANGES) && defined(LTE_TDD)
       case EVTTFUNONRTIND:
          cmUnpkTfuNonRtInd(RgLiTfuNonRtInd, pst, mBuf);