X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_ex_ms.c;h=0319cc2ce0d949ea66ea6aaf48d7a216ec3cad12;hb=53088c437fc01fb772f221e228ba7475fb5131d5;hp=31e0fdaa45a0addb4fd563668b47fba782b2461e;hpb=694adde1a08c393a8443fd5bbd4f036f5cf85403;p=o-du%2Fl2.git

diff --git a/src/5gnrmac/rg_ex_ms.c b/src/5gnrmac/rg_ex_ms.c
index 31e0fdaa4..0319cc2ce 100755
--- 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. 
@@ -72,17 +73,11 @@ registered with SSI during the LTE MAC Task initialization.
  *  @param[in]  Reason reason.
  *  @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)
-Pst     *pst;                       /* post structure       */
-Buffer  *mBuf;                      /* message buffer       */
-#endif
 {
    switch(pst->event)
    {
@@ -112,23 +107,32 @@ Buffer  *mBuf;                      /* message buffer       */
          /* Process MAC cell config */
          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;
-      default:
+      case EVENT_MAC_CELL_START:
+	 /* Process MAC cell start request */
+	 unpackMacCellStart(MacProcCellStart, pst, mBuf);
+	 break;
+      case EVENT_MAC_CELL_STOP:
+	 /* Process MAC cell stop request */
+	 unpackMacCellStop(MacProcCellStop, 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;
+    case EVENT_MAC_UE_DELETE_REQ:
+    {
+       unpackMacUeDeleteReq(MacProcUeDeleteReq, pst, mBuf);
+       break;
+    }
+    default:
          RG_FREE_MSG(mBuf);
          break;
    }
@@ -149,17 +153,11 @@ Buffer  *mBuf;                      /* message buffer       */
  *  @param[in]  Reason reason.
  *  @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)
-Pst     *pst;                       /* post structure       */
-Buffer  *mBuf;                      /* message buffer       */
-#endif
 {
    switch(pst->event)
    {
@@ -194,17 +192,11 @@ Buffer  *mBuf;                      /* message buffer       */
  *  @param[in]  Reason reason.
  *  @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)
-Pst     *pst;                       /* post structure       */
-Buffer  *mBuf;                      /* message buffer       */
-#endif
 {
    switch(pst->event)
    {
@@ -249,33 +241,32 @@ Buffer  *mBuf;                      /* message buffer       */
  *  @param[in]  Reason reason.
  *  @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)
-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;
@@ -297,17 +288,11 @@ Buffer  *mBuf;                      /* message buffer       */
  *  @param[in]  Reason reason.
  *  @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)
-Pst     *pst;                       /* post structure       */
-Buffer  *mBuf;                      /* message buffer       */
-#endif
 {
    switch(pst->event)
    {
@@ -421,17 +406,11 @@ Buffer  *mBuf;                      /* message buffer       */
  *  @return  S16
  *      -# ROK
  **/
-#ifdef ANSI
 S16 rgActvTsk
 (
 Pst     *pst,                       /* post structure       */
 Buffer  *mBuf                       /* message buffer       */
 )
-#else
-S16 rgActvTsk(pst, mBuf)
-Pst     *pst;                       /* post structure       */
-Buffer  *mBuf;                      /* message buffer       */
-#endif
 {
    switch(pst->srcEnt)
    {