[task-ID: ODUHIGH-524] Cell configuration Fixes with respect to O1

Change-Id: I989cfaf457a8d5d0ca0c982092e89089db473ec2
Signed-off-by: lal.harshita <Harshita.Lal@radisys.com>

diff --git a/build/config/cellConfig.xml b/build/config/cellConfig.xml
index 8963f54..cace81a 100644 (file)
--- a/build/config/cellConfig.xml
+++ b/build/config/cellConfig.xml
@@ -56,7 +56,7 @@
          <sst>1</sst>\r
        </pLMNInfoList>\r
        <nRPCI>1</nRPCI>\r
-       <ssbFrequency>1</ssbFrequency>\r
+       <ssbFrequency>3000000</ssbFrequency>\r
        <ssbPeriodicity>20</ssbPeriodicity>\r
        <ssbSubCarrierSpacing>15</ssbSubCarrierSpacing>\r
        <ssbOffset>0</ssbOffset>\r
@@ -66,7 +66,7 @@
        <nRTAC>1</nRTAC>\r
        <arfcnDL>428000</arfcnDL>\r
        <arfcnUL>390000</arfcnUL>\r
-       <arfcnSUL>200</arfcnSUL>\r
+       <arfcnSUL>100</arfcnSUL>\r
        <bSChannelBwDL>20</bSChannelBwDL>\r
        <bSChannelBwUL>20</bSChannelBwUL>\r
        <bSChannelBwSUL>14</bSChannelBwSUL>\r

diff --git a/src/du_app/du_cfg.c b/src/du_app/du_cfg.c
index 4c7a1c5..f48ffab 100644 (file)
--- a/src/du_app/du_cfg.c
+++ b/src/du_app/du_cfg.c
@@ -130,7 +130,7 @@ uint8_t readMacCfg()
    duCfgParam.macCellCfg.cellCfg.cellState  = cellParams.cellState;
    duCfgParam.macCellCfg.cellCfg.phyCellId  = cellParams.nRPCI;
    duCfgParam.macCellCfg.cellCfg.tac        = cellParams.nRTAC;
-   duCfgParam.macCellCfg.cellCfg.ssbFreq    = convertArfcnToFreqKhz(cellParams.ssbFrequency);
+   duCfgParam.macCellCfg.cellCfg.ssbFreq    = cellParams.ssbFrequency;
 #else
    duCfgParam.macCellCfg.cellCfg.opState    = OP_DISABLED; 
    duCfgParam.macCellCfg.cellCfg.adminState = ADMIN_UNLOCKED;
@@ -808,7 +808,7 @@ uint8_t readCfg()
 #ifdef O1_ENABLE      
       duCfgParam.srvdCellLst[srvdCellIdx].duCellInfo.f1Mode.mode.tdd.nrFreqInfo.nrArfcn = cellParams.arfcnUL;
       duCfgParam.srvdCellLst[srvdCellIdx].duCellInfo.f1Mode.mode.tdd.nrFreqInfo.sulInfo.sulArfcn = cellParams.arfcnSUL;
-      duCfgParam.srvdCellLst[srvdCellIdx].duCellInfo.f1Mode.mode.tdd.nrFreqInfo.sulInfo.sulTxBw.nrScs = cellParams.ssbSubCarrierSpacing;               
+      duCfgParam.srvdCellLst[srvdCellIdx].duCellInfo.f1Mode.mode.tdd.nrFreqInfo.sulInfo.sulTxBw.nrScs = convertScsValToScsEnum(cellParams.ssbSubCarrierSpacing);               
 #else
       duCfgParam.srvdCellLst[srvdCellIdx].duCellInfo.f1Mode.mode.tdd.nrFreqInfo.nrArfcn = NR_UL_ARFCN;
       duCfgParam.srvdCellLst[srvdCellIdx].duCellInfo.f1Mode.mode.tdd.nrFreqInfo.sulInfo.sulArfcn = SUL_ARFCN;
@@ -831,12 +831,12 @@ uint8_t readCfg()
 #ifdef O1_ENABLE
       duCfgParam.srvdCellLst[srvdCellIdx].duCellInfo.f1Mode.mode.fdd.ulNrFreqInfo.nrArfcn = cellParams.arfcnUL;
       duCfgParam.srvdCellLst[srvdCellIdx].duCellInfo.f1Mode.mode.fdd.ulNrFreqInfo.sulInfo.sulArfcn = cellParams.arfcnSUL;
-      duCfgParam.srvdCellLst[srvdCellIdx].duCellInfo.f1Mode.mode.fdd.ulTxBw.nrScs = cellParams.ssbSubCarrierSpacing;
-      duCfgParam.srvdCellLst[srvdCellIdx].duCellInfo.f1Mode.mode.fdd.ulNrFreqInfo.sulInfo.sulTxBw.nrScs = cellParams.ssbSubCarrierSpacing;
+      duCfgParam.srvdCellLst[srvdCellIdx].duCellInfo.f1Mode.mode.fdd.ulTxBw.nrScs = convertScsValToScsEnum(cellParams.ssbSubCarrierSpacing);
+      duCfgParam.srvdCellLst[srvdCellIdx].duCellInfo.f1Mode.mode.fdd.ulNrFreqInfo.sulInfo.sulTxBw.nrScs = convertScsValToScsEnum(cellParams.ssbSubCarrierSpacing);
       duCfgParam.srvdCellLst[srvdCellIdx].duCellInfo.f1Mode.mode.fdd.dlNrFreqInfo.nrArfcn = cellParams.arfcnDL;
       duCfgParam.srvdCellLst[srvdCellIdx].duCellInfo.f1Mode.mode.fdd.dlNrFreqInfo.sulInfo.sulArfcn = cellParams.arfcnSUL;
-      duCfgParam.srvdCellLst[srvdCellIdx].duCellInfo.f1Mode.mode.fdd.dlNrFreqInfo.sulInfo.sulTxBw.nrScs = cellParams.ssbSubCarrierSpacing;
-      duCfgParam.srvdCellLst[srvdCellIdx].duCellInfo.f1Mode.mode.fdd.dlTxBw.nrScs = cellParams.ssbSubCarrierSpacing;
+      duCfgParam.srvdCellLst[srvdCellIdx].duCellInfo.f1Mode.mode.fdd.dlNrFreqInfo.sulInfo.sulTxBw.nrScs = convertScsValToScsEnum(cellParams.ssbSubCarrierSpacing);
+      duCfgParam.srvdCellLst[srvdCellIdx].duCellInfo.f1Mode.mode.fdd.dlTxBw.nrScs = convertScsValToScsEnum(cellParams.ssbSubCarrierSpacing);
 #else
       duCfgParam.srvdCellLst[srvdCellIdx].duCellInfo.f1Mode.mode.fdd.ulNrFreqInfo.nrArfcn = NR_UL_ARFCN;
       duCfgParam.srvdCellLst[srvdCellIdx].duCellInfo.f1Mode.mode.fdd.ulNrFreqInfo.sulInfo.sulArfcn = SUL_ARFCN;