X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Fsch.h;h=101cb97a0b3d968014bd6d4492f76f2de0c6ffd0;hb=45d134510deb6902b870b4a0fb574b6075fba601;hp=ab2989d470395007c15da9fc948aae75ada2334f;hpb=f56e7aa2f07c03f3b30eda22a2260d038e0214e9;p=o-du%2Fl2.git diff --git a/src/5gnrsch/sch.h b/src/5gnrsch/sch.h index ab2989d47..101cb97a0 100644 --- a/src/5gnrsch/sch.h +++ b/src/5gnrsch/sch.h @@ -14,11 +14,10 @@ # See the License for the specific language governing permissions and # # limitations under the License. # ################################################################################ -*******************************************************************************/ + *******************************************************************************/ /* macros */ #define SCH_INST_START 1 -#define SCH_MAX_CELLS 1 #define SCH_MAX_INST 1 #define SCH_NUM_SLOTS 10 /*forcing this to 10 */ #define SCH_MAX_SFN 1024 @@ -28,81 +27,62 @@ #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_MEM_REGION 4 -#define SCH_POOL 1 +#define SCH_SSB_NUM_SYMB 4 +#define SCH_SSB_NUM_PRB 20 #define SCHED_DELTA 1 -#define RAR_DELAY 1 -#define SCH_MAX_UE 1 +#define BO_DELTA 1 +#define RAR_DELAY 2 +#define MSG4_DELAY 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) \ -{ \ - S16 _ret; \ - _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) \ - if(_datPtr) \ - SPutSBuf(SCH_MEM_REGION, SCH_POOL, \ - (Data *)_datPtr, _size); +extern uint8_t schProcessRachInd(RachIndInfo *rachInd, Inst schInst); +typedef enum +{ + SCH_UE_STATE_INACTIVE, + SCH_UE_STATE_ACTIVE +}SchUeState; -#define SCH_FILL_RSP_PST(_rspPst, _inst)\ -{ \ - _rspPst.srcProcId = SFndProcId(); \ - _rspPst.dstProcId = SFndProcId();\ - _rspPst.srcEnt = ENTRG;\ - _rspPst.dstEnt = ENTRG;\ - _rspPst.srcInst = 1;\ - _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. - */ + * @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. - */ -typedef struct schDlAlloc + * @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 */ - 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; - bool rarPres; - RarInfo rarInfo; -}SchDlAlloc; + 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 { @@ -110,43 +90,60 @@ typedef struct schRaCb }SchRaCb; /** - * @brief - * scheduler allocationsfor UL per cell. - */ -typedef struct schUlAlloc + * @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 + * UE control block + */ +typedef struct schUeCb { - 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 */ -}SchUlAlloc; + uint16_t ueIdx; + uint16_t crnti; + SchUeCfg ueCfg; + SchUeState state; +}SchUeCb; /** - * @brief - * Cell Control block per cell. - */ + * @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 */ - SlotIndInfo slotInfo; /*!< SFN, Slot info being processed*/ - SchDlAlloc *dlAlloc[SCH_NUM_SLOTS]; /*!< SCH resource allocations in DL */ - SchUlAlloc *ulAlloc[SCH_NUM_SLOTS]; /*!< SCH resource allocations in UL */ - SchCellCfg cellCfg; /*!< Cell ocnfiguration */ - SchRaCb raCb[SCH_MAX_UE]; + 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]; /*!