X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=inline;f=src%2F5gnrmac%2Frg_ex_ms.c;h=b3bf9a7e0ad13df0dd6d8b55bf287092cb81af64;hb=65443172dd60a6ea312bd3a15959dbf54ad7f045;hp=736b6b228c475e5c292be7d7eeb1b18e834e1666;hpb=105199ef642ffe9736ea24a01d4546578fa25e60;p=o-du%2Fl2.git

diff --git a/src/5gnrmac/rg_ex_ms.c b/src/5gnrmac/rg_ex_ms.c
index 736b6b228..b3bf9a7e0 100755
--- a/src/5gnrmac/rg_ex_ms.c
+++ b/src/5gnrmac/rg_ex_ms.c
@@ -56,7 +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 */
-int unpackDuMacCellCfg(DuMacCellCfgReq func,Pst *pst,Buffer *mBuf);
+#include "rlc_mac_inf.h"
 
 /**
  * @brief Task Activation callback function Entity SM. 
@@ -73,19 +73,17 @@ int unpackDuMacCellCfg(DuMacCellCfgReq func,Pst *pst,Buffer *mBuf);
  *  @return  void
  **/
 #ifdef ANSI
-PRIVATE INLINE void rgHdlSMEvents
+static inline void rgHdlSMEvents
 (
 Pst     *pst,                       /* post structure       */
 Buffer  *mBuf                       /* message buffer       */
 )
 #else
-PRIVATE INLINE void rgHdlSMEvents(pst, mBuf)
+static inline void rgHdlSMEvents(pst, mBuf)
 Pst     *pst;                       /* post structure       */
 Buffer  *mBuf;                      /* message buffer       */
 #endif
 {
-   TRC2(rgHdlSMEvents)
-
    switch(pst->event)
    {
 #ifdef LCRGMILRG
@@ -112,24 +110,28 @@ 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;
-		case EVENT_MAC_DL_CCCH_IND:
-			/* Process DL CCCH Ind */
-			unpackMacDlCcchInd(MacHdlDlCcchInd, pst, mBuf);
-			break;
-		case EVENT_MAC_UE_CREATE_REQ:
-		   /* Process Ue Create Request */
-			unpackMacUeCreateReq(MacHdlUeCreateReq, 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;
@@ -152,19 +154,17 @@ Buffer  *mBuf;                      /* message buffer       */
  *  @return  void
  **/
 #ifdef ANSI
-PRIVATE INLINE void rgHdlNHEvents
+static inline void rgHdlNHEvents
 (
 Pst     *pst,                       /* post structure       */
 Buffer  *mBuf                       /* message buffer       */
 )
 #else
-PRIVATE INLINE void rgHdlNHEvents(pst, mBuf)
+static inline void rgHdlNHEvents(pst, mBuf)
 Pst     *pst;                       /* post structure       */
 Buffer  *mBuf;                      /* message buffer       */
 #endif
 {
-   TRC2(rgHdlNHEvents)
-
    switch(pst->event)
    {
 #ifdef LCRGUICRG
@@ -199,19 +199,17 @@ Buffer  *mBuf;                      /* message buffer       */
  *  @return  void
  **/
 #ifdef ANSI
-PRIVATE INLINE void rgHdlKWEvents
+static inline void rgHdlKWEvents
 (
 Pst     *pst,                       /* post structure       */
 Buffer  *mBuf                       /* message buffer       */
 )
 #else
-PRIVATE INLINE void rgHdlKWEvents(pst, mBuf)
+static inline void rgHdlKWEvents(pst, mBuf)
 Pst     *pst;                       /* post structure       */
 Buffer  *mBuf;                      /* message buffer       */
 #endif
 {
-   TRC2(rgHdlKWEvents)
-
    switch(pst->event)
    {
 #ifdef LCRGUIRGU
@@ -221,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
 
@@ -256,19 +254,17 @@ Buffer  *mBuf;                      /* message buffer       */
  *  @return  void
  **/
 #ifdef ANSI
-PRIVATE INLINE void rgHdlTFEvents
+static inline void rgHdlTFEvents
 (
 Pst     *pst,                       /* post structure       */
 Buffer  *mBuf                       /* message buffer       */
 )
 #else
-PRIVATE INLINE void rgHdlTFEvents(pst, mBuf)
+static inline void rgHdlTFEvents(pst, mBuf)
 Pst     *pst;                       /* post structure       */
 Buffer  *mBuf;                      /* message buffer       */
 #endif
 {
-   TRC2(rgHdlTFEvents)
-
    switch(pst->event)
    {
 #if  (defined(LCRGLITFU) || defined(LWLCRGLITFU))
@@ -278,9 +274,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);
@@ -309,19 +302,17 @@ Buffer  *mBuf;                      /* message buffer       */
  *  @return  void
  **/
 #ifdef ANSI
-PRIVATE INLINE void rgHdlRGEvents
+static inline void rgHdlRGEvents
 (
 Pst     *pst,                       /* post structure       */
 Buffer  *mBuf                       /* message buffer       */
 )
 #else
-PRIVATE INLINE void rgHdlRGEvents(pst, mBuf)
+static inline void rgHdlRGEvents(pst, mBuf)
 Pst     *pst;                       /* post structure       */
 Buffer  *mBuf;                      /* message buffer       */
 #endif
 {
-   TRC2(rgHdlRGEvents)
-
    switch(pst->event)
    {
 #ifdef LCRG
@@ -435,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,
@@ -458,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 */