X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fdu_app%2Fdu_mgr_ex_ms.c;h=2392d6afbfb6ec7336923d3729d9d14e9b23d468;hb=aee73991f728cc127d1ed76d5a52571d916235a4;hp=5fcd095895b77e853f587693b1bdf32d93dd505b;hpb=45d134510deb6902b870b4a0fb574b6075fba601;p=o-du%2Fl2.git

diff --git a/src/du_app/du_mgr_ex_ms.c b/src/du_app/du_mgr_ex_ms.c
index 5fcd09589..2392d6afb 100644
--- a/src/du_app/du_mgr_ex_ms.c
+++ b/src/du_app/du_mgr_ex_ms.c
@@ -20,26 +20,31 @@
 #include "common_def.h"
 #include "lrg.h"
 #include "legtp.h"
+#include "lsctp.h"
+#include "legtp.h"
 #include "lkw.h"
+#include "kwu.h"
 #include "lrg.x"
 #include "lkw.x"
+#include "kwu.x"
 #include "du_app_mac_inf.h"
+#include "du_app_rlc_inf.h"
 #include "du_cfg.h"
+#include "du_mgr.h"
 #include "E2AP-PDU.h"
 #include "du_sctp.h"
+#include "F1AP-PDU.h"
 #include "du_f1ap_msg_hdl.h"
 #include "du_e2ap_msg_hdl.h"
-#include "lsctp.h"
-#include "legtp.h"
 #include "du_app_mac_inf.h"
 #include "du_ue_mgr.h"
-#include "kwu.x"
+#include "du_utils.h"
 
-extern S16 cmUnpkLkwCfgCfm(LkwCfgCfm func,Pst *pst, Buffer *mBuf);
-extern S16 cmUnpkLkwCntrlCfm(LkwCntrlCfm func,Pst *pst, Buffer *mBuf);
-extern S16 cmUnpkLrgCfgCfm(LrgCfgCfm func,Pst *pst, Buffer *mBuf);
-extern S16 cmUnpkKwuDatInd(KwuDatInd func,Pst *pst, Buffer *mBuf);
-extern S16 cmUnpkLrgSchCfgCfm(LrgSchCfgCfm func,Pst *pst,Buffer *mBuf);
+extern uint8_t unpackRlcConfigCfm(RlcConfigCfm func,Pst *pst, Buffer *mBuf);
+extern uint8_t cmUnpkLkwCntrlCfm(LkwCntrlCfm func,Pst *pst, Buffer *mBuf);
+extern uint8_t cmUnpkLrgCfgCfm(LrgCfgCfm func,Pst *pst, Buffer *mBuf);
+extern uint8_t cmUnpkKwuDatInd(KwuDatInd func,Pst *pst, Buffer *mBuf);
+extern uint8_t cmUnpkLrgSchCfgCfm(LrgSchCfgCfm func,Pst *pst,Buffer *mBuf);
 /**************************************************************************
  * @brief Task Initiation callback function. 
  *
@@ -60,7 +65,7 @@ extern S16 cmUnpkLrgSchCfgCfm(LrgSchCfgCfm func,Pst *pst,Buffer *mBuf);
  * @return ROK     - success
  *         RFAILED - failure
  ***************************************************************************/
-S16 duActvInit(Ent entity, Inst inst, Region region, Reason reason)
+uint8_t duActvInit(Ent entity, Inst inst, Region region, Reason reason)
 {
    uint8_t id;
 
@@ -92,7 +97,7 @@ S16 duActvInit(Ent entity, Inst inst, Region region, Reason reason)
    duCb.numCfgCells  = 0;
    duCb.numActvCells = 0;
 
-   SSetProcId(DU_PROC);
+   ODU_SET_PROC_ID(DU_PROC);
 
    return ROK;
 
@@ -118,9 +123,9 @@ S16 duActvInit(Ent entity, Inst inst, Region region, Reason reason)
  *         RFAILED - failure
  *
  ***************************************************************************/
-S16 duActvTsk(Pst *pst, Buffer *mBuf)
+uint8_t duActvTsk(Pst *pst, Buffer *mBuf)
 {
-   S16 ret = ROK;
+   uint8_t ret = ROK;
 
    switch(pst->srcEnt)
    {
@@ -132,13 +137,13 @@ S16 duActvTsk(Pst *pst, Buffer *mBuf)
 		  {
 		     DU_LOG("\n****** Received initial configs at DU APP ******\n");
 		     duProcCfgComplete();
-		     SPutMsg(mBuf);
+		     ODU_PUT_MSG(mBuf);
 		     break;
 		  }
 	       default:
 		  {
 		     DU_LOG("\nDU_APP : Invalid event received at duActvTsk from ENTDUAPP");
-		     SPutMsg(mBuf);
+		     ODU_PUT_MSG(mBuf);
 		     ret = RFAILED;
 		  }
 	    }
@@ -151,7 +156,7 @@ S16 duActvTsk(Pst *pst, Buffer *mBuf)
 	    {
 	       case LKW_EVT_CFG_CFM:
 		  {
-		     ret = cmUnpkLkwCfgCfm(duHdlRlcCfgComplete, pst, mBuf);
+		     ret = unpackRlcConfigCfm(DuHdlRlcCfgComplete, pst, mBuf);
 		     break;
 		  }
 	       case LKW_EVT_CNTRL_CFM:
@@ -168,11 +173,21 @@ S16 duActvTsk(Pst *pst, Buffer *mBuf)
 		     ret = cmUnpkKwuDatInd(duHdlRlcUlData, pst, mBuf);
 		     break;
 		  }
+	       case EVENT_RLC_UL_UE_CREATE_RSP:
+		  {
+		     ret = unpackRlcUlUeCreateRsp(DuProcRlcUlUeCreateRsp, pst, mBuf);
+		     break;
+		  }
+	       case EVENT_UL_RRC_MSG_TRANS_TO_DU:
+	          {
+	             ret = unpackRlcUlRrcMsgToDu(DuProcRlcUlRrcMsgTrans, pst, mBuf);
+		     break;
+                  }
 	       default:
 		  {
 		     DU_LOG("\nDU_APP : Invalid event %d received at duActvTsk from ENTKW", \
 			   pst->event);
-		     SPutMsg(mBuf);
+		     ODU_PUT_MSG(mBuf);
 		     ret = RFAILED;
 		  }
 	    }
@@ -185,7 +200,7 @@ S16 duActvTsk(Pst *pst, Buffer *mBuf)
 	       //Config complete
 	       case EVTCFG:
 		  {
-		     SPutMsg(mBuf);
+		     ODU_PUT_MSG(mBuf);
 		     break;
 		  }
 	       case EVTLRGCFGCFM:
@@ -224,14 +239,14 @@ S16 duActvTsk(Pst *pst, Buffer *mBuf)
 		  }
 	       case EVENT_MAC_UE_CREATE_RSP:
 		  {
-		     ret = unpackDuMacUeCreateRsp(duHandleMacUeCreateRsp, pst, mBuf); 
+		     ret = unpackDuMacUeCreateRsp(DuHandleMacUeCreateRsp, pst, mBuf); 
 		     break;
 		  }
 
 	       default:
 		  {
 		     DU_LOG("\nDU_APP : Invalid event received at duActvTsk from ENTRG");
-		     SPutMsg(mBuf);
+		     ODU_PUT_MSG(mBuf);
 		     ret = RFAILED;
 		  }
 	    }
@@ -264,7 +279,7 @@ S16 duActvTsk(Pst *pst, Buffer *mBuf)
 		  }
 
 	    }
-	    SPutMsg(mBuf);
+	    ODU_PUT_MSG(mBuf);
 	    break;
 	 }
       case ENTEGTP:
@@ -292,18 +307,18 @@ S16 duActvTsk(Pst *pst, Buffer *mBuf)
 		     ret = RFAILED;
 		  }
 	    }
-	    SPutMsg(mBuf);
+	    ODU_PUT_MSG(mBuf);
 	    break;
 	 }
       default:
 	 {
 	    DU_LOG("\nDU_APP : DU APP can not process message from Entity %d", pst->srcEnt);
-	    SPutMsg(mBuf);
+	    ODU_PUT_MSG(mBuf);
 	    ret = RFAILED;
 	 }
 
    }
-   SExitTsk();
+   ODU_EXIT_TASK();
    return ret;
 }