RLC BO, BO response and DL Data handling. [Issue-ID: ODUHIGH-181]

[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 79d69e5..a1da997 100755 (executable)
--- 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. 
@@ -220,11 +221,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
 
@@ -431,13 +432,13 @@ 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
@@ -454,21 +455,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 */
 
 \f