#define EVENT_RACH_IND_TO_SCH 5
#define EVENT_CRC_IND_TO_SCH 6
#define EVENT_DL_RLC_BO_INFO_TO_SCH 7
-#define EVENT_UE_CREATE_REQ_TO_SCH 8
-#define EVENT_UE_CREATE_RSP_TO_MAC 9
+#define EVENT_ADD_UE_CONFIG_REQ_TO_SCH 8
+#define EVENT_UE_CONFIG_RSP_TO_MAC 9
#define EVENT_SLOT_IND_TO_SCH 10
#define EVENT_SHORT_BSR 11
#define EVENT_UCI_IND_TO_SCH 12
+#define EVENT_MODIFY_UE_CONFIG_REQ_TO_SCH 13
+#define EVENT_UE_RECONFIG_RSP_TO_MAC 14
+
/*macros*/
#define NO_SSB 0
#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 */
+/* PUCCH Configuration Macro */
+#define MAX_NUM_PUCCH_RESRC 128
+#define MAX_NUM_PUCCH_RESRC_SET 4
+#define MAX_NUM_PUCCH_PER_RESRC_SET 32
+#define MAX_NUM_SPATIAL_RELATIONS 8
+#define MAX_NUM_PUCCH_P0_PER_SET 8
+#define MAX_NUM_PATH_LOSS_REF_RS 4
+#define MAX_NUM_DL_DATA_TO_UL_ACK 15
#define SD_SIZE 3
#define ADD_DELTA_TO_TIME(crntTime, toFill, incr) \
typedef enum
{
- INTERLEAVED_CCE_REG_MAPPING,
+ INTERLEAVED_CCE_REG_MAPPING = 1,
NONINTERLEAVED_CCE_REG_MAPPING
}SchREGMappingType;
typedef enum
{
- SLOT_PERIODICITY_AND_OFFSET_SL_1,
+ SLOT_PERIODICITY_AND_OFFSET_SL_1 = 1,
SLOT_PERIODICITY_AND_OFFSET_SL_2,
SLOT_PERIODICITY_AND_OFFSET_SL_4,
SLOT_PERIODICITY_AND_OFFSET_SL_5,
typedef enum
{
- SEARCH_SPACE_TYPE_COMMON,
+ SEARCH_SPACE_TYPE_COMMON = 1,
SEARCH_SPACE_TYPE_UE_SPECIFIC
}SchSearchSpaceType;
+typedef enum
+{
+ SCH_QOS_NON_DYNAMIC = 1,
+ SCH_QOS_DYNAMIC
+}SchQosType;
+
typedef enum
{
AGGREGATION_LEVEL_N0,
typedef enum
{
- STATIC_BUNDLING_TYPE,
+ STATIC_BUNDLING_TYPE = 1,
DYNAMIC_BUNDLING_TYPE
}SchBundlingType;
+typedef enum
+{
+ SCH_SET1_SIZE_N4,
+ SCH_SET1_SIZE_WIDEBAND,
+ SCH_SET1_SIZE_N2_WIDEBAND,
+ SCH_SET1_SIZE_N4_WIDEBAND
+}SchBundlingSizeSet1;
+
+typedef enum
+{
+ SCH_SET2_SIZE_N4,
+ SCH_SET2_SIZE_WIDEBAND
+}SchBundlingSizeSet2;
+
typedef enum
{
DUPLEX_MODE_FDD,
FORMAT1_1
}FormatType;
+typedef enum
+{
+ SCH_MCS_TABLE_QAM_64,
+ SCH_MCS_TABLE_QAM_256,
+ SCH_MCS_TABLE_QAM_64_LOW_SE
+}SchMcsTable;
+
/*structures*/
typedef struct timeDomainAlloc
{
typedef struct schCellCfg
{
- uint16_t cellId; /* Cell Id */
- uint16_t phyCellId; /* Physical cell id */
- uint8_t bandwidth; /* Supported B/W */
+ uint16_t cellId; /* Cell Id */
+ uint16_t phyCellId; /* Physical cell id */
+ uint8_t bandwidth; /* Supported B/W */
+ uint8_t numerology; /* Supported numerology */
SchDuplexMode dupMode; /* Duplex type: TDD/FDD */
- SchSsbCfg ssbSchCfg; /* SSB config */
- SchSib1Cfg sib1SchCfg; /* SIB1 config */
- SchRachCfg schRachCfg; /* PRACH config */
- SchBwpDlCfg schInitialDlBwp; /* Initial DL BWP */
- SchBwpUlCfg schInitialUlBwp; /* Initial UL BWP */
- uint8_t puschMu; /* PUSCH MU */
+ SchSsbCfg ssbSchCfg; /* SSB config */
+ SchSib1Cfg sib1SchCfg; /* SIB1 config */
+ SchRachCfg schRachCfg; /* PRACH config */
+ SchBwpDlCfg schInitialDlBwp; /* Initial DL BWP */
+ SchBwpUlCfg schInitialUlBwp; /* Initial UL BWP */
+#ifdef NR_TDD
+ TDDCfg tddCfg; /* TDD Cfg */
+#endif
}SchCellCfg;
typedef struct schCellCfgCfm
typedef struct tbInfo
{
- uint8_t mcs; /* MCS */
- uint8_t ndi; /* NDI */
- uint8_t rv; /* Redundancy Version */
- uint16_t tbSize; /* TB Size */
+ uint8_t qamOrder; /* Modulation Order */
+ uint8_t mcs; /* MCS */
+ SchMcsTable mcsTable; /* MCS Table */
+ uint8_t ndi; /* NDI */
+ uint8_t rv; /* Redundancy Version */
+ uint16_t tbSize; /* TB Size */
}TbInfo;
typedef struct schPuschInfo
uint8_t dmrsAddPos;
}SchPuschInfo;
+typedef struct schPucchFormatCfg
+{
+ uint8_t interSlotFreqHop;
+ uint8_t addDmrs;
+ uint8_t maxCodeRate;
+ uint8_t numSlots;
+ bool pi2BPSK;
+ bool harqAckCSI;
+}SchPucchFormatCfg;
+
typedef struct schPucchInfo
{
uint16_t rnti;
uint8_t numHarqBits;
uint8_t uciFlag;
uint8_t numUciBits;
+ uint8_t intraFreqHop;
+ uint16_t secondPrbHop;
+ uint8_t initialCyclicShift;
+ uint8_t occLen;
+ uint8_t occIdx;
+ uint8_t timeDomOCC;
+ SchPucchFormatCfg cmnFormatCfg;
}SchPucchInfo;
typedef struct ulSchedInfo
uint8_t symbolLength;
}SchPdschTimeDomRsrcAlloc;
+
+typedef struct schPdschBundling
+{
+ struct schStaticBundling
+ {
+ SchBundlingSizeSet2 size;
+ }SchStaticBundling;
+ struct schDynamicBundling
+ {
+ SchBundlingSizeSet1 sizeSet1;
+ SchBundlingSizeSet2 sizeSet2;
+ }SchDynamicBundling;
+}SchPdschBundling;
+
/* DMRS downlink configuration */
typedef struct schDmrsDlCfg
{
SchRBGSize rbgSize;
SchCodeWordsSchedByDci numCodeWordsSchByDci; /* Number of code words scheduled by DCI */
SchBundlingType bundlingType;
+ SchPdschBundling bundlingInfo;
}SchPdschConfig;
/* Initial Downlink BWP */
}SchPdschServCellCfg;
/* PUCCH Configuration */
+typedef struct schPucchResrcSetInfo
+{
+ uint8_t resrcSetId;
+ uint8_t resrcListCount;
+ uint8_t resrcList[MAX_NUM_PUCCH_PER_RESRC_SET];
+ uint8_t maxPayLoadSize;
+}SchPucchResrcSetInfo;
+
+typedef struct schPucchResrcSetCfg
+{
+ uint8_t resrcSetToAddModListCount;
+ SchPucchResrcSetInfo resrcSetToAddModList[MAX_NUM_PUCCH_RESRC_SET];
+ uint8_t resrcSetToRelListCount;
+ uint8_t resrcSetToRelList[MAX_NUM_PUCCH_RESRC];
+}SchPucchResrcSetCfg;
+
+typedef struct schPucchFormat0
+{
+ uint8_t initialCyclicShift;
+ uint8_t numSymbols;
+ uint8_t startSymbolIdx;
+}SchPucchFormat0;
+
+typedef struct schPucchFormat1
+{
+ uint8_t initialCyclicShift;
+ uint8_t numSymbols;
+ uint8_t startSymbolIdx;
+ uint8_t timeDomOCC;
+}SchPucchFormat1;
+
+typedef struct schPucchFormat2_3
+{
+ uint8_t numPrbs;
+ uint8_t numSymbols;
+ uint8_t startSymbolIdx;
+}SchPucchFormat2_3;
+
+typedef struct schPucchFormat4
+{
+ uint8_t numSymbols;
+ uint8_t occLen;
+ uint8_t occIdx;
+ uint8_t startSymbolIdx;
+}SchPucchFormat4;
+
+typedef struct schPucchResrcInfo
+{
+ uint8_t resrcId;
+ uint16_t startPrb;
+ uint8_t intraFreqHop;
+ uint16_t secondPrbHop;
+ uint8_t pucchFormat;
+ union{
+ SchPucchFormat0 *format0;
+ SchPucchFormat1 *format1;
+ SchPucchFormat2_3 *format2;
+ SchPucchFormat2_3 *format3;
+ SchPucchFormat4 *format4;
+ }SchPucchFormat;
+}SchPucchResrcInfo;
+
+typedef struct schPucchResrcCfg
+{
+ uint8_t resrcToAddModListCount;
+ SchPucchResrcInfo resrcToAddModList[MAX_NUM_PUCCH_RESRC];
+ uint8_t resrcToRelListCount;
+ uint8_t resrcToRelList[MAX_NUM_PUCCH_RESRC];
+}SchPucchResrcCfg;
+
+
+typedef struct schSchedReqResrcInfo
+{
+ uint8_t resrcId;
+ uint8_t requestId;
+ uint8_t periodicity;
+ uint16_t offset;
+ uint8_t resrc;
+}SchSchedReqResrcInfo;
+
+typedef struct schPucchSchedReqCfg
+{
+ uint8_t schedAddModListCount;
+ SchSchedReqResrcInfo schedAddModList[MAX_NUM_SR_CFG_PER_CELL_GRP];
+ uint8_t schedRelListCount;
+ uint8_t schedRelList[MAX_NUM_SR_CFG_PER_CELL_GRP];
+}SchPucchSchedReqCfg;
+
+typedef struct schSpatialRelationInfo
+{
+ uint8_t spatialRelationId;
+ uint8_t servCellIdx;
+ uint8_t pathLossRefRSId;
+ uint8_t p0PucchId;
+ uint8_t closeLoopIdx;
+}SchSpatialRelationInfo;
+
+typedef struct schPucchSpatialCfg
+{
+ uint8_t spatialAddModListCount;
+ SchSpatialRelationInfo spatialAddModList[MAX_NUM_SPATIAL_RELATIONS];
+ uint8_t spatialRelListCount;
+ uint8_t spatialRelList[MAX_NUM_SPATIAL_RELATIONS];
+}SchPucchSpatialCfg;
+
+typedef struct schP0PucchCfg
+{
+ uint8_t p0PucchId;
+ int p0PucchVal;
+}SchP0PucchCfg;
+
+typedef struct schPathLossRefRSCfg
+{
+ uint8_t pathLossRefRSId;
+}SchPathLossRefRSCfg;
+
+typedef struct schPucchMultiCsiCfg
+{
+ uint8_t multiCsiResrcListCount;
+ uint8_t multiCsiResrcList[MAX_NUM_PUCCH_RESRC-1];
+}SchPucchMultiCsiCfg;
+
+typedef struct schPucchDlDataToUlAck
+{
+ uint8_t dlDataToUlAckListCount;
+ uint8_t dlDataToUlAckList[MAX_NUM_DL_DATA_TO_UL_ACK];
+}SchPucchDlDataToUlAck;
+
+typedef struct schPucchPowerControl
+{
+ int deltaF_Format0;
+ int deltaF_Format1;
+ int deltaF_Format2;
+ int deltaF_Format3;
+ int deltaF_Format4;
+ uint8_t p0SetCount;
+ SchP0PucchCfg p0Set[MAX_NUM_PUCCH_P0_PER_SET];
+ uint8_t pathLossRefRSListCount;
+ SchPathLossRefRSCfg pathLossRefRSList[MAX_NUM_PATH_LOSS_REF_RS];
+}SchPucchPowerControl;
+
typedef struct schPucchCfg
{
- /* TODO : Not used currently */
+ SchPucchResrcSetCfg *resrcSet;
+ SchPucchResrcCfg *resrc;
+ SchPucchFormatCfg *format1;
+ SchPucchFormatCfg *format2;
+ SchPucchFormatCfg *format3;
+ SchPucchFormatCfg *format4;
+ SchPucchSchedReqCfg *schedReq;
+ SchPucchMultiCsiCfg *multiCsiCfg;
+ SchPucchSpatialCfg *spatialInfo;
+ SchPucchDlDataToUlAck *dlDataToUlAck;
+ SchPucchPowerControl *powerControl;
}SchPucchCfg;
/* Transform precoding disabled */
/* PUSCH Configuration */
typedef struct schPuschCfg
{
+ uint8_t dataScramblingId;
SchDmrsUlCfg dmrsUlCfgForPuschMapTypeA;
SchResourceAllocType resourceAllocType;
uint8_t numTimeDomRsrcAlloc;
/* DRB QoS */
typedef struct schDrbQos
{
- uint8_t fiveQiType; /* Dynamic or non-dynamic */
+ SchQosType fiveQiType; /* Dynamic or non-dynamic */
union
{
SchNonDynFiveQi nonDyn5Qi;
/* Logical Channel configuration */
typedef struct schLcCfg
{
+ ConfigType configType;
uint8_t lcId;
SchDrbQosInfo *drbQos;
SchSnssai *snssai;
SchDlLcCfg dlLcCfg;
- SchUlLcCfg *ulLcCfg;
+ SchUlLcCfg ulLcCfg;
}SchLcCfg;
/* Aggregate max bit rate */
-typedef struct aggrMaxBitRate
+typedef struct schAmbrCfg
{
- uint32_t ulBitRate;
- uint32_t dlBitRate;
-}SchAggrMaxBitRate;
+ uint32_t ulBr; /* Ul BitRate */
+ uint32_t dlBr; /* Dl BitRate */
+}SchAmbrCfg;
+
+typedef struct schModulationInfo
+{
+ uint8_t modOrder;
+ uint8_t mcsIndex;
+ SchMcsTable mcsTable;
+}SchModulationInfo;
/* UE configuration */
typedef struct schUeCfg
SchMacCellGrpCfg macCellGrpCfg;
SchPhyCellGrpCfg phyCellGrpCfg;
SchSpCellCfg spCellCfg;
- SchAggrMaxBitRate *aggrMaxBitRate;
- uint8_t numLc;
- SchLcCfg lcCfgList[MAX_NUM_LC];
+ SchAmbrCfg *ambrCfg;
+ SchModulationInfo dlModInfo;
+ SchModulationInfo ulModInfo;
+ uint8_t numLcs;
+ SchLcCfg schLcCfg[MAX_NUM_LC];
}SchUeCfg;
typedef struct schUeCfgRsp
Pst *pst, /* Post structure */
DlRlcBoInfo *dlBoInfo)); /* DL BO Info */
-typedef uint8_t (*MacSchUeCreateReqFunc) ARGS((
+typedef uint8_t (*MacSchAddUeConfigReqFunc) ARGS((
Pst *pst, /* Post structure */
SchUeCfg *ueCfgToSch)); /* Scheduler UE Cfg */
Pst *pst, /* Post structure */
SrUciIndInfo *uciInd)); /* UCI IND Info */
+typedef uint8_t (*MacSchModUeConfigReqFunc) ARGS((
+ Pst *pst, /* Post structure */
+ SchUeCfg *ueCfgToSch)); /* Scheduler UE Cfg */
+
+typedef uint8_t (*SchUeReCfgRspFunc) ARGS((
+ Pst *pst, /* Post structure */
+ SchUeCfgRsp *cfgRsp)); /* Scheduler UE Cfg response */
/* function declarations */
uint8_t packMacSchSlotInd(Pst *pst, SlotIndInfo *slotInd);
uint8_t MacSchCrcInd(Pst *pst, CrcIndInfo *crcInd);
uint8_t packMacSchDlRlcBoInfo(Pst *pst, DlRlcBoInfo *dlBoInfo);
uint8_t MacSchDlRlcBoInfo(Pst *pst, DlRlcBoInfo *dlBoInfo);
-uint8_t packMacSchUeCreateReq(Pst *pst, SchUeCfg *ueCfgToSch);
-uint8_t MacSchUeCreateReq(Pst *pst, SchUeCfg *ueCfgToSch);
+uint8_t packMacSchAddUeConfigReq(Pst *pst, SchUeCfg *ueCfgToSch);
+uint8_t MacSchAddUeConfigReq(Pst *pst, SchUeCfg *ueCfgToSch);
uint8_t packSchUeCfgRsp(Pst *pst, SchUeCfgRsp *cfgRsp);
uint8_t MacProcSchUeCfgRsp(Pst *pst, SchUeCfgRsp *cfgRsp);
uint8_t MacSchSlotInd ARGS((Pst * pst, SlotIndInfo * slotInd));
uint8_t MacSchBsr(Pst *pst, UlBufferStatusRptInd *bsrInd);
uint8_t packMacSchSrUciInd(Pst *pst, SrUciIndInfo *uciInd);
uint8_t MacSchSrUciInd(Pst *pst, SrUciIndInfo *uciInd);
+uint8_t packMacSchModUeConfigReq(Pst *pst, SchUeCfg *ueCfgToSch);
+uint8_t MacSchModUeConfigReq(Pst *pst, SchUeCfg *ueCfgToSch);
+uint8_t packSchUeReconfigRsp(Pst *pst, SchUeCfgRsp *cfgRsp);
+uint8_t MacProcSchUeReconfigRsp(Pst *pst, SchUeCfgRsp *cfgRsp);
/**********************************************************************
End of file