#define SS_MONITORING_SYMBOL 0x2000; /* symbol-0, set 14th bit */
#define SIB1_MCS 4
-#define SRB_ID_0 0
-#define SRB_ID_1 1
-
/* Macro for Ue Context */
-#define MAX_NUM_LOGICAL_CHANNELS 11
#define MAX_NUM_SR_CFG_PER_CELL_GRP 8 /* Max number of scheduling request config per cell group */
#define MAC_NUM_TAGS 4 /* Max number of timing advance groups */
#define MAX_NUM_BWP 4 /* Max number of BWP per serving cell */
#define MAX_NUM_CRSET 3 /* Max number of control resource set in add/modify/release list */
#define MAX_NUM_SEARCH_SPC 10 /* Max number of search space in add/modify/release list */
-#define FREQ_DOM_RSRC_SIZE 6 /* i.e. 6 bytes because Size of frequency domain resource is 45 bits */
#define MONITORING_SYMB_WITHIN_SLOT_SIZE 2 /* i.e. 2 bytes because size of monitoring symbols within slot is 14 bits */
#define MAX_NUM_DL_ALLOC 16 /* Max number of pdsch time domain downlink allocation */
#define MAX_NUM_UL_ALLOC 16 /* Max number of pusch time domain uplink allocation */
#define EVENT_MAC_DL_CCCH_IND 207
#define EVENT_MAC_UE_CREATE_REQ 208
#define EVENT_MAC_UE_CREATE_RSP 209
+#define EVENT_MAC_UE_RECONFIG_REQ 210
+#define EVENT_MAC_UE_RECONFIG_RSP 211
+
+#define BSR_PERIODIC_TIMER_SF_10 10
+#define BSR_RETX_TIMER_SF_320 320
+#define BSR_SR_DELAY_TMR_2560 2560
typedef enum
{
typedef enum
{
- CCE_REG_MAPPINGTYPE_PR_INTERLEAVED,
+ CCE_REG_MAPPINGTYPE_PR_INTERLEAVED = 1,
CCE_REG_MAPPINGTYPE_PR_NONINTERLEAVED
}REGMappingType;
typedef enum
{
- SLOTPERIODICITYANDOFFSET_PR_SL1,
+ SLOTPERIODICITYANDOFFSET_PR_SL1 = 1,
SLOTPERIODICITYANDOFFSET_PR_SL2,
SLOTPERIODICITYANDOFFSET_PR_SL4,
SLOTPERIODICITYANDOFFSET_PR_SL5,
typedef enum
{
- SEARCHSPACETYPE_PR_COMMON,
+ SEARCHSPACETYPE_PR_COMMON = 1,
SEARCHSPACETYPE_PR_UE_SPECIFIC
}SearchSpaceType;
+typedef enum
+{
+ QOS_NON_DYNAMIC = 1,
+ QOS_DYNAMIC
+}QosType;
+
typedef enum
{
AGGREGATIONLEVEL_N0 = 0,
typedef enum
{
- TYPE_STATIC_BUNDLING,
+ TYPE_STATIC_BUNDLING = 1,
TYPE_DYNAMIC_BUNDLING
}BundlingType;
+typedef enum
+{
+ SET2_SIZE_N4,
+ SET2_SIZE_WIDEBAND
+}BundlingSizeSet2;
+
+typedef enum
+{
+ SET1_SIZE_N4,
+ SET1_SIZE_WIDEBAND,
+ SET1_SIZE_N2_WIDEBAND,
+ SET1_SIZE_N4_WIDEBAND
+}BundlingSizeSet1;
+
typedef enum
{
LC_PRIORITY_1 = 1,
LC_PRIORITY_3
}LcPriority;
+typedef enum
+{
+ PBR_KBPS_0,
+ PBR_KBPS_8,
+ PBR_KBPS_16,
+ PBR_KBPS_32,
+ PBR_KBPS_64,
+ PBR_KBPS_128,
+ PBR_KBPS_256,
+ PBR_KBPS_512,
+ PBR_KBPS_1024,
+ PBR_KBPS_2048,
+ PBR_KBPS_4096,
+ PBR_KBPS_8192,
+ PBR_KBPS_16384,
+ PBR_KBPS_32768,
+ PBR_KBPS_65536,
+ PBR_KBPS_INFINITY
+}PBitRate;
+
+typedef enum
+{
+ BSD_MS_5,
+ BSD_MS_10,
+ BSD_MS_20,
+ BSD_MS_50,
+ BSD_MS_100,
+ BSD_MS_150,
+ BSD_MS_300,
+ BSD_MS_500,
+ BSD_MS_1000,
+ BSD_SPARE_7,
+ BSD_SPARE_6,
+ BSD_SPARE_5,
+ BSD_SPARE_4,
+ BSD_SPARE_3,
+ BSD_SPARE_2,
+ BSD_SPARE_1
+
+}BucketSizeDur;
+
typedef enum
{
RADIO_NW_LAYER_FAIL,
UNSPECIFIED_MISC_CAUSE
}MiscFailCause;
+typedef enum
+{
+ MCS_TABLE_QAM64,
+ MCS_TABLE_QAM256,
+ MCS_TABLE_QAM64_LOW_SE
+}McsTable;
+
typedef struct failureCause
{
CauseGrp type;
typedef struct carrierCfg
{
- Bool pres;
- U16 bw; /* DL/UL bandwidth */
- U32 freq; /* Absolute frequency of DL/UL point A in KHz */
- U16 k0[NUM_NUMEROLOGY]; /* K0 for DL/UL */
- U16 gridSize[NUM_NUMEROLOGY]; /* DL/UL Grid size for each numerologies */
- U16 numAnt; /* Number of Tx/Rx antennas */
+ bool pres;
+ uint32_t bw; /* DL/UL bandwidth */
+ uint32_t freq; /* Absolute frequency of DL/UL point A in KHz */
+ uint16_t k0[NUM_NUMEROLOGY]; /* K0 for DL/UL */
+ uint16_t gridSize[NUM_NUMEROLOGY]; /* DL/UL Grid size for each numerologies */
+ uint16_t numAnt; /* Number of Tx/Rx antennas */
}CarrierCfg;
typedef struct ssbCfg
uint8_t mibPdu[3]; /* MIB payload */
uint32_t ssbMask[SSB_MASK_SIZE]; /* Bitmap for actually transmitted SSB. */
uint8_t beamId[NUM_SSB];
- Bool multCarrBand; /* Multiple carriers in a band */
- Bool multCellCarr; /* Multiple cells in single carrier */
+ bool multCarrBand; /* Multiple carriers in a band */
+ bool multCellCarr; /* Multiple cells in single carrier */
}SsbCfg;
typedef struct fdmInfo
{
- U16 rootSeqIdx; /* Root sequence index */
- U8 numRootSeq; /* Number of root sequences required for FD */
- U16 k1; /* Frequency Offset for each FD */
- U8 zeroCorrZoneCfg; /* Zero correlation zone cofig */
- U8 numUnusedRootSeq; /* Number of unused root sequence */
- U8 *unsuedRootSeq; /* Unused root sequence per FD */
+ uint16_t rootSeqIdx; /* Root sequence index */
+ uint8_t numRootSeq; /* Number of root sequences required for FD */
+ uint16_t k1; /* Frequency Offset for each FD */
+ uint8_t zeroCorrZoneCfg; /* Zero correlation zone cofig */
+ uint8_t numUnusedRootSeq; /* Number of unused root sequence */
+ uint8_t *unsuedRootSeq; /* Unused root sequence per FD */
}PrachFdmInfo;
typedef struct prachCfg
{
- Bool pres;
+ bool pres;
uint8_t prachCfgIdx; /* PRACH Cfg Index */
PrachSeqLen prachSeqLen; /* RACH Sequence length: Long/short */
uint8_t prachSubcSpacing; /* Subcarrier spacing of RACH */
uint8_t rootSeqLen; /* Root sequence length */
PrachFdmInfo fdm[8]; /* FDM info */
uint8_t ssbPerRach; /* SSB per RACH occassion */
- Bool prachMultCarrBand; /* Multiple carriers in Band */
+ bool prachMultCarrBand; /* Multiple carriers in Band */
uint8_t prachRestrictedSet; /* Support for PRACH restricted set */
uint8_t raContResTmr; /* RA Contention Resoultion Timer */
uint8_t rsrpThreshSsb; /* RSRP Threshold SSB */
typedef struct tddCfg
{
- Bool pres;
+ bool pres;
DlUlTxPeriodicity tddPeriod; /* DL UL Transmission periodicity */
SlotConfig slotCfg[MAXIMUM_TDD_PERIODICITY][MAX_SYMB_PER_SLOT];
}TDDCfg;
typedef struct macCellCfg
{
- U16 cellId; /* Cell Id */
- U8 numTlv; /* Number of configuration TLVs */
- U8 carrierId; /* Carrired Index */
- U16 phyCellId; /* Physical cell id */
+ uint16_t cellId; /* Cell Id */
+ uint8_t carrierId; /* Carrired Index */
+ uint16_t phyCellId; /* Physical cell id */
+ uint8_t numerology; /* Supported numerology */
DuplexMode dupType; /* Duplex type: TDD/FDD */
CarrierCfg dlCarrCfg; /* DL Carrier configuration */
CarrierCfg ulCarrCfg; /* UL Carrier configuration */
- Bool freqShft; /* Indicates presence of 7.5kHz frequency shift */
+ bool freqShft; /* Indicates presence of 7.5kHz frequency shift */
SsbCfg ssbCfg; /* SSB configuration */
PrachCfg prachCfg; /* PRACH Configuration */
TDDCfg tddCfg; /* TDD periodicity and slot configuration */
typedef struct macCellCfgCfm
{
- U16 cellId;
+ uint16_t cellId;
uint8_t rsp;
}MacCellCfgCfm;
{
uint16_t cellId;
uint16_t crnti;
+ uint16_t ulCcchMsgLen;
uint8_t *ulCcchMsg;
}UlCcchIndInfo;
typedef struct bsrTmrCfg
{
- uint8_t periodicTimer;
- uint8_t retxTimer;
- uint8_t srDelayTimer;
+ uint16_t periodicTimer;
+ uint16_t retxTimer;
+ uint16_t srDelayTimer;
}BsrTmrCfg;
uint8_t startSymbolAndLength;
}PdschTimeDomRsrcAlloc;
+
+typedef struct pdschBundling
+{
+ struct staticBundling
+ {
+ BundlingSizeSet2 size;
+ }StaticBundling;
+ struct dynamicBundling
+ {
+ BundlingSizeSet1 sizeSet1;
+ BundlingSizeSet2 sizeSet2;
+ }DynamicBundling;
+}PdschBundling;
+
/* DMRS downlink configuration */
typedef struct dmrsDlCfg
{
RBGSize rbgSize;
CodeWordsSchedDci numCodeWordsSchByDci; /* Number of code words scheduled by DCI */
BundlingType bundlingType;
+ PdschBundling bundlingInfo;
}PdschConfig;
/* Initial Downlink BWP */
/* PUSCH Configuration */
typedef struct puschCfg
{
+ uint8_t dataScramblingId;
DmrsUlCfg dmrsUlCfgForPuschMapTypeA;
ResAllocType resourceAllocType;
uint8_t numTimeDomRsrcAlloc;
ServCellCfgInfo servCellCfg;
}SpCellCfg;
-typedef struct maxAggrBitRate
+typedef struct ambrCfg
{
- uint32_t ulBits;
- uint32_t dlBits;
-}MaxAggrBitRate;
+ uint32_t ulBr; /* UL Bit rate */
+ uint32_t dlBr; /* DL Bit rate */
+}AmbrCfg;
/* Single Network Slice Selection assistance Info */
typedef struct snssai
typedef struct drbQos
{
- uint8_t fiveQiType; /* Dynamic or non-dynamic */
+ QosType fiveQiType; /* Dynamic or non-dynamic */
union
{
NonDynFiveQi nonDyn5Qi;
uint8_t priority;
uint8_t lcGroup;
uint8_t schReqId;
- uint8_t pbr; // prioritisedBitRate
- uint8_t bsd; // bucketSizeDuration
+ PBitRate pbr; // prioritisedBitRate
+ BucketSizeDur bsd; // bucketSizeDuration
}UlLcCfg;
typedef struct duLcCfg
typedef struct lcCfg
{
+ ConfigType configType;
uint8_t lcId;
DrbQosInfo *drbQos;
Snssai *snssai;
- UlLcCfg *ulLcCfg;
+ bool ulLcCfgPres;
+ UlLcCfg ulLcCfg;
DlLcCfg dlLcCfg;
-
}LcCfg;
+typedef struct modulationInfo
+{
+ uint8_t modOrder; /* Modulation order */
+ uint8_t mcsIndex; /* MCS Index */
+ McsTable mcsTable; /* MCS table */
+}ModulationInfo;
+
typedef struct macUeCfg
{
uint16_t cellId;
MacCellGrpCfg macCellGrpCfg;
PhyCellGrpCfg phyCellGrpCfg;
SpCellCfg spCellCfg;
- MaxAggrBitRate *maxAggrBitRate;
+ AmbrCfg *ambrCfg;
+ ModulationInfo dlModInfo; /* DL modulation info */
+ ModulationInfo ulModInfo; /* UL modulation info */
uint8_t numLcs;
- LcCfg lcCfgList[MAX_NUM_LOGICAL_CHANNELS];
+ LcCfg lcCfgList[MAX_NUM_LC];
+ UeCfgState macUeCfgState; /* InActive / Completed */
}MacUeCfg;
typedef struct nrcgi
MacUeCfg *ueCfg ));
/* UE create Response from MAC to DU APP */
-typedef uint8_t (*DuMacUeCreateRspFunc) ARGS((
+typedef uint8_t (*MacDuUeCfgRspFunc) ARGS((
Pst *pst,
MacUeCfgRsp *cfgRsp));
+/* UE Reconfig Request from DU APP to MAC*/
+typedef uint8_t (*DuMacUeReconfigReq) ARGS((
+ Pst *pst,
+ MacUeCfg *ueCfg ));
+
uint8_t packMacSlotInd(Pst *pst, SlotIndInfo *slotInfo );
uint8_t unpackMacSlotInd(DuMacSlotInd func, Pst *pst, Buffer *mBuf);
uint8_t duHandleSlotInd(Pst *pst, SlotIndInfo *slotInfo);
uint8_t packDuMacUeCreateReq(Pst *pst, MacUeCfg *ueCfg);
uint8_t unpackMacUeCreateReq(DuMacUeCreateReq func, Pst *pst, Buffer *mBuf);
uint8_t MacProcUeCreateReq(Pst *pst, MacUeCfg *ueCfg);
-uint8_t packDuMacUeCreateRsp(Pst *pst, MacUeCfgRsp *cfgRsp);
-uint8_t unpackDuMacUeCreateRsp(DuMacUeCreateRspFunc func, Pst *pst, Buffer *mBuf);
-uint8_t DuHandleMacUeCreateRsp(Pst *pst, MacUeCfgRsp *cfgRsp);
uint8_t sendStopIndMacToDuApp(uint16_t cellId);
+uint8_t packDuMacUeCfgRsp(Pst *pst, MacUeCfgRsp *cfgRsp);
+uint8_t unpackDuMacUeCfgRsp(MacDuUeCfgRspFunc func, Pst *pst, Buffer *mBuf);
+uint8_t DuProcMacUeCfgRsp(Pst *pst, MacUeCfgRsp *cfgRsp);
+uint8_t packDuMacUeReconfigReq(Pst *pst, MacUeCfg *ueCfg);
+uint8_t unpackMacUeReconfigReq(DuMacUeReconfigReq func, Pst *pst, Buffer *mBuf);
+uint8_t MacProcUeReconfigReq(Pst *pst, MacUeCfg *ueCfg);
+
#endif
/**********************************************************************
Code Review / o-du / l2.git / blobdiff