X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fdu_app%2Fdu_cfg.c;h=9b5db13b00b6eebc5b2850fe0f17fceaf6fd81b1;hb=49dc0e36836dc940ec40dea3a475ff067177819a;hp=5576e9555d366dfe4f0dc39b6ca02362e3d50aad;hpb=3a5197157c8a4ff70f26254c70ea0bbb2482423b;p=o-du%2Fl2.git

diff --git a/src/du_app/du_cfg.c b/src/du_app/du_cfg.c
index 5576e9555..9b5db13b0 100644
--- a/src/du_app/du_cfg.c
+++ b/src/du_app/du_cfg.c
@@ -214,7 +214,6 @@ uint8_t readMacCfg()
    duCfgParam.macCellCfg.ssbCfg.ssbScOffset = SSB_SUBCARRIER_OFFSET;
 #endif
    duCfgParam.macCellCfg.ssbCfg.ssbMask[0] = 1; /* only one SSB is transmitted */
-   duCfgParam.macCellCfg.ssbCfg.ssbMask[1] = 0;
    if(BuildMibPdu() != ROK)
    {
       DU_LOG("\nERROR  -->  Failed to build MIB PDU");
@@ -278,7 +277,20 @@ uint8_t readMacCfg()
    duCfgParam.macCellCfg.sib1Cfg.coresetZeroIndex = CORESET_0_INDEX;
    duCfgParam.macCellCfg.sib1Cfg.searchSpaceZeroIndex = SEARCHSPACE_0_INDEX;
    duCfgParam.macCellCfg.sib1Cfg.sib1Mcs = DEFAULT_MCS;
-
+  
+   GET_NUM_PAGING_OCC(duCfgParam.sib1Params.srvCellCfgCommSib.dlCfg.pcchCfg.ns,
+                           duCfgParam.macCellCfg.sib1Cfg.pagingCfg.numPO);
+   if(duCfgParam.sib1Params.srvCellCfgCommSib.dlCfg.pcchCfg.firstPDCCHMontioringType != \
+             PCCH_Config__firstPDCCH_MonitoringOccasionOfPO_PR_NOTHING)
+   {
+      duCfgParam.macCellCfg.sib1Cfg.pagingCfg.poPresent = TRUE;
+      memcpy(duCfgParam.macCellCfg.sib1Cfg.pagingCfg.pagingOcc, 
+              duCfgParam.sib1Params.srvCellCfgCommSib.dlCfg.pcchCfg.firstPDCCHMontioringInfo,MAX_PO_PER_PF);
+   }
+   else
+   {
+      duCfgParam.macCellCfg.sib1Cfg.pagingCfg.poPresent = FALSE;
+   }
 
    /* fill Intial DL BWP */
    duCfgParam.macCellCfg.initialDlBwp.bwp.firstPrb = 0;
@@ -530,8 +542,13 @@ uint8_t fillServCellCfgCommSib(SrvCellCfgCommSib *srvCellCfgComm)
 
    /* Configuring PCCH Config for SIB1 */
    pcchCfg.dfltPagingCycle = PagingCycle_rf256;
-   pcchCfg.nAndPagingFrmOffPresent = PCCH_Config__nAndPagingFrameOffset_PR_oneT;
-   pcchCfg.numPagingOcc = PCCH_Config__ns_four;
+   pcchCfg.nAndPagingFrmOffsetType = PCCH_Config__nAndPagingFrameOffset_PR_oneT;
+   pcchCfg.pageFrameOffset = 0;
+   pcchCfg.ns = PCCH_Config__ns_one;
+   pcchCfg.firstPDCCHMontioringType = PCCH_Config__firstPDCCH_MonitoringOccasionOfPO_PR_sCS30KHZoneT_SCS15KHZhalfT;
+   memset(pcchCfg.firstPDCCHMontioringInfo, 0, sizeof(uint16_t));
+   pcchCfg.firstPDCCHMontioringInfo[0] = 44;
+   
    srvCellCfgComm->dlCfg.pcchCfg = pcchCfg;