X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fdu_app%2Fdu_mgr_ex_ms.c;h=21d752b0dcd5fde6a3bb5f9854bedf4712ae0149;hb=deeae2741b8520edcd37ecb20a40f1de821ceadf;hp=ce4895b39aca5a083c7c8be16f24ffe60c18b591;hpb=3235ecfc7414aa0b72d0ad50db63ae8b5626045b;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 ce4895b39..21d752b0d 100644
--- a/src/du_app/du_mgr_ex_ms.c
+++ b/src/du_app/du_mgr_ex_ms.c
@@ -20,13 +20,18 @@
 
 #include "du_sctp.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"
 
 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);
 /**************************************************************************
  * @brief Task Initiation callback function. 
  *
@@ -49,6 +54,8 @@ extern S16 cmUnpkLrgCfgCfm(LrgCfgCfm func,Pst *pst, Buffer *mBuf);
  ***************************************************************************/
 S16 duActvInit(Ent entity, Inst inst, Region region, Reason reason)
 {
+   uint8_t id;
+
    duCb.init.procId  = SFndProcId();
    duCb.init.ent     = entity;
    duCb.init.inst    = inst;
@@ -63,27 +70,12 @@ S16 duActvInit(Ent entity, Inst inst, Region region, Reason reason)
    duCb.mem.pool     = DU_POOL;
 
    duCb.f1Status     = FALSE;
+   duCb.e2Status     = FALSE;
 
-   if(ROK != cmHashListInit(&(duCb.cellLst), 
-            (U16) DU_MAX_CELLS,
-            (U16) 0,
-            (Bool) FALSE, 
-            (U16) CM_HASH_KEYTYPE_CONID,
-            0,   
-            0))
-   {
-      DU_LOG("\nDU_APP : cellLst Initialization Failed");
-   }
-
-   if(ROK != cmHashListInit(&(duCb.actvCellLst), 
-            (U16) DU_MAX_CELLS,
-            (U16) 0,
-            (Bool) FALSE, 
-            (U16) CM_HASH_KEYTYPE_CONID,
-            0,   
-            0))
+   for(id = 0; id < DU_MAX_CELLS; id ++)
    {
-      DU_LOG("\nDU_APP : ActvCellLst Initialization Failed");
+	   duCb.cfgCellLst[id] = NULL;
+      duCb.actvCellLst[id] = NULL;
    }
 
    SSetProcId(DU_PROC);
@@ -157,6 +149,11 @@ S16 duActvTsk(Pst *pst, Buffer *mBuf)
                   {
                      break;
                   }
+               case KWU_EVT_DAT_IND:
+                  {
+                     ret = cmUnpkKwuDatInd(duHdlRlcUlData, pst, mBuf);
+                     break;
+                  }
                default:
                   {
                      DU_LOG("\nDU_APP : Invalid event %d received at duActvTsk from ENTKW", \
@@ -191,7 +188,16 @@ S16 duActvTsk(Pst *pst, Buffer *mBuf)
                      ret = cmUnpkLrgSchCfgCfm(duHdlSchCfgComplete, pst, mBuf);
                      break;
                   }
-
+               case EVENT_MAC_CELL_CONFIG_CFM:
+                  {
+                     ret = unpackMacCellCfgCfm(duHandleMacCellCfgCfm, pst, mBuf);
+                     break;
+                  }
+               case EVENT_MAC_SLOT_IND:
+                  {
+                     ret = unpackMacSlotInd(duHandleSlotInd, pst, mBuf);
+                     break;
+                  }
                default:
                   {
                      DU_LOG("\nDU_APP : Invalid event received at duActvTsk from ENTRG");
@@ -206,16 +212,21 @@ S16 duActvTsk(Pst *pst, Buffer *mBuf)
          {
             switch(pst->event)
             {
-               case EVTSCTPDATA:
+               case EVENT_CU_DATA:
                {
                   F1APMsgHdlr(mBuf);
                   break;
                }
-               case EVTSCTPNTFY:
+               case EVENT_SCTP_NTFY:
                {
                   ret = cmUnpkSctpNtfy(duSctpNtfyHdl, pst, mBuf);
                   break;
                }
+               case EVENT_RIC_DATA:
+               {
+                  E2APMsgHdlr(mBuf);
+                  break;
+               }
                default:
                {
                   DU_LOG("\nDU_APP : Invalid event received at duActvTsk from ENTSCTP");
@@ -232,17 +243,17 @@ S16 duActvTsk(Pst *pst, Buffer *mBuf)
             {
                case EVTCFGCFM:
                {
-                  cmUnpkEgtpCfgCfm(duHdlEgtpCfgComplete, mBuf);
+                  unpackEgtpCfgCfm(duHdlEgtpCfgComplete, mBuf);
                   break;
                }
                case EVTSRVOPENCFM:
                {
-                  cmUnpkEgtpSrvOpenCfm(duHdlEgtpSrvOpenComplete, mBuf);
+                  unpackEgtpSrvOpenCfm(duHdlEgtpSrvOpenComplete, mBuf);
                   break;
                }
                case EVTTNLMGMTCFM:
                {
-                  cmUnpkEgtpTnlMgmtCfm(duHdlEgtpTnlMgmtCfm, mBuf);
+                  unpackEgtpTnlMgmtCfm(duHdlEgtpTnlMgmtCfm, mBuf);
                   break;
                }
                default: