[Epic-ID: ODUHIGH-406] [Task-ID: ODUHIGH-439] Building Paging RRC PDU

[o-du/l2.git] / src / du_app / du_sys_info_hdl.c

diff --git a/src/du_app/du_sys_info_hdl.c b/src/du_app/du_sys_info_hdl.c
index 3b31947..a4c883e 100644 (file)
--- a/src/du_app/du_sys_info_hdl.c
+++ b/src/du_app/du_sys_info_hdl.c
@@ -24,6 +24,8 @@
 #include "legtp.h"
 #include "du_app_mac_inf.h"
 #include "du_cfg.h"
+#include "du_app_rlc_inf.h"
+#include "du_mgr.h"
 #include "du_utils.h"
 #include "BCCH-BCH-Message.h"
 #include "MIB.h"
@@ -55,6 +57,7 @@
 #include "SIB1.h"
 #include "odu_common_codec.h"
 #include "du_sys_info_hdl.h"
+#include "du_f1ap_conversions.h"
 
 void FreeSib1Msg(SIB1_t *sib1Msg);
 uint8_t FreqInfoUlret = RFAILED;
@@ -1309,8 +1312,8 @@ uint8_t fillFirstPdcchMonitoringOcc(struct PCCH_Config__firstPDCCH_MonitoringOcc
 
    firstPO->present = srcPcchCfg->firstPDCCHMontioringType;
 
-   GET_NUM_PAGING_OCC(srcPcchCfg->ns, numPO);
-   if(srcPcchCfg->ns == 0)
+   numPO = srcPcchCfg->ns;
+   if(numPO == 0)
    {
       DU_LOG("\nINFO   -->  DU APP : Paging Occasions is ZERO, no need to fill further");
       return ROK;
@@ -1441,7 +1444,7 @@ uint8_t BuildPcchConfig(PCCH_Config_t *pcchCfg)
 
    duPcchCfg = duCfgParam.sib1Params.srvCellCfgCommSib.dlCfg.pcchCfg;
 
-   pcchCfg->defaultPagingCycle = duPcchCfg.dfltPagingCycle;
+   pcchCfg->defaultPagingCycle = convertPagingCycleValueToEnum(duPcchCfg.dfltPagingCycle);
    pcchCfg->nAndPagingFrameOffset.present =  duPcchCfg.nAndPagingFrmOffsetType;
    switch(pcchCfg->nAndPagingFrameOffset.present)
    {
@@ -1507,7 +1510,7 @@ uint8_t BuildPcchConfig(PCCH_Config_t *pcchCfg)
             return RFAILED;
          }
    }
-   pcchCfg->ns = duPcchCfg.ns;
+   pcchCfg->ns = convertNsValueToEnum(duPcchCfg.ns);
 
    DU_ALLOC(pcchCfg->firstPDCCH_MonitoringOccasionOfPO, \
          sizeof(struct PCCH_Config__firstPDCCH_MonitoringOccasionOfPO));