MAC Clean-up [Issue-ID: ODUHIGH-212]

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

diff --git a/src/5gnrmac/lwr_mac.h b/src/5gnrmac/lwr_mac.h
index 9480bbe..bd690a5 100644 (file)
--- a/src/5gnrmac/lwr_mac.h
+++ b/src/5gnrmac/lwr_mac.h
@@ -20,10 +20,6 @@
 #ifndef __LWR_MAC_H__
 #define __LWR_MAC_H__
 
-#define MAX_NUM_CELL_SUPP 1
-
-#include "du_app_mac_inf.h"
-
 #ifdef INTEL_WLS
 #define LWR_MAC_ALLOC(_datPtr, _size)   WLS_MEM_ALLOC(_datPtr, _size);
 #else                                     
@@ -40,32 +36,32 @@ typedef enum
 
 /* Events in Lower Mac */
 typedef enum{
-  PARAM_REQUEST,
-  PARAM_RESPONSE,
-  CONFIG_REQUEST,
-  CONFIG_RESPONSE,
-  START_REQUEST,
-  STOP_REQUEST,
-  MAX_EVENT
+   PARAM_REQUEST,
+   PARAM_RESPONSE,
+   CONFIG_REQUEST,
+   CONFIG_RESPONSE,
+   START_REQUEST,
+   STOP_REQUEST,
+   MAX_EVENT
 }EventState;
 
-typedef struct clCb
+typedef struct cellCb
+{
+   uint16_t     cellId;
+   uint16_t     phyCellId;
+   PhyState     state;
+}LwrMacCellCb;
+
+typedef struct lwrMacGlobalCb
 {
    Region          region;
    Pool            pool;
-   Bool            clCfgDone;   /* CL configuration done */
-   CmHashListCp    cellCbLst;   /* List of Cells configured */
-   U8              numOfCells;  /* Number of Cells configured */
+   bool            clCfgDone;   /* CL configuration done */
+   LwrMacCellCb    cellCb[MAX_NUM_CELL];   /* List of Cells configured */
+   uint8_t         numCell;  /* Number of Cells configured */
    PhyState        phyState;    /* State of PHY */
    EventState      event;       /* State of Event */
-}ClCb;
-
-typedef struct cellCb
-{
-   U16         cellId;
-   MacCellCfg   cellCfg;
-   PhyState    phyState;
-}ClCellCb;
+}LwrMacCb;
 
 typedef enum
 {
@@ -222,9 +218,9 @@ typedef struct clCellParam
    ParamSupport          precoderGranularityCoreset;
    ParamSupport          pdcchMuMimo;
    ParamSupport          pdcchPrecoderCycling;
-   U8                    maxPdcchsPerSlot;
+   uint8_t               maxPdcchsPerSlot;
    Formats               pucchFormats;
-   U8                    maxPucchsPerSlot;   
+   uint8_t               maxPucchsPerSlot;   
    MappingType           pdschMappingType;
    AllocationType        pdschAllocationTypes;
    VrbToPrbMap           pdschVrbToPrbMapping;
@@ -232,10 +228,10 @@ typedef struct clCellParam
    DmrsConfigType        pdschDmrsConfigTypes;
    DmrMaxLen             pdschDmrsMaxLength;
    DmrsPos               pdschDmrsAdditionalPos;
-   U8                    maxPdschsTBsPerSlot;
-   U8                    maxNumberMimoLayersPdsch;
+   uint8_t               maxPdschsTBsPerSlot;
+   uint8_t               maxNumberMimoLayersPdsch;
    ModulationOrder       supportedMaxModulationOrderDl;
-   U8                    maxMuMimoUsersDl;
+   uint8_t               maxMuMimoUsersDl;
    ParamSupport          pdschDataInDmrsSymbols;
    ParamSupport          premptionSupport;
    ParamSupport          pdschNonSlotSupport;
@@ -249,11 +245,11 @@ typedef struct clCellParam
    MappingType           puschMappingType;
    AllocationType        puschAllocationTypes;
    VrbToPrbMap           puschVrbToPrbMapping;
-   U8                    puschMaxPtrsPorts;
-   U8                    maxPduschsTBsPerSlot;
-   U8                    maxNumberMimoLayersNonCbPusch;
+   uint8_t               puschMaxPtrsPorts;
+   uint8_t               maxPduschsTBsPerSlot;
+   uint8_t               maxNumberMimoLayersNonCbPusch;
    ModulationOrder       supportedModulationOrderUl;
-   U8                    maxMuMimoUsersUl;
+   uint8_t               maxMuMimoUsersUl;
    ParamSupport          dftsOfdmSupport;
    AggregationFactor     puschAggregationFactor;
    Formats                prachLongFormats;
@@ -263,15 +259,15 @@ typedef struct clCellParam
    RssiMeasurement       rssiMeasurementSupport;
 }ClCellParam;
 
-EXTERN ClCb clGlobalCp; 
-EXTERN ClCellCb * rgClUtlGetCellCb ARGS((U16 cellId));
+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,\
-   uint32_t val, uint8_t valSize);
+      uint32_t val, uint8_t valSize);
 EXTERN void lwrMacInit();
 
 #endif
 
 /**********************************************************************
-         End of file
-**********************************************************************/
+  End of file
+ **********************************************************************/