X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fdu_app%2Fdu_mgr_ex_ms.c;h=76fabd659ab62163b24b4fe6cb2b2f2d57b2b908;hb=82fed26a7029a52cb9add31cb57451e2a0073437;hp=881bd7e060a62745502ec638f78622cf74e29589;hpb=6b44407d464a5a4e060999255233a7cfe78bb0fa;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 881bd7e06..76fabd659 100644
--- a/src/du_app/du_mgr_ex_ms.c
+++ b/src/du_app/du_mgr_ex_ms.c
@@ -40,11 +40,11 @@
 #include "du_ue_mgr.h"
 #include "du_utils.h"
 
-extern S16 unpackRlcConfigCfm(RlcConfigCfm func,Pst *pst, Buffer *mBuf);
-extern S16 cmUnpkLkwCntrlCfm(LkwCntrlCfm func,Pst *pst, Buffer *mBuf);
-extern S16 cmUnpkLrgCfgCfm(LrgCfgCfm 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 S16 cmUnpkLrgSchCfgCfm(LrgSchCfgCfm func,Pst *pst,Buffer *mBuf);
+extern uint8_t cmUnpkLrgSchCfgCfm(LrgSchCfgCfm func,Pst *pst,Buffer *mBuf);
 /**************************************************************************
  * @brief Task Initiation callback function. 
  *
@@ -65,13 +65,13 @@ 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;
 
    memset(&duCb, 0, sizeof(DuCb));
 
-   duCb.init.procId  = SFndProcId();
+   duCb.init.procId  = ODU_GET_PROCID();
    duCb.init.ent     = entity;
    duCb.init.inst    = inst;
    duCb.init.region  = region;
@@ -97,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;
 
@@ -123,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)
    {
@@ -137,20 +137,20 @@ S16 duActvTsk(Pst *pst, Buffer *mBuf)
 		  {
 		     DU_LOG("\n****** Received initial configs at DU APP ******\n");
 		     duProcCfgComplete();
-		     SPutMsg(mBuf);
+		     ODU_PUT_MSG_BUF(mBuf);
 		     break;
 		  }
 	       default:
 		  {
 		     DU_LOG("\nDU_APP : Invalid event received at duActvTsk from ENTDUAPP");
-		     SPutMsg(mBuf);
+		     ODU_PUT_MSG_BUF(mBuf);
 		     ret = RFAILED;
 		  }
 	    }
 
 	    break;
 	 }
-      case ENTKW:
+      case ENTRLC:
 	 {
 	    switch(pst->event)
 	    {
@@ -168,11 +168,6 @@ S16 duActvTsk(Pst *pst, Buffer *mBuf)
 		  {
 		     break;
 		  }
-	       case KWU_EVT_DAT_IND:
-		  {
-		     ret = cmUnpkKwuDatInd(duHdlRlcUlData, pst, mBuf);
-		     break;
-		  }
 	       case EVENT_RLC_UL_UE_CREATE_RSP:
 		  {
 		     ret = unpackRlcUlUeCreateRsp(DuProcRlcUlUeCreateRsp, pst, mBuf);
@@ -183,24 +178,29 @@ S16 duActvTsk(Pst *pst, Buffer *mBuf)
 	             ret = unpackRlcUlRrcMsgToDu(DuProcRlcUlRrcMsgTrans, pst, mBuf);
 		     break;
                   }
+	       case EVENT_RRC_DELIVERY_MSG_TRANS_TO_DU:
+	          {
+		     ret = unpackRrcDeliveryReportToDu(DuProcRlcRrcDeliveryReport, pst, mBuf);
+		     break;
+		  }
 	       default:
 		  {
-		     DU_LOG("\nDU_APP : Invalid event %d received at duActvTsk from ENTKW", \
+		     DU_LOG("\nDU_APP : Invalid event %d received at duActvTsk from ENTRLC", \
 			   pst->event);
-		     SPutMsg(mBuf);
+		     ODU_PUT_MSG_BUF(mBuf);
 		     ret = RFAILED;
 		  }
 	    }
 	    break;
 	 }
-      case ENTRG:
+      case ENTMAC:
 	 {
 	    switch(pst->event)
 	    {
 	       //Config complete
 	       case EVTCFG:
 		  {
-		     SPutMsg(mBuf);
+		     ODU_PUT_MSG_BUF(mBuf);
 		     break;
 		  }
 	       case EVTLRGCFGCFM:
@@ -245,8 +245,8 @@ S16 duActvTsk(Pst *pst, Buffer *mBuf)
 
 	       default:
 		  {
-		     DU_LOG("\nDU_APP : Invalid event received at duActvTsk from ENTRG");
-		     SPutMsg(mBuf);
+		     DU_LOG("\nDU_APP : Invalid event received at duActvTsk from ENTMAC");
+		     ODU_PUT_MSG_BUF(mBuf);
 		     ret = RFAILED;
 		  }
 	    }
@@ -279,7 +279,7 @@ S16 duActvTsk(Pst *pst, Buffer *mBuf)
 		  }
 
 	    }
-	    SPutMsg(mBuf);
+	    ODU_PUT_MSG_BUF(mBuf);
 	    break;
 	 }
       case ENTEGTP:
@@ -307,18 +307,18 @@ S16 duActvTsk(Pst *pst, Buffer *mBuf)
 		     ret = RFAILED;
 		  }
 	    }
-	    SPutMsg(mBuf);
+	    ODU_PUT_MSG_BUF(mBuf);
 	    break;
 	 }
       default:
 	 {
 	    DU_LOG("\nDU_APP : DU APP can not process message from Entity %d", pst->srcEnt);
-	    SPutMsg(mBuf);
+	    ODU_PUT_MSG_BUF(mBuf);
 	    ret = RFAILED;
 	 }
 
    }
-   SExitTsk();
+   ODU_EXIT_TASK();
    return ret;
 }