X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Fsch.h;h=ae4cb77099ff24e258f6af04e8a89a0102284dcb;hb=4e803fe4bcf3a446b7082675d25d35ad102f16f6;hp=4c4f2b782e40963c79760a1cd93e35ea64b58811;hpb=eb178a8cc45a9cebc65df73f128f88b3a3dfefbb;p=o-du%2Fl2.git diff --git a/src/5gnrsch/sch.h b/src/5gnrsch/sch.h index 4c4f2b782..ae4cb7709 100644 --- a/src/5gnrsch/sch.h +++ b/src/5gnrsch/sch.h @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # # limitations under the License. # ################################################################################ -*******************************************************************************/ + *******************************************************************************/ /* macros */ #define SCH_INST_START 1 @@ -25,11 +25,11 @@ #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_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 @@ -49,22 +49,30 @@ #define CRC_PASSED 1 /* allocate and zero out a static buffer */ -#define SCH_ALLOC(_datPtr, _size) \ +#define SCH_ALLOC(_datPtr, _size) \ { \ S16 _ret; \ - _ret = SGetSBuf(SCH_MEM_REGION, SCH_POOL, \ - (Data **)&_datPtr, _size); \ + _ret = SGetSBuf(SCH_MEM_REGION, SCH_POOL, \ + (Data **)&_datPtr, _size); \ if(_ret == ROK) \ + { \ cmMemset((U8*)_datPtr, 0, _size); \ + } \ else \ + { \ _datPtr = NULLP; \ + } \ } /* free a static buffer */ -#define SCH_FREE(_datPtr, _size) \ +#define SCH_FREE(_datPtr, _size) \ +{ \ if(_datPtr) \ - SPutSBuf(SCH_MEM_REGION, SCH_POOL, \ - (Data *)_datPtr, _size); + { \ + SPutSBuf(SCH_MEM_REGION, SCH_POOL, \ + (Data *)_datPtr, _size); \ + } \ +} #define SCH_FILL_RSP_PST(_rspPst, _inst)\ { \ @@ -74,38 +82,45 @@ _rspPst.dstEnt = ENTRG;\ _rspPst.srcInst = 1;\ _rspPst.dstInst = 0;\ - _rspPst.selector = ODU_SELECTOR_TC;\ + _rspPst.selector = ODU_SELECTOR_TC;\ } extern uint8_t schProcessRachInd(RachIndInfo *rachInd, Inst schInst); + +typedef enum +{ + SCH_UE_STATE_INACTIVE, + SCH_UE_STATE_ACTIVE +}SchUeState; + /** - * @brief - * Structure holding LTE MAC's General Configuration information. - */ + * @brief + * Structure holding LTE MAC's General Configuration information. + */ typedef struct schGenCb { uint8_t tmrRes; /*!< Timer resolution */ uint8_t startCellId; /*!< Starting Cell Id */ #ifdef LTE_ADV bool forceCntrlSrbBoOnPCel; /*!< value 1 means force scheduling - of RLC control BO and SRB BO on - PCell. val 0 means don't force*/ + of RLC control BO and SRB BO on + PCell. val 0 means don't force*/ bool isSCellActDeactAlgoEnable; /*!< TRUE will enable activation/deactivation algo at Schd */ #endif }SchGenCb; /** - * @brief - * scheduler allocationsfor DL per cell. - */ + * @brief + * scheduler allocationsfor DL per cell. + */ 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 */ + 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 */ + 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; @@ -115,41 +130,55 @@ typedef struct schRaCb }SchRaCb; /** - * @brief - * scheduler allocationsfor UL per cell. - */ + * @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 */ + 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 - * Cell Control block per cell. - */ + * @brief + * UE control block + */ +typedef struct schUeCb +{ + uint16_t ueIdx; + uint16_t crnti; + SchUeCfg ueCfg; + SchUeState state; +}SchUeCb; + +/** + * @brief + * Cell Control block per cell. + */ 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 */ + 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]; /*!