X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_ex_ms.c;h=c7422093652dd85b99113754ef04c92ed305c57e;hb=1616921700a3c7541f1df6dd2678f9ee4d8e933b;hp=65f5fa228eb98a51f2ccc6ac01324c71dec788b7;hpb=d1ead035ab3b543810f1838b2519904bf84477ec;p=o-du%2Fl2.git diff --git a/src/5gnrmac/rg_ex_ms.c b/src/5gnrmac/rg_ex_ms.c index 65f5fa228..c74220936 100755 --- a/src/5gnrmac/rg_ex_ms.c +++ b/src/5gnrmac/rg_ex_ms.c @@ -33,17 +33,7 @@ registered with SSI during the LTE MAC Task initialization. */ /* header include files -- defines (.h) */ -#include "envopt.h" /* environment options */ -#include "envdep.h" /* environment dependent */ -#include "envind.h" /* environment independent */ -#include "gen.h" /* general layer */ -#include "ssi.h" /* system services */ -#include "cm5.h" /* common timers defines */ -#include "cm_hash.h" /* common hash list defines */ -#include "cm_llist.h" /* common linked list defines */ -#include "cm_mblk.h" /* memory management */ -#include "cm_tkns.h" /* common tokens */ -#include "cm_lte.h" /* common tokens */ +#include "common_def.h" #include "rgu.h" /* RGU defines */ #include "tfu.h" /* RGU defines */ #include "lrg.h" /* layer management defines for LTE-MAC */ @@ -57,15 +47,6 @@ registered with SSI during the LTE MAC Task initialization. /* header/extern include files (.x) */ -#include "gen.x" /* general layer typedefs */ -#include "ssi.x" /* system services typedefs */ -#include "cm5.x" /* common timers */ -#include "cm_hash.x" /* common hash list */ -#include "cm_lib.x" /* common library */ -#include "cm_llist.x" /* common linked list */ -#include "cm_mblk.x" /* memory management */ -#include "cm_tkns.x" /* common tokens */ -#include "cm_lte.x" /* common tokens */ #include "rgu.x" /* RGU types */ #include "tfu.x" /* RGU types */ #include "lrg.x" /* layer management typedefs for MAC */ @@ -73,9 +54,9 @@ registered with SSI during the LTE MAC Task initialization. #include "crg.x" /* CRG interface typedes */ #include "rg_sch_inf.x" /* SCH interface typedefs */ #include "rg_prg.x" /*PRG interface includes*/ -#include "mac_interface.h" +#include "du_app_mac_inf.h" #include "rg.x" /* typedefs for MAC */ - +#include "rlc_mac_inf.h" /** * @brief Task Activation callback function Entity SM. @@ -103,8 +84,6 @@ Pst *pst; /* post structure */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(rgHdlSMEvents) - switch(pst->event) { #ifdef LCRGMILRG @@ -116,9 +95,6 @@ Buffer *mBuf; /* message buffer */ /* Process a config. request */ cmUnpkLrgSchCfgReq(MacSchGenCfgReq, pst, mBuf); break; - case EVTMACSCHCFGREQ: - cmUnpkRgrCfgReq(MacSchCfgReq, pst, mBuf); - break; case EVTLRGCNTRLREQ: /* Process a control request */ cmUnpkLrgCntrlReq(RgMiLrgCntrlReq, pst, mBuf); @@ -134,8 +110,28 @@ Buffer *mBuf; /* message buffer */ #endif /* LCRGMILRG */ case EVENT_MAC_CELL_CONFIG_REQ: /* Process MAC cell config */ - cmUnpackLwLcMacCellCfg(unpackMacCellCfgReq, pst, mBuf); - break; + unpackDuMacCellCfg(MacProcCellCfgReq, pst, mBuf); + break; + case EVENT_MAC_CELL_START_REQ: + /* Process MAC cell start request */ + unpackMacCellStartReq(MacProcCellStartReq, pst, mBuf); + break; + case EVENT_MAC_CELL_STOP_REQ: + /* Process MAC cell stop request */ + unpackMacCellStopReq(MacProcCellStopReq, pst, mBuf); + break; + case EVENT_MAC_DL_CCCH_IND: + /* Process DL CCCH Ind */ + unpackMacDlCcchInd(MacProcDlCcchInd, pst, mBuf); + break; + case EVENT_MAC_UE_CREATE_REQ: + /* Process Ue Create Request */ + unpackMacUeCreateReq(MacProcUeCreateReq, pst, mBuf); + break; + case EVENT_MAC_UE_RECONFIG_REQ: + /* Process Ue Reconfig Request */ + unpackMacUeReconfigReq(MacProcUeReconfigReq, pst, mBuf); + break; default: RG_FREE_MSG(mBuf); break; @@ -169,8 +165,6 @@ Pst *pst; /* post structure */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(rgHdlNHEvents) - switch(pst->event) { #ifdef LCRGUICRG @@ -216,8 +210,6 @@ Pst *pst; /* post structure */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(rgHdlKWEvents) - switch(pst->event) { #ifdef LCRGUIRGU @@ -227,11 +219,11 @@ Buffer *mBuf; /* message buffer */ case EVTRGUUBNDREQ: cmUnpkRguUbndReq(RgUiRguUbndReq, pst, mBuf); break; - case EVTRLCDLDAT: - unpackDlData(RgUiRguDDatReq, pst, mBuf); + case EVENT_DL_DATA_TO_MAC: + unpackRlcDlData(MacProcRlcDlData, pst, mBuf); break; - case EVTRLCBOSTA: - unpackBOStatus(RgUiRguDStaRsp, pst, mBuf); + case EVENT_BO_STATUS_TO_MAC: + unpackRlcBoStatus(MacProcRlcBoStatus, pst, mBuf); break; #ifdef LTE_L2_MEAS @@ -273,8 +265,6 @@ Pst *pst; /* post structure */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(rgHdlTFEvents) - switch(pst->event) { #if (defined(LCRGLITFU) || defined(LWLCRGLITFU)) @@ -284,9 +274,6 @@ Buffer *mBuf; /* message buffer */ case EVTTFUDATIND: cmUnpkTfuDatInd(RgLiTfuDatInd, pst, mBuf); break; - case EVTTFUTTIIND: - cmUnpkTfuTtiInd(RgLiTfuTtiInd, pst, mBuf); - break; #if defined(TENB_T2K3K_SPECIFIC_CHANGES) && defined(LTE_TDD) case EVTTFUNONRTIND: cmUnpkTfuNonRtInd(RgLiTfuNonRtInd, pst, mBuf); @@ -326,8 +313,6 @@ Pst *pst; /* post structure */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(rgHdlRGEvents) - switch(pst->event) { #ifdef LCRG @@ -441,19 +426,17 @@ Buffer *mBuf; /* message buffer */ * -# ROK **/ #ifdef ANSI -PUBLIC S16 rgActvTsk +S16 rgActvTsk ( Pst *pst, /* post structure */ Buffer *mBuf /* message buffer */ ) #else -PUBLIC S16 rgActvTsk(pst, mBuf) +S16 rgActvTsk(pst, mBuf) Pst *pst; /* post structure */ Buffer *mBuf; /* message buffer */ #endif { - TRC2(rgActvTsk) - switch(pst->srcEnt) { /* The originator of this message is the stack manager, @@ -464,21 +447,21 @@ Buffer *mBuf; /* message buffer */ case ENTNH: rgHdlNHEvents(pst, mBuf); break; - case ENTKW: + case ENTRLC: rgHdlKWEvents(pst, mBuf); break; - case ENTTF: + case ENTLWRMAC: rgHdlTFEvents(pst, mBuf); break; - case ENTRG: /* When scheduler instance sends msg to MAC */ + case ENTMAC: /* When scheduler instance sends msg to MAC */ rgHdlRGEvents(pst, mBuf); break; default: RG_FREE_MSG(mBuf); break; } - SExitTsk(); - RETVALUE(ROK); + ODU_EXIT_TASK(); + return ROK; }/* end of rgActvTsk */