warning set 2: fixed warning related to du_app

[o-du/l2.git] / src / du_app / du_mgr_ex_ms.c

diff --git a/src/du_app/du_mgr_ex_ms.c b/src/du_app/du_mgr_ex_ms.c
index d2095e3..8245d2f 100644 (file)
--- a/src/du_app/du_mgr_ex_ms.c
+++ b/src/du_app/du_mgr_ex_ms.c
@@ -20,9 +20,12 @@
 
 #include "du_sctp.h"
 #include "du_f1ap_msg_hdl.h"
+#include "du_e2ap_msg_hdl.h"
 #include "lsctp.h"
 #include "legtp.h"
-#include "mac_interface.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);
@@ -50,6 +53,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;
@@ -64,27 +69,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);
@@ -158,6 +148,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", \
@@ -194,7 +189,12 @@ S16 duActvTsk(Pst *pst, Buffer *mBuf)
                   }
                case EVENT_MAC_CELL_CONFIG_CFM:
                   {
-                     ret = cmUnpackLcMacCellCfgCfm(duHandleMacCellCfgCfm, pst, mBuf);
+                     ret = unpackMacCellCfgCfm(duHandleMacCellCfgCfm, pst, mBuf);
+                     break;
+                  }
+               case EVENT_MAC_SLOT_IND:
+                  {
+                     ret = unpackMacSlotInd(duHandleSlotInd, pst, mBuf);
                      break;
                   }
                default:
@@ -211,16 +211,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");
@@ -237,17 +242,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: