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

diff --git a/src/5gnrmac/rg_ex_ms.c b/src/5gnrmac/rg_ex_ms.c
index c74220936..ec2c85bee 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,13 +107,13 @@ Buffer  *mBuf;                      /* message buffer       */
          /* Process MAC cell config */
          unpackDuMacCellCfg(MacProcCellCfgReq, pst, mBuf);
          break;
-      case EVENT_MAC_CELL_START_REQ:
+      case EVENT_MAC_CELL_START:
 	 /* Process MAC cell start request */
-	 unpackMacCellStartReq(MacProcCellStartReq, pst, mBuf);
+	 unpackMacCellStart(MacProcCellStart, pst, mBuf);
 	 break;
-      case EVENT_MAC_CELL_STOP_REQ:
+      case EVENT_MAC_CELL_STOP:
 	 /* Process MAC cell stop request */
-	 unpackMacCellStopReq(MacProcCellStopReq, pst, mBuf);
+	 unpackMacCellStop(MacProcCellStop, pst, mBuf);
 	 break;
       case EVENT_MAC_DL_CCCH_IND:
 	 /* Process DL CCCH Ind */
@@ -153,17 +148,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)
    {
@@ -198,17 +187,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)
    {
@@ -253,33 +236,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);
+      case EVENT_SLOT_IND_TO_MAC:
+	 unpackSlotInd(fapiMacSlotInd, 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_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;
@@ -301,17 +283,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)
    {
@@ -425,17 +401,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)
    {