Code Review / o-du / l2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | compact (merge: 66f88e5 95d4c22)
Merge "[Epic-ID: ODUHIGH-518] Alignment to latest ORAN WG8 Spec: O-RAN.WG8.AAD.0...
authorSangeeta Vaidhyanathan <svaidhya@radisys.com>
Wed, 9 Aug 2023 06:48:43 +0000 (06:48 +0000)
committerGerrit Code Review <gerrit@o-ran-sc.org>
Wed, 9 Aug 2023 06:48:43 +0000 (06:48 +0000)
1  2 
src/du_app/du_cfg.c patch | diff1 | diff2 | blob | history
src/du_app/du_cfg.h patch | diff1 | diff2 | blob | history

diff --combined src/du_app/du_cfg.c
index 56197b6,5c3059c..44608b8
--- 1/src/du_app/du_cfg.c
--- 2/src/du_app/du_cfg.c
+++ b/src/du_app/du_cfg.c
@@@ -130,7 -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;
@@@ -169,7 -169,7 +169,7 @@@
           }
        }
     }
-    duCfgParam.macCellCfg.cellCfg.numerology = NR_NUMEROLOGY;
+    duCfgParam.macCellCfg.cellCfg.subCarrSpacing = NR_SCS;
     duCfgParam.macCellCfg.cellCfg.dupType    = DUPLEX_MODE;
  
     /* SSB configuration */
@@@ -248,77 -248,77 +248,77 @@@
     }
  
     /* fill Intial DL BWP */
-    duCfgParam.macCellCfg.initialDlBwp.bwp.firstPrb = 0;
-    duCfgParam.macCellCfg.initialDlBwp.bwp.numPrb = TOTAL_PRB_20MHZ_MU0; /* configured to total BW */
-    duCfgParam.macCellCfg.initialDlBwp.bwp.scs = duCfgParam.macCellCfg.ssbCfg.scsCmn;
-    duCfgParam.macCellCfg.initialDlBwp.bwp.cyclicPrefix = NORMAL_CYCLIC_PREFIX;
-    duCfgParam.macCellCfg.initialDlBwp.pdcchCommon.commonSearchSpace.searchSpaceId = SEARCHSPACE_1_INDEX;
-    duCfgParam.macCellCfg.initialDlBwp.pdcchCommon.commonSearchSpace.coresetId = CORESET_0_INDEX;
-    duCfgParam.macCellCfg.initialDlBwp.pdcchCommon.commonSearchSpace.monitoringSlot =
+    duCfgParam.macCellCfg.cellCfg.initialDlBwp.bwp.firstPrb = 0;
+    duCfgParam.macCellCfg.cellCfg.initialDlBwp.bwp.numPrb = TOTAL_PRB_20MHZ_MU0; /* configured to total BW */
+    duCfgParam.macCellCfg.cellCfg.initialDlBwp.bwp.scs = duCfgParam.macCellCfg.ssbCfg.scsCmn;
+    duCfgParam.macCellCfg.cellCfg.initialDlBwp.bwp.cyclicPrefix = NORMAL_CYCLIC_PREFIX;
+    duCfgParam.macCellCfg.cellCfg.initialDlBwp.pdcchCommon.commonSearchSpace.searchSpaceId = SEARCHSPACE_1_INDEX;
+    duCfgParam.macCellCfg.cellCfg.initialDlBwp.pdcchCommon.commonSearchSpace.coresetId = CORESET_0_INDEX;
+    duCfgParam.macCellCfg.cellCfg.initialDlBwp.pdcchCommon.commonSearchSpace.monitoringSlot =
        SS_MONITORING_SLOT_SL1; /* sl1 - all slots */
-    duCfgParam.macCellCfg.initialDlBwp.pdcchCommon.commonSearchSpace.duration = 0;
-    duCfgParam.macCellCfg.initialDlBwp.pdcchCommon.commonSearchSpace.monitoringSymbol =
+    duCfgParam.macCellCfg.cellCfg.initialDlBwp.pdcchCommon.commonSearchSpace.duration = 0;
+    duCfgParam.macCellCfg.cellCfg.initialDlBwp.pdcchCommon.commonSearchSpace.monitoringSymbol =
        SS_MONITORING_SYMBOL;
-    duCfgParam.macCellCfg.initialDlBwp.pdcchCommon.commonSearchSpace.
+    duCfgParam.macCellCfg.cellCfg.initialDlBwp.pdcchCommon.commonSearchSpace.
        candidate.aggLevel1     = 8;
-    duCfgParam.macCellCfg.initialDlBwp.pdcchCommon.commonSearchSpace.
+    duCfgParam.macCellCfg.cellCfg.initialDlBwp.pdcchCommon.commonSearchSpace.
        candidate.aggLevel2     = 4;
-    duCfgParam.macCellCfg.initialDlBwp.pdcchCommon.commonSearchSpace.
+    duCfgParam.macCellCfg.cellCfg.initialDlBwp.pdcchCommon.commonSearchSpace.
        candidate.aggLevel4     = 2;
-    duCfgParam.macCellCfg.initialDlBwp.pdcchCommon.commonSearchSpace.
+    duCfgParam.macCellCfg.cellCfg.initialDlBwp.pdcchCommon.commonSearchSpace.
        candidate.aggLevel8     = 1;
-    duCfgParam.macCellCfg.initialDlBwp.pdcchCommon.commonSearchSpace.
+    duCfgParam.macCellCfg.cellCfg.initialDlBwp.pdcchCommon.commonSearchSpace.
        candidate.aggLevel16    = 0;
  
-    duCfgParam.macCellCfg.initialDlBwp.pdschCommon.numTimeDomAlloc = NUM_TIME_DOM_RSRC_ALLOC;
+    duCfgParam.macCellCfg.cellCfg.initialDlBwp.pdschCommon.numTimeDomAlloc = NUM_TIME_DOM_RSRC_ALLOC;
     idx = 0;
-    duCfgParam.macCellCfg.initialDlBwp.pdschCommon.timeDomRsrcAllocList[idx].k0 = PDSCH_K0_CFG1;
-    duCfgParam.macCellCfg.initialDlBwp.pdschCommon.timeDomRsrcAllocList[idx].mappingType = 
+    duCfgParam.macCellCfg.cellCfg.initialDlBwp.pdschCommon.timeDomRsrcAllocList[idx].k0 = PDSCH_K0_CFG1;
+    duCfgParam.macCellCfg.cellCfg.initialDlBwp.pdschCommon.timeDomRsrcAllocList[idx].mappingType = 
        PDSCH_MAPPING_TYPE_A;
-    duCfgParam.macCellCfg.initialDlBwp.pdschCommon.timeDomRsrcAllocList[idx].startSymbol = 
+    duCfgParam.macCellCfg.cellCfg.initialDlBwp.pdschCommon.timeDomRsrcAllocList[idx].startSymbol = 
        PDSCH_START_SYMBOL;
-    duCfgParam.macCellCfg.initialDlBwp.pdschCommon.timeDomRsrcAllocList[idx].lengthSymbol =
+    duCfgParam.macCellCfg.cellCfg.initialDlBwp.pdschCommon.timeDomRsrcAllocList[idx].lengthSymbol =
        PDSCH_LENGTH_SYMBOL;
  
     idx++;
-    duCfgParam.macCellCfg.initialDlBwp.pdschCommon.timeDomRsrcAllocList[idx].k0 = PDSCH_K0_CFG2;
-    duCfgParam.macCellCfg.initialDlBwp.pdschCommon.timeDomRsrcAllocList[idx].mappingType = 
+    duCfgParam.macCellCfg.cellCfg.initialDlBwp.pdschCommon.timeDomRsrcAllocList[idx].k0 = PDSCH_K0_CFG2;
+    duCfgParam.macCellCfg.cellCfg.initialDlBwp.pdschCommon.timeDomRsrcAllocList[idx].mappingType = 
        PDSCH_MAPPING_TYPE_A;
-    duCfgParam.macCellCfg.initialDlBwp.pdschCommon.timeDomRsrcAllocList[idx].startSymbol = 
+    duCfgParam.macCellCfg.cellCfg.initialDlBwp.pdschCommon.timeDomRsrcAllocList[idx].startSymbol = 
        PDSCH_START_SYMBOL;
-    duCfgParam.macCellCfg.initialDlBwp.pdschCommon.timeDomRsrcAllocList[idx].lengthSymbol =
+    duCfgParam.macCellCfg.cellCfg.initialDlBwp.pdschCommon.timeDomRsrcAllocList[idx].lengthSymbol =
        PDSCH_LENGTH_SYMBOL;
  
     /* ra-searchSpace ID is set to 1 */
-    duCfgParam.macCellCfg.initialDlBwp.pdcchCommon.raSearchSpaceId = SEARCHSPACE_1_INDEX;
+    duCfgParam.macCellCfg.cellCfg.initialDlBwp.pdcchCommon.raSearchSpaceId = SEARCHSPACE_1_INDEX;
  
     /* fill Intial UL BWP */
-    duCfgParam.macCellCfg.initialUlBwp.bwp.firstPrb = 0;
-    duCfgParam.macCellCfg.initialUlBwp.bwp.numPrb = TOTAL_PRB_20MHZ_MU0; /* configured to total BW */
-    duCfgParam.macCellCfg.initialUlBwp.bwp.scs = duCfgParam.macCellCfg.ssbCfg.scsCmn;
-    duCfgParam.macCellCfg.initialUlBwp.bwp.cyclicPrefix = NORMAL_CYCLIC_PREFIX;
-    duCfgParam.macCellCfg.initialUlBwp.puschCommon.numTimeDomRsrcAlloc = 2;
-    duCfgParam.macCellCfg.initialUlBwp.puschCommon.timeDomRsrcAllocList[0].k2 = PUSCH_K2_CFG1;
-    duCfgParam.macCellCfg.initialUlBwp.puschCommon.timeDomRsrcAllocList[0].mappingType = 
+    duCfgParam.macCellCfg.cellCfg.initialUlBwp.bwp.firstPrb = 0;
+    duCfgParam.macCellCfg.cellCfg.initialUlBwp.bwp.numPrb = TOTAL_PRB_20MHZ_MU0; /* configured to total BW */
+    duCfgParam.macCellCfg.cellCfg.initialUlBwp.bwp.scs = duCfgParam.macCellCfg.ssbCfg.scsCmn;
+    duCfgParam.macCellCfg.cellCfg.initialUlBwp.bwp.cyclicPrefix = NORMAL_CYCLIC_PREFIX;
+    duCfgParam.macCellCfg.cellCfg.initialUlBwp.puschCommon.numTimeDomRsrcAlloc = 2;
+    duCfgParam.macCellCfg.cellCfg.initialUlBwp.puschCommon.timeDomRsrcAllocList[0].k2 = PUSCH_K2_CFG1;
+    duCfgParam.macCellCfg.cellCfg.initialUlBwp.puschCommon.timeDomRsrcAllocList[0].mappingType = 
        PUSCH_MAPPING_TYPE_A;
-    duCfgParam.macCellCfg.initialUlBwp.puschCommon.timeDomRsrcAllocList[0].startSymbol = 
+    duCfgParam.macCellCfg.cellCfg.initialUlBwp.puschCommon.timeDomRsrcAllocList[0].startSymbol = 
        PUSCH_START_SYMBOL;
-    duCfgParam.macCellCfg.initialUlBwp.puschCommon.timeDomRsrcAllocList[0].symbolLength =
+    duCfgParam.macCellCfg.cellCfg.initialUlBwp.puschCommon.timeDomRsrcAllocList[0].symbolLength =
        PUSCH_LENGTH_SYMBOL;
  
-    duCfgParam.macCellCfg.initialUlBwp.puschCommon.timeDomRsrcAllocList[1].k2 = PUSCH_K2_CFG2;
-    duCfgParam.macCellCfg.initialUlBwp.puschCommon.timeDomRsrcAllocList[1].mappingType = 
+    duCfgParam.macCellCfg.cellCfg.initialUlBwp.puschCommon.timeDomRsrcAllocList[1].k2 = PUSCH_K2_CFG2;
+    duCfgParam.macCellCfg.cellCfg.initialUlBwp.puschCommon.timeDomRsrcAllocList[1].mappingType = 
        PUSCH_MAPPING_TYPE_A;
-    duCfgParam.macCellCfg.initialUlBwp.puschCommon.timeDomRsrcAllocList[1].startSymbol = 
+    duCfgParam.macCellCfg.cellCfg.initialUlBwp.puschCommon.timeDomRsrcAllocList[1].startSymbol = 
        PUSCH_START_SYMBOL;
-    duCfgParam.macCellCfg.initialUlBwp.puschCommon.timeDomRsrcAllocList[1].symbolLength =
+    duCfgParam.macCellCfg.cellCfg.initialUlBwp.puschCommon.timeDomRsrcAllocList[1].symbolLength =
        PUSCH_LENGTH_SYMBOL;
  
     duCfgParam.macCellCfg.ssbCfg.dmrsTypeAPos = DMRS_TYPE_A_POS; 
  
     /* fill PUCCH config common */
-    duCfgParam.macCellCfg.initialUlBwp.pucchCommon.pucchResourceCommon = PUCCH_RSRC_COMMON;
-    duCfgParam.macCellCfg.initialUlBwp.pucchCommon.pucchGroupHopping = PUCCH_GROUP_HOPPING;
+    duCfgParam.macCellCfg.cellCfg.initialUlBwp.pucchCommon.pucchResourceCommon = PUCCH_RSRC_COMMON;
+    duCfgParam.macCellCfg.cellCfg.initialUlBwp.pucchCommon.pucchGroupHopping = PUCCH_GROUP_HOPPING;
  
  
  #ifndef O1_ENABLE
@@@ -595,19 -595,15 +595,19 @@@ uint8_t fillServCellCfgCommSib(SrvCellC
  
  uint8_t readCfg()
  {
 -   uint8_t srvdCellIdx, bandIdx, sliceIdx, plmnIdx;
 +   CmLList *node;
 +   uint8_t srvdCellIdx, bandIdx, sliceIdx, plmnIdx, ranFuncIdx, eventTriggerStyleIdx, reportStyleIdx, tnlAssocIdx;
     uint8_t brdcstPlmnIdx, freqBandIdx, srvdPlmnIdx;
     uint32_t ipv4_du, ipv4_cu, ipv4_ric;
     MibParams mib;
     Sib1Params sib1;
     F1TaiSliceSuppLst *taiSliceSuppLst;
 -
 -   duCb.e2apDb.e2TransInfo.transIdCounter = 0;
 -   memset(duCb.e2apDb.e2TransInfo.onGoingTransaction, 0, MAX_NUM_TRANSACTION * sizeof(E2TransInfo));
 +   uint8_t MeasurementInfoIdx =0, measurementInfoLen=0;
 +   char shortName[] = SHORT_NAME;
 +   char serviceModelOID[]= SERVICE_MODEL_OID;
 +   char  description[] = DESCRIPTION;
 +   char event_trigger_style_name[]= EVENT_TRIGGER_STYLE_NAME;
 +   char ric_report_style_name[]= REPORT_STYLE_NAME;
  
  #ifndef O1_ENABLE
     /* Note: Added these below variable for local testing*/
@@@ -667,74 -663,6 +667,74 @@@
     }
     strcpy((char*)duCfgParam.duName,DU_NAME);
  
 +   memset(&duCb.e2apDb, 0, sizeof(E2apDb));
 +   duCb.e2apDb.e2NodeId =  DU_ID;
 +   duCb.e2apDb.e2TransInfo.transIdCounter = 0;
 +
 +   duCb.e2apDb.numOfTNLAssoc = 1;
 +   for(tnlAssocIdx =0; tnlAssocIdx<duCb.e2apDb.numOfTNLAssoc; tnlAssocIdx++)
 +   {
 +      duCb.e2apDb.tnlAssoc[tnlAssocIdx].localIpAddress.ipV4Pres = duCfgParam.sctpParams.duIpAddr.ipV4Pres;
 +      duCb.e2apDb.tnlAssoc[tnlAssocIdx].localIpAddress.ipV4Addr = duCfgParam.sctpParams.duIpAddr.ipV4Addr;
 +      duCb.e2apDb.tnlAssoc[tnlAssocIdx].localPort = duCfgParam.sctpParams.duPort[E2_INTERFACE];
 +      duCb.e2apDb.tnlAssoc[tnlAssocIdx].destIpAddress.ipV4Pres = duCfgParam.sctpParams.ricIpAddr.ipV4Pres;
 +      duCb.e2apDb.tnlAssoc[tnlAssocIdx].destIpAddress.ipV4Addr = duCfgParam.sctpParams.ricIpAddr.ipV4Addr;
 +      duCb.e2apDb.tnlAssoc[tnlAssocIdx].destPort = duCfgParam.sctpParams.ricPort;
 +      duCb.e2apDb.tnlAssoc[tnlAssocIdx].usage = BOTH_FUNCTIONALITY;
 +   }
 +   duCb.e2apDb.numOfRanFunction = 1;
 +   for(ranFuncIdx =0; ranFuncIdx<duCb.e2apDb.numOfRanFunction; ranFuncIdx++)
 +   {
 +      duCb.e2apDb.ranFunction[ranFuncIdx].id = ranFuncIdx + 1;
 +      memcpy(&duCb.e2apDb.ranFunction[ranFuncIdx].name.shortName, shortName, sizeof(shortName));
 +      memcpy(&duCb.e2apDb.ranFunction[ranFuncIdx].name.serviceModelOID, serviceModelOID, sizeof(serviceModelOID));
 +      memcpy(&duCb.e2apDb.ranFunction[ranFuncIdx].name.description, description, sizeof(description));
 +      duCb.e2apDb.ranFunction[ranFuncIdx].revisionCounter = 0;
 +      
 +      duCb.e2apDb.ranFunction[ranFuncIdx].numOfEventTriggerStyleSupported  = NUM_OF_EVENT_TRIGGER_STYLE_SUPPORTED;
 +      for(eventTriggerStyleIdx=0; eventTriggerStyleIdx<duCb.e2apDb.ranFunction[ranFuncIdx].numOfEventTriggerStyleSupported; eventTriggerStyleIdx++)
 +      {
 +         duCb.e2apDb.ranFunction[ranFuncIdx].eventTriggerStyleList[eventTriggerStyleIdx].styleType = EVENT_TRIGGER_STYLE_TYPE;
 +         duCb.e2apDb.ranFunction[ranFuncIdx].eventTriggerStyleList[eventTriggerStyleIdx].formatType = EVENT_TRIGGER_STYLE_FORMAT_TYPE;
 +         memcpy(duCb.e2apDb.ranFunction[ranFuncIdx].eventTriggerStyleList[eventTriggerStyleIdx].name, event_trigger_style_name, sizeof(event_trigger_style_name));
 +      }
 +      
 +      duCb.e2apDb.ranFunction[ranFuncIdx].numOfReportStyleSupported= NUM_OF_RIC_REPORT_STYLE_SUPPORTED;
 +      for(reportStyleIdx=0; reportStyleIdx<duCb.e2apDb.ranFunction[ranFuncIdx].numOfReportStyleSupported; reportStyleIdx++)
 +      {
 +         duCb.e2apDb.ranFunction[ranFuncIdx].reportStyleList[reportStyleIdx].reportStyle.styleType = REPORT_STYLE_TYPE;
 +         duCb.e2apDb.ranFunction[ranFuncIdx].reportStyleList[reportStyleIdx].reportStyle.formatType = REPORT_ACTION_FORMAT_TYPE;
 +         memcpy(duCb.e2apDb.ranFunction[ranFuncIdx].reportStyleList[reportStyleIdx].reportStyle.name, ric_report_style_name, sizeof(ric_report_style_name));
 +         
 +         for(MeasurementInfoIdx =0; MeasurementInfoIdx<NUM_OF_MEASUREMENT_INFO_SUPPORTED; MeasurementInfoIdx++)
 +         {
 +            measurementInfoLen= strlen(MEASUREMENT_TYPE_NAME[MeasurementInfoIdx]);
 +            MeasurementInfoForAction *measurementInfoForAction;
 +            DU_ALLOC(measurementInfoForAction, sizeof(MeasurementInfoForAction));
 +            if(measurementInfoForAction)
 +            {
 +               measurementInfoForAction->measurementTypeId = MeasurementInfoIdx+1;
 +               memcpy(measurementInfoForAction->measurementTypeName, MEASUREMENT_TYPE_NAME[MeasurementInfoIdx], measurementInfoLen+1);
 +            }
 +            DU_ALLOC(node, sizeof(CmLList));
 +            if(node)
 +            {
 +               node->node = (PTR) measurementInfoForAction;
 +               cmLListAdd2Tail(&duCb.e2apDb.ranFunction[ranFuncIdx].reportStyleList[reportStyleIdx].measurementInfoList, node);
 +            }
 +            else
 +            {
 +
 +               DU_FREE(measurementInfoForAction, sizeof(MeasurementInfoForAction));
 +            }
 +         }
 +      }
 +      
 +      duCb.e2apDb.ranFunction[ranFuncIdx].ricIndicationHeaderFormat = RIC_INDICATION_HEADER_FORMAT;
 +      duCb.e2apDb.ranFunction[ranFuncIdx].ricIndicationMessageFormat = RIC_INDICATION_MESSAGE_FORMAT; 
 +   }
 +   memset(duCb.e2apDb.e2TransInfo.onGoingTransaction, 0, MAX_NUM_TRANSACTION * sizeof(E2TransInfo));
 +   
     /* Mib Params */
     mib.sysFrmNum = SYS_FRAME_NUM;
  #ifdef NR_TDD
@@@ -880,7 -808,7 +880,7 @@@
  #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;
@@@ -903,12 -831,12 +903,12 @@@
  #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;
@@@ -1161,7 -1089,7 +1161,7 @@@ uint8_t duReadCfg(
     pst.pool= DU_POOL;
  
     /* Initialize the timer blocks */
 -   cmInitTimers(&(duCb.e2apDb.e2Timers.e2SetupTimer), 1);
 +   cmInitTimers(&(duCb.e2apDb.e2TimersInfo.e2Timers.e2SetupTimer), 1);
  
     /* Initialzie the timer queue */   
     memset(&(duCb.duTimersInfo.tmrTq), 0, sizeof(CmTqType) * DU_TQ_SIZE);
diff --combined src/du_app/du_cfg.h
index 316a1e7,3b0a0d4..aae8b12
--- 1/src/du_app/du_cfg.h
--- 2/src/du_app/du_cfg.h
+++ b/src/du_app/du_cfg.h
@@@ -46,7 -46,6 +46,6 @@@
  //TODO: while testing for TDD, Mu1 and 100 MHz, this flag must be enabled
  #ifdef NR_TDD
  #define DUPLEX_MODE DUP_MODE_TDD
- #define NR_NUMEROLOGY 1
  #define NR_DL_ARFCN 623400
  #define NR_UL_ARFCN 623400
  #define NR_FREQ_BAND 78
@@@ -54,7 -53,6 +53,6 @@@
  #define NR_BANDWIDTH BANDWIDTH_100MHZ
  #else
  #define DUPLEX_MODE DUP_MODE_FDD
- #define NR_NUMEROLOGY 0
  #define NR_DL_ARFCN 428000
  #define NR_UL_ARFCN 390000
  #define NR_FREQ_BAND 1
@@@ -1262,6 -1260,15 +1260,6 @@@ typedef struct duCfgParam
     MacSliceCfgReq     tempSliceCfg;
  }DuCfgParams;
  
 -typedef struct f1SetupMsg
 -{
 -   uint8_t f1MsgReqBufSize;
 -   char    *f1MsgReqBuf; 
 -   uint8_t f1MsgRspBufSize;
 -   char    *f1MsgRspBuf;
 -}F1SetupMsg;
 -
 -
  #ifndef O1_ENABLE
  //RRM POLICY STRUCT
  
O-RAN DU Layer 2