Code Review
/
o-du
/
l2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[ JIRA Id - ODUHIGH-606 ] Fixing null memory size allocation issue
[o-du/l2.git]
/
src
/
5gnrmac
/
lwr_mac.h
diff --git
a/src/5gnrmac/lwr_mac.h
b/src/5gnrmac/lwr_mac.h
index
422adbf
..
687286f
100644
(file)
--- a/
src/5gnrmac/lwr_mac.h
+++ b/
src/5gnrmac/lwr_mac.h
@@
-20,18
+20,17
@@
#ifndef __LWR_MAC_H__
#define __LWR_MAC_H__
#ifndef __LWR_MAC_H__
#define __LWR_MAC_H__
-#define MAX_NUM_CELL_SUPP 1
+#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
-#include "envdep.h"
-#include "gen.h"
-#include "ssi.h"
-#include "cm_hash.h"
-
-#include "gen.x"
-#include "ssi.x"
-#include "cm_hash.x"
-#include "cm_lib.x"
-#include "du_mgr_mac_inf.h"
+#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
{
typedef enum
{
@@
-43,34
+42,40
@@
typedef enum
/* Events in Lower Mac */
typedef enum{
/* Events in Lower Mac */
typedef enum{
- PARAM_REQ,
- CONFIG_REQ = 2,
- START_REQ = 4,
- STOP_REQ,
- MAX_EVENT
+#ifdef INTEL_TIMER_MODE
+ UL_IQ_SAMPLE,
+#endif
+ PARAM_REQUEST,
+ PARAM_RESPONSE,
+ CONFIG_REQUEST,
+ CONFIG_RESPONSE,
+ START_REQUEST,
+ STOP_REQUEST,
+ MAX_EVENT
}EventState;
}EventState;
-typedef struct clCb
+typedef struct cellCb
+{
+ uint16_t cellId;
+ uint16_t phyCellId;
+ PhyState state;
+}LwrMacCellCb;
+
+typedef struct lwrMacGlobalCb
{
Region region;
Pool pool;
{
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 */
+ uint8_t phySlotIndCntr;
+ 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 */
PhyState phyState; /* State of PHY */
EventState event; /* State of Event */
-}ClCb;
-
-typedef struct cellCb
-{
- U16 cellId;
- MacCellCfg cellCfg;
- PhyState phyState;
-}ClCellCb;
+}LwrMacCb;
typedef enum
{
typedef enum
{
- RELEASE_15
+
FAPI_
RELEASE_15
}ReleaseCapab;
typedef enum
}ReleaseCapab;
typedef enum
@@
-223,9
+228,9
@@
typedef struct clCellParam
ParamSupport precoderGranularityCoreset;
ParamSupport pdcchMuMimo;
ParamSupport pdcchPrecoderCycling;
ParamSupport precoderGranularityCoreset;
ParamSupport pdcchMuMimo;
ParamSupport pdcchPrecoderCycling;
-
U8
maxPdcchsPerSlot;
+
uint8_t
maxPdcchsPerSlot;
Formats pucchFormats;
Formats pucchFormats;
-
U8
maxPucchsPerSlot;
+
uint8_t
maxPucchsPerSlot;
MappingType pdschMappingType;
AllocationType pdschAllocationTypes;
VrbToPrbMap pdschVrbToPrbMapping;
MappingType pdschMappingType;
AllocationType pdschAllocationTypes;
VrbToPrbMap pdschVrbToPrbMapping;
@@
-233,10
+238,10
@@
typedef struct clCellParam
DmrsConfigType pdschDmrsConfigTypes;
DmrMaxLen pdschDmrsMaxLength;
DmrsPos pdschDmrsAdditionalPos;
DmrsConfigType pdschDmrsConfigTypes;
DmrMaxLen pdschDmrsMaxLength;
DmrsPos pdschDmrsAdditionalPos;
-
U8
maxPdschsTBsPerSlot;
-
U8
maxNumberMimoLayersPdsch;
+
uint8_t
maxPdschsTBsPerSlot;
+
uint8_t
maxNumberMimoLayersPdsch;
ModulationOrder supportedMaxModulationOrderDl;
ModulationOrder supportedMaxModulationOrderDl;
-
U8
maxMuMimoUsersDl;
+
uint8_t
maxMuMimoUsersDl;
ParamSupport pdschDataInDmrsSymbols;
ParamSupport premptionSupport;
ParamSupport pdschNonSlotSupport;
ParamSupport pdschDataInDmrsSymbols;
ParamSupport premptionSupport;
ParamSupport pdschNonSlotSupport;
@@
-250,11
+255,11
@@
typedef struct clCellParam
MappingType puschMappingType;
AllocationType puschAllocationTypes;
VrbToPrbMap puschVrbToPrbMapping;
MappingType puschMappingType;
AllocationType puschAllocationTypes;
VrbToPrbMap puschVrbToPrbMapping;
-
U8
puschMaxPtrsPorts;
-
U8
maxPduschsTBsPerSlot;
-
U8
maxNumberMimoLayersNonCbPusch;
+
uint8_t
puschMaxPtrsPorts;
+
uint8_t
maxPduschsTBsPerSlot;
+
uint8_t
maxNumberMimoLayersNonCbPusch;
ModulationOrder supportedModulationOrderUl;
ModulationOrder supportedModulationOrderUl;
-
U8
maxMuMimoUsersUl;
+
uint8_t
maxMuMimoUsersUl;
ParamSupport dftsOfdmSupport;
AggregationFactor puschAggregationFactor;
Formats prachLongFormats;
ParamSupport dftsOfdmSupport;
AggregationFactor puschAggregationFactor;
Formats prachLongFormats;
@@
-264,12
+269,14
@@
typedef struct clCellParam
RssiMeasurement rssiMeasurementSupport;
}ClCellParam;
RssiMeasurement rssiMeasurementSupport;
}ClCellParam;
-
-EXTERN ClCb clGlobalCp;
-EXTERN ClCellCb * rgClUtlGetCellCb ARGS((U16 cellId));
+extern 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);
#endif
/**********************************************************************
#endif
/**********************************************************************
-
End of file
-**********************************************************************/
+ End of file
+
**********************************************************************/