X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fdu_app%2Fdu_mgr_msg_router.c;h=a1112d0515c65abb093e34ce2da21edc68c59350;hb=6dc8a4c17da24847b3a3aee91b37151f77a8a5bc;hp=6241229d18153d67282a14b1e5fd28b225b5d07f;hpb=a71383f67779dcf9d67d15bf47949c7df9b5ddbb;p=o-du%2Fl2.git diff --git a/src/du_app/du_mgr_msg_router.c b/src/du_app/du_mgr_msg_router.c index 6241229d1..a1112d051 100644 --- a/src/du_app/du_mgr_msg_router.c +++ b/src/du_app/du_mgr_msg_router.c @@ -18,6 +18,7 @@ /* File : du_mgr_msg_router.c */ /* This file contains message handling functionality for DU APP */ #include "common_def.h" +#include "du_tmr.h" #include "lrg.h" #include "legtp.h" #include "lsctp.h" @@ -29,13 +30,14 @@ #include "kwu.x" #include "du_app_mac_inf.h" #include "du_app_rlc_inf.h" +#include "du_e2ap_mgr.h" +#include "du_e2ap_msg_hdl.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 "du_app_mac_inf.h" #include "du_ue_mgr.h" #include "du_utils.h" @@ -96,6 +98,7 @@ uint8_t duActvInit(Ent entity, Inst inst, Region region, Reason reason) memset(duCb.ueCcchCtxt, 0, MAX_NUM_UE * sizeof(UeCcchCtxt)); duCb.numCfgCells = 0; duCb.numActvCells = 0; + duCb.gnbDuUeF1apIdGenerator = 0; cmLListInit(&duCb.reservedF1apPduList); ODU_SET_PROC_ID(DU_PROC); @@ -103,6 +106,7 @@ uint8_t duActvInit(Ent entity, Inst inst, Region region, Reason reason) } +#ifdef CALL_FLOW_DEBUG_LOG /************************************************************************** * @brief Function prints the src dest and msg reached to egtp. * @@ -223,11 +227,6 @@ void callFlowduActvTsk(Pst *pst) strcpy(message,"EVTLRGCFGCFM"); break; } - case EVTLRGCNTRLCFM: - { - strcpy(message,"EVTLRGCNTRLCFM"); - break; - } case EVTMACSCHGENCFGCFM: { strcpy(message,"EVTMACSCHGENCFGCFM"); @@ -243,6 +242,11 @@ void callFlowduActvTsk(Pst *pst) strcpy(message,"EVENT_MAC_CELL_UP_IND"); break; } + case EVENT_MAC_SLOT_IND: + { + strcpy(message,"EVENT_MAC_SLOT_IND"); + break; + } case EVENT_MAC_STOP_IND: { strcpy(message,"EVENT_MAC_STOP_IND"); @@ -273,6 +277,31 @@ void callFlowduActvTsk(Pst *pst) strcpy(message,"EVENT_MAC_CELL_DELETE_RSP"); break; } + case EVENT_MAC_SLICE_CFG_RSP: + { + strcpy(message,"EVENT_MAC_SLICE_CFG_RSP"); + break; + } + case EVENT_MAC_SLICE_RECFG_RSP: + { + strcpy(message,"EVENT_MAC_SLICE_RECFG_RSP"); + break; + } + case EVENT_MAC_STATISTICS_RSP: + { + strcpy(message,"EVENT_MAC_STATISTICS_RSP"); + break; + } + case EVENT_MAC_STATISTICS_IND: + { + strcpy(message,"EVENT_MAC_STATISTICS_IND"); + break; + } + case EVENT_MAC_STATS_DELETE_RSP: + { + strcpy(message,"EVENT_MAC_STATS_DELETE_RSP"); + break; + } default: { strcpy(message,"Invalid Event"); @@ -347,6 +376,8 @@ void callFlowduActvTsk(Pst *pst) } DU_LOG("\nCall Flow: %s -> %s : %s\n", sourceTask, destTask, message); } +#endif + /************************************************************************** * @brief Task Activation callback function. * @@ -418,12 +449,12 @@ uint8_t duActvTsk(Pst *pst, Buffer *mBuf) } case EVENT_RLC_UE_CREATE_RSP: { - ret = unpackRlcUeCfgRsp(DuProcRlcUeCfgRsp, pst, mBuf); + ret = unpackRlcUeCreateRsp(DuProcRlcUeCreateRsp, pst, mBuf); break; } case EVENT_RLC_UE_RECONFIG_RSP: { - ret = unpackRlcUeCfgRsp(DuProcRlcUeCfgRsp, pst, mBuf); + ret = unpackRlcUeReconfigRsp(DuProcRlcUeReconfigRsp, pst, mBuf); break; } case EVENT_RLC_UE_DELETE_RSP: @@ -446,11 +477,26 @@ uint8_t duActvTsk(Pst *pst, Buffer *mBuf) ret = unpackRlcDlRrcMsgRspToDu(DuProcRlcDlRrcMsgRsp, pst, mBuf); break; } + case EVENT_RLC_MAX_RETRANSMISSION: + { + ret = unpackRlcMaxRetransInd(DuProcRlcMaxRetransInd, pst, mBuf); + break; + } case EVENT_UL_USER_DATA_TRANS_TO_DU: { ret = unpackRlcUlUserDataToDu(DuProcRlcUlUserDataTrans, pst, mBuf); break; } + case EVENT_RLC_SLICE_PM_TO_DU: + { + ret = unpackRlcSlicePm(DuProcRlcSliceMetrics, pst, mBuf); + break; + } + case EVENT_RLC_UE_REESTABLISH_RSP: + { + ret = unpackRlcUeReestablishRsp(DuProcRlcUeReestablishRsp, pst, mBuf); + break; + } default: { DU_LOG("\nERROR --> DU_APP : Invalid event %d received at duActvTsk from ENTRLC", \ @@ -476,10 +522,6 @@ uint8_t duActvTsk(Pst *pst, Buffer *mBuf) ret = cmUnpkLrgCfgCfm(duHdlMacCfgComplete, pst, mBuf); break; } - case EVTLRGCNTRLCFM: - { - break; - } case EVTMACSCHGENCFGCFM: { ret = cmUnpkLrgSchCfgCfm(duHdlSchCfgComplete, pst, mBuf); @@ -495,6 +537,11 @@ uint8_t duActvTsk(Pst *pst, Buffer *mBuf) ret = unpackMacCellUpInd(duHandleCellUpInd, pst, mBuf); break; } + case EVENT_MAC_SLOT_IND: + { + ret = unpackDuMacSlotInd(duHandleSlotInd, pst, mBuf); + break; + } case EVENT_MAC_STOP_IND: { ret = unpackMacStopInd(duHandleStopInd, pst, mBuf); @@ -507,12 +554,12 @@ uint8_t duActvTsk(Pst *pst, Buffer *mBuf) } case EVENT_MAC_UE_CREATE_RSP: { - ret = unpackDuMacUeCfgRsp(DuProcMacUeCfgRsp, pst, mBuf); + ret = unpackDuMacUeCreateRsp(DuProcMacUeCreateRsp, pst, mBuf); break; } case EVENT_MAC_UE_RECONFIG_RSP: { - ret = unpackDuMacUeCfgRsp(DuProcMacUeCfgRsp, pst, mBuf); + ret = unpackDuMacUeRecfgRsp(DuProcMacUeRecfgRsp, pst, mBuf); break; } case EVENT_MAC_UE_DELETE_RSP: @@ -525,6 +572,46 @@ uint8_t duActvTsk(Pst *pst, Buffer *mBuf) ret = unpackDuMacCellDeleteRsp(DuProcMacCellDeleteRsp, pst, mBuf); break; } + case EVENT_MAC_SLICE_CFG_RSP: + { + ret = unpackDuMacSliceCfgRsp(DuProcMacSliceCfgRsp, pst, mBuf); + break; + } + case EVENT_MAC_UE_SYNC_STATUS_IND: + { + ret = unpackDuMacUeSyncStatusInd(DuProcMacUeSyncStatusInd, pst, mBuf); + break; + } + case EVENT_MAC_SLICE_RECFG_RSP: + { + ret = unpackDuMacSliceRecfgRsp(DuProcMacSliceRecfgRsp, pst, mBuf); + break; + } + case EVENT_MAC_RACH_RESOURCE_RSP: + { + ret = unpackDuMacRachRsrcRsp(DuProcMacRachRsrcRsp, pst, mBuf); + break; + } + case EVENT_MAC_UE_RESET_RSP: + { + ret = unpackDuMacUeResetRsp(DuProcMacUeResetRsp, pst, mBuf); + break; + } + case EVENT_MAC_STATISTICS_RSP: + { + ret = unpackDuMacStatsRsp(DuProcMacStatsRsp, pst, mBuf); + break; + } + case EVENT_MAC_STATISTICS_IND: + { + ret = unpackDuMacStatsInd(DuProcMacStatsInd, pst, mBuf); + break; + } + case EVENT_MAC_STATS_DELETE_RSP: + { + ret = unpackDuMacStatsDeleteRsp(DuProcMacStatsDeleteRsp, pst, mBuf); + break; + } default: { DU_LOG("\nERROR --> DU_APP : Invalid event received at duActvTsk from ENTMAC");