X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_ex_ms.c;h=6fded6309cc996c903ee88bdf2dc890f1b95c1cd;hb=0a26c487f1b6bbb5217e47b15fa8273b2e749283;hp=0e6caf230bbc3ef345683669b297e154a07e039e;hpb=e550b2091fb29289d12a5722b189acbede7862f0;p=o-du%2Fl2.git

diff --git a/src/5gnrmac/rg_ex_ms.c b/src/5gnrmac/rg_ex_ms.c
index 0e6caf230..6fded6309 100755
--- 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 */
@@ -76,7 +57,6 @@ registered with SSI during the LTE MAC Task initialization.
 #include "du_app_mac_inf.h"
 #include "rg.x"            /* typedefs for MAC */
 
-
 /**
  * @brief Task Activation callback function Entity SM. 
  *
@@ -131,16 +111,24 @@ 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);
-         break;
-      case EVENT_MAC_CELL_STOP_REQ:
-         /* Process MAC cell stop request */
-         unpackMacCellStopReq(MacHdlCellStopReq, pst, mBuf);
-         break;
+         unpackMacCellStartReq(MacProcCellStartReq, pst, mBuf);
+         break;
+		case EVENT_MAC_CELL_STOP_REQ:
+			/* Process MAC cell stop request */
+			unpackMacCellStopReq(MacProcCellStopReq, pst, mBuf);
+			break;
+		case EVENT_MAC_DL_CCCH_IND:
+			/* Process DL CCCH Ind */
+			unpackMacDlCcchInd(MacProcDlCcchInd, pst, mBuf);
+			break;
+		case EVENT_MAC_UE_CREATE_REQ:
+		   /* Process Ue Create Request */
+			unpackMacUeCreateReq(MacProcUeCreateReq, pst, mBuf);
+			break;
       default:
          RG_FREE_MSG(mBuf);
          break;
@@ -233,10 +221,10 @@ Buffer  *mBuf;                      /* message buffer       */
          cmUnpkRguUbndReq(RgUiRguUbndReq, pst, mBuf);
          break;
       case EVTRLCDLDAT:
-         unpackDlData(RgUiRguDDatReq, pst, mBuf);
+         unpackDlData(MacRlcProcDlData, pst, mBuf);
          break;
       case EVTRLCBOSTA:
-         unpackBOStatus(RgUiRguDStaRsp, pst, mBuf);
+         unpackBOStatus(MacRlcProcBOStatus, pst, mBuf);
          break;
 #ifdef LTE_L2_MEAS
 
@@ -289,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);
@@ -446,13 +431,13 @@ Buffer  *mBuf;                      /* message buffer       */
  *      -# ROK
  **/
 #ifdef ANSI
-PUBLIC S16 rgActvTsk
+S16 rgActvTsk
 (
 Pst     *pst,                       /* post structure       */
 Buffer  *mBuf                       /* message buffer       */
 )
 #else
-PUBLIC S16 rgActvTsk(pst, mBuf)
+S16 rgActvTsk(pst, mBuf)
 Pst     *pst;                       /* post structure       */
 Buffer  *mBuf;                      /* message buffer       */
 #endif
@@ -469,21 +454,21 @@ Buffer  *mBuf;                      /* message buffer       */
       case ENTNH:
           rgHdlNHEvents(pst, mBuf);
           break;
-      case ENTKW:
+      case ENTRLC:
           rgHdlKWEvents(pst, mBuf);
           break;
-      case ENTTF:
+      case ENTLWRMAC:
           rgHdlTFEvents(pst, mBuf);
           break;
-      case ENTRG: /* When scheduler instance sends msg to MAC */
+      case ENTMAC: /* When scheduler instance sends msg to MAC */
           rgHdlRGEvents(pst, mBuf);
           break;
        default:
           RG_FREE_MSG(mBuf);
           break;
    }
-   SExitTsk();
-   RETVALUE(ROK);
+   ODU_EXIT_TASK();
+   return ROK;
 }/* end of rgActvTsk */