X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_ex_ms.c;h=e6a65c428fb950a850ff9fc22db52d496c1ecf78;hb=50aa3f9538e700074800c809f226760079e68d4a;hp=0c8eb8a2e585a047c5fa4de074caaf7edec1ac92;hpb=5625a52ad68f6ad93684e68bbbdbaef0d462cf9a;p=o-du%2Fl2.git

diff --git a/src/5gnrmac/rg_ex_ms.c b/src/5gnrmac/rg_ex_ms.c
index 0c8eb8a2e..e6a65c428 100755
--- a/src/5gnrmac/rg_ex_ms.c
+++ b/src/5gnrmac/rg_ex_ms.c
@@ -47,11 +47,13 @@ registered with SSI during the LTE MAC Task initialization.
 #include "rgu.h"           /* RGU defines */
 #include "tfu.h"           /* RGU defines */
 #include "lrg.h"           /* layer management defines for LTE-MAC */
+#include "rgr.h"           /* layer management defines for LTE-MAC */
 #include "crg.h"           /* CRG interface includes */
 #include "rg_sch_inf.h"    /* SCH interface includes */
 #include "rg_prg.h"        /* PRG interface includes */
 #include "rg_env.h"        /* customisable defines and macros for LTE-MAC */
 #include "rg.h"            /* defines and macros for MAC */
+#include "rgr.h"            /* defines and macros for SCH */
 
 
 /* header/extern include files (.x) */
@@ -67,11 +69,13 @@ registered with SSI during the LTE MAC Task initialization.
 #include "rgu.x"           /* RGU types */
 #include "tfu.x"           /* RGU types */
 #include "lrg.x"           /* layer management typedefs for MAC */
+#include "rgr.x"           /* layer management typedefs for MAC */
 #include "crg.x"           /* CRG interface typedes */
 #include "rg_sch_inf.x"    /* SCH interface typedefs */
 #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. 
@@ -108,6 +112,10 @@ Buffer  *mBuf;                      /* message buffer       */
          /* Process a config. request */
          cmUnpkLrgCfgReq(RgMiLrgCfgReq, pst, mBuf);
          break;
+      case EVTMACSCHGENCFGREQ:
+         /* Process a config. request */
+         cmUnpkLrgSchCfgReq(MacSchGenCfgReq, pst, mBuf);
+         break;
       case EVTLRGCNTRLREQ:
          /* Process a control request */
          cmUnpkLrgCntrlReq(RgMiLrgCntrlReq, pst, mBuf);
@@ -121,6 +129,18 @@ Buffer  *mBuf;                      /* message buffer       */
          cmUnpkLrgStsReq(RgMiLrgStsReq, pst, mBuf);
          break;
 #endif /* LCRGMILRG */
+      case EVENT_MAC_CELL_CONFIG_REQ:
+         /* Process MAC cell config */
+         unpackDuMacCellCfg(MacHdlCellCfgReq, 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;
       default:
          RG_FREE_MSG(mBuf);
          break;
@@ -212,17 +232,11 @@ Buffer  *mBuf;                      /* message buffer       */
       case EVTRGUUBNDREQ:
          cmUnpkRguUbndReq(RgUiRguUbndReq, pst, mBuf);
          break;
-      case EVTRGUCDATREQ:
-         cmUnpkRguCDatReq(RgUiRguCDatReq, pst, mBuf);
-         break;
-      case EVTRGUDDATREQ:
-         cmUnpkRguDDatReq(RgUiRguDDatReq, pst, mBuf);
-         break;
-      case EVTRGUCSTARSP:
-         cmUnpkRguCStaRsp(RgUiRguCStaRsp, pst, mBuf);
+      case EVTRLCDLDAT:
+         unpackDlData(MacRlcProcDlData, pst, mBuf);
          break;
-      case EVTRGUDSTARSP:
-         cmUnpkRguDStaRsp(RgUiRguDStaRsp, pst, mBuf);
+      case EVTRLCBOSTA:
+         unpackBOStatus(MacRlcProcBOStatus, pst, mBuf);
          break;
 #ifdef LTE_L2_MEAS
 
@@ -275,8 +289,8 @@ Buffer  *mBuf;                      /* message buffer       */
       case EVTTFUDATIND:
          cmUnpkTfuDatInd(RgLiTfuDatInd, pst, mBuf);
          break;
-      case EVTTFUTTIIND:
-         cmUnpkTfuTtiInd(RgLiTfuTtiInd, pst, mBuf);
+      case EVENT_SLOT_IND_TO_MAC:
+         cmUnpackSlotInd(fapiMacSlotInd, pst, mBuf);
          break;
 #if defined(TENB_T2K3K_SPECIFIC_CHANGES) && defined(LTE_TDD)
       case EVTTFUNONRTIND:
@@ -449,7 +463,7 @@ Buffer  *mBuf;                      /* message buffer       */
    {
       /* The originator of this message is the stack manager,
        * unpack and go to the respective primitive processing function */
-      case ENTSM:
+      case ENTDUAPP:
           rgHdlSMEvents(pst, mBuf);
            break;
       case ENTNH: