X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Fsch.h;h=96f3d225fd89db9525078144d34b3ab0b20b104b;hb=6f769128e3fa5a83ee92e668ef9ac152c96b3200;hp=ae6b8f120c59d853d4c5044fc46473f95657f547;hpb=5ea4c59cb4dd37164953218b0bd355284e11d22c;p=o-du%2Fl2.git diff --git a/src/5gnrsch/sch.h b/src/5gnrsch/sch.h index ae6b8f120..96f3d225f 100644 --- a/src/5gnrsch/sch.h +++ b/src/5gnrsch/sch.h @@ -21,15 +21,27 @@ #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 15 +#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_MEM_REGION 4 #define SCH_POOL 1 +#define SCHED_DELTA 1 +#define BO_DELTA 1 +#define RAR_DELAY 2 +#define SCH_MAX_UE 1 +#define PUSCH_START_RB 15 +#define SI_RNTI 0xFFFF +#define P_RNTI 0xFFFE + +#define CRC_FAILED 0 +#define CRC_PASSED 1 /* allocate and zero out a static buffer */ #define SCH_ALLOC(_datPtr, _size) \ @@ -49,7 +61,6 @@ SPutSBuf(SCH_MEM_REGION, SCH_POOL, \ (Data *)_datPtr, _size); - #define SCH_FILL_RSP_PST(_rspPst, _inst)\ { \ _rspPst.srcProcId = SFndProcId(); \ @@ -60,7 +71,7 @@ _rspPst.dstInst = 0;\ _rspPst.selector = MAC_SELECTOR_TC;\ } - +extern uint8_t schProcessRachInd(RachIndInfo *rachInd, Inst schInst); /** * @brief * Structure holding LTE MAC's General Configuration information. @@ -81,14 +92,35 @@ 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 */ -}SchDlAlloc; + bool sib1Pres; + //bool rarPres; + RarInfo *rarInfo; + Msg4Info *msg4Info; +}SchDlSlotInfo; + +typedef struct schRaCb +{ + 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 */ +}SchUlSlotInfo; /** * @brief @@ -101,8 +133,10 @@ typedef struct schCellCb 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 */ + SchDlSlotInfo *schDlSlotInfo[SCH_NUM_SLOTS]; /*!< SCH resource allocations in DL */ + SchUlSlotInfo *schUlSlotInfo[SCH_NUM_SLOTS]; /*!< SCH resource allocations in UL */ SchCellCfg cellCfg; /*!< Cell ocnfiguration */ + SchRaCb raCb[SCH_MAX_UE]; }SchCellCb; /** @@ -120,9 +154,10 @@ typedef struct schCb SchCb schCb[SCH_MAX_INST]; /* function declarations */ -int schCmnDlAlloc(SchCellCb *cell, DlBrdcstAlloc *dlBrdcstAlloc); -int schProcessSlotInd(SlotIndInfo *slotInd, Inst inst); - +uint8_t schBroadcastAlloc(SchCellCb *cell, DlBrdcstAlloc *dlBrdcstAlloc,uint16_t slot); +uint8_t schProcessSlotInd(SlotIndInfo *slotInd, Inst inst); +uint8_t schUlResAlloc(SchCellCb *cell, Inst schInst); +uint8_t schDlRsrcAllocMsg4(Msg4Alloc *msg4Alloc, SchCellCb *cell, uint16_t slot); /**********************************************************************