X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Flwr_mac_fsm.h;h=606e65d110cc8db540741552ac19af689c2e05ce;hb=d0d5d7b78e2a24af16003322cfd1c78bcd8d7664;hp=43f3c950ab6b39158d6f8170f6f5f3a7b57c8559;hpb=a2484c58e5beeb1ab9e1c86104cf9d9bc56750d1;p=o-du%2Fl2.git

diff --git a/src/5gnrmac/lwr_mac_fsm.h b/src/5gnrmac/lwr_mac_fsm.h
index 43f3c950a..606e65d11 100644
--- a/src/5gnrmac/lwr_mac_fsm.h
+++ b/src/5gnrmac/lwr_mac_fsm.h
@@ -24,31 +24,43 @@
 #define FAPI_UINT_32  4
 #define INVALID_VALUE -1
 
-#include "lwr_mac.h"
+#define CORESET_TYPE0 0
+#define CORESET_TYPE1 1
+#define CORESET_TYPE2 2
+#define CORESET_TYPE3 3
 
-#ifdef FAPI
-#include "fapi.h"
-#endif
+#define FILL_FAPI_LIST_ELEM(_currElem, _nextElem, _msgType, _numMsgInBlock, _alignOffset)\
+{\
+   _currElem->msg_type             = (uint8_t) _msgType;\
+   _currElem->num_message_in_block = _numMsgInBlock;\
+   _currElem->align_offset         = (uint16_t) _alignOffset;\
+   _currElem->msg_len              = _numMsgInBlock * _alignOffset;\
+   _currElem->p_next               = _nextElem;\
+   _currElem->p_tx_data_elm_list   = NULL;\
+   _currElem->time_stamp           = 0;\
+}
 
 typedef enum{
    SI_RNTI_TYPE,
    RA_RNTI_TYPE,
-   TC_RNTI_TYPE
+   TC_RNTI_TYPE,
+   C_RNTI_TYPE
 }RntiType;
 
-S16 lwr_mac_handleInvalidEvt(void *msg);
-S16 lwr_mac_handleParamReqEvt(void *msg);
-S16 lwr_mac_handleParamRspEvt(void *msg);
-S16 lwr_mac_handleConfigReqEvt(void *msg);
-S16 lwr_mac_handleConfigRspEvt(void *msg);
-S16 lwr_mac_handleStartReqEvt(void *msg);
-S16 lwr_mac_handleStopReqEvt(void *msg);
-void sendToLowerMac(U16, U32, void *);
-uint16_t handleDlTtiReq(CmLteTimingInfo *currTimingInfo);
-uint16_t handleUlTtiReq(CmLteTimingInfo *currTimingInfo);
-void handlePhyMessages(uint16_t msgType, uint32_t msgSize, void *msg);
-
-typedef S16 (*lwrMacFsmHdlr)(void *);
+uint8_t lwr_mac_procInvalidEvt(void *msg);
+uint8_t lwr_mac_procParamReqEvt(void *msg);
+uint8_t lwr_mac_procParamRspEvt(void *msg);
+uint8_t lwr_mac_procConfigReqEvt(void *msg);
+uint8_t lwr_mac_procConfigRspEvt(void *msg);
+uint8_t lwr_mac_procStartReqEvt(void *msg);
+uint8_t lwr_mac_procStopReqEvt(void *msg);
+void sendToLowerMac(uint16_t, uint32_t, void *);
+void procPhyMessages(uint16_t msgType, uint32_t msgSize, void *msg);
+uint16_t fillUlTtiReq(SlotIndInfo currTimingInfo);
+uint16_t fillDlTtiReq(SlotIndInfo currTimingInfo);
+uint16_t fillUlDciReq(SlotIndInfo currTimingInfo);
+
+typedef uint8_t (*lwrMacFsmHdlr)(void *);
 #endif
 
 /**********************************************************************