X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fdu_app%2Fdu_mgr_ex_ms.c;h=8dcf644f6d7160a075304d72639d8e3e286b45d3;hb=6d01b1cb797bb2b47115eee21ad7d1a6ff3fcfe7;hp=fce7500e907afeadc3183b7510ce56bd8f8b3356;hpb=cfe7ea3ab6cb69d18ed91d79c1bf66b3bc8bdc98;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 fce7500e9..8dcf644f6 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 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);
+uint8_t unpackRlcConfigCfm(RlcConfigCfm func,Pst *pst, Buffer *mBuf);
+uint8_t cmUnpkLkwCntrlCfm(LkwCntrlCfm func,Pst *pst, Buffer *mBuf);
+uint8_t cmUnpkLrgCfgCfm(LrgCfgCfm func,Pst *pst, Buffer *mBuf);
+uint8_t cmUnpkKwuDatInd(KwuDatInd func,Pst *pst, Buffer *mBuf);
+uint8_t cmUnpkLrgSchCfgCfm(LrgSchCfgCfm func,Pst *pst,Buffer *mBuf);
 /**************************************************************************
  * @brief Task Initiation callback function. 
  *
@@ -71,7 +71,7 @@ uint8_t duActvInit(Ent entity, Inst inst, Region region, Reason reason)
 
    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;
@@ -142,7 +142,7 @@ uint8_t duActvTsk(Pst *pst, Buffer *mBuf)
 		  }
 	       default:
 		  {
-		     DU_LOG("\nDU_APP : Invalid event received at duActvTsk from ENTDUAPP");
+		     DU_LOG("\nERROR  -->  DU_APP : Invalid event received at duActvTsk from ENTDUAPP");
 		     ODU_PUT_MSG_BUF(mBuf);
 		     ret = RFAILED;
 		  }
@@ -168,14 +168,14 @@ uint8_t duActvTsk(Pst *pst, Buffer *mBuf)
 		  {
 		     break;
 		  }
-	       case KWU_EVT_DAT_IND:
+	       case EVENT_RLC_UE_CREATE_RSP:
 		  {
-		     ret = cmUnpkKwuDatInd(duHdlRlcUlData, pst, mBuf);
+		     ret = unpackRlcUeCfgRsp(DuProcRlcUeCfgRsp, pst, mBuf);
 		     break;
 		  }
-	       case EVENT_RLC_UL_UE_CREATE_RSP:
+	       case EVENT_RLC_UE_RECONFIG_RSP:
 		  {
-		     ret = unpackRlcUlUeCreateRsp(DuProcRlcUlUeCreateRsp, pst, mBuf);
+		     ret = unpackRlcUeCfgRsp(DuProcRlcUeCfgRsp, pst, mBuf);
 		     break;
 		  }
 	       case EVENT_UL_RRC_MSG_TRANS_TO_DU:
@@ -188,9 +188,19 @@ uint8_t duActvTsk(Pst *pst, Buffer *mBuf)
 		     ret = unpackRrcDeliveryReportToDu(DuProcRlcRrcDeliveryReport, pst, mBuf);
 		     break;
 		  }
+	       case EVENT_DL_RRC_MSG_RSP_TO_DU:
+                  {
+	             ret = unpackRlcDlRrcMsgRspToDu(DuProcRlcDlRrcMsgRsp, pst, mBuf);
+		     break;
+                  }
+	       case EVENT_UL_USER_DATA_TRANS_TO_DU:
+	          {
+		     ret = unpackRlcUlUserDataToDu(DuProcRlcUlUserDataTrans, pst, mBuf);
+		     break;
+		  }
 	       default:
 		  {
-		     DU_LOG("\nDU_APP : Invalid event %d received at duActvTsk from ENTRLC", \
+		     DU_LOG("\nERROR  -->  DU_APP : Invalid event %d received at duActvTsk from ENTRLC", \
 			   pst->event);
 		     ODU_PUT_MSG_BUF(mBuf);
 		     ret = RFAILED;
@@ -227,9 +237,9 @@ uint8_t duActvTsk(Pst *pst, Buffer *mBuf)
 		     ret = unpackMacCellCfgCfm(duHandleMacCellCfgCfm, pst, mBuf);
 		     break;
 		  }
-	       case EVENT_MAC_SLOT_IND:
+	       case EVENT_MAC_CELL_UP_IND:
 		  {
-		     ret = unpackMacSlotInd(duHandleSlotInd, pst, mBuf);
+		     ret = unpackMacCellUpInd(duHandleCellUpInd, pst, mBuf);
 		     break;
 		  }
 	       case EVENT_MAC_STOP_IND:
@@ -244,13 +254,17 @@ uint8_t duActvTsk(Pst *pst, Buffer *mBuf)
 		  }
 	       case EVENT_MAC_UE_CREATE_RSP:
 		  {
-		     ret = unpackDuMacUeCreateRsp(DuHandleMacUeCreateRsp, pst, mBuf); 
+		     ret = unpackDuMacUeCfgRsp(DuProcMacUeCfgRsp, pst, mBuf); 
+		     break;
+		  }
+               case EVENT_MAC_UE_RECONFIG_RSP:
+		  {
+		     ret = unpackDuMacUeCfgRsp(DuProcMacUeCfgRsp, pst, mBuf); 
 		     break;
 		  }
-
 	       default:
 		  {
-		     DU_LOG("\nDU_APP : Invalid event received at duActvTsk from ENTMAC");
+		     DU_LOG("\nERROR  -->  DU_APP : Invalid event received at duActvTsk from ENTMAC");
 		     ODU_PUT_MSG_BUF(mBuf);
 		     ret = RFAILED;
 		  }
@@ -279,7 +293,7 @@ uint8_t duActvTsk(Pst *pst, Buffer *mBuf)
 		  }
 	       default:
 		  {
-		     DU_LOG("\nDU_APP : Invalid event received at duActvTsk from ENTSCTP");
+		     DU_LOG("\nERROR  -->  DU_APP : Invalid event received at duActvTsk from ENTSCTP");
 		     ret = RFAILED;
 		  }
 
@@ -308,7 +322,7 @@ uint8_t duActvTsk(Pst *pst, Buffer *mBuf)
 		  }
 	       default:
 		  {
-		     DU_LOG("\nDU_APP : Invalid event[%d] received at duActvTsk from ENTEGTP", pst->event);
+		     DU_LOG("\nERROR  -->  DU_APP : Invalid event[%d] received at duActvTsk from ENTEGTP", pst->event);
 		     ret = RFAILED;
 		  }
 	    }
@@ -317,7 +331,7 @@ uint8_t duActvTsk(Pst *pst, Buffer *mBuf)
 	 }
       default:
 	 {
-	    DU_LOG("\nDU_APP : DU APP can not process message from Entity %d", pst->srcEnt);
+	    DU_LOG("\nERROR  -->  DU_APP : DU APP can not process message from Entity %d", pst->srcEnt);
 	    ODU_PUT_MSG_BUF(mBuf);
 	    ret = RFAILED;
 	 }