X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Fsch_common.c;h=8b866b7926e1b38f8d311a852ffe9e27d1061326;hb=e006592159c0a16a4c2f24cc50f712ff9461a000;hp=697b82045047237978b25d120c29a131badb1844;hpb=4fc13842d17b3cce83876c95cba9eef4b2a413dd;p=o-du%2Fl2.git

diff --git a/src/5gnrsch/sch_common.c b/src/5gnrsch/sch_common.c
index 697b82045..8b866b792 100644
--- a/src/5gnrsch/sch_common.c
+++ b/src/5gnrsch/sch_common.c
@@ -82,8 +82,7 @@ SchMacUlSchInfoFunc schMacUlSchInfoOpts[] =
  *     
  *     This function handles common scheduling for DL
  *     
- *  @param[in]  schCellCb *cell, cell cb
- *  @param[in]  DlBrdcstAlloc *dlBrdcstAlloc, DL brdcst allocation
+ *  @param[in]  uint8_t scs, uint8_t *ssbStartSym
  *  @return  void
  **/
 void ssbDlTdAlloc(uint8_t scs, uint8_t *ssbStartSymb)
@@ -114,7 +113,7 @@ void ssbDlTdAlloc(uint8_t scs, uint8_t *ssbStartSymb)
  *
  * @details
  *
- *     Function : schCmnDlAlloc
+ *     Function : schBroadcastAlloc
  *     
  *     This function handles common scheduling for DL
  *     
@@ -122,7 +121,8 @@ void ssbDlTdAlloc(uint8_t scs, uint8_t *ssbStartSymb)
  *  @param[in]  DlBrdcstAlloc *dlBrdcstAlloc, DL brdcst allocation
  *  @return  void
  **/
-uint8_t schCmnDlAlloc(SchCellCb *cell, DlBrdcstAlloc *dlBrdcstAlloc)
+uint8_t schBroadcastAlloc(SchCellCb *cell, DlBrdcstAlloc *dlBrdcstAlloc,
+        uint16_t slot)
 {
 	/* schedule SSB */
 	uint8_t scs, ssbStartPrb, ssbStartSymb, idx;
@@ -130,12 +130,11 @@ uint8_t schCmnDlAlloc(SchCellCb *cell, DlBrdcstAlloc *dlBrdcstAlloc)
 	SchDlAlloc *dlAlloc;
 	SsbInfo ssbInfo;
 
-	dlAlloc = cell->dlAlloc[cell->slotInfo.slot];
+	dlAlloc = cell->dlAlloc[slot];
 	if(dlBrdcstAlloc->ssbTrans)
 	{
 		scs = cell->cellCfg.ssbSchCfg.scsCommon;
-		ssbStartPrb = \
-		   (cell->cellCfg.ssbSchCfg.ssbOffsetPointA)/SCH_NUM_SC_PRB;
+		ssbStartPrb = cell->cellCfg.ssbSchCfg.ssbOffsetPointA;
 
 		memset(ssbStartSymbArr, 0, SCH_MAX_SSB_BEAM);
 		ssbDlTdAlloc(scs, ssbStartSymbArr);
@@ -144,10 +143,10 @@ uint8_t schCmnDlAlloc(SchCellCb *cell, DlBrdcstAlloc *dlBrdcstAlloc)
 		for(idx=0; idx<dlBrdcstAlloc->ssbIdxSupported; idx++)
 		{
 			ssbInfo.ssbIdx = idx;
-			ssbInfo.fdAlloc.ssbStartPrbIdx = ssbStartPrb;
-			ssbInfo.fdAlloc.ssbPrbDuration = SCH_SSB_PRB_DURATION;
-			ssbInfo.tdAlloc.ssbStartSymbIdx = ssbStartSymb;
-			ssbInfo.tdAlloc.ssbSymbolDuration = SCH_SSB_SYMB_DURATION;
+			ssbInfo.fdAlloc.startPrb  = ssbStartPrb;
+			ssbInfo.fdAlloc.numPrb    = SCH_SSB_PRB_DURATION;
+			ssbInfo.tdAlloc.startSymb = ssbStartSymb;
+			ssbInfo.tdAlloc.numSymb   = SCH_SSB_SYMB_DURATION;
 			dlBrdcstAlloc->ssbInfo[idx] = ssbInfo;
 			dlAlloc->ssbInfo[idx] = ssbInfo;
 
@@ -157,7 +156,7 @@ uint8_t 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 + 1; /* +1 for kSsb */
+			dlAlloc->assignedPrb[idx] = ssbStartPrb + SCH_SSB_PRB_DURATION + 1; /* +1 for kSsb */
 		}
 
 	}
@@ -165,8 +164,13 @@ uint8_t schCmnDlAlloc(SchCellCb *cell, DlBrdcstAlloc *dlBrdcstAlloc)
 	/* 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)); 
+		dlAlloc->sib1Pres = true;
+		for(idx=0; idx<SCH_SYMBOL_PER_SLOT; idx++)
+		{
+			dlAlloc->assignedPrb[idx] = ssbStartPrb + SCH_SSB_PRB_DURATION + 1 + 10; /* 10 PRBs for sib1 */
+		}
+	   memcpy(&dlBrdcstAlloc->sib1Alloc.sib1PdcchCfg, &cell->cellCfg.sib1SchCfg.sib1PdcchCfg, sizeof(PdcchCfg)); 
+	   memcpy(&dlBrdcstAlloc->sib1Alloc.sib1PdschCfg, &cell->cellCfg.sib1SchCfg.sib1PdschCfg, sizeof(PdschCfg)); 
 	}
 	return ROK;
 }
@@ -222,7 +226,7 @@ int schPrachResAlloc(SchCellCb *cell, UlSchInfo *ulSchInfo)
 	uint8_t  prachFormat = 0;
 	uint8_t  x = 0;
 	uint8_t  y = 0;
-	uint8_t  prachSubframe = 0;
+	uint16_t prachSubframe = 0;
 	uint8_t  prachStartSymbol = 0;
 	uint8_t  prachOcas = 0;
 	uint8_t  dataType = 0;
@@ -297,12 +301,25 @@ int schPrachResAlloc(SchCellCb *cell, UlSchInfo *ulSchInfo)
  *  @param[in]  SchCellCb *cell, cellCb
  *  @return  void
  **/
-int schUlResAlloc(SchCellCb *cell, Inst schInst)
+uint8_t schUlResAlloc(SchCellCb *cell, Inst schInst)
 {
    int ret = ROK;
    UlSchInfo ulSchInfo;
+	SchUlAlloc *ulAlloc;
+
    /* Schedule resources for PRACH */
 	schPrachResAlloc(cell, &ulSchInfo);
+
+	ulAlloc = cell->ulAlloc[cell->slotInfo.slot]; 
+	
+	if(ulAlloc->schPuschInfo)
+	{
+		ulSchInfo.dataType |= SCH_DATATYPE_PUSCH;
+		memcpy(&ulSchInfo.schPuschInfo, ulAlloc->schPuschInfo,
+				sizeof(SchPuschInfo));
+		SCH_FREE(ulAlloc->schPuschInfo, sizeof(SchPuschInfo));
+	}
+
 	//send msg to MAC
    ret = sendUlSchInfoToMac(&ulSchInfo, schInst);
    if(ret != ROK)