X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcm%2Fmac_sch_interface.h;h=781973f4a12f9923cb62681df6f9e4809aa841ad;hb=a14bf79bbc001990f96e01ada0dd291bcc9ddcad;hp=67d64edc79e559820ab99ebd8b2da9508db6f41e;hpb=9c4801c94d7798cc638a6b112d514e68c695f20a;p=o-du%2Fl2.git diff --git a/src/cm/mac_sch_interface.h b/src/cm/mac_sch_interface.h index 67d64edc7..781973f4a 100644 --- a/src/cm/mac_sch_interface.h +++ b/src/cm/mac_sch_interface.h @@ -41,6 +41,18 @@ #define EVENT_SLICE_CFG_RSP_TO_MAC 22 #define EVENT_SLICE_RECFG_REQ_TO_SCH 23 #define EVENT_SLICE_RECFG_RSP_TO_MAC 24 +#define EVENT_RACH_RESOURCE_REQUEST_TO_SCH 25 +#define EVENT_RACH_RESOURCE_RESPONSE_TO_MAC 26 +#define EVENT_RACH_RESOURCE_RELEASE_TO_SCH 27 +#define EVENT_PAGING_IND_TO_SCH 28 +#define EVENT_DL_PAGING_ALLOC 29 +#define EVENT_DL_REL_HQ_PROC 30 +#define EVENT_DL_HARQ_IND_TO_SCH 31 +#define EVENT_DL_CQI_TO_SCH 32 +#define EVENT_UL_CQI_TO_SCH 33 +#define EVENT_PHR_IND_TO_SCH 34 +#define EVENT_STATISTICS_REQ_TO_SCH 35 +#define EVENT_STATISTICS_RSP_TO_MAC 36 /*macros*/ #define MAX_SSB_IDX 1 /* forcing it as 1 for now. Right value is 64 */ @@ -62,14 +74,8 @@ #define MAX_NUMBER_OF_CRC_IND_BITS 1 #define MAX_NUMBER_OF_UCI_IND_BITS 1 #define MAX_SR_BITS_IN_BYTES 1 +#define MAX_HARQ_BITS_IN_BYTES 1 #define MAX_NUM_LOGICAL_CHANNEL_GROUPS 8 -/* can we have a common numslot numscs between mac sch */ -#ifdef NR_TDD -#define MAX_SLOTS 20 -#else -#define MAX_SLOTS 10 -#endif -#define MAX_SFN 1024 #define MAX_NUM_SR_CFG_PER_CELL_GRP 8 /* Max number of scheduling request config per cell group */ #define MAX_NUM_TAGS 4 /* Max number of timing advance groups */ #define MAX_NUM_BWP 4 /* Max number of BWP per serving cell */ @@ -106,9 +112,15 @@ #define DEFAULT_K2_VALUE_FOR_SCS60 2 #define DEFAULT_K2_VALUE_FOR_SCS120 3 -#define ADD_DELTA_TO_TIME(crntTime, toFill, incr) \ +#define MAX_PLMN 2 +#define DL_DMRS_SYMBOL_POS 4 /* Bitmap value 00000000000100 i.e. using 3rd symbol for PDSCH DMRS */ + +#define MAX_PHR_REPORT 1 /*TODO: Range of PHR reports in multiple PHR.*/ +#define MAX_FAILURE_DET_RESOURCES 10 /*Spec 38.331 'maxNrofFailureDetectionResources'*/ + +#define ADD_DELTA_TO_TIME(crntTime, toFill, incr, numOfSlot) \ { \ - if ((crntTime.slot + incr) > (MAX_SLOTS - 1)) \ + if ((crntTime.slot + incr) > (numOfSlot - 1)) \ { \ toFill.sfn = (crntTime.sfn + 1); \ } \ @@ -116,7 +128,7 @@ { \ toFill.sfn = crntTime.sfn; \ } \ - toFill.slot = (crntTime.slot + incr) % MAX_SLOTS; \ + toFill.slot = (crntTime.slot + incr) % numOfSlot; \ if (toFill.sfn >= MAX_SFN) \ { \ toFill.sfn%=MAX_SFN; \ @@ -130,12 +142,6 @@ typedef enum RRC_CONNECTED_USERS_RSRC }SchResourceType; -typedef enum -{ - SLICE_FOUND, - SLICE_NOT_FOUND -}RspCause; - typedef enum { NO_TRANSMISSION, @@ -143,14 +149,6 @@ typedef enum REPEATITION }PduTxOccsaion; -typedef enum -{ - UNSPECIFIED_CAUSE, - INVALID_PARAM_VALUE, - RESOURCE_UNAVAILABLE, - SYSTEM_ERROR -}SchFailureCause; - typedef enum { SR_PROHIBIT_MS1, @@ -163,13 +161,6 @@ typedef enum SR_PROHIBIT_MS128 }SchSrProhibitTimer; -typedef enum -{ - NOT_APPLICABLE, - INVALID_CELLID, - INVALID_UEID -}ErrorCause; - typedef enum { SR_TRANS_MAX_N4, @@ -405,6 +396,18 @@ typedef enum LONG_TRUNCATED_BSR }BsrType; +typedef enum +{ + SINGLE_ENTRY_PHR, + MULTIPLE_ENTRY_PHR +}PhrType; + +typedef enum +{ + PH_TYPE_1, + PH_TYPE_2 +}PhType; + typedef enum { FORMAT0_0, @@ -435,6 +438,26 @@ typedef enum RESTART_DATA_TRANSMISSION }SchDataTransmission; +typedef enum +{ + SchBeamFailure, + SchRlf, + SchBoth +}SchPurposeOfFailureDet; + +typedef enum +{ + CQI_PUCCH = 1, + CQI_PUSCH +}CqiUlReportType; + +/* Performance measurements from 3GPP TS 28.552 Release 15 */ +typedef enum +{ + SCH_DL_TOTAL_PRB_USAGE, + SCH_UL_TOTAL_PRB_USAGE +}SchMeasurementType; + /*structures*/ typedef struct timeDomainAlloc { @@ -442,32 +465,25 @@ typedef struct timeDomainAlloc uint16_t numSymb; }TimeDomainAlloc; -typedef struct freqDomainAlloc +typedef struct resAllocType0 +{ + uint8_t rbBitmap[36]; +}ResAllocType0; + +typedef struct resAllocType1 { uint16_t startPrb; uint16_t numPrb; -}FreqDomainAlloc; +}ResAllocType1; +typedef struct resAllocType1 FreqDomainRsrc; -typedef struct -{ - uint32_t ssbPbchPwr; /* SSB block power */ - uint8_t scsCommon; /* subcarrier spacing for common [0-3]*/ - uint8_t ssbOffsetPointA; /* SSB sub carrier offset from point A */ - SchSSBPeriod ssbPeriod; /* SSB Periodicity in msec */ - uint8_t ssbSubcOffset; /* Subcarrier Offset(Kssb) */ - uint32_t nSSBMask[SCH_SSB_MASK_SIZE]; /* Bitmap for actually transmitted SSB. */ - - /*Ref:Spec 38.331 "ssb-PositionsInBurst", Value 0 in Bitmap => corresponding SS/PBCH block is not transmitted - *value 1 => corresponding SS/PBCH block is transmitted*/ - uint8_t totNumSsb; /*S = Total Number of Actual SSB transmitted*/ -}SchSsbCfg; - +/* Reference -> O-RAN.WG8.AAD.0-v07.00, Table 9-32 BWP Information */ typedef struct bwpCfg { uint8_t subcarrierSpacing; uint8_t cyclicPrefix; - FreqDomainAlloc freqAlloc; + FreqDomainRsrc freqAlloc; }BwpCfg; typedef struct prg @@ -513,14 +529,17 @@ typedef struct pdschFreqAlloc { uint8_t resourceAllocType; /* since we are using type-1, rbBitmap excluded */ - FreqDomainAlloc freqAlloc; + uint8_t rbBitmap[36]; + uint16_t startPrb; + uint16_t numPrb; uint8_t vrbPrbMapping; -} PdschFreqAlloc; +}PdschFreqAlloc; typedef struct pdschTimeAlloc { - uint8_t rowIndex; - TimeDomainAlloc timeAlloc; + uint8_t rowIndex; + uint16_t startSymb; + uint16_t numSymb; } PdschTimeAlloc; typedef struct txPowerPdschInfo @@ -529,6 +548,7 @@ typedef struct txPowerPdschInfo uint8_t powerControlOffsetSS; } TxPowerPdschInfo; +/* Reference -> O-RAN.WG8.AAD.0-v07.00, Table 9-43 PDSCH Configuration */ typedef struct pdschCfg { uint16_t pduBitmap; @@ -550,6 +570,7 @@ typedef struct pdschCfg /* SIB1 interface structure */ +/* Reference -> O-RAN.WG8.AAD.0-v07.00, Table 9-35 CORESET Configuration */ typedef struct coresetCfg { uint8_t coreSetSize; @@ -559,8 +580,9 @@ typedef struct coresetCfg uint8_t cceRegMappingType; uint8_t regBundleSize; uint8_t interleaverSize; - uint8_t coreSetType; uint16_t shiftIndex; + uint8_t coreSetType; + uint8_t coresetPoolIndex; uint8_t precoderGranularity; uint8_t cceIndex; uint8_t aggregationLevel; @@ -568,10 +590,11 @@ typedef struct coresetCfg typedef struct txPowerPdcchInfo { - uint8_t powerValue; + uint8_t beta_pdcch_1_0; uint8_t powerControlOffsetSS; -} TxPowerPdcchInfo; +}TxPowerPdcchInfo; +/* Reference -> O-RAN.WG8.AAD.0-v07.00, Table 9-42 DL-DCI Configuration */ typedef struct dlDCI { uint16_t rnti; @@ -581,63 +604,60 @@ typedef struct dlDCI uint8_t aggregLevel; BeamformingInfo beamPdcchInfo; TxPowerPdcchInfo txPdcchPower; - PdschCfg *pdschCfg; -} DlDCI; + PdschCfg pdschCfg; +}DlDCI; typedef struct pdcchCfg { /* coreset-0 configuration */ CoresetCfg coresetCfg; - - uint16_t numDlDci; - DlDCI dci; /* as of now its only one DCI, later it will be numDlCi */ + uint16_t numDlDci; + DlDCI dci; /* as of now its only one DCI, later it will be numDlCi */ } PdcchCfg; /* end of SIB1 PDCCH structures */ -typedef struct pageCfg +typedef struct schPcchCfg { uint8_t numPO; /*Derived from Ns*/ bool poPresent; /*FirstPDCCH-MonitoringPO is present or not*/ uint16_t pagingOcc[MAX_PO_PER_PF]; /*FirstPDCCH-Monitoring Paging Occasion*/ -}PageCfg; +}SchPcchCfg; -typedef struct +typedef struct schPdcchConfigSib1 { - /* parameters recieved from DU-APP */ - uint16_t sib1PduLen; - uint16_t sib1RepetitionPeriod; uint8_t coresetZeroIndex; /* derived from 4 LSB of pdcchSib1 present in MIB */ uint8_t searchSpaceZeroIndex; /* derived from 4 MSB of pdcchSib1 present in MIB */ - uint16_t sib1Mcs; - - /* parameters derived in scheduler */ - uint8_t n0; - BwpCfg bwp; - PdcchCfg sib1PdcchCfg; - PdschCfg sib1PdschCfg; - PageCfg pageCfg; /*Config of Paging*/ -}SchSib1Cfg; +}SchPdcchConfigSib1; -typedef struct schRachCfg +typedef struct schRachCfgGeneric { uint8_t prachCfgIdx; /* PRACH config idx */ - uint8_t prachSubcSpacing; /* Subcarrier spacing of RACH */ - uint16_t msg1FreqStart; /* Msg1-FrequencyStart */ uint8_t msg1Fdm; /* PRACH FDM (1,2,4,8) */ - uint8_t rootSeqLen; /* root sequence length */ - uint16_t rootSeqIdx; /* Root sequence index */ - uint8_t numRootSeq; /* Number of root sequences required for FD */ - uint16_t k1; /* Frequency Offset for each FD */ + uint16_t msg1FreqStart; /* Msg1-FrequencyStart */ + uint8_t zeroCorrZoneCfg; /* Zero correlation zone cofig */ + int16_t preambleRcvdTargetPower; + uint8_t preambleTransMax; + uint8_t pwrRampingStep; + uint8_t raRspWindow; /* RA Response Window */ +}SchRachCfgGeneric; + +typedef struct schRachCfg +{ + SchRachCfgGeneric prachCfgGeneric; + uint8_t totalNumRaPreamble; /* Total number of RA preambles */ uint8_t ssbPerRach; /* SSB per RACH occassion */ - uint8_t prachMultCarrBand; /* Presence of Multiple carriers in Band */ + uint8_t numCbPreamblePerSsb; /* Number of CB preamble per SSB */ uint8_t raContResTmr; /* RA Contention Resoultion Timer */ uint8_t rsrpThreshSsb; /* RSRP Threshold SSB */ - uint8_t raRspWindow; /* RA Response Window */ + uint16_t rootSeqIdx; /* Root sequence index */ + uint16_t rootSeqLen; /* root sequence length */ + uint8_t numRootSeq; /* Number of root sequences required for FD */ + uint8_t msg1SubcSpacing; /* Subcarrier spacing of RACH */ }SchRachCfg; typedef struct schBwpParams { - FreqDomainAlloc freqAlloc; + FreqDomainRsrc freqAlloc; uint8_t scs; uint8_t cyclicPrefix; }SchBwpParams; @@ -732,7 +752,6 @@ typedef struct schBwpDlCfg SchBwpParams bwp; SchPdcchCfgCmn pdcchCommon; SchPdschCfgCmn pdschCommon; - SchK0K1TimingInfoTbl k0K1InfoTbl; }SchBwpDlCfg; typedef struct schK2TimingInfo @@ -750,10 +769,9 @@ typedef struct schK2TimingInfoTbl typedef struct schBwpUlCfg { SchBwpParams bwp; + SchRachCfg schRachCfg; /* PRACH config */ SchPucchCfgCmn pucchCommon; SchPuschCfgCmn puschCommon; - SchK2TimingInfoTbl msg3K2InfoTbl; - SchK2TimingInfoTbl k2InfoTbl; }SchBwpUlCfg; typedef struct schPlmnInfoList @@ -763,45 +781,206 @@ typedef struct schPlmnInfoList Snssai **snssai; /* List of supporting snssai*/ }SchPlmnInfoList; +#ifdef NR_DRX +/* The following list of structures is taken from the DRX-Config section of specification 33.331. */ + +typedef struct schDrxOnDurationTimer +{ + bool onDurationTimerValInMs; + union + { + uint8_t subMilliSeconds; + uint16_t milliSeconds; + }onDurationtimerValue; +}SchDrxOnDurationTimer; + +typedef struct schDrxLongCycleStartOffset +{ + uint16_t drxLongCycleStartOffsetChoice; + uint16_t drxLongCycleStartOffsetVal; +}SchDrxLongCycleStartOffset; + +typedef struct schShortDrx +{ + uint16_t drxShortCycle; + uint8_t drxShortCycleTimer; +}SchShortDrx; + +typedef struct schDrxCfg +{ + SchDrxOnDurationTimer drxOnDurationTimer; + uint16_t drxInactivityTimer; + uint8_t drxHarqRttTimerDl; + uint8_t drxHarqRttTimerUl; + uint16_t drxRetransmissionTimerDl; + uint16_t drxRetransmissionTimerUl; + SchDrxLongCycleStartOffset drxLongCycleStartOffset; + bool shortDrxPres; + SchShortDrx shortDrx; + uint8_t drxSlotOffset; +}SchDrxCfg; +#endif + +/*Spec 38.331 'NrNsPmaxList'*/ +typedef struct schNrNsPmaxList +{ + long additionalPMax; + long additionalSpectrumEmission; +}SchNrNsPmaxList; + +/*Spec 38.331 'FrequencyInfoDL-SIB'*/ +typedef struct schMultiFreqBandListSib +{ + long freqBandIndNr; + SchNrNsPmaxList nrNsPmaxList[1]; +}SchMultiFreqBandListSib; + +/*Spec 38.331 'SCS-SpecificCarrier'*/ +typedef struct schScsSpecificCarrier +{ + uint16_t offsetToCarrier; + uint8_t subCarrierSpacing; + uint16_t carrierBw; + uint16_t txDirectCurrentLoc; +}SchScsSpecificCarrier; + +/*Spec 38.331 'FrequencyInfoDL-SIB'*/ +typedef struct schFreqInfoDlSib +{ + SchMultiFreqBandListSib mutiFreqBandList[1]; + uint16_t offsetToPointA; + SchScsSpecificCarrier schSpcCarrier[1]; +}SchFreqInfoDlSib; + +typedef struct schBcchCfg +{ + long modPeriodCoeff; +}SchBcchCfg; + +/*Spec 38.331 'DownlinkConfigCommonSIB'*/ +typedef struct schDlCfgCommon +{ + SchFreqInfoDlSib schFreqInfoDlSib; + SchBwpDlCfg schInitialDlBwp; /* Initial DL BWP */ + SchBcchCfg schBcchCfg; + SchPcchCfg schPcchCfg; +}SchDlCfgCommon; + +/*Spec 38.331 'FrequencyInfoUL-SIB'*/ +typedef struct schFreqInfoUlSib +{ + SchMultiFreqBandListSib mutiFreqBandList[1]; + uint16_t absoluteFreqPointA; + SchScsSpecificCarrier schSpcCarrier[1]; + int8_t schPMax; + bool frequencyShift7p5khz; +}SchFreqInfoUlSib; + +/*Spec 38.331 'UplinkConfigCommonSIB '*/ +typedef struct schUlCfgCommon +{ + SchFreqInfoUlSib schFreqInfoUlSib; + SchBwpUlCfg schInitialUlBwp; /* Initial DL BWP */ + uint16_t schTimeAlignTimer; +}SchUlCfgCommon; + +/*Ref: ORAN_WG8.V7.0.0 Sec 11.2.4.2.1 Cell Conf Request*/ typedef struct schCellCfg { - uint16_t cellId; /* Cell Id */ - uint16_t phyCellId; /* Physical cell id */ - uint8_t numerology; /* Supported numerology */ - SchDuplexMode dupMode; /* Duplex type: TDD/FDD */ - uint8_t bandwidth; /* Supported B/W */ - uint32_t dlFreq; /* DL Frequency */ - uint32_t ulFreq; /* UL Frequency */ - SchSsbCfg ssbSchCfg; /* SSB config */ - SchSib1Cfg sib1SchCfg; /* SIB1 config */ - SchRachCfg schRachCfg; /* PRACH config */ - SchBwpDlCfg schInitialDlBwp; /* Initial DL BWP */ - SchBwpUlCfg schInitialUlBwp; /* Initial UL BWP */ - SchPlmnInfoList plmnInfoList; /* Consits of PlmnId and Snssai list */ + uint16_t cellId; /* Cell Id */ + uint8_t numOfBeams; + uint8_t numLayers; + uint8_t numAntPorts; + uint16_t phyCellId; /* Physical cell id */ + SchPlmnInfoList plmnInfoList[MAX_PLMN]; /* Consits of PlmnId and Snssai list */ + SchDuplexMode dupMode; /* Duplex type: TDD/FDD */ + uint8_t dlBandwidth; /* Supported B/W */ + uint8_t ulBandwidth; /* Supported B/W */ + SchDlCfgCommon dlCfgCommon; /*Spec 38.331 DownlinkConfigCommonSIB*/ + SchUlCfgCommon ulCfgCommon; /*Spec 38.331 UplinkConfigCommonSIB*/ #ifdef NR_TDD - TDDCfg tddCfg; /* TDD Cfg */ -#endif + TDDCfg tddCfg; /* Spec 38.331 tdd-UL-DL-ConfigurationCommon */ +#endif + + /*Ref:Spec 38.331 "ssb-PositionsInBurst", Value 0 in Bitmap => corresponding SS/PBCH block is not transmitted + *value 1 => corresponding SS/PBCH block is transmitted*/ + uint32_t ssbPosInBurst[SCH_SSB_MASK_SIZE]; /* Bitmap for actually transmitted SSB. */ + SchSSBPeriod ssbPeriod; /* SSB Periodicity in msec */ + uint32_t ssbFrequency; /* SB frequency in kHz*/ + uint8_t dmrsTypeAPos; + uint8_t ssbScs; /* SSB subcarrier spacing*/ + SchPdcchConfigSib1 pdcchCfgSib1; /* Req to configure CORESET#0 and SearchSpace#0*/ + uint32_t ssbPbchPwr; /* SSB block power */ + uint8_t ssbSubcOffset; /* Subcarrier Offset(Kssb) */ + uint16_t sib1PduLen; }SchCellCfg; +/*Ref: ORAN_WG8.V7.0.0 Sec 11.2.4.3.1 Cell Config Response*/ typedef struct schCellCfgCfm { uint16_t cellId; /* Cell Id */ - SchMacRsp rsp; + SchMacRsp rsp; + CauseOfResult cause; }SchCellCfgCfm; +/*Ref: ORAN_WG8.V7.0.0 Sec 11.2.4.2.2 Cell Del Req*/ +typedef struct schCellDeleteReq +{ + uint16_t cellId; +}SchCellDeleteReq; + +/*Ref: ORAN_WG8.V7.0.0 Sec 11.2.4.3.2 Cell Del Response*/ +typedef struct schCellDeleteRsp +{ + uint16_t cellId; + SchMacRsp rsp; + CauseOfResult cause; +}SchCellDeleteRsp; + +/*Ref: ORAN_WG8.V7.0.0 Sec 11.2.4.2.3*/ +typedef struct schRrmPolicyRatio +{ + uint8_t maxRatio; + uint8_t minRatio; + uint8_t dedicatedRatio; +}SchRrmPolicyRatio; + +typedef struct schRrmPolicyOfSlice +{ + Snssai snssai; + SchRrmPolicyRatio rrmPolicyRatioInfo; +}SchRrmPolicyOfSlice; + +typedef struct schSliceCfgReq +{ + uint8_t numOfConfiguredSlice; + SchRrmPolicyOfSlice **listOfSlices; +}SchSliceCfgReq; + +/*Ref: ORAN_WG8.V7.0.0 Sec 11.2.4.3.3 Slice Cfg Response*/ +typedef struct schSliceCfgRsp +{ + Snssai snssai; + SchMacRsp rsp; + CauseOfResult cause; +}SchSliceCfgRsp; + +/*As per ORAN-WG8 V7.0.0 Sec 11.2.4.3.4 , Slice Cfg and Recfg are same structures*/ +typedef struct schSliceCfgReq SchSliceRecfgReq; +typedef struct schSliceCfgRsp SchSliceRecfgRsp; + typedef struct ssbInfo { uint8_t ssbIdx; /* SSB Index */ - TimeDomainAlloc tdAlloc; /* Time domain allocation */ - FreqDomainAlloc fdAlloc; /* Freq domain allocation */ + TimeDomainAlloc tdAlloc; /* Time domain allocation */ + FreqDomainRsrc fdAlloc; /* Freq domain allocation */ }SsbInfo; typedef struct sib1AllocInfo { BwpCfg bwp; - PdcchCfg sib1PdcchCfg; - PdschCfg sib1PdschCfg; -} Sib1AllocInfo; + PdcchCfg *sib1PdcchCfg; +}Sib1AllocInfo; typedef struct prachSchInfo { @@ -809,23 +988,26 @@ typedef struct prachSchInfo uint8_t prachFormat; /* PRACH Format */ uint8_t numRa; /* Freq domain ocassion */ uint8_t prachStartSymb; /* Freq domain ocassion */ -}PrachSchInfo; +}SchPrachInfo; /* Interface structure signifying DL broadcast allocation for SSB, SIB1 */ typedef struct dlBrdcstAlloc { + uint16_t crnti; /* SI-RNTI */ /* Ssb transmission is determined as follows: * 0 : No tranamission * 1 : SSB Transmission * 2 : SSB Repetition */ - uint8_t ssbTrans; + uint8_t ssbTransmissionMode; uint8_t ssbIdxSupported; SsbInfo ssbInfo[MAX_SSB_IDX]; + bool systemInfoIndicator; + uint8_t *siContent; /* Sib1 transmission is determined as follows: * 0 : No tranamission * 1 : SIB1 Transmission * 2 : SIB1 Repetition */ - uint8_t sib1Trans; + uint8_t sib1TransmissionMode; Sib1AllocInfo sib1Alloc; }DlBrdcstAlloc; @@ -833,7 +1015,7 @@ typedef struct msg3UlGrant { uint8_t freqHopFlag; uint16_t bwpSize; - FreqDomainAlloc msg3FreqAlloc; + FreqDomainRsrc msg3FreqAlloc; uint8_t k2Index; uint8_t mcs; uint8_t tpc; @@ -842,7 +1024,6 @@ typedef struct msg3UlGrant typedef struct rarInfo { - uint16_t raRnti; uint8_t RAPID; uint16_t ta; Msg3UlGrant ulGrant; @@ -853,53 +1034,67 @@ typedef struct rarInfo typedef struct rarAlloc { - DlPduType pduPres; - uint8_t pdschSlot; - RarInfo rarInfo; - BwpCfg bwp; - PdcchCfg rarPdcchCfg; - PdschCfg rarPdschCfg; + uint16_t raRnti; + RarInfo rarInfo; + BwpCfg bwp; + PdcchCfg *rarPdcchCfg; + PdschCfg *rarPdschCfg; }RarAlloc; -typedef struct dlMsgInfo -{ - uint16_t crnti; - uint8_t ndi; - uint8_t harqProcNum; - uint8_t dlAssignIdx; - uint8_t pucchTpc; - uint8_t pucchResInd; - uint8_t harqFeedbackInd; - uint8_t dciFormatId; - bool isMsg4Pdu; - uint16_t dlMsgPduLen; - uint8_t *dlMsgPdu; -}DlMsgInfo; - typedef struct lcSchInfo { uint8_t lcId; - uint32_t schBytes; /* Number of scheduled bytes */ + uint32_t schBytes; }LcSchInfo; -typedef struct dlMsgSchedInfo +typedef struct ceSchInfo +{ + uint8_t ceLcId; + uint8_t *ceContent; +}CeSchInfo; + +typedef struct freqDomainAlloc +{ + uint8_t resAllocType; /* Resource allocation type */ + union + { + ResAllocType0 type0; + ResAllocType1 type1; + }resAlloc; +}FreqDomainAlloc; + +typedef struct transportBlock { + uint8_t mcs; + bool ndi; + uint8_t rv; + uint16_t tbSize; + uint8_t numCe; + CeSchInfo ceSchInfo[MAX_NUM_LC]; uint8_t numLc; - LcSchInfo lcSchInfo[MAX_NUM_LC]; /* Scheduled LC info */ - BwpCfg bwp; - PdcchCfg dlMsgPdcchCfg; - PdschCfg dlMsgPdschCfg; - DlPduType pduPres; - uint8_t pdschSlot; - DlMsgInfo dlMsgInfo; -}DlMsgSchInfo; + LcSchInfo lcSchInfo[MAX_NUM_LC]; +}TransportBlock; -typedef struct dlMsgAlloc +typedef struct dlMsgSchedInfo { - uint16_t crnti; - uint8_t numSchedInfo; - DlMsgSchInfo dlMsgSchedInfo[2]; -}DlMsgAlloc; + uint16_t crnti; + uint8_t dciFormatId; + uint8_t harqProcNum; + bool vrbPrbMapping; + uint8_t dlAssignIdx; + uint8_t pucchTpc; + uint8_t pucchResInd; + uint8_t harqFeedbackInd; + uint16_t dlMsgPduLen; + uint8_t *dlMsgPdu; + FreqDomainAlloc freqAlloc; + TimeDomainAlloc timeAlloc; + uint8_t numOfTbs; + TransportBlock transportBlock[2]; + BwpCfg bwp; + PdcchCfg *dlMsgPdcchCfg; + PdschCfg *dlMsgPdschCfg; +}DlMsgSchInfo; typedef struct schSlotValue { @@ -910,62 +1105,78 @@ typedef struct schSlotValue SlotTimingInfo ulDciTime; }SchSlotValue; + +/* Reference -> O-RAN.WG8.AAD.0-v07.00, Table 9-36 DCI Format0_0 Configuration */ typedef struct format0_0 { uint8_t resourceAllocType; - /* since we are using type-1, hence rbBitmap excluded */ FreqDomainAlloc freqAlloc; TimeDomainAlloc timeAlloc; uint16_t rowIndex; uint8_t mcs; - uint8_t harqProcId; /* HARQ Process ID */ - bool puschHopFlag; + uint8_t harqProcId; bool freqHopFlag; - uint8_t ndi; /* NDI */ - uint8_t rv; /* Redundancy Version */ + uint8_t ndi; + uint8_t rvIndex; uint8_t tpcCmd; - bool sUlCfgd; + bool sulIndicator; }Format0_0; +/* Reference -> O-RAN.WG8.AAD.0-v07.00, Table 9-40 DCI Format 0_1 Configuration */ typedef struct format0_1 { -/* TBD */ - + uint8_t carrierIndicator; + bool sulIndicator; + uint8_t bwpIndicator; + uint8_t resourceAlloc; + FreqDomainRsrc freqAlloc; + TimeDomainAlloc timeAlloc; + uint16_t rowIndex; + uint8_t mcs; + uint8_t harqProcId; + bool freqHopFlag; + uint8_t ndi; + uint8_t rvIndex; + uint8_t firstDownlinkAssignmentIndex; + uint8_t secondDownlinkAssignmentIndex; + uint8_t tpcCommand; + uint8_t srsResourceSetIndicator; + uint8_t srsResourceIndicator; + uint8_t tpmi; + uint8_t antennaPorts; + uint8_t srsRequest; + uint8_t csiRequest; + uint8_t cbgTransmissionInfo; + uint8_t ptrsDmrs; + uint8_t betaOffsetIndicator; + bool dmrsSequenceInitialization; + bool ulschIndicatior; }Format0_1; -typedef struct format1_0 +typedef struct dciFormat { -/* TBD */ - -}Format1_0; - -typedef struct format1_1 -{ -/* TBD */ -}Format1_1; - -typedef struct dciInfo -{ - uint16_t cellId; - uint16_t crnti; /* CRNI */ - SlotTimingInfo slotIndInfo; /* Slot Info: sfn, slot number */ - BwpCfg bwpCfg; /* BWP Cfg */ - CoresetCfg coresetCfg; /* Coreset1 Cfg */ - FormatType formatType; /* DCI Format */ + FormatType formatType; /* DCI Format */ union { Format0_0 format0_0; /* Format 0_0 */ Format0_1 format0_1; /* Format 0_1 */ - Format1_0 format1_0; /* Format 1_0 */ - Format1_1 format1_1; /* Format 1_1 */ }format; - DlDCI dciInfo; +}DciFormat; + +typedef struct dciInfo +{ + uint16_t crnti; /* CRNTI */ + BwpCfg bwpCfg; /* BWP Cfg */ + CoresetCfg coresetCfg; /* Coreset1 Cfg */ + DciFormat dciFormatInfo; /* Dci Format */ + DlDCI dciInfo; /* DlDCI */ }DciInfo; +/* Reference -> O-RAN.WG8.AAD.0-v07.00, Section 11.2.4.3.8 DL Scheduling Information */ typedef struct dlSchedInfo { - uint16_t cellId; /* Cell Id */ + uint16_t cellId; /* Cell Id */ SchSlotValue schSlotValue; /* Allocation for broadcast messages */ @@ -979,33 +1190,126 @@ typedef struct dlSchedInfo DciInfo *ulGrant; /* Allocation from dedicated DL msg */ - DlMsgAlloc *dlMsgAlloc[MAX_NUM_UE]; + DlMsgSchInfo *dlMsgAlloc[MAX_NUM_UE]; }DlSchedInfo; +/*Reference: O-RAN.WG8.AAD.v7.0.0, Sec 11.2.4.3.13 Downlink Paging Allocation*/ +typedef struct interleaved_t +{ + uint8_t regBundleSize; + uint8_t interleaverSize; + uint16_t shiftIndex; +}Interleaved; + +typedef struct pageDlDci +{ + uint8_t freqDomainResource[6]; + uint8_t durationSymbols; + uint8_t cceRegMappingType; + union + { + Interleaved interleaved; + uint8_t nonInterleaved; + }cceReg; + uint8_t ssStartSymbolIndex; + uint8_t cceIndex; + uint8_t aggregLevel; + uint8_t precoderGranularity; + uint8_t coreSetSize; +}PageDlDci; + +typedef struct resAllocType1 PageFreqDomainAlloc; + +typedef struct pageTimeDomainAlloc +{ + uint8_t mappingType; + uint16_t startSymb; + uint16_t numSymb; +}PageTimeDomainAlloc; + +typedef struct pageDmrsConfig +{ + uint8_t dmrsType; + uint8_t dmrsAddPos; + uint8_t nrOfDmrsSymbols; +}PageDmrsConfig; + +typedef struct pageTbInfo +{ + uint8_t mcs; + uint32_t tbSize; +}PageTbInfo; + +typedef struct pageDlSch +{ + PageFreqDomainAlloc freqAlloc; + PageTimeDomainAlloc timeAlloc; + PageDmrsConfig dmrs; + uint8_t vrbPrbMapping; + PageTbInfo tbInfo; + uint8_t tbScaling; + uint16_t dlPagePduLen; + uint8_t *dlPagePdu; +}PageDlSch; + +typedef struct dlPageAlloc +{ + uint16_t cellId; + SlotTimingInfo dlPageTime; + uint8_t ssbIdx; + bool shortMsgInd; + uint8_t shortMsg; + BwpCfg bwp; + PageDlDci pageDlDci; + PageDlSch pageDlSch; +}DlPageAlloc; + typedef struct tbInfo { - uint8_t qamOrder; /* Modulation Order */ - uint8_t mcs; /* MCS */ + uint8_t mcs; /* MCS */ + uint8_t ndi; /* NDI */ + uint8_t rv; /* Redundancy Version */ + uint16_t tbSize; /* TB Size */ + uint8_t qamOrder; /* Modulation Order */ SchMcsTable mcsTable; /* MCS Table */ - uint8_t ndi; /* NDI */ - uint8_t rv; /* Redundancy Version */ - uint16_t tbSize; /* TB Size */ }TbInfo; typedef struct schPuschInfo { - uint16_t crnti; uint8_t harqProcId; /* HARQ Process ID */ - uint8_t resAllocType; /* Resource allocation type */ FreqDomainAlloc fdAlloc; /* Freq domain allocation */ TimeDomainAlloc tdAlloc; /* Time domain allocation */ TbInfo tbInfo; /* TB info */ +#ifdef INTEL_FAPI uint8_t dmrsMappingType; uint8_t nrOfDmrsSymbols; uint8_t dmrsAddPos; +#endif }SchPuschInfo; +typedef struct harqInfo +{ + uint16_t harqAckBitLength; + uint8_t betaOffsetHarqAck; +}HarqInfo; + +typedef struct csiInfo +{ + uint16_t csiBits; + uint8_t betaOffsetCsi; +}CsiInfo; + +typedef struct harqFdbkInfo +{ + uint16_t harqBitLength; +}HarqFdbkInfo; + +typedef struct csiFdbkInfo +{ + uint16_t csiBits; +}CsiFdbkInfo; + typedef struct schPucchFormatCfg { uint8_t interSlotFreqHop; @@ -1018,71 +1322,46 @@ typedef struct schPucchFormatCfg typedef struct schPucchInfo { - uint16_t rnti; - uint8_t pucchFormat; - FreqDomainAlloc fdAlloc; /* Freq domain allocation */ - TimeDomainAlloc tdAlloc; /* Time domain allocation */ + FreqDomainRsrc fdAlloc; + TimeDomainAlloc tdAlloc; uint8_t srFlag; - uint8_t harqFlag; - uint8_t numHarqBits; - uint8_t uciFlag; - uint8_t numUciBits; + HarqFdbkInfo harqInfo; + CsiFdbkInfo csiInfo; + BeamformingInfo beamPucchInfo; + uint8_t pucchFormat; uint8_t intraFreqHop; uint16_t secondPrbHop; uint8_t initialCyclicShift; uint8_t occLen; uint8_t occIdx; uint8_t timeDomOCC; - SchPucchFormatCfg cmnFormatCfg; + uint8_t addDmrs; + bool pi2BPSK; }SchPucchInfo; +typedef struct schPuschUci +{ + uint8_t harqProcId; /* HARQ Process ID */ + FreqDomainAlloc fdAlloc; /* Freq domain allocation */ + TimeDomainAlloc tdAlloc; /* Time domain allocation */ + TbInfo tbInfo; /* TB information */ + HarqInfo harqInfo; /* Harq Information */ + CsiInfo csiInfo; /* Csi information*/ +}SchPuschUci; + +/* Reference -> O-RAN.WG8.AAD.0-v07.00, Section 11.2.4.3.9 UL Scheduling Information */ typedef struct ulSchedInfo { - uint16_t cellId; /* Cell Id */ - uint16_t crnti; /* CRNI */ + uint16_t cellId; /* Cell Id */ + uint16_t crnti; /* CRNI */ SlotTimingInfo slotIndInfo; /* Slot Info: sfn, slot number */ - uint8_t dataType; /* Type of info being scheduled */ - PrachSchInfo prachSchInfo; /* Prach scheduling info */ - SchPuschInfo schPuschInfo; /* Pusch scheduling info */ - SchPucchInfo schPucchInfo; /* Pusch scheduling info */ + uint8_t dataType; /* Type of info being scheduled */ + SchPrachInfo prachSchInfo; /* Prach scheduling info */ + SchPuschInfo schPuschInfo; /* Pusch scheduling info */ + SchPuschUci schPuschUci; /* Pusch Uci */ + SchPucchInfo schPucchInfo; /* Pucch and Uci scheduling info */ }UlSchedInfo; -typedef struct rachIndInfo -{ - uint16_t cellId; - uint16_t crnti; - SlotTimingInfo timingInfo; - uint8_t slotIdx; - uint8_t symbolIdx; - uint8_t freqIdx; - uint8_t preambleIdx; - uint16_t timingAdv; -}RachIndInfo; - - -typedef struct crcIndInfo -{ - uint16_t cellId; - uint16_t crnti; - SlotTimingInfo timingInfo; - uint16_t numCrcInd; - uint8_t crcInd[MAX_NUMBER_OF_CRC_IND_BITS]; -}CrcIndInfo; - -typedef struct boInfo -{ - uint8_t lcId; - uint32_t dataVolume; -}BOInfo; - -typedef struct dlRlcBOInfo -{ - uint16_t cellId; - uint16_t crnti; - uint8_t lcId; - uint32_t dataVolume; -}DlRlcBoInfo; - /* Info of Scheduling Request to Add/Modify */ typedef struct schSchedReqInfo { @@ -1134,6 +1413,10 @@ typedef struct schMacCellGrpCfg SchSchedReqCfg schedReqCfg; SchTagCfg tagCfg; SchPhrCfg phrCfg; /* To be used only if phrCfgSetupPres is true */ +#ifdef NR_DRX + bool drxCfgPresent; + SchDrxCfg drxCfg; /* Drx configuration */ +#endif }SchMacCellGrpCfg; /* Physical Cell Group Configuration */ @@ -1232,19 +1515,54 @@ typedef struct schInitalDlBwp SchPdcchConfig pdcchCfg; bool pdschCfgPres; SchPdschConfig pdschCfg; - bool k0K1TblPrsnt; - SchK0K1TimingInfoTbl k0K1InfoTbl; }SchInitalDlBwp; -/* BWP Downlink common */ -typedef struct schBwpDlCommon +/*Spec 38.331 'RadioLinkMonitoringConfig'*/ +typedef uint8_t SchRadioLinkMonitoringRsId; + +typedef struct schRadioLinkMonRS +{ + SchRadioLinkMonitoringRsId radioLinkMonitoringRsId; + SchPurposeOfFailureDet purpose; + union + { + uint8_t ssbIndx; + uint8_t nzpCsiRsResId; + }SchDetectionRes; +}SchRadioLinkMonRS; + +typedef struct schRadioLinkConfig { -}SchBwpDlCommon; + SchRadioLinkMonRS failurDetResAddModList[MAX_FAILURE_DET_RESOURCES]; + SchRadioLinkMonitoringRsId failurDetResRelList[MAX_FAILURE_DET_RESOURCES]; + uint8_t beamFailureInstanceMaxCount; + uint8_t beamFailureDetectionTimer; +}SchRadioLinkConfig; -/* Downlink BWP information */ +/*Spec 38.331 "SPS-Config'*/ +typedef struct schSpsConfig +{ + uint16_t periodicity; + uint8_t numOfHqProcess; + uint8_t n1PucchAN; + SchMcsTable mcsTable; +}SchSpsConfig; + +/* Spec 38.331, 'BWP-DownlinkDedicated'*/ +typedef struct schBwpDlCfgDed +{ + SchPdcchConfig pdcchCfgDed; + SchPdschConfig pdschCfgDed; + SchSpsConfig spsCfgDed; + SchRadioLinkConfig radioLnkMonCfgDed; +}SchBwpDlCfgDed; + +/* Spec 38.331, 'BWP-Downlink' Downlink BWP information */ typedef struct schDlBwpInfo { uint8_t bwpId; + SchBwpDlCfg bwpCommon; + SchBwpDlCfgDed bwpDedicated; }SchDlBwpInfo; /* PDCCH Serving Cell configuration */ @@ -1257,6 +1575,46 @@ typedef struct schPdschServCellCfg SchPdschXOverhead *xOverhead; }SchPdschServCellCfg; +typedef struct schRaPrioritization +{ + uint8_t powerRampingStepHighPriority; + uint8_t scalingFactorBI; +}SchRaPrioritization; + +typedef struct schBfrCsiRsRes +{ + uint8_t csrRsIndex; + uint8_t raOccList; + uint8_t raPreambleIndex; +}SchBfrCsiRsRes; + +typedef struct schBfrSsbRes +{ + uint16_t ssbIndex; + uint8_t raPreambleIndex; +}SchBfrSsbRes; + +typedef struct schPrachResDedBfr +{ + SchBfrSsbRes ssb; + SchBfrCsiRsRes csiRs; +}SchPrachResDedBfr; + +/*Spec 38.331 'BeamFailureRecoveryConfig' */ +typedef struct schBeamFailRecoveryCfg +{ + uint8_t rootSeqIndexBfr; + SchRachCfgGeneric rachCfgBfr; + uint8_t rsrpThreshSsbBfr; /* RSRP Threshold SSB */ + SchPrachResDedBfr candidateBeamRSList; + uint8_t ssbPerRachBfr; /* SSB per RACH occassion */ + uint8_t raSsbOccMaskIndex; + uint8_t recoverySearchSpaceId; + SchRaPrioritization raPrioBfr; + uint16_t bfrTimer; + uint8_t msg1SubcSpacing; /* Subcarrier spacing of RACH */ +}SchBeamFailRecoveryCfg; + /* PUCCH Configuration */ typedef struct schPucchResrcSetInfo { @@ -1445,30 +1803,65 @@ typedef struct schInitialUlBwp SchPucchCfg pucchCfg; bool puschCfgPres; SchPuschCfg puschCfg; - bool k2TblPrsnt; - SchK2TimingInfoTbl k2InfoTbl; }SchInitialUlBwp; +typedef struct schBwpCfgDedicated +{ + SchPucchCfg pucchCfg; + SchPuschCfg puschCfg; +}SchBwpCfgDedicated; + /* Uplink BWP information */ typedef struct schUlBwpInfo { - uint8_t bwpId; + uint8_t bwpId; + SchBwpUlCfg bwpCommon; + SchBwpCfgDedicated bwpDed; }SchUlBwpInfo; +typedef struct schBwpRelInfo +{ + uint8_t bwpId; +}SchBwpRelInfo; + +/* Serving cell configuration */ +typedef struct schServCellRecfgInfo +{ + SchInitalDlBwp initDlBwp; + SchRadioLinkConfig radioLinkMonConfig; + uint8_t numDlBwpToAddOrMod; + SchDlBwpInfo dlBwpToAddOrModList[MAX_NUM_BWP]; + uint8_t numDlBwpToRel; + SchBwpRelInfo dlBwpToRelList[MAX_NUM_BWP]; + uint8_t firstActvDlBwpId; + uint8_t defaultDlBwpId; + uint8_t *bwpInactivityTmr; + SchPdschServCellCfg pdschServCellCfg; + SchInitialUlBwp initUlBwp; + SchBeamFailRecoveryCfg beamFailureRecoveryCfg; + uint8_t numUlBwpToAddOrMod; + SchUlBwpInfo ulBwpToAddOrModList[MAX_NUM_BWP]; + uint8_t numUlBwpToRel; + SchBwpRelInfo ulBwpToRelList[MAX_NUM_BWP]; + uint8_t firstActvUlBwpId; +}SchServCellRecfgInfo; + /* Serving cell configuration */ typedef struct schServCellCfgInfo { SchInitalDlBwp initDlBwp; + SchRadioLinkConfig radioLinkMonConfig; uint8_t numDlBwpToAdd; - SchDlBwpInfo DlBwpToAddList[MAX_NUM_BWP]; + SchDlBwpInfo dlBwpToAddList[MAX_NUM_BWP]; uint8_t firstActvDlBwpId; uint8_t defaultDlBwpId; uint8_t *bwpInactivityTmr; - SchPdschServCellCfg pdschServCellCfg; - SchInitialUlBwp initUlBwp; - uint8_t numUlBwpToAdd; - SchUlBwpInfo UlBwpToAddList[MAX_NUM_BWP]; - uint8_t firstActvUlBwpId; + SchPdschServCellCfg pdschServCellCfg; + SchInitialUlBwp initUlBwp; + SchBeamFailRecoveryCfg beamFailureRecoveryCfg; + uint8_t numUlBwpToAdd; + SchUlBwpInfo ulBwpToAddList[MAX_NUM_BWP]; + uint8_t firstActvUlBwpId; }SchServCellCfgInfo; typedef struct schNonDynFiveQi @@ -1528,6 +1921,13 @@ typedef struct schSpCellCfg SchServCellCfgInfo servCellCfg; }SchSpCellCfg; +/* Special cell Reconfiguration */ +typedef struct schSpCellRecfg +{ + uint8_t servCellIdx; + SchServCellRecfgInfo servCellRecfg; +}SchSpCellRecfg; + /* Uplink logical channel configuration */ typedef struct SchUlLcCfg { @@ -1547,10 +1947,9 @@ typedef struct schDlLcCfg /* Logical Channel configuration */ typedef struct schLcCfg { - ConfigType configType; uint8_t lcId; - SchDrbQosInfo *drbQos; Snssai *snssai; + SchDrbQosInfo *drbQos; SchDlLcCfg dlLcCfg; SchUlLcCfg ulLcCfg; }SchLcCfg; @@ -1568,61 +1967,222 @@ typedef struct schModulationInfo SchMcsTable mcsTable; }SchModulationInfo; -/* UE configuration */ -typedef struct schUeCfg +/*Spec O-RAN, WG8, V7.0.0, '11.2.4.2.5' UE Configuration Request*/ +typedef struct schUeCfgReq { - uint16_t cellId; - uint8_t ueId; - uint16_t crnti; - bool macCellGrpCfgPres; + uint16_t cellId; + uint8_t ueId; + uint8_t beamIdx; + uint16_t crnti; + bool macCellGrpCfgPres; SchMacCellGrpCfg macCellGrpCfg; - bool phyCellGrpCfgPres; + bool phyCellGrpCfgPres; SchPhyCellGrpCfg phyCellGrpCfg; - bool spCellCfgPres; + bool spCellCfgPres; SchSpCellCfg spCellCfg; SchAmbrCfg *ambrCfg; SchModulationInfo dlModInfo; SchModulationInfo ulModInfo; - uint8_t numLcs; + uint8_t numLcsToAdd; SchLcCfg schLcCfg[MAX_NUM_LC]; +}SchUeCfgReq; + +/*Spec O-RAN, WG8, V7.0.0, '11.2.4.2.6' UE Reconfiguration Request*/ +typedef struct schUeRecfgReq +{ + uint16_t cellId; + uint8_t ueId; + uint8_t beamIdx; + uint16_t crnti; + bool macCellGrpRecfgPres; + SchMacCellGrpCfg macCellGrpRecfg; + bool phyCellGrpRecfgPres; + SchPhyCellGrpCfg phyCellGrpRecfg; + bool spCellRecfgPres; + SchSpCellRecfg spCellRecfg; + SchAmbrCfg *ambrRecfg; + SchModulationInfo dlModInfo; + SchModulationInfo ulModInfo; + uint8_t numLcsToAdd; + SchLcCfg schLcCfgAdd[MAX_NUM_LC]; + uint8_t numLcsToDel; + uint8_t lcIdToDel[MAX_NUM_LC]; + uint8_t numLcsToMod; + SchLcCfg schLcCfgMod[MAX_NUM_LC]; SchDataTransmission dataTransmissionInfo; -}SchUeCfg; +#ifdef NR_DRX + bool drxConfigIndicatorRelease; +#endif +}SchUeRecfgReq; +/*Ref: ORAN_WG8.V7.0.0 Sec 11.2.4.3.5 UE Confg Response*/ typedef struct schUeCfgRsp { uint16_t cellId; + uint8_t beamIdx; uint16_t ueId; uint16_t crnti; SchMacRsp rsp; - SchFailureCause cause; + CauseOfResult cause; }SchUeCfgRsp; +/*As per WG8 V7.0.0 Sec 11.2.4.3.6, UE ReCFG and UECFG have same structure definition*/ +typedef struct schUeCfgRsp SchUeRecfgRsp; + +/*Spec O-RAN, WG8, V7.0.0, '11.2.4.2.7' Delete UE Request*/ typedef struct schUeDelete { uint16_t cellId; uint16_t crnti; }SchUeDelete; +/*Ref: ORAN_WG8.V7.0.0 Sec 11.2.4.3.7*/ typedef struct schUeDeleteRsp { uint16_t cellId; uint16_t crnti; SchMacRsp rsp; - ErrorCause cause; + CauseOfResult cause; }SchUeDeleteRsp; -typedef struct schCellDelete +/*Spec O-RAN, WG8, V7.0.0, '11.2.4.2.8' DL HARQ Indication*/ +typedef struct dlHarqInd { - uint16_t cellId; -}SchCellDelete; + uint16_t cellId; + uint16_t crnti; + SlotTimingInfo slotInd; + uint8_t numHarq; + uint8_t harqPayload[MAX_HARQ_BITS_IN_BYTES]; +}DlHarqInd; +/*Spec O-RAN, WG8, V7.0.0, '11.2.4.2.9' UL HARQ (CRC) Indication*/ +typedef struct crcIndInfo +{ + uint16_t cellId; + uint16_t crnti; + SlotTimingInfo timingInfo; + uint16_t numCrcInd; + uint8_t crcInd[MAX_NUMBER_OF_CRC_IND_BITS]; +}CrcIndInfo; -typedef struct schCellDeleteRsp +/*Spec O-RAN, WG8, V7.0.0, '11.2.4.2.10' UL Channel Quality Indication*/ +typedef struct ulCqiReport +{ + CqiUlReportType reportType; + uint16_t ulCqi; + uint8_t timingAdv; +}UlCqiReport; + +typedef struct schUlCqiInd +{ + uint16_t cellId; + uint16_t crnti; + SlotTimingInfo timingInfo; + uint8_t numUlCqiReported; + UlCqiReport ulCqiRpt; +}SchUlCqiInd; + +/*Spec O-RAN, WG8, V7.0.0, '11.2.4.2.11' DL Channel Quality Indication*/ +typedef struct dlCqiReport +{ + uint8_t reportType; /*Bitmap for CQI, PMI, RI, CRI report*/ + uint16_t cqi; + uint16_t pmi; + uint16_t cri; + uint16_t ri; +}DlCqiReport; + +typedef struct schDlCqiInd +{ + uint16_t cellId; + uint16_t crnti; + SlotTimingInfo timingInfo; + uint8_t numDlCqiReported; + DlCqiReport dlCqiRpt; +}SchDlCqiInd; + +/*Spec O-RAN WG8 v7.0.0, '11.2.4.2.12' Rach Ind contents*/ +typedef struct rachIndInfo +{ + uint16_t cellId; + uint16_t crnti; + SlotTimingInfo timingInfo; + uint8_t slotIdx; + uint8_t symbolIdx; + uint8_t freqIdx; + uint8_t preambleIdx; + uint16_t timingAdv; +}RachIndInfo; + +/*Spec O-RAN WG8 v7.0.0, '11.2.4.2.13' Paging Ind contents*/ +typedef struct schPageInd +{ + uint16_t cellId; + uint16_t pf; + uint8_t i_s; + uint16_t pduLen; + uint8_t *pagePdu; +}SchPageInd; + +/*ORAN WG8 v7.0.0, Sec 11.2.4.2.14 Rach Res Request*/ +typedef struct schRachRsrcReq +{ + SlotTimingInfo slotInd; + uint16_t cellId; + uint16_t crnti; + uint8_t numSsb; + uint8_t ssbIdx[MAX_NUM_SSB]; +}SchRachRsrcReq; + +typedef struct schCfraSsbResource +{ + uint8_t ssbIdx; + uint8_t raPreambleIdx; +}SchCfraSsbResource; + +typedef struct schCfraRsrc +{ + uint8_t numSsb; + SchCfraSsbResource ssbResource[MAX_NUM_SSB]; +}SchCfraResource; + +typedef struct schRachRsrcRsp { uint16_t cellId; - SchMacRsp rsp; -}SchCellDeleteRsp; + uint16_t crnti; + SchMacRsp result; + SchCfraResource cfraResource; +}SchRachRsrcRsp; + +/*ORAN WG8 v7.0.0, Sec 11.2.4.2.15 Rach Res Release*/ +typedef struct schRachRsrcRel +{ + SlotTimingInfo slotInd; + uint16_t cellId; + uint16_t crnti; + SchCfraResource cfraResource; +}SchRachRsrcRel; +/*O-RAN WG* v7.0.0 Sec 11.2.4.2.16 DL RLC Buffer Status Information*/ +typedef struct dlRlcBOInfo +{ + uint16_t cellId; + uint16_t crnti; + uint8_t lcId; + uint32_t dataVolume; +}DlRlcBoInfo; + +/*O-RAN WG8 v7.0.0 Sec 11.2.4.2.17 Scheduling Request Indication*/ +typedef struct srUciIndInfo +{ + uint16_t cellId; + uint16_t crnti; + SlotTimingInfo slotInd; + uint8_t numSrBits; + uint8_t srPayload[MAX_SR_BITS_IN_BYTES]; +}SrUciIndInfo; + +/*O-RAN WG* v7.0.0 Sec 11.2.4.2.18 UL RLC Buffer Status Information*/ typedef struct dataVolInfo { uint8_t lcgId; @@ -1638,191 +2198,77 @@ typedef struct ulBufferStatusRptInd DataVolInfo dataVolInfo[MAX_NUM_LOGICAL_CHANNEL_GROUPS]; }UlBufferStatusRptInd; -typedef struct srUciIndInfo +/**O-RAN WG* v7.0.0 Sec 11.2.4.2.19 Power Headroom Indication*/ +typedef struct phrData /*Spec 38.321 Sec 6.1.3.8*/ +{ + uint8_t phr; + uint8_t pcmax_f_c; +}PhrData; + +typedef struct singlePhrInfo +{ + PhrData phrData; +}SinglePhrInfo; + +typedef struct multiPhr +{ + PhType phType; + PhrData phrData; +}MultiPhr; + +typedef struct multiplePhrInfo /*Spec 38.321 Sec 6.1.3.9*/ +{ + uint8_t numPhrReported; + MultiPhr multiPhrStat[MAX_PHR_REPORT]; +}MultiplePhrInfo; + +typedef struct schPwrHeadroomInd { uint16_t cellId; uint16_t crnti; - SlotTimingInfo slotInd; - uint8_t numSrBits; - uint8_t srPayload[MAX_SR_BITS_IN_BYTES]; -}SrUciIndInfo; + PhrType phrType; + union + { + SinglePhrInfo singlePhr; + MultiplePhrInfo multiPhr; + }phrInfo; +}SchPwrHeadroomInd; -typedef struct schRrmPolicyRatio +typedef struct schUeHqInfo { - uint8_t policyMaxRatio; - uint8_t policyMinRatio; - uint8_t policyDedicatedRatio; -}SchRrmPolicyRatio; + uint16_t crnti; + uint8_t hqProcId; +}SchUeHqInfo; -typedef struct schRrmPolicyOfSlice +typedef struct schRlsHqInfo { - Snssai snssai; - SchRrmPolicyRatio *rrmPolicyRatioInfo; -}SchRrmPolicyOfSlice; + uint16_t cellId; + uint8_t numUes; + SchUeHqInfo *ueHqInfo; +}SchRlsHqInfo; -typedef struct schSliceCfgReq +typedef struct schStatsInfo { - uint8_t numOfConfiguredSlice; - SchRrmPolicyOfSlice **listOfConfirguration; -}SchSliceCfgReq; + SchMeasurementType type; + uint16_t periodicity; /* In milliseconds */ +}SchStatsInfo; -typedef struct sliceRsp +typedef struct schStatsReq { - Snssai snssai; - SchMacRsp rsp; - RspCause cause; -}SliceRsp; + uint8_t numStats; + SchStatsInfo statsList[MAX_NUM_STATS]; +}SchStatsReq; -typedef struct schSliceRsp +typedef struct schStatsRsp { - uint8_t numSliceCfgRsp; - SliceRsp **listOfSliceCfgRsp; -}SchSliceCfgRsp; + SchMacRsp rsp; + CauseOfResult cause; +}SchStatsRsp; -/* function pointers */ -typedef uint8_t (*SchCellCfgCfmFunc) ARGS(( - Pst *pst, /* Post Structure */ - SchCellCfgCfm *schCellCfgCfm /* Cell Cfg Cfm */ - )); - -typedef uint8_t (*SchCellCfgFunc) ARGS(( - Pst *pst, /* Post Structure */ - SchCellCfg *schCellCfg /* Cell Cfg */ - )); - -typedef uint8_t (*SchMacDlAllocFunc) ARGS(( - Pst *pst, /* Post Structure */ - DlSchedInfo *dlSchedInfo /* dl allocation Info */ - )); - -typedef uint8_t (*SchMacUlSchInfoFunc) ARGS(( - Pst *pst, /* Post Structure */ - UlSchedInfo *ulSchedInfo /* UL Alloc Sch Info */ - )); - -typedef uint8_t (*MacSchRachIndFunc) ARGS(( - Pst *pst, /* Post structure */ - RachIndInfo *rachInd)); /* Rach Indication Info */ - -typedef uint8_t (*MacSchCrcIndFunc) ARGS(( - Pst *pst, /* Post structure */ - CrcIndInfo *crcInd)); /* CRC Info */ - -typedef uint8_t (*MacSchDlRlcBoInfoFunc) ARGS(( - Pst *pst, /* Post structure */ - DlRlcBoInfo *dlBoInfo)); /* DL BO Info */ - -typedef uint8_t (*MacSchAddUeConfigReqFunc) ARGS(( - Pst *pst, /* Post structure */ - SchUeCfg *ueCfgToSch)); /* Scheduler UE Cfg */ - -typedef uint8_t (*SchUeCfgRspFunc) ARGS(( - Pst *pst, /* Post structure */ - SchUeCfgRsp *cfgRsp)); /* Scheduler UE Cfg response */ - -typedef uint8_t (*MacSchSlotIndFunc) ARGS(( - Pst *pst, /* Post structure */ - SlotTimingInfo *slotInd)); /* Slot Info */ - -typedef uint8_t (*MacSchBsrFunc) ARGS(( - Pst *pst, - UlBufferStatusRptInd *bsrInd -)); - -typedef uint8_t (*MacSchSrUciIndFunc) ARGS(( - 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 */ - -typedef uint8_t (*MacSchUeDeleteReqFunc) ARGS(( - Pst *pst, /* Post structure */ - SchUeDelete *schUeDel)); /*Scheduler UE Del*/ - -typedef uint8_t (*SchUeDeleteRspFunc) ARGS(( - Pst *pst, /* Post structure */ - SchUeDeleteRsp *delRsp)); /* Scheduler UE delete response */ - -typedef uint8_t (*MacSchCellDeleteReqFunc) ARGS(( - Pst *pst, /* Post structure */ - SchCellDelete *schCellDelete)); /*Scheduler UE Del*/ - -typedef uint8_t (*SchCellDeleteRspFunc) ARGS(( - Pst *pst, /* Post structure */ - SchCellDeleteRsp *schCellDeleteRsp)); /* Scheduler UE delete response */ - -typedef uint8_t (*MacSchSliceCfgReqFunc) ARGS(( - Pst *pst, /* Post structure */ - SchSliceCfgReq *schSliceCfgReq)); /* Scheduler Slice Cfg Req */ - -typedef uint8_t (*SchSliceCfgRspFunc) ARGS(( - Pst *pst, /* Post Structure */ - SchSliceCfgRsp *schSliceCfgRsp /* Cell Cfg Cfm */ - )); - -typedef uint8_t (*MacSchSliceReCfgReqFunc) ARGS(( - Pst *pst, /* Post structure */ - SchSliceCfgReq *schSliceReCfgReq)); /* Scheduler Slice ReCfg Req */ - -typedef uint8_t (*SchSliceReCfgRspFunc) ARGS(( - Pst *pst, /* Post Structure */ - SchSliceCfgRsp *schSliceReCfgRsp /* Cell ReCfg Cfm */ - )); /* function declarations */ -uint8_t packMacSchSlotInd(Pst *pst, SlotTimingInfo *slotInd); -uint8_t packSchMacDlAlloc(Pst *pst, DlSchedInfo *dlSchedInfo); -uint8_t packSchMacUlSchInfo(Pst *pst, UlSchedInfo *ulSchedInfo); -uint8_t packSchCellCfg(Pst *pst, SchCellCfg *schCellCfg); -uint8_t packSchCellCfgCfm(Pst *pst, SchCellCfgCfm *schCellCfgCfm); -uint8_t MacProcDlAlloc(Pst *pst, DlSchedInfo *dlSchedInfo); -uint8_t MacProcSchCellCfg(Pst *pst, SchCellCfg *schCellCfg); -uint8_t MacProcSchCellCfgCfm(Pst *pst, SchCellCfgCfm *schCellCfgCfm); -uint8_t SchHdlCellCfgReq(Pst *pst, SchCellCfg *schCellCfg); -uint8_t schActvInit(Ent entity, Inst instId, Region region, Reason reason); -uint8_t MacProcUlSchInfo(Pst *pst, UlSchedInfo *ulSchedInfo); -uint8_t packMacSchRachInd(Pst *pst, RachIndInfo *rachInd); -uint8_t MacSchRachInd(Pst *pst, RachIndInfo *rachInd); -uint8_t packMacSchCrcInd(Pst *pst, CrcIndInfo *crcInd); -uint8_t MacSchCrcInd(Pst *pst, CrcIndInfo *crcInd); -uint8_t packMacSchDlRlcBoInfo(Pst *pst, DlRlcBoInfo *dlBoInfo); -uint8_t MacSchDlRlcBoInfo(Pst *pst, DlRlcBoInfo *dlBoInfo); -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, SlotTimingInfo * slotInd)); -uint8_t packMacSchSlotInd(Pst * pst, SlotTimingInfo * slotInd); -uint8_t unpackMacSchSlotInd(MacSchSlotIndFunc func, Pst *pst, Buffer *mBuf); -uint8_t packMacSchBsr(Pst *pst, UlBufferStatusRptInd *bsrInd); -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); -uint8_t packMacSchUeDeleteReq(Pst *pst, SchUeDelete *schUeDel); -uint8_t MacSchUeDeleteReq(Pst *pst, SchUeDelete *ueDelete); -uint8_t packSchUeDeleteRsp(Pst *pst, SchUeDeleteRsp *delRsp); -uint8_t MacProcSchUeDeleteRsp(Pst *pst, SchUeDeleteRsp *schUeDelRsp); -uint8_t packMacSchCellDeleteReq(Pst *pst, SchCellDelete *schCellDelete); -uint8_t MacSchCellDeleteReq(Pst *pst, SchCellDelete *schCellDelete); -uint8_t packSchCellDeleteRsp(Pst *pst, SchCellDeleteRsp *schCellDeleteRsp); -uint8_t MacProcSchCellDeleteRsp(Pst *pst, SchCellDeleteRsp *schCellDeleteRsp); -uint8_t packMacSchSliceCfgReq(Pst *pst, SchSliceCfgReq *cfgReq); -uint8_t MacSchSliceCfgReq(Pst *pst, SchSliceCfgReq *schSliceCfgReq); -uint8_t packSchSliceCfgRsp(Pst *pst, SchSliceCfgRsp *cfgRsp); -uint8_t MacProcSchSliceCfgRsp(Pst *pst, SchSliceCfgRsp *cfgRsp); -uint8_t packMacSchSliceReCfgReq(Pst *pst, SchSliceCfgReq *cfgReq); -uint8_t MacSchSliceReCfgReq(Pst *pst, SchSliceCfgReq *schSliceCfgReq); -uint8_t packSchSliceReCfgRsp(Pst *pst, SchSliceCfgRsp *cfgRsp); -uint8_t MacProcSchSliceReCfgRsp(Pst *pst, SchSliceCfgRsp *sliceReCfgrsp); +uint8_t MacMessageRouter(Pst *pst, void *msg); +uint8_t SchMessageRouter(Pst *pst, void *msg); + /********************************************************************** End of file **********************************************************************/