Merge "Cleanup of all f1ap messages"

[o-du/l2.git] / src / 5gnrsch / sch.h

diff --git a/src/5gnrsch/sch.h b/src/5gnrsch/sch.h
index b97db6c..efc7851 100644 (file)
--- a/src/5gnrsch/sch.h
+++ b/src/5gnrsch/sch.h
@@ -35,6 +35,7 @@
 #define SCHED_DELTA 1
 #define RAR_DELAY   1
 #define SCH_MAX_UE  1
+#define PUSCH_START_RB 15
 #define SI_RNTI 0xFFFF
 #define P_RNTI  0xFFFE
 
@@ -59,7 +60,6 @@
       SPutSBuf(SCH_MEM_REGION, SCH_POOL,                      \
          (Data *)_datPtr, _size);
 
-
 #define SCH_FILL_RSP_PST(_rspPst, _inst)\
 {                                  \
    _rspPst.srcProcId = SFndProcId(); \
@@ -101,6 +101,7 @@ typedef struct schDlAlloc
        bool        sib1Pres;
        bool        rarPres;
        RarInfo     rarInfo;
+   Msg4Info    *msg4Info;
 }SchDlAlloc;
 
 typedef struct schRaCb
@@ -114,9 +115,10 @@ typedef struct schRaCb
   */
 typedef struct schUlAlloc
 {
-       uint16_t    totalPrb;  /*!< Number of RBs in the cell */
-       uint16_t    assignedPrb[SCH_SYMBOL_PER_SLOT]; /*!< Num RBs and corresponding symbols allocated */
-       uint8_t     prachStartSymb; /*!< Start symbol for PRACH */
+       uint16_t     totalPrb;  /*!< Number of RBs in the cell */
+       uint16_t     assignedPrb[SCH_SYMBOL_PER_SLOT]; /*!< Num RBs and corresponding symbols allocated */
+       bool         puschPres; /*!< PUSCH presence field */
+       SchPuschInfo *schPuschInfo; /*!< PUSCH info */
 }SchUlAlloc;
 
 /**
@@ -154,7 +156,7 @@ SchCb schCb[SCH_MAX_INST];
 uint8_t schBroadcastAlloc(SchCellCb *cell, DlBrdcstAlloc *dlBrdcstAlloc,uint16_t slot);
 uint8_t schProcessSlotInd(SlotIndInfo *slotInd, Inst inst);
 uint8_t schUlResAlloc(SchCellCb *cell, Inst schInst);
-
+uint8_t schDlRsrcAllocMsg4(Msg4Alloc *msg4Alloc, SchCellCb *cell, uint16_t slot);
 
 
 /**********************************************************************