X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2F5gnrsch%2Fsch.h;h=efc7851797b54ee25cce10440acf087f18170d25;hb=cbf9db65bacb54e33073cbc49d2f799ec9e75e2b;hp=b97db6c75330aa69b44810f554d7b2bc6a10152c;hpb=db0a2ee4edd328449d01ab184d253327fca950d6;p=o-du%2Fl2.git diff --git a/src/5gnrsch/sch.h b/src/5gnrsch/sch.h index b97db6c75..efc785179 100644 --- 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); /**********************************************************************