X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Fsch_common.c;h=5d79f162d10ea6c75304fbc3462bd07c6cb3c60f;hb=483d527d19566ecca87eee46a198bab6c890c6bb;hp=5b32a5d3f2f8fcbaa306b80cd2d7098fc79da910;hpb=5ea4c59cb4dd37164953218b0bd355284e11d22c;p=o-du%2Fl2.git

diff --git a/src/5gnrsch/sch_common.c b/src/5gnrsch/sch_common.c
index 5b32a5d3f..5d79f162d 100644
--- a/src/5gnrsch/sch_common.c
+++ b/src/5gnrsch/sch_common.c
@@ -111,7 +111,7 @@ void ssbDlTdAlloc(uint8_t scs, uint8_t *ssbStartSymb)
  *  @param[in]  DlBrdcstAlloc *dlBrdcstAlloc, DL brdcst allocation
  *  @return  void
  **/
-int schCmnDlAlloc(SchCellCb *cell, DlBrdcstAlloc *dlBrdcstAlloc)
+uint8_t schCmnDlAlloc(SchCellCb *cell, DlBrdcstAlloc *dlBrdcstAlloc)
 {
 	/* schedule SSB */
 	uint8_t scs, ssbStartPrb, ssbStartSymb, idx;
@@ -122,9 +122,9 @@ int schCmnDlAlloc(SchCellCb *cell, DlBrdcstAlloc *dlBrdcstAlloc)
 	dlAlloc = cell->dlAlloc[cell->slotInfo.slot];
 	if(dlBrdcstAlloc->ssbTrans)
 	{
-		scs = cell->cellCfg.scsCommon;
+		scs = cell->cellCfg.ssbSchCfg.scsCommon;
 		ssbStartPrb = \
-		   ((cell->cellCfg.ssbSubcOffset)-(cell->cellCfg.ssbOffsetPointA))/SCH_NUM_SC_PRB;
+		   (cell->cellCfg.ssbSchCfg.ssbOffsetPointA)/SCH_NUM_SC_PRB;
 
 		memset(ssbStartSymbArr, 0, SCH_MAX_SSB_BEAM);
 		ssbDlTdAlloc(scs, ssbStartSymbArr);
@@ -146,10 +146,17 @@ int schCmnDlAlloc(SchCellCb *cell, DlBrdcstAlloc *dlBrdcstAlloc)
 		dlAlloc->ssbIdxSupported = dlBrdcstAlloc->ssbIdxSupported;
 		for(idx=ssbStartSymb; idx<ssbStartSymb+SCH_SSB_SYMB_DURATION; idx++)
 		{
-			dlAlloc->assignedPrb[idx] = SCH_SSB_PRB_DURATION; 
+			dlAlloc->assignedPrb[idx] = SCH_SSB_PRB_DURATION + 1; /* +1 for kSsb */
 		}
 
 	}
+
+	/* SIB1 allocation */
+	if(dlBrdcstAlloc->sib1Trans)
+	{
+	   memcpy(&dlBrdcstAlloc->sib1Alloc.sib1PdcchCfg, &cell->cellCfg.sib1SchCfg.sib1PdcchCfg, sizeof(Sib1PdcchCfg)); 
+	   memcpy(&dlBrdcstAlloc->sib1Alloc.sib1PdschCfg, &cell->cellCfg.sib1SchCfg.sib1PdschCfg, sizeof(Sib1PdschCfg)); 
+	}
 	return ROK;
 }