X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Fsch.h;h=3793761f5dfa364cee92b3efebc19a4eaaae2649;hb=f76690adc96d589ab208fbcdef906be32a5abb7d;hp=043ca95468c2658b0f76e645b4418ae245c488dc;hpb=9c4801c94d7798cc638a6b112d514e68c695f20a;p=o-du%2Fl2.git

diff --git a/src/5gnrsch/sch.h b/src/5gnrsch/sch.h
index 043ca9546..3793761f5 100644
--- a/src/5gnrsch/sch.h
+++ b/src/5gnrsch/sch.h
@@ -91,13 +91,6 @@ typedef enum
    WINDOW_EXPIRED
 }RaRspWindowStatus;
 
-typedef enum 
-{
-   SEARCH,
-   CREATE,
-   DELETE
-}ActionTypeLcLL;
-
 /**
  * @brief
  * Structure holding LTE MAC's General Configuration information.
@@ -275,6 +268,7 @@ typedef struct schUeCb
    SchUeCfgCb ueCfg;
    SchUeState state;
    SchCellCb  *cellCb;
+   SchCfraResource cfraResource;
    bool       srRcvd;
    bool       bsrRcvd;
    BsrInfo    bsrInfo[MAX_NUM_LOGICAL_CHANNEL_GROUPS];
@@ -292,20 +286,20 @@ typedef struct schRaReq
 {
    uint32_t        raRnti;
    RachIndInfo     *rachInd;
+   bool            isCFRA;
+   SchUeCb         *ueCb;          /* Filled only if isCFRA = true */
    SlotTimingInfo  winStartTime;
    SlotTimingInfo  winEndTime;
 }SchRaReq;
 
 typedef struct schPageInfo
 {
-  uint8_t        pf;       /*Value of Paging Frame received from DUAPP*/
-  uint8_t        i_s;      /*Value of Paging Occ Index received from DUAPP*/
-  SlotTimingInfo TxTime;   /*Start Paging window*/
-  uint8_t        crntSsbIdx; /*Counts the slot till totalSSB is receached*/
-  uint8_t        mcs;
-  uint8_t        nPRB;
-  uint16_t       msgLen;
-  uint8_t        *pagePdu;   
+  uint16_t       pf;          /*Value of Paging Frame received from DUAPP*/
+  uint8_t        i_s;         /*Value of Paging Occ Index received from DUAPP*/
+  SlotTimingInfo pageTxTime;  /*Start Paging window*/
+  uint8_t        mcs;         /*MCS index*/
+  uint16_t       msgLen;      /*Pdu length */
+  uint8_t       *pagePdu;     /*RRC Page PDU bit string*/
 }SchPageInfo;
 
 typedef struct schPagingOcc
@@ -316,9 +310,8 @@ typedef struct schPagingOcc
 
 typedef struct schPageCb
 {
-   CmLListCp    pageReqInfoRecord[MAX_SFN];   /*List of Page Records received which are stored per sfn*/
-   SchPagingOcc pagMonOcc[MAX_PO_PER_PF]; /*Paging Occasion Slot/FrameOffset are stored*/ 
-   SchPageInfo  currPageInfo;   /*Page Req which is being currently processed */
+   CmLListCp    pageIndInfoRecord[MAX_SFN]; /*List of Page Records received which are stored per sfn*/
+   SchPagingOcc pagMonOcc[MAX_PO_PER_PF];   /*Paging Occasion Slot/FrameOffset are stored*/ 
 }SchPageCb;
 
 /**
@@ -337,15 +330,16 @@ typedef struct schCellCb
    SchCellCfg    cellCfg;                           /*!< Cell ocnfiguration */
    bool          firstSsbTransmitted;
    bool          firstSib1Transmitted;
-   uint8_t       ssbStartSymbArr[SCH_MAX_SSB_BEAM]; /*!<start symbol per SSB beam */
+   uint8_t       ssbStartSymbArr[SCH_MAX_SSB_BEAM]; /*!< start symbol per SSB beam */
+   uint64_t      dedPreambleBitMap;                 /*!< Bit map to find used/free preambles index */
    SchRaReq      *raReq[MAX_NUM_UE];                /*!< Pending RA request */
    SchRaCb       raCb[MAX_NUM_UE];                  /*!< RA Cb */
-   uint16_t      numActvUe;                         /*!<Number of active UEs */
-   uint32_t      actvUeBitMap;                      /*!<Bit map to find active UEs */
-   uint32_t      boIndBitMap;                       /*!<Bit map to indicate UEs that have recevied BO */
-   SchUeCb       ueCb[MAX_NUM_UE];                  /*!<Pointer to UE contexts of this cell */
-   CmLListCp     ueToBeScheduled;                   /*!<Linked list to store UEs pending to be scheduled, */
-   SchPageCb     pageCb;        /*!<Page Record at Schedular*/
+   uint16_t      numActvUe;                         /*!< Number of active UEs */
+   uint32_t      actvUeBitMap;                      /*!< Bit map to find active UEs */
+   uint32_t      boIndBitMap;                       /*!< Bit map to indicate UEs that have recevied BO */
+   SchUeCb       ueCb[MAX_NUM_UE];                  /*!< Pointer to UE contexts of this cell */
+   CmLListCp     ueToBeScheduled;                   /*!< Linked list to store UEs pending to be scheduled, */
+   SchPageCb     pageCb;                            /*!< Page Record at Schedular*/
 #ifdef NR_TDD
    uint8_t       numSlotsInPeriodicity;             /*!< number of slots in configured periodicity and SCS */
    uint32_t      slotFrmtBitMap;                    /*!< 2 bits must be read together to determine D/U/S slots. 00-D, 01-U, 10-S */
@@ -431,7 +425,7 @@ bool schCalculateUlTbs(SchUeCb *ueCb, SlotTimingInfo puschTime, uint8_t symbLen,
 /*Generic Functions*/
 void updateGrantSizeForBoRpt(CmLListCp *lcLL, DlMsgAlloc *dlMsgAlloc, BsrInfo *bsrInfo, uint32_t *accumalatedBOSize);
 uint16_t searchLargestFreeBlock(SchCellCb *cell, SlotTimingInfo slotTime,uint16_t *startPrb, Direction dir);
-LcInfo* handleLcLList(CmLListCp *lcLL, uint8_t lcId, ActionTypeLcLL action);
+LcInfo* handleLcLList(CmLListCp *lcLL, uint8_t lcId, ActionTypeLL action);
 void prbAllocUsingRRMPolicy(CmLListCp *lcLL, bool dedicatedPRB, uint16_t mcsIdx,uint8_t numSymbols,\
                       uint16_t *sharedPRB, uint16_t *reservedPRB, bool *isTxPayloadLenAdded, bool *srRcvd);
 void updateBsrAndLcList(CmLListCp *lcLL, BsrInfo *bsrInfo, uint8_t status);
@@ -440,6 +434,8 @@ void updateBsrAndLcList(CmLListCp *lcLL, BsrInfo *bsrInfo, uint8_t status);
 void schProcPagingCfg(SchCellCb *cell);
 void schCfgPdcchMonOccOfPO(SchCellCb *cell);
 void schIncrSlot(SlotTimingInfo *timingInfo, uint8_t incr, uint16_t numSlotsPerRF);
+uint8_t schFillPagePdschCfg(SchCellCb *cell, PdschCfg *pagePdschCfg, SlotTimingInfo slotTime, \
+                             uint16_t tbSize, uint8_t mcs, uint16_t startPrb);
 
 /**********************************************************************
   End of file