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

diff --git a/src/5gnrsch/sch_common.c b/src/5gnrsch/sch_common.c
index 25e88efb1..8b866b792 100644
--- a/src/5gnrsch/sch_common.c
+++ b/src/5gnrsch/sch_common.c
@@ -143,10 +143,10 @@ uint8_t schBroadcastAlloc(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;
 
@@ -305,8 +305,21 @@ 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)