Merge "[Epic-ID: ODUHIGH-516][Task-ID: ODUHIGH-531] RIC Subscription Modification...

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

diff --git a/src/5gnrmac/lwr_mac.h b/src/5gnrmac/lwr_mac.h
index bd690a5..fff6043 100644 (file)
--- a/src/5gnrmac/lwr_mac.h
+++ b/src/5gnrmac/lwr_mac.h
@@ -20,12 +20,18 @@
 #ifndef __LWR_MAC_H__
 #define __LWR_MAC_H__
 
-#ifdef INTEL_WLS
+#ifdef INTEL_WLS_MEM
 #define LWR_MAC_ALLOC(_datPtr, _size)   WLS_MEM_ALLOC(_datPtr, _size);
 #else                                     
 #define LWR_MAC_ALLOC(_datPtr, _size)   MAC_ALLOC(_datPtr, _size);
 #endif                                    
 
+#ifdef INTEL_WLS_MEM
+#define LWR_MAC_FREE(_datPtr, _size) WLS_MEM_FREE(_datPtr, _size);
+#else
+#define LWR_MAC_FREE(_datPtr, _size) MAC_FREE(_datPtr, _size);
+#endif
+
 typedef enum
 {
    PHY_STATE_IDLE,
@@ -36,6 +42,9 @@ typedef enum
 
 /* Events in Lower Mac */
 typedef enum{
+#ifdef INTEL_TIMER_MODE
+   UL_IQ_SAMPLE,
+#endif
    PARAM_REQUEST,
    PARAM_RESPONSE,
    CONFIG_REQUEST,
@@ -57,6 +66,7 @@ typedef struct lwrMacGlobalCb
    Region          region;
    Pool            pool;
    bool            clCfgDone;   /* CL configuration done */
+   uint8_t         phySlotIndCntr;
    LwrMacCellCb    cellCb[MAX_NUM_CELL];   /* List of Cells configured */
    uint8_t         numCell;  /* Number of Cells configured */
    PhyState        phyState;    /* State of PHY */
@@ -259,12 +269,11 @@ typedef struct clCellParam
    RssiMeasurement       rssiMeasurementSupport;
 }ClCellParam;
 
-EXTERN LwrMacCb lwrMacCb; 
-EXTERN LwrMacCellCb * lwrMacGetCellCb ARGS((uint16_t cellId));
-EXTERN uint32_t reverseBits(uint32_t num, uint8_t numBits);
-EXTERN void fillDlDciPayload(uint8_t *buf, uint8_t *bytePos, uint8_t *bitPos,\
+LwrMacCb lwrMacCb; 
+LwrMacCellCb * lwrMacGetCellCb ARGS((uint16_t cellId));
+uint32_t reverseBits(uint32_t num, uint8_t numBits);
+void fillDlDciPayload(uint8_t *buf, uint8_t *bytePos, uint8_t *bitPos,\
       uint32_t val, uint8_t valSize);
-EXTERN void lwrMacInit();
 
 #endif