X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Fsch.h;h=1b262b3c77a6b4c8a1408d9afc98539d8f6a6239;hb=e97e12fe1ca460ef5437675bb94ad61740cf29e2;hp=bacee4064dee93a623becbecf93ccbf075fd1239;hpb=6521c41a55f8015d12793741917472b5edaf2548;p=o-du%2Fl2.git diff --git a/src/5gnrsch/sch.h b/src/5gnrsch/sch.h index bacee4064..1b262b3c7 100644 --- a/src/5gnrsch/sch.h +++ b/src/5gnrsch/sch.h @@ -25,16 +25,10 @@ #define SCH_MU3_NUM_SLOTS 40 #define SCH_MU4_NUM_SLOTS 50 #define SCH_MAX_SFN 1024 -#ifdef NR_TDD -#define MAX_NUM_RB 275 /* value for numerology 1, 100 MHz */ -#else -#define MAX_NUM_RB 106 /* value for numerology 0, 20 MHz */ -#endif #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 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 21 /* One extra PRB as buffer */ #define SCHED_DELTA 1 @@ -96,6 +90,13 @@ typedef enum WINDOW_EXPIRED }RaRspWindowStatus; +typedef enum +{ + SEARCH, + CREATE, + DELETE +}ActionTypeLcLL; + /** * @brief * Structure holding LTE MAC's General Configuration information. @@ -126,7 +127,7 @@ typedef struct freePrbBlock typedef struct schPrbAlloc { CmLListCp freePrbBlockList; /*!< List of continuous blocks for available PRB */ - uint64_t prbBitMap[SCH_SYMBOL_PER_SLOT][PRB_BITMAP_MAX_IDX]; /*!< BitMap to store the allocated PRBs */ + uint64_t prbBitMap[ MAX_SYMB_PER_SLOT][PRB_BITMAP_MAX_IDX]; /*!< BitMap to store the allocated PRBs */ }SchPrbAlloc; /** @@ -140,13 +141,18 @@ typedef struct schDlSlotInfo 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 */ - RarAlloc *rarAlloc; /*!< RAR allocation */ - DlMsgInfo *dlMsgInfo; /*!< DL dedicated Msg info */ + uint8_t pdcchUe; /*!< UE for which PDCCH is scheduled in this slot */ + uint8_t pdschUe; /*!< UE for which PDSCH is scheduled in this slot */ + RarAlloc *rarAlloc[MAX_NUM_UE]; /*!< RAR allocation per UE*/ + DciInfo *ulGrant; + DlMsgAlloc *dlMsgAlloc[MAX_NUM_UE]; /*!< Dl msg allocation per UE*/ }SchDlSlotInfo; typedef struct schRaCb { - uint16_t tcrnti; + bool msg4recvd; + uint16_t tcrnti; + uint16_t dlMsgPduLen; }SchRaCb; /** @@ -155,12 +161,14 @@ typedef struct schRaCb */ typedef struct schUlSlotInfo { - SchPrbAlloc prbAlloc; /*!< PRB allocated/available per symbol */ - 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 */ + SchPrbAlloc prbAlloc; /*!< PRB allocated/available per symbol */ + 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 */ + uint8_t pucchUe; /*!< Store UE id for which PUCCH is scheduled */ + uint8_t puschUe; /*!< Store UE id for which PUSCH is scheduled */ }SchUlSlotInfo; /** @@ -181,11 +189,11 @@ typedef struct schLcCtxt uint32_t bo; uint16_t pduSessionId; /*Pdu Session Id*/ Snssai *snssai; /*S-NSSAI assoc with LCID*/ + bool isDedicated; /*Flag containing Dedicated S-NSSAI or not*/ }SchDlLcCtxt; typedef struct schDlCb { - uint8_t numDlLc; SchDlLcCtxt dlLcCtxt[MAX_NUM_LC]; }SchDlCb; @@ -200,11 +208,11 @@ typedef struct schUlLcCtxt uint8_t bsd; // bucketSizeDuration uint16_t pduSessionId; /*Pdu Session Id*/ Snssai *snssai; /*S-NSSAI assoc with LCID*/ + bool isDedicated; /*Flag containing Dedicated S-NSSAI or not*/ }SchUlLcCtxt; typedef struct schUlCb { - uint8_t numUlLc; SchUlLcCtxt ulLcCtxt[MAX_NUM_LC]; }SchUlCb; @@ -223,6 +231,36 @@ typedef struct schUeCfgCb SchModulationInfo ulModInfo; }SchUeCfgCb; +/*Following structures to keep record and estimations of PRB allocated for each + * LC taking into consideration the RRM policies*/ +typedef struct lcInfo +{ + uint8_t lcId; /*LCID for which BO are getting recorded*/ + uint32_t reqBO; /*Size of the BO requested/to be allocated for this LC*/ + uint32_t allocBO; /*TBS/BO Size which is actually allocated*/ + uint8_t allocPRB; /*PRB count which is allocated based on RRM policy/FreePRB*/ +}LcInfo; + +typedef struct dedicatedLCInfo +{ + CmLListCp dedLcList; /*Linklist of LC assoc with RRMPolicyMemberList*/ + uint16_t rsvdDedicatedPRB; /*Number of PRB reserved for this Dedicated S-NSSAI*/ +}DedicatedLCInfo; + +typedef struct schLcPrbEstimate +{ + /* TODO: For Multiple RRMPolicies, Make DedicatedLcInfo as array/Double Pointer + * and have separate DedLCInfo for each RRMPolcyMemberList*/ + /* Dedicated LC List will be allocated, if any available*/ + DedicatedLCInfo *dedLcInfo; /*Contain LCInfo per RRMPolicy*/ + + CmLListCp defLcList; /*Linklist of LC assoc with Default S-NSSAI(s)*/ + + /* SharedPRB number can be used by any LC. + * Need to calculate in every Slot based on PRB availability*/ + uint16_t sharedNumPrb; +}SchLcPrbEstimate; + /** * @brief * UE control block @@ -235,9 +273,12 @@ typedef struct schUeCb SchUeState state; SchCellCb *cellCb; bool srRcvd; + bool bsrRcvd; BsrInfo bsrInfo[MAX_NUM_LOGICAL_CHANNEL_GROUPS]; SchUlCb ulInfo; SchDlCb dlInfo; + SchLcPrbEstimate dlLcPrbEst; /*DL PRB Alloc Estimate among different LC*/ + SchLcPrbEstimate ulLcPrbEst; /*UL PRB Alloc Estimate among different LC*/ }SchUeCb; /** @@ -275,6 +316,7 @@ typedef struct schCellCb uint32_t actvUeBitMap; /*!