JIRA ID - ODUHIGH-241 Implementation of RRC DELIVERY REPORT

[o-du/l2.git] / src / 5gnrsch / sch_common.c

diff --git a/src/5gnrsch/sch_common.c b/src/5gnrsch/sch_common.c
index c9bc50f..7e61145 100644 (file)
--- a/src/5gnrsch/sch_common.c
+++ b/src/5gnrsch/sch_common.c
@@ -106,10 +106,17 @@ uint8_t schBroadcastAlloc(SchCellCb *cell, DlBrdcstAlloc *dlBrdcstAlloc,
    /* SIB1 allocation */
    if(dlBrdcstAlloc->sib1Trans)
    {
+      uint16_t tbSize         = 0;
+      uint8_t numPdschSymbols = 12; /* considering pdsch region from 2 to 13 */
+      uint8_t mcs             = 4;  /* MCS fixed to 4 */
+      uint8_t numSib1Prb      = 0;
       schDlSlotInfo->sib1Pres = true;
+
+      tbSize = schCalcTbSize(cell->cellCfg.sib1SchCfg.sib1PduLen); /* send this value to the func in bytes when considering sib1 size */
+      numSib1Prb = schCalcNumPrb(tbSize,mcs,numPdschSymbols);
       for(idx=0; idx<SCH_SYMBOL_PER_SLOT; idx++)
       {
-        schDlSlotInfo->assignedPrb[idx] = ssbStartPrb + SCH_SSB_NUM_PRB + 1 + 10; /* 10 PRBs for sib1 */
+        schDlSlotInfo->assignedPrb[idx] = ssbStartPrb + SCH_SSB_NUM_PRB + 1 + numSib1Prb; /* 10 PRBs for sib1 */
       }
       memcpy(&dlBrdcstAlloc->sib1Alloc.bwp, &cell->cellCfg.sib1SchCfg.bwp, sizeof(BwpCfg)); 
       memcpy(&dlBrdcstAlloc->sib1Alloc.sib1PdcchCfg, &cell->cellCfg.sib1SchCfg.sib1PdcchCfg, sizeof(PdcchCfg)); 
@@ -246,8 +253,8 @@ uint16_t fillPucchResourceInfo(SchPucchInfo *schPucchInfo, Inst inst)
    schPucchInfo->numHarqBits = 1; /* 1 bit for HARQ */
 
    /* set SR and UCI flag to false */
-   schPucchInfo->srFlag  = false;
-   schPucchInfo->uciFlag = false;
+   schPucchInfo->srFlag  = true;
+   schPucchInfo->uciFlag = true;
 
    return ROK;
 }
@@ -309,8 +316,8 @@ uint8_t schUlResAlloc(SchCellCb *cell, Inst schInst)
    {
       DU_LOG("\nSending UL Sch info from SCH to MAC failed");
    }
-   memset(cell->schUlSlotInfo[ulTimingInfo.slot], 0, sizeof(SchUlSlotInfo));
 
+   schInitUlSlot(schUlSlotInfo);
    return ret;
 }
 
@@ -384,7 +391,7 @@ uint8_t schDlRsrcAllocMsg4(Msg4Alloc *msg4Alloc, SchCellCb *cell, uint16_t slot)
    pdcch->coreset0Cfg.regBundleSize = 6;    /* spec-38.211 sec 7.3.2.2 */
    pdcch->coreset0Cfg.interleaverSize = 2;  /* spec-38.211 sec 7.3.2.2 */
    pdcch->coreset0Cfg.coreSetType = 0;
-   pdcch->coreset0Cfg.coreSet0Size = numRbs;
+   pdcch->coreset0Cfg.coreSetSize = numRbs;
    pdcch->coreset0Cfg.shiftIndex = cell->cellCfg.phyCellId;
    pdcch->coreset0Cfg.precoderGranularity = 0; /* sameAsRegBundle */
    pdcch->numDlDci = 1;