X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_ex_ms.c;h=c7422093652dd85b99113754ef04c92ed305c57e;hb=1616921700a3c7541f1df6dd2678f9ee4d8e933b;hp=79d69e56bb153689ac297b97dd442ca397211f6b;hpb=a5530e70a9d414952dadd1688aa9b4280c0dbb5a;p=o-du%2Fl2.git

diff --git a/src/5gnrmac/rg_ex_ms.c b/src/5gnrmac/rg_ex_ms.c
index 79d69e56b..c74220936 100755
--- a/src/5gnrmac/rg_ex_ms.c
+++ b/src/5gnrmac/rg_ex_ms.c
@@ -56,6 +56,7 @@ 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 */
+#include "rlc_mac_inf.h"
 
 /**
  * @brief Task Activation callback function Entity SM. 
@@ -83,8 +84,6 @@ Pst     *pst;                       /* post structure       */
 Buffer  *mBuf;                      /* message buffer       */
 #endif
 {
-   TRC2(rgHdlSMEvents)
-
    switch(pst->event)
    {
 #ifdef LCRGMILRG
@@ -114,21 +113,25 @@ Buffer  *mBuf;                      /* message buffer       */
          unpackDuMacCellCfg(MacProcCellCfgReq, pst, mBuf);
          break;
       case EVENT_MAC_CELL_START_REQ:
-         /* Process MAC cell start request */
-         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;
+	 /* Process MAC cell start request */
+	 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;
+      case EVENT_MAC_UE_RECONFIG_REQ:
+	 /* Process Ue Reconfig Request */
+	 unpackMacUeReconfigReq(MacProcUeReconfigReq, pst, mBuf);
+	 break;
       default:
          RG_FREE_MSG(mBuf);
          break;
@@ -162,8 +165,6 @@ Pst     *pst;                       /* post structure       */
 Buffer  *mBuf;                      /* message buffer       */
 #endif
 {
-   TRC2(rgHdlNHEvents)
-
    switch(pst->event)
    {
 #ifdef LCRGUICRG
@@ -209,8 +210,6 @@ Pst     *pst;                       /* post structure       */
 Buffer  *mBuf;                      /* message buffer       */
 #endif
 {
-   TRC2(rgHdlKWEvents)
-
    switch(pst->event)
    {
 #ifdef LCRGUIRGU
@@ -220,11 +219,11 @@ Buffer  *mBuf;                      /* message buffer       */
       case EVTRGUUBNDREQ:
          cmUnpkRguUbndReq(RgUiRguUbndReq, pst, mBuf);
          break;
-      case EVTRLCDLDAT:
-         unpackDlData(MacRlcProcDlData, pst, mBuf);
+      case EVENT_DL_DATA_TO_MAC:
+         unpackRlcDlData(MacProcRlcDlData, pst, mBuf);
          break;
-      case EVTRLCBOSTA:
-         unpackBOStatus(MacRlcProcBOStatus, pst, mBuf);
+      case EVENT_BO_STATUS_TO_MAC:
+         unpackRlcBoStatus(MacProcRlcBoStatus, pst, mBuf);
          break;
 #ifdef LTE_L2_MEAS
 
@@ -266,8 +265,6 @@ Pst     *pst;                       /* post structure       */
 Buffer  *mBuf;                      /* message buffer       */
 #endif
 {
-   TRC2(rgHdlTFEvents)
-
    switch(pst->event)
    {
 #if  (defined(LCRGLITFU) || defined(LWLCRGLITFU))
@@ -316,8 +313,6 @@ Pst     *pst;                       /* post structure       */
 Buffer  *mBuf;                      /* message buffer       */
 #endif
 {
-   TRC2(rgHdlRGEvents)
-
    switch(pst->event)
    {
 #ifdef LCRG
@@ -431,19 +426,17 @@ 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
 {
-   TRC2(rgActvTsk)
-
    switch(pst->srcEnt)
    {
       /* The originator of this message is the stack manager,
@@ -454,21 +447,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 */