X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_ex_ms.c;h=6e64f4af1994897d3878f8ea5b14f6c7647f5e6e;hb=ba78fa13b01e0729fe0a6a7a18cbf1d52cdcda1c;hp=c7422093652dd85b99113754ef04c92ed305c57e;hpb=1616921700a3c7541f1df6dd2678f9ee4d8e933b;p=o-du%2Fl2.git diff --git a/src/5gnrmac/rg_ex_ms.c b/src/5gnrmac/rg_ex_ms.c index c74220936..6e64f4af1 100755 --- a/src/5gnrmac/rg_ex_ms.c +++ b/src/5gnrmac/rg_ex_ms.c @@ -57,6 +57,7 @@ registered with SSI during the LTE MAC Task initialization. #include "du_app_mac_inf.h" #include "rg.x" /* typedefs for MAC */ #include "rlc_mac_inf.h" +#include "lwr_mac_upr_inf.h" /** * @brief Task Activation callback function Entity SM. @@ -73,13 +74,13 @@ registered with SSI during the LTE MAC Task initialization. * @return void **/ #ifdef ANSI -PRIVATE INLINE void rgHdlSMEvents +static inline void rgHdlSMEvents ( Pst *pst, /* post structure */ Buffer *mBuf /* message buffer */ ) #else -PRIVATE INLINE void rgHdlSMEvents(pst, mBuf) +static inline void rgHdlSMEvents(pst, mBuf) Pst *pst; /* post structure */ Buffer *mBuf; /* message buffer */ #endif @@ -154,13 +155,13 @@ Buffer *mBuf; /* message buffer */ * @return void **/ #ifdef ANSI -PRIVATE INLINE void rgHdlNHEvents +static inline void rgHdlNHEvents ( Pst *pst, /* post structure */ Buffer *mBuf /* message buffer */ ) #else -PRIVATE INLINE void rgHdlNHEvents(pst, mBuf) +static inline void rgHdlNHEvents(pst, mBuf) Pst *pst; /* post structure */ Buffer *mBuf; /* message buffer */ #endif @@ -199,13 +200,13 @@ Buffer *mBuf; /* message buffer */ * @return void **/ #ifdef ANSI -PRIVATE INLINE void rgHdlKWEvents +static inline void rgHdlKWEvents ( Pst *pst, /* post structure */ Buffer *mBuf /* message buffer */ ) #else -PRIVATE INLINE void rgHdlKWEvents(pst, mBuf) +static inline void rgHdlKWEvents(pst, mBuf) Pst *pst; /* post structure */ Buffer *mBuf; /* message buffer */ #endif @@ -254,32 +255,37 @@ Buffer *mBuf; /* message buffer */ * @return void **/ #ifdef ANSI -PRIVATE INLINE void rgHdlTFEvents +static inline void rgHdlTFEvents ( Pst *pst, /* post structure */ Buffer *mBuf /* message buffer */ ) #else -PRIVATE INLINE void rgHdlTFEvents(pst, mBuf) +static inline void rgHdlTFEvents(pst, mBuf) Pst *pst; /* post structure */ Buffer *mBuf; /* message buffer */ #endif { switch(pst->event) { -#if (defined(LCRGLITFU) || defined(LWLCRGLITFU)) - case EVTTFUBNDCFM: - cmUnpkTfuBndCfm(RgLiTfuBndCfm, pst, mBuf); + case EVENT_SLOT_IND_TO_MAC: + unpackSlotInd(fapiMacSlotInd, pst, mBuf); break; - case EVTTFUDATIND: - cmUnpkTfuDatInd(RgLiTfuDatInd, pst, mBuf); - break; -#if defined(TENB_T2K3K_SPECIFIC_CHANGES) && defined(LTE_TDD) - case EVTTFUNONRTIND: - cmUnpkTfuNonRtInd(RgLiTfuNonRtInd, pst, mBuf); - break; -#endif -#endif + case EVENT_STOP_IND_TO_MAC: + unpackStopInd(fapiMacStopInd, pst, mBuf); + break; + case EVENT_RACH_IND_TO_MAC: + unpackRachInd(fapiMacRachInd, pst, mBuf); + break; + case EVENT_CRC_IND_TO_MAC: + unpackCrcInd(fapiMacCrcInd, pst, mBuf); + break; + case EVENT_RX_DATA_IND_TO_MAC: + unpackRxDataInd(fapiMacRxDataInd, pst, mBuf); + break; + case EVENT_UCI_IND_TO_MAC: + unpackUciInd(FapiMacUciInd, pst, mBuf); + break; default: RG_FREE_MSG(mBuf); break; @@ -302,13 +308,13 @@ Buffer *mBuf; /* message buffer */ * @return void **/ #ifdef ANSI -PRIVATE INLINE void rgHdlRGEvents +static inline void rgHdlRGEvents ( Pst *pst, /* post structure */ Buffer *mBuf /* message buffer */ ) #else -PRIVATE INLINE void rgHdlRGEvents(pst, mBuf) +static inline void rgHdlRGEvents(pst, mBuf) Pst *pst; /* post structure */ Buffer *mBuf; /* message buffer */ #endif