X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Fsch.h;h=c8863994a2d609b1deb4c835551af2d97f7360ef;hb=fdf994581c1b672158c911a9a5f7a4191832c695;hp=5322e8c8868dabbfa1b33a69299c3d14952aeea2;hpb=6b44407d464a5a4e060999255233a7cfe78bb0fa;p=o-du%2Fl2.git diff --git a/src/5gnrsch/sch.h b/src/5gnrsch/sch.h index 5322e8c88..c8863994a 100644 --- a/src/5gnrsch/sch.h +++ b/src/5gnrsch/sch.h @@ -19,13 +19,17 @@ /* macros */ #define SCH_INST_START 1 #define SCH_MAX_INST 1 -#define SCH_NUM_SLOTS 10 /*forcing this to 10 */ +#define SCH_MU0_NUM_SLOTS 10 +#define SCH_MU1_NUM_SLOTS 20 +#define SCH_MU2_NUM_SLOTS 30 +#define SCH_MU3_NUM_SLOTS 40 +#define SCH_MU4_NUM_SLOTS 50 #define SCH_MAX_SFN 1024 #define MAX_NUM_RB 106 /* value for numerology 0 15Khz */ -#define SCH_MIB_TRANS 80 +#define SCH_MIB_TRANS 8 /* MIB transmission as per 38.331 is every 80 ms */ +#define SCH_SIB1_TRANS 16 /* SIB1 transmission as per 38.331 is every 160 ms */ #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_MAX_SSB_BEAM 8 /* since we are supporting only SCS=15KHz and 30KHz */ #define SCH_SYMBOL_PER_SLOT 14 #define SCH_SSB_NUM_SYMB 4 #define SCH_SSB_NUM_PRB 20 @@ -34,26 +38,45 @@ #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 PUCCH_NUM_PRB_FORMAT_0_1_4 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 SCH_DEFAULT_K1 1 +#define SCH_TQ_SIZE 10 #define CRC_FAILED 0 #define CRC_PASSED 1 + +#define MAC_HDR_SIZE 3 /* 3 bytes of MAC Header */ #define UL_GRANT_SIZE 224 typedef struct schCellCb SchCellCb; typedef struct schUeCb SchUeCb; +typedef enum +{ + SCH_NUMEROLOGY_0, + SCH_NUMEROLOGY_1, + SCH_NUMEROLOGY_2, + SCH_NUMEROLOGY_3, + SCH_NUMEROLOGY_4 +}SchNumerology; + typedef enum { SCH_UE_STATE_INACTIVE, SCH_UE_STATE_ACTIVE }SchUeState; +typedef enum +{ + SCH_LC_STATE_INACTIVE, + SCH_LC_STATE_ACTIVE +}SchLcState; + /** * @brief * Structure holding LTE MAC's General Configuration information. @@ -78,12 +101,13 @@ 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 resAllocBitMap; /*!< Resource allocation bitmap */ 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 */ + DlMsgInfo *dlMsgInfo; /*!< DL dedicated Msg info */ }SchDlSlotInfo; typedef struct schRaCb @@ -99,6 +123,7 @@ 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 */ + uint16_t resAllocBitMap; /*!< Resource allocation bitmap */ uint8_t puschCurrentPrb; /* Current PRB for PUSCH allocation */ bool puschPres; /*!< PUSCH presence field */ SchPuschInfo *schPuschInfo; /*!< PUSCH info */ @@ -116,7 +141,51 @@ typedef struct bsrInfo uint32_t dataVol; /* Data volume requested in bytes */ }BsrInfo; +typedef struct schLcCtxt +{ + uint8_t lcId; // logical Channel ID + uint8_t lcp; // logical Channel Prioritization + SchLcState lcState; + uint32_t bo; +}SchDlLcCtxt; + +typedef struct schDlCb +{ + uint8_t numDlLc; + SchDlLcCtxt dlLcCtxt[MAX_NUM_LC]; +}SchDlCb; + +typedef struct schUlLcCtxt +{ + SchLcState lcState; + uint8_t lcId; + uint8_t priority; + uint8_t lcGroup; + uint8_t schReqId; + uint8_t pbr; // prioritisedBitRate + uint8_t bsd; // bucketSizeDuration +}SchUlLcCtxt; + +typedef struct schUlCb +{ + uint8_t numUlLc; + SchUlLcCtxt ulLcCtxt[MAX_NUM_LC]; +}SchUlCb; +typedef struct schUeCfgCb +{ + uint16_t cellId; + uint16_t crnti; + bool macCellGrpCfgPres; + SchMacCellGrpCfg macCellGrpCfg; + bool phyCellGrpCfgPres; + SchPhyCellGrpCfg phyCellGrpCfg; + bool spCellCfgPres; + SchSpCellCfg spCellCfg; + SchAmbrCfg *ambrCfg; + SchModulationInfo dlModInfo; + SchModulationInfo ulModInfo; +}SchUeCfgCb; /** * @brief @@ -126,11 +195,13 @@ typedef struct schUeCb { uint16_t ueIdx; uint16_t crnti; - SchUeCfg ueCfg; + SchUeCfgCb ueCfg; SchUeState state; SchCellCb *cellCb; bool srRcvd; BsrInfo bsrInfo[MAX_NUM_LOGICAL_CHANNEL_GROUPS]; + SchUlCb ulInfo; + SchDlCb dlInfo; }SchUeCb; /** @@ -144,13 +215,22 @@ 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*/ - SchDlSlotInfo *schDlSlotInfo[SCH_NUM_SLOTS]; /*!< SCH resource allocations in DL */ - SchUlSlotInfo *schUlSlotInfo[SCH_NUM_SLOTS]; /*!< SCH resource allocations in UL */ + SchDlSlotInfo **schDlSlotInfo; /*!< SCH resource allocations in DL */ + SchUlSlotInfo **schUlSlotInfo; /*!< SCH resource allocations in UL */ SchCellCfg cellCfg; /*!< Cell ocnfiguration */ + bool firstSsbTransmitted; + bool firstSib1Transmitted; uint8_t ssbStartSymbArr[SCH_MAX_SSB_BEAM]; /*!