X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Flwr_mac.h;h=fff6043599c7fd4568931b289e8a5899c3a7bf35;hb=531da47c7bfb6ce138a454f66eb184729860beef;hp=bd690a5a33897d8a60fe99040ab86c108e9fb195;hpb=45d134510deb6902b870b4a0fb574b6075fba601;p=o-du%2Fl2.git

diff --git a/src/5gnrmac/lwr_mac.h b/src/5gnrmac/lwr_mac.h
index bd690a5a3..fff604359 100644
--- 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