X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Fsch.h;h=4c4f2b782e40963c79760a1cd93e35ea64b58811;hb=eb178a8cc45a9cebc65df73f128f88b3a3dfefbb;hp=906e436b6ef67f8c1388b0464025d7fc8449354e;hpb=a6e0e974ff223ae507ae646c354dcfb76d94a1ed;p=o-du%2Fl2.git diff --git a/src/5gnrsch/sch.h b/src/5gnrsch/sch.h index 906e436b6..4c4f2b782 100644 --- a/src/5gnrsch/sch.h +++ b/src/5gnrsch/sch.h @@ -21,17 +21,32 @@ #define SCH_MAX_CELLS 1 #define SCH_MAX_INST 1 #define SCH_NUM_SLOTS 10 /*forcing this to 10 */ +#define SCH_MAX_SFN 1024 #define MAX_NUM_RB 106 /* value for numerology 0 15Khz */ #define SCH_MIB_TRANS 80 #define SCH_NUM_SC_PRB 12 /* number of SCs in a PRB */ -#define SCH_MAX_SSB_BEAM 4 /* since we are supporting only SCS=15KHz */ #define SCH_SCS_15KHZ 0 /* numerology 0 and 15Khz */ #define SCH_SYMBOL_PER_SLOT 14 -#define SCH_SSB_SYMB_DURATION 4 -#define SCH_SSB_PRB_DURATION 20 +#define SCH_SSB_NUM_SYMB 4 +#define SCH_SSB_NUM_PRB 20 +#define SCH_MAX_SSB_BEAM 4 /* since we are supporting only SCS=15KHz */ #define SCH_MEM_REGION 4 #define SCH_POOL 1 #define SCHED_DELTA 1 +#define BO_DELTA 1 +#define RAR_DELAY 2 +#define MSG4_DELAY 1 +#define SCH_MAX_UE 1 +#define PUSCH_START_RB 15 +#define PUCCH_NUM_PRB_FORMAT_0 1 /* number of PRBs in freq domain, spec 38.213 - 9.2.1 */ +#define SI_RNTI 0xFFFF +#define P_RNTI 0xFFFE +#define DMRS_MAP_TYPE_A 1 +#define NUM_DMRS_SYMBOLS 12 +#define DMRS_ADDITIONAL_POS 2 + +#define CRC_FAILED 0 +#define CRC_PASSED 1 /* allocate and zero out a static buffer */ #define SCH_ALLOC(_datPtr, _size) \ @@ -51,7 +66,6 @@ SPutSBuf(SCH_MEM_REGION, SCH_POOL, \ (Data *)_datPtr, _size); - #define SCH_FILL_RSP_PST(_rspPst, _inst)\ { \ _rspPst.srcProcId = SFndProcId(); \ @@ -60,9 +74,9 @@ _rspPst.dstEnt = ENTRG;\ _rspPst.srcInst = 1;\ _rspPst.dstInst = 0;\ - _rspPst.selector = MAC_SELECTOR_TC;\ + _rspPst.selector = ODU_SELECTOR_TC;\ } - +extern uint8_t schProcessRachInd(RachIndInfo *rachInd, Inst schInst); /** * @brief * Structure holding LTE MAC's General Configuration information. @@ -83,14 +97,36 @@ typedef struct schGenCb * @brief * scheduler allocationsfor DL per cell. */ -typedef struct schDlAlloc +typedef struct schDlSlotInfo +{ + uint16_t totalPrb; /*!< Number of RBs in the cell */ + uint16_t assignedPrb[SCH_SYMBOL_PER_SLOT]; /*!< Num RBs and corresponding symbols allocated */ + bool ssbPres; /*!< Flag to determine if SSB is present in this slot */ + uint8_t ssbIdxSupported; /*!< Max SSB index */ + SsbInfo ssbInfo[MAX_SSB_IDX]; /*!< SSB info */ + bool sib1Pres; /*!< Flag to determine if SIB1 is present in this slot */ + RarInfo *rarInfo; /*!< RAR info */ + Msg4Info *msg4Info; /*!< msg4 info */ +}SchDlSlotInfo; + +typedef struct schRaCb { - uint16_t totalPrb; /*!< Number of RBs in the cell */ - uint16_t assignedPrb[SCH_SYMBOL_PER_SLOT]; /*!< Num RBs and corresponding symbols allocated */ - bool ssbPres; /*!< Flag to determine if SSB is present in this slot */ - uint8_t ssbIdxSupported; /*!< Max SSB index */ - SsbInfo ssbInfo[MAX_SSB_IDX]; /*!< SSB info */ -}SchDlAlloc; + uint16_t tcrnti; +}SchRaCb; + +/** + * @brief + * scheduler allocationsfor UL per cell. + */ +typedef struct schUlSlotInfo +{ + uint16_t totalPrb; /*!< Number of RBs in the cell */ + uint16_t assignedPrb[SCH_SYMBOL_PER_SLOT]; /*!< Num RBs and corresponding symbols allocated */ + bool puschPres; /*!< PUSCH presence field */ + SchPuschInfo *schPuschInfo; /*!< PUSCH info */ + bool pucchPres; /*!< PUCCH presence field */ + SchPucchInfo schPucchInfo; /*!< PUCCH info */ +}SchUlSlotInfo; /** * @brief @@ -98,13 +134,16 @@ typedef struct schDlAlloc */ typedef struct schCellCb { - uint16_t cellId; /*!< Cell ID */ - Inst instIdx; /*!< Index of the scheduler instance */ - Inst macInst; /*!< Index of the MAC instance */ - uint8_t numSlots; /*!< Number of slots in current frame */ - SlotIndInfo slotInfo; /*!< SFN, Slot info being processed*/ - SchDlAlloc *dlAlloc[SCH_NUM_SLOTS]; /*!< SCH resource allocations in DL */ - SchCellCfg cellCfg; /*!< Cell ocnfiguration */ + uint16_t cellId; /*!< Cell ID */ + Inst instIdx; /*!< Index of the scheduler instance */ + Inst macInst; /*!< Index of the MAC instance */ + uint8_t numSlots; /*!< Number of slots in current frame */ + SlotIndInfo slotInfo; /*!< SFN, Slot info being processed*/ + SchDlSlotInfo *schDlSlotInfo[SCH_NUM_SLOTS]; /*!< SCH resource allocations in DL */ + SchUlSlotInfo *schUlSlotInfo[SCH_NUM_SLOTS]; /*!< SCH resource allocations in UL */ + SchCellCfg cellCfg; /*!< Cell ocnfiguration */ + uint8_t ssbStartSymbArr[SCH_MAX_SSB_BEAM]; /*!