L1-L2 Integration fixes.[Issue-ID: ODUHIGH-252]

[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 31e0fda..6e64f4a 100755 (executable)
--- a/src/5gnrmac/rg_ex_ms.c
+++ b/src/5gnrmac/rg_ex_ms.c
@@ -57,6 +57,7 @@ registered with SSI during the LTE MAC Task initialization.
 #include "du_app_mac_inf.h"
 #include "rg.x"            /* typedefs for MAC */
 #include "rlc_mac_inf.h"
+#include "lwr_mac_upr_inf.h"
 
 /**
  * @brief Task Activation callback function Entity SM. 
@@ -73,13 +74,13 @@ registered with SSI during the LTE MAC Task initialization.
  *  @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
@@ -113,21 +114,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;
@@ -150,13 +155,13 @@ 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
@@ -195,13 +200,13 @@ 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
@@ -250,32 +255,37 @@ 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
 {
    switch(pst->event)
    {
-#if  (defined(LCRGLITFU) || defined(LWLCRGLITFU))
-      case EVTTFUBNDCFM:
-         cmUnpkTfuBndCfm(RgLiTfuBndCfm, pst, mBuf);
-         break;
-      case EVTTFUDATIND:
-         cmUnpkTfuDatInd(RgLiTfuDatInd, pst, mBuf);
-         break;
-#if defined(TENB_T2K3K_SPECIFIC_CHANGES) && defined(LTE_TDD)
-      case EVTTFUNONRTIND:
-         cmUnpkTfuNonRtInd(RgLiTfuNonRtInd, pst, mBuf);
-         break;
-#endif
-#endif            
+      case EVENT_SLOT_IND_TO_MAC:
+        unpackSlotInd(fapiMacSlotInd, pst, mBuf);
+         break;
+      case EVENT_STOP_IND_TO_MAC:
+        unpackStopInd(fapiMacStopInd, pst, mBuf);
+        break;
+      case EVENT_RACH_IND_TO_MAC:
+        unpackRachInd(fapiMacRachInd, pst, mBuf);
+        break;
+      case EVENT_CRC_IND_TO_MAC:
+        unpackCrcInd(fapiMacCrcInd, pst, mBuf);
+        break;
+      case EVENT_RX_DATA_IND_TO_MAC:
+        unpackRxDataInd(fapiMacRxDataInd, pst, mBuf);
+        break;
+      case EVENT_UCI_IND_TO_MAC:
+        unpackUciInd(FapiMacUciInd, pst, mBuf);
+        break;
       default:
          RG_FREE_MSG(mBuf);
          break;
@@ -298,13 +308,13 @@ 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