Replaced old SSI function with new macros jira id - ODUHIGH-212

[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 90f4203..0fb3fe4 100644 (file)
--- a/src/du_app/du_sys_info_hdl.c
+++ b/src/du_app/du_sys_info_hdl.c
@@ -17,9 +17,14 @@
 *******************************************************************************/
 
 /* This file contains ASN codec for MIB and SIB1 msgs */
-
-#include "du_mgr.h"
-#include "du_log.h"
+#include "common_def.h"
+#include "lrg.h"
+#include "lkw.x"
+#include "lrg.x"
+#include "legtp.h"
+#include "du_app_mac_inf.h"
+#include "du_cfg.h"
+#include "du_utils.h"
 #include "BCCH-BCH-Message.h"
 #include "MIB.h"
 #include "PLMN-IdentityInfo.h"
@@ -48,7 +53,9 @@
 #include "ServingCellConfigCommonSIB.h"
 #include "MCC.h"
 #include "SIB1.h"
+#include "odu_common_codec.h"
 #include "du_sys_info_hdl.h"
+
 void FreeSib1Msg(SIB1_t *sib1Msg);
 uint8_t FreqInfoUlret = RFAILED;
 uint8_t RachCfgCommonret = RFAILED;
@@ -57,6 +64,7 @@ uint8_t UlCfgCommSibret = RFAILED;
 uint8_t FreqInfoDlret = RFAILED;
 uint8_t DlCfgCommSibret = RFAILED;
 uint8_t CommonSerachSpaceListret = RFAILED;
+
 /*******************************************************************
  *
  * @brief Builds MIB
@@ -166,7 +174,7 @@ uint8_t BuildMibPdu()
        uint8_t ret = RFAILED;
        BCCH_BCH_Message_t *bcchMsg;
        asn_enc_rval_t encRetVal;        /* Encoder return value */
-   while(1)
+   while(true)
        {
        DU_ALLOC(bcchMsg, sizeof(BCCH_BCH_Message_t));
        if(!bcchMsg)
@@ -188,7 +196,7 @@ uint8_t BuildMibPdu()
                     break;
                 }
            xer_fprint(stdout, &asn_DEF_BCCH_BCH_Message, bcchMsg);
-           cmMemset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN);
+           memset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN);
            encBufSize = 0;
            encRetVal = aper_encode(&asn_DEF_BCCH_BCH_Message, 0,
                                   bcchMsg, PrepFinalEncBuf, encBuf);
@@ -270,7 +278,7 @@ uint8_t BuildMibMsg()
        asn_enc_rval_t encRetVal;        /* Encoder return value */
    uint8_t ret = RFAILED;
        uint8_t BuildMibret;
-   while(1)
+   while(true)
        {
            DU_ALLOC(mibMsg, sizeof(MIB_t));
            if(!mibMsg)
@@ -284,7 +292,7 @@ uint8_t BuildMibMsg()
                    break;
                 }
            xer_fprint(stdout, &asn_DEF_MIB, mibMsg);
-           cmMemset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN);
+           memset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN);
            encBufSize = 0;
            encRetVal = aper_encode(&asn_DEF_MIB, 0,
                                   mibMsg, PrepFinalEncBuf, encBuf);
@@ -2175,7 +2183,34 @@ uint8_t BuildServCellCfgCommonSib(ServingCellConfigCommonSIB_t *srvCellCfg)
    ssbPosInBurst->buf[0] = duSrvCellCfg.ssbPosInBurst;  
    ssbPosInBurst->bits_unused = 0;
 
-   srvCellCfg->ssb_PeriodicityServingCell = duSrvCellCfg.ssbPrdServingCell;
+       switch(duSrvCellCfg.ssbPrdServingCell)
+       {
+          case SSB_PERIODICITY_5MS:
+                  srvCellCfg->ssb_PeriodicityServingCell = \
+                          ServingCellConfigCommonSIB__ssb_PeriodicityServingCell_ms5;
+                       break;
+          case SSB_PERIODICITY_10MS:
+                  srvCellCfg->ssb_PeriodicityServingCell = \
+                          ServingCellConfigCommonSIB__ssb_PeriodicityServingCell_ms10;
+                       break;
+               case SSB_PERIODICITY_20MS:
+                  srvCellCfg->ssb_PeriodicityServingCell = \
+                          ServingCellConfigCommonSIB__ssb_PeriodicityServingCell_ms20;
+                       break;
+               case SSB_PERIODICITY_40MS:
+                  srvCellCfg->ssb_PeriodicityServingCell = \
+                          ServingCellConfigCommonSIB__ssb_PeriodicityServingCell_ms40;
+                       break;
+               case SSB_PERIODICITY_80MS:
+                  srvCellCfg->ssb_PeriodicityServingCell = \
+                          ServingCellConfigCommonSIB__ssb_PeriodicityServingCell_ms80;
+                       break;
+               case SSB_PERIODICITY_160MS:
+                  srvCellCfg->ssb_PeriodicityServingCell = \
+                          ServingCellConfigCommonSIB__ssb_PeriodicityServingCell_ms160;
+                       break;
+       }
+
    srvCellCfg->ss_PBCH_BlockPower = duSrvCellCfg.ssPbchBlockPwr;
 
    /* Downlink config common */
@@ -2307,7 +2342,7 @@ uint8_t BuildSib1Msg()
        xer_fprint(stdout, &asn_DEF_SIB1, sib1Msg);
 
            /* Encode the F1SetupRequest type as APER */
-           cmMemset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN);
+           memset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN);
            encBufSize = 0;
            encRetVal = aper_encode(&asn_DEF_SIB1, 0, sib1Msg, PrepFinalEncBuf,\
                        encBuf);
@@ -2328,7 +2363,7 @@ uint8_t BuildSib1Msg()
        
                 ret = ROK;
        break; 
-   }while(1);
+   }while(true);
 
        FreeSib1Msg(sib1Msg);