Merge "cleanup of BuildAndSendUESetReq"

[o-du/l2.git] / src / 5gnrmac / lwr_mac.h

diff --git a/src/5gnrmac/lwr_mac.h b/src/5gnrmac/lwr_mac.h
index d153bcc..b8cc0af 100644 (file)
--- a/src/5gnrmac/lwr_mac.h
+++ b/src/5gnrmac/lwr_mac.h
@@ -26,13 +26,21 @@
 #include "gen.h"
 #include "ssi.h"
 #include "cm_hash.h"
+#include "cm_lte.h"
 
 #include "gen.x"
 #include "ssi.x"
 #include "cm_hash.x"
+#include "cm_lte.x"
 #include "cm_lib.x"
 #include "du_app_mac_inf.h"
 
+#ifdef INTEL_WLS
+#define LWR_MAC_ALLOC(_datPtr, _size)   WLS_MEM_ALLOC(_datPtr, _size);
+#else                                     
+#define LWR_MAC_ALLOC(_datPtr, _size)   MAC_ALLOC(_datPtr, _size);
+#endif                                    
+
 typedef enum
 {
    PHY_STATE_IDLE,
@@ -43,12 +51,12 @@ typedef enum
 
 /* Events in Lower Mac */
 typedef enum{
-  PARAM_REQ,
-  PARAM_RSP,
-  CONFIG_REQ,
-  CONFIG_RSP,
-  START_REQ,
-  STOP_REQ,
+  PARAM_REQUEST,
+  PARAM_RESPONSE,
+  CONFIG_REQUEST,
+  CONFIG_RESPONSE,
+  START_REQUEST,
+  STOP_REQUEST,
   MAX_EVENT
 }EventState;
 
@@ -72,7 +80,7 @@ typedef struct cellCb
 
 typedef enum
 {
-   RELEASE_15
+   FAPI_RELEASE_15
 }ReleaseCapab;
 
 typedef enum
@@ -266,9 +274,12 @@ typedef struct clCellParam
    RssiMeasurement       rssiMeasurementSupport;
 }ClCellParam;
 
-
 EXTERN ClCb clGlobalCp; 
 EXTERN ClCellCb * rgClUtlGetCellCb ARGS((U16 cellId));
+EXTERN uint32_t reverseBits(uint32_t num, uint8_t numBits);
+EXTERN void fillDlDciPayload(uint8_t *buf, uint8_t *bytePos, uint8_t *bitPos,\
+   uint32_t val, uint8_t valSize);
+EXTERN void lwrMacInit();
 
 #endif