X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Fsch.h;h=3621feeebb99978ec5ffd92d393a39c1910654c3;hb=791615463ef2fcc0d6e0697d7860e6e6a56bd9a6;hp=101cb97a0b3d968014bd6d4492f76f2de0c6ffd0;hpb=a5530e70a9d414952dadd1688aa9b4280c0dbb5a;p=o-du%2Fl2.git diff --git a/src/5gnrsch/sch.h b/src/5gnrsch/sch.h index 101cb97a0..3621feeeb 100644 --- a/src/5gnrsch/sch.h +++ b/src/5gnrsch/sch.h @@ -44,7 +44,12 @@ #define CRC_FAILED 0 #define CRC_PASSED 1 -extern uint8_t schProcessRachInd(RachIndInfo *rachInd, Inst schInst); +#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 { @@ -52,6 +57,12 @@ typedef enum 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. @@ -81,7 +92,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 @@ -97,22 +108,69 @@ 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 */ + uint8_t puschCurrentPrb; /* Current PRB for PUSCH allocation */ bool puschPres; /*!< PUSCH presence field */ SchPuschInfo *schPuschInfo; /*!< PUSCH info */ bool pucchPres; /*!< PUCCH presence field */ SchPucchInfo schPucchInfo; /*!< PUCCH info */ }SchUlSlotInfo; +/** +@brief +* BSR info per slot per UE. +*/ +typedef struct bsrInfo +{ + uint8_t priority; /* CG priority */ + 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 * UE control block */ typedef struct schUeCb { - uint16_t ueIdx; - uint16_t crnti; - SchUeCfg ueCfg; - SchUeState state; + uint16_t ueIdx; + uint16_t crnti; + SchUeCfg ueCfg; + SchUeState state; + SchCellCb *cellCb; + bool srRcvd; + BsrInfo bsrInfo[MAX_NUM_LOGICAL_CHANNEL_GROUPS]; + SchUlCb ulInfo; + SchDlCb dlInfo; }SchUeCb; /** @@ -132,6 +190,8 @@ typedef struct schCellCb uint8_t ssbStartSymbArr[SCH_MAX_SSB_BEAM]; /*!