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=refs%2Fchanges%2F91%2F5391%2F11;hp=5fcd095895b77e853f587693b1bdf32d93dd505b;hpb=a5530e70a9d414952dadd1688aa9b4280c0dbb5a;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..8dcf644f6 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); +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. * @@ -60,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; @@ -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,26 +137,26 @@ 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); + DU_LOG("\nERROR --> DU_APP : Invalid event received at duActvTsk from ENTDUAPP"); + ODU_PUT_MSG_BUF(mBuf); ret = RFAILED; } } break; } - case ENTKW: + case ENTRLC: { switch(pst->event) { case LKW_EVT_CFG_CFM: { - ret = cmUnpkLkwCfgCfm(duHdlRlcCfgComplete, pst, mBuf); + ret = unpackRlcConfigCfm(DuHdlRlcCfgComplete, pst, mBuf); break; } case LKW_EVT_CNTRL_CFM: @@ -163,29 +168,54 @@ S16 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_UE_RECONFIG_RSP: + { + ret = unpackRlcUeCfgRsp(DuProcRlcUeCfgRsp, pst, mBuf); + break; + } + case EVENT_UL_RRC_MSG_TRANS_TO_DU: + { + ret = unpackRlcUlRrcMsgToDu(DuProcRlcUlRrcMsgTrans, pst, mBuf); + break; + } + case EVENT_RRC_DELIVERY_MSG_TRANS_TO_DU: + { + 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 ENTKW", \ + DU_LOG("\nERROR --> DU_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: @@ -207,9 +237,9 @@ S16 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: @@ -224,14 +254,18 @@ S16 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 ENTRG"); - SPutMsg(mBuf); + DU_LOG("\nERROR --> DU_APP : Invalid event received at duActvTsk from ENTMAC"); + ODU_PUT_MSG_BUF(mBuf); ret = RFAILED; } } @@ -259,12 +293,12 @@ S16 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; } } - SPutMsg(mBuf); + ODU_PUT_MSG_BUF(mBuf); break; } case ENTEGTP: @@ -288,22 +322,22 @@ S16 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; } } - 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); + DU_LOG("\nERROR --> DU_APP : DU APP can not process message from Entity %d", pst->srcEnt); + ODU_PUT_MSG_BUF(mBuf); ret = RFAILED; } } - SExitTsk(); + ODU_EXIT_TASK(); return ret; }