X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Fsch.h;h=3090cbda6ee51cef337ad80243f398624c12aa8b;hb=refs%2Fchanges%2F77%2F4377%2F11;hp=96f3d225fd89db9525078144d34b3ab0b20b104b;hpb=6f769128e3fa5a83ee92e668ef9ac152c96b3200;p=o-du%2Fl2.git

diff --git a/src/5gnrsch/sch.h b/src/5gnrsch/sch.h
index 96f3d225f..3090cbda6 100644
--- a/src/5gnrsch/sch.h
+++ b/src/5gnrsch/sch.h
@@ -25,18 +25,20 @@
 #define MAX_NUM_RB 106 /* value for numerology 0 15Khz */
 #define SCH_MIB_TRANS 80 
 #define SCH_NUM_SC_PRB 12 /* number of SCs in a PRB */
-#define SCH_MAX_SSB_BEAM 4 /* since we are supporting only SCS=15KHz */
 #define SCH_SCS_15KHZ 0 /* numerology 0 and 15Khz */
 #define SCH_SYMBOL_PER_SLOT 14
-#define SCH_SSB_SYMB_DURATION 4
-#define SCH_SSB_PRB_DURATION 20
+#define SCH_SSB_NUM_SYMB 4
+#define SCH_SSB_NUM_PRB 20
+#define SCH_MAX_SSB_BEAM 4 /* since we are supporting only SCS=15KHz */
 #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
 #define P_RNTI  0xFFFE
 
@@ -69,7 +71,7 @@
    _rspPst.dstEnt    = ENTRG;\
    _rspPst.srcInst   = 1;\
    _rspPst.dstInst   = 0;\
-	_rspPst.selector  = MAC_SELECTOR_TC;\
+	_rspPst.selector  = ODU_SELECTOR_TC;\
 }	
 extern uint8_t schProcessRachInd(RachIndInfo *rachInd, Inst schInst);
 /**
@@ -94,15 +96,14 @@ typedef struct schGenCb
   */
 typedef struct schDlSlotInfo
 {
-	uint16_t    totalPrb;  /*!< Number of RBs in the cell */
-	uint16_t    assignedPrb[SCH_SYMBOL_PER_SLOT]; /*!< Num RBs and corresponding symbols allocated */
-   bool        ssbPres;    /*!< Flag to determine if SSB is present in this slot */
-   uint8_t     ssbIdxSupported;  /*!< Max SSB index */
-	SsbInfo     ssbInfo[MAX_SSB_IDX]; /*!< SSB info */
-	bool        sib1Pres;
-	//bool        rarPres;
-	RarInfo     *rarInfo;
-   Msg4Info    *msg4Info;
+	uint16_t  totalPrb;                          /*!< Number of RBs in the cell */
+	uint16_t  assignedPrb[SCH_SYMBOL_PER_SLOT];  /*!< Num RBs and corresponding symbols allocated */
+   bool      ssbPres;                           /*!< Flag to determine if SSB is present in this slot */
+   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 */
+	RarInfo   *rarInfo;                          /*!< RAR info */
+   Msg4Info  *msg4Info;                         /*!< msg4 info */
 }SchDlSlotInfo;
 
 typedef struct schRaCb
@@ -120,6 +121,8 @@ typedef struct schUlSlotInfo
 	uint16_t     assignedPrb[SCH_SYMBOL_PER_SLOT]; /*!< Num RBs and corresponding symbols allocated */
 	bool         puschPres; /*!< PUSCH presence field */
 	SchPuschInfo *schPuschInfo; /*!< PUSCH info */
+	bool         pucchPres; /*!< PUCCH presence field */
+	SchPucchInfo schPucchInfo; /*!< PUCCH info */
 }SchUlSlotInfo;
 
 /**
@@ -128,15 +131,16 @@ typedef struct schUlSlotInfo
   */
 typedef struct schCellCb
 {
-   uint16_t      cellId;           /*!< Cell ID */
-   Inst          instIdx;          /*!< Index of the scheduler instance */
-   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 */
-	SchCellCfg    cellCfg;                /*!< Cell ocnfiguration */
-	SchRaCb       raCb[SCH_MAX_UE];
+   uint16_t      cellId;                            /*!< Cell ID */
+   Inst          instIdx;                           /*!< Index of the scheduler instance */
+   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 */
+	SchCellCfg    cellCfg;                           /*!< Cell ocnfiguration */
+	uint8_t       ssbStartSymbArr[SCH_MAX_SSB_BEAM]; /*!<start symbol per SSB beam */
+	SchRaCb       raCb[SCH_MAX_UE];                  /*!< Rach Cb */
 }SchCellCb;
 
 /**
@@ -158,8 +162,9 @@ uint8_t schBroadcastAlloc(SchCellCb *cell, DlBrdcstAlloc *dlBrdcstAlloc,uint16_t
 uint8_t schProcessSlotInd(SlotIndInfo *slotInd, Inst inst);
 uint8_t schUlResAlloc(SchCellCb *cell, Inst schInst);
 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);
 /**********************************************************************
          End of file
 **********************************************************************/