X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Fsch.h;h=5322e8c8868dabbfa1b33a69299c3d14952aeea2;hb=604190ac7e354996f34ebfae0cdd00962811393f;hp=ae4cb77099ff24e258f6af04e8a89a0102284dcb;hpb=e4e50f696285e2554d237169091026bf9f1b6257;p=o-du%2Fl2.git

diff --git a/src/5gnrsch/sch.h b/src/5gnrsch/sch.h
index ae4cb7709..5322e8c88 100644
--- a/src/5gnrsch/sch.h
+++ b/src/5gnrsch/sch.h
@@ -18,7 +18,6 @@
 
 /* macros */
 #define SCH_INST_START 1
-#define SCH_MAX_CELLS 1
 #define SCH_MAX_INST 1
 #define SCH_NUM_SLOTS 10 /*forcing this to 10 */
 #define SCH_MAX_SFN 1024
@@ -30,13 +29,10 @@
 #define SCH_SYMBOL_PER_SLOT 14
 #define SCH_SSB_NUM_SYMB 4
 #define SCH_SSB_NUM_PRB 20
-#define SCH_MEM_REGION     4
-#define SCH_POOL           1
 #define SCHED_DELTA 1
 #define BO_DELTA 1
 #define RAR_DELAY   2
 #define MSG4_DELAY  1
-#define SCH_MAX_UE  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 SI_RNTI 0xFFFF
@@ -47,44 +43,10 @@
 
 #define CRC_FAILED 0
 #define CRC_PASSED 1
+#define UL_GRANT_SIZE 224
 
-/* allocate and zero out a static buffer */
-#define SCH_ALLOC(_datPtr, _size)                               \
-{                                                               \
-   S16 _ret;                                                    \
-   _ret = SGetSBuf(SCH_MEM_REGION, SCH_POOL,                    \
-	 (Data **)&_datPtr, _size);                             \
-   if(_ret == ROK)                                              \
-   {                                                            \
-      cmMemset((U8*)_datPtr, 0, _size);                         \
-   }                                                            \
-   else                                                         \
-   {                                                            \
-      _datPtr = NULLP;                                          \
-   }                                                            \
-}
-
-/* free a static buffer */
-#define SCH_FREE(_datPtr, _size)                                \
-{                                                               \
-   if(_datPtr)                                                  \
-   {                                                            \
-      SPutSBuf(SCH_MEM_REGION, SCH_POOL,                        \
-	    (Data *)_datPtr, _size);                            \
-   }                                                            \
-}
-
-#define SCH_FILL_RSP_PST(_rspPst, _inst)\
-{                                  \
-   _rspPst.srcProcId = SFndProcId(); \
-   _rspPst.dstProcId = SFndProcId();\
-   _rspPst.srcEnt    = ENTRG;\
-   _rspPst.dstEnt    = ENTRG;\
-   _rspPst.srcInst   = 1;\
-   _rspPst.dstInst   = 0;\
-   _rspPst.selector  = ODU_SELECTOR_TC;\
-}	
-extern uint8_t schProcessRachInd(RachIndInfo *rachInd, Inst schInst);
+typedef struct schCellCb SchCellCb;
+typedef struct schUeCb SchUeCb;
 
 typedef enum
 {
@@ -137,22 +99,38 @@ 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;
+
+
+
 /**
  * @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];
 }SchUeCb;
 
 /**
@@ -170,9 +148,9 @@ typedef struct schCellCb
    SchUlSlotInfo *schUlSlotInfo[SCH_NUM_SLOTS];     /*!< SCH resource allocations in UL */
    SchCellCfg    cellCfg;                           /*!< Cell ocnfiguration */
    uint8_t       ssbStartSymbArr[SCH_MAX_SSB_BEAM]; /*!<start symbol per SSB beam */
-   SchRaCb       raCb[SCH_MAX_UE];                  /*!< Rach Cb */
+   SchRaCb       raCb[MAX_NUM_UE];                  /*!< Rach Cb */
    uint16_t      numActvUe;
-   SchUeCb       ueCb[SCH_MAX_UE];
+   SchUeCb       ueCb[MAX_NUM_UE];
 }SchCellCb;
 
 /**
@@ -183,7 +161,7 @@ typedef struct schCb
 {
    TskInit       schInit;              /*!< Task Init info */
    SchGenCb      genCfg;                 /*!< General Config info */
-   SchCellCb     *cells[SCH_MAX_CELLS];  /* Array to store cellCb ptr */  
+   SchCellCb     *cells[MAX_NUM_CELL];  /* Array to store cellCb ptr */  
 }SchCb;
 
 /* Declaration for scheduler control blocks */
@@ -197,6 +175,10 @@ uint8_t schDlRsrcAllocMsg4(Msg4Alloc *msg4Alloc, SchCellCb *cell, uint16_t slot)
 uint16_t schCalcTbSize(uint16_t payLoadSize);
 uint16_t schCalcNumPrb(uint16_t tbSize, uint16_t mcs, uint8_t numSymbols);
 uint16_t schAllocPucchResource(SchCellCb *cell, uint16_t crnti, uint16_t slot);
+uint8_t schProcessRachInd(RachIndInfo *rachInd, Inst schInst);
+uint8_t schFillUlDci(SchUeCb *ueCb, SchPuschInfo puschInfo, DciInfo *dciInfo);
+uint8_t schFillPuschAlloc(SchUeCb *ueCb, uint16_t pdcchSlot, uint32_t dataVol, SchPuschInfo *puschInfo);
+
 /**********************************************************************
   End of file
  **********************************************************************/