X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Fsch.h;h=8734f65cf2ee2d5b84b60e5ca47d05cb45978855;hb=refs%2Fchanges%2F77%2F5377%2F4;hp=5322e8c8868dabbfa1b33a69299c3d14952aeea2;hpb=6b44407d464a5a4e060999255233a7cfe78bb0fa;p=o-du%2Fl2.git diff --git a/src/5gnrsch/sch.h b/src/5gnrsch/sch.h index 5322e8c88..8734f65cf 100644 --- a/src/5gnrsch/sch.h +++ b/src/5gnrsch/sch.h @@ -19,7 +19,11 @@ /* 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 @@ -43,17 +47,35 @@ #define CRC_FAILED 0 #define CRC_PASSED 1 + +#define RLC_HDR_SIZE 3 /* 3 bytes of RLC Header size */ +#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. @@ -83,7 +105,7 @@ typedef struct schDlSlotInfo 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 @@ -116,7 +138,36 @@ 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; + uint16_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; /** * @brief @@ -131,6 +182,8 @@ typedef struct schUeCb SchCellCb *cellCb; bool srRcvd; BsrInfo bsrInfo[MAX_NUM_LOGICAL_CHANNEL_GROUPS]; + SchUlCb ulInfo; + SchDlCb dlInfo; }SchUeCb; /** @@ -144,13 +197,15 @@ 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 */ uint8_t ssbStartSymbArr[SCH_MAX_SSB_BEAM]; /*!