X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fdu_app%2Fdu_cfg.c;h=ac754e4a85ea9481b55703ece617a26e8a842054;hb=62605166db94fd7d52f32de84dea8c7006e0f4c5;hp=d2c758c15b9e50f737e6428f3cd560cbc26729ad;hpb=cad4905437d02b16c3916903a42f501eb8f7b1ac;p=o-du%2Fl2.git diff --git a/src/du_app/du_cfg.c b/src/du_app/du_cfg.c index d2c758c15..ac754e4a8 100644 --- a/src/du_app/du_cfg.c +++ b/src/du_app/du_cfg.c @@ -52,6 +52,11 @@ #include "BWP-DownlinkCommon.h" #include "BWP-UplinkCommon.h" +#ifdef O1_ENABLE +#include "ConfigInterface.h" +extern StartupConfig g_cfg; +#endif + DuCfgParams duCfgParam; char encBuf[ENC_BUF_MAX_LEN]; @@ -61,10 +66,16 @@ char encBuf[ENC_BUF_MAX_LEN]; * 0 DL DL DL DL DL DL DL DL DL DL DL DL DL DL * 1 DL DL DL DL DL DL DL DL DL DL DL DL DL DL * 2 DL DL DL DL DL DL DL DL DL DL DL DL DL DL - * 3 DL DL DL DL DL DL DL DL DL DL GD GD GD UL - * 4 UL UL UL UL UL UL UL UL UL UL UL UL UL UL + 3 DL DL DL DL DL DL DL DL DL DL DL DL DL DL + 4 DL DL DL DL DL DL DL DL DL DL DL DL DL DL + 5 DL DL DL DL DL DL DL DL DL DL DL DL DL DL + 6 DL DL DL DL DL DL DL DL DL DL DL DL DL DL + 7 DL DL DL DL DL DL DL DL DL DL DL DL F UL + 8 UL UL UL UL UL UL UL UL UL UL UL UL UL UL + 9 UL UL UL UL UL UL UL UL UL UL UL UL UL UL */ +#ifdef NR_TDD /******************************************************************* * * @brief Fills the Slot configuration @@ -82,27 +93,35 @@ char encBuf[ENC_BUF_MAX_LEN]; * ****************************************************************/ void FillSlotConfig() { - uint8_t slot; - uint8_t symbol; - - for(slot = 0; slot <= 3; slot++) + uint8_t slot = 0; + uint8_t symbol =0; + + memset(duCfgParam.macCellCfg.tddCfg.slotCfg, 0, sizeof(duCfgParam.macCellCfg.tddCfg.slotCfg[slot][symbol]* \ + MAX_TDD_PERIODICITY_SLOTS*MAX_SYMB_PER_SLOT)); + + //Filling the DL Slots and initializing flexi slot + for(slot = 0; slot <= NUM_DL_SLOTS; slot++) { - for(symbol = 0; symbol < MAX_SYMB_PER_SLOT; symbol++) + for(symbol =0; symbol < MAX_SYMB_PER_SLOT; symbol++) + { duCfgParam.macCellCfg.tddCfg.slotCfg[slot][symbol] = DL_SLOT; + } } - - duCfgParam.macCellCfg.tddCfg.slotCfg[3][10] = GUARD_SLOT; - duCfgParam.macCellCfg.tddCfg.slotCfg[3][11] = GUARD_SLOT; - duCfgParam.macCellCfg.tddCfg.slotCfg[3][12] = GUARD_SLOT; - duCfgParam.macCellCfg.tddCfg.slotCfg[3][13] = UL_SLOT; - - for(symbol = 0; symbol < MAX_SYMB_PER_SLOT; symbol++) - duCfgParam.macCellCfg.tddCfg.slotCfg[4][symbol] = UL_SLOT; + + //Filling UL Slots + for(slot = NUM_DL_SLOTS+1; slot <= NUM_DL_SLOTS+NUM_UL_SLOTS; slot++) + { + for(symbol = 0; symbol < MAX_SYMB_PER_SLOT; symbol++) + duCfgParam.macCellCfg.tddCfg.slotCfg[slot][symbol] = UL_SLOT; + } + //Updating Flexi Slot + slot = NUM_DL_SLOTS; + duCfgParam.macCellCfg.tddCfg.slotCfg[slot][12] = FLEXI_SLOT; + duCfgParam.macCellCfg.tddCfg.slotCfg[slot][13] = UL_SLOT; } - +#endif /******************************************************************* - * * @brief Reads the CL Configuration. * * @details @@ -123,6 +142,8 @@ void FillSlotConfig() /* This function is used to fill up the cell configuration for CL */ uint8_t readMacCfg() { + uint8_t idx; + duCfgParam.macCellCfg.carrierId = CARRIER_IDX; /* Cell configuration */ @@ -133,7 +154,11 @@ uint8_t readMacCfg() /* DL carrier configuration */ duCfgParam.macCellCfg.dlCarrCfg.pres = TRUE; +#ifdef NR_TDD + duCfgParam.macCellCfg.dlCarrCfg.bw = BANDWIDTH_100MHZ; +#else duCfgParam.macCellCfg.dlCarrCfg.bw = BANDWIDTH_20MHZ; +#endif duCfgParam.macCellCfg.dlCarrCfg.freq = NR_DL_ARFCN; duCfgParam.macCellCfg.dlCarrCfg.k0[0] = 1; duCfgParam.macCellCfg.dlCarrCfg.k0[1] = 1; @@ -149,7 +174,11 @@ uint8_t readMacCfg() /* UL Carrier configuration */ duCfgParam.macCellCfg.ulCarrCfg.pres = TRUE; +#ifdef NR_TDD + duCfgParam.macCellCfg.dlCarrCfg.bw = BANDWIDTH_100MHZ; +#else duCfgParam.macCellCfg.ulCarrCfg.bw = BANDWIDTH_20MHZ; +#endif duCfgParam.macCellCfg.ulCarrCfg.freq = NR_UL_ARFCN; duCfgParam.macCellCfg.ulCarrCfg.k0[0] = 1; duCfgParam.macCellCfg.ulCarrCfg.k0[1] = 1; @@ -168,7 +197,11 @@ uint8_t readMacCfg() /* SSB configuration */ duCfgParam.macCellCfg.ssbCfg.ssbPbchPwr = SSB_PBCH_PWR; duCfgParam.macCellCfg.ssbCfg.bchPayloadFlag = BCH_PAYLOAD; - duCfgParam.macCellCfg.ssbCfg.scsCmn = SUBCARRIER_SPACING; +#ifdef NR_TDD + duCfgParam.macCellCfg.ssbCfg.scsCmn = SCS_30KHZ; +#else + duCfgParam.macCellCfg.ssbCfg.scsCmn = SCS_15KHZ; +#endif duCfgParam.macCellCfg.ssbCfg.ssbOffsetPointA = OFFSET_TO_POINT_A; duCfgParam.macCellCfg.ssbCfg.betaPss = BETA_PSS; duCfgParam.macCellCfg.ssbCfg.ssbPeriod = SSB_PRDCTY_MS_20; @@ -177,7 +210,7 @@ uint8_t readMacCfg() duCfgParam.macCellCfg.ssbCfg.ssbMask[1] = 0; if(BuildMibPdu() != ROK) { - DU_LOG("\nFailed to build MIB PDU"); + DU_LOG("\nERROR --> Failed to build MIB PDU"); memset(&duCfgParam.macCellCfg.ssbCfg.mibPdu, 0, 3*sizeof(uint8_t)); } else @@ -210,7 +243,7 @@ uint8_t readMacCfg() NUM_UNUSED_ROOT_SEQ * sizeof(uint8_t)); if(duCfgParam.macCellCfg.prachCfg.fdm[0].unsuedRootSeq == NULLP) { - DU_LOG("\nDU_APP : Memory allocation failed"); + DU_LOG("\nERROR --> DU_APP : Memory allocation failed at readMacCfg"); return RFAILED; } *(duCfgParam.macCellCfg.prachCfg.fdm[0].unsuedRootSeq) = UNUSED_ROOT_SEQ; @@ -221,12 +254,14 @@ uint8_t readMacCfg() duCfgParam.macCellCfg.prachCfg.rsrpThreshSsb = RSRP_THRESHOLD_SSB; duCfgParam.macCellCfg.prachCfg.raRspWindow = RA_RSP_WINDOW; duCfgParam.macCellCfg.prachCfg.prachRestrictedSet = PRACH_RESTRICTED_SET; +#ifdef NR_TDD /* TDD configuration */ duCfgParam.macCellCfg.tddCfg.pres = TRUE; duCfgParam.macCellCfg.tddCfg.tddPeriod = TDD_PERIODICITY; FillSlotConfig(); +#endif /* RSSI Measurement configuration */ duCfgParam.macCellCfg.rssiUnit = RSS_MEASUREMENT_UNIT; @@ -235,7 +270,6 @@ uint8_t readMacCfg() DU_ALLOC_SHRABL_BUF(duCfgParam.macCellCfg.sib1Cfg.sib1Pdu,duCfgParam.srvdCellLst[0].duSysInfo.sib1Len); memcpy(duCfgParam.macCellCfg.sib1Cfg.sib1Pdu, duCfgParam.srvdCellLst[0].duSysInfo.sib1Msg, \ duCfgParam.srvdCellLst[0].duSysInfo.sib1Len); - duCfgParam.macCellCfg.sib1Cfg.sib1NewTxPeriod = SIB1_NEW_TX_PERIOD; duCfgParam.macCellCfg.sib1Cfg.sib1RepetitionPeriod = SIB1_REPETITION_PERIOD; duCfgParam.macCellCfg.sib1Cfg.coresetZeroIndex = CORESET_0_INDEX; duCfgParam.macCellCfg.sib1Cfg.searchSpaceZeroIndex = SEARCHSPACE_0_INDEX; @@ -245,7 +279,11 @@ uint8_t readMacCfg() /* 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 = SUBCARRIER_SPACING; /* numerology is 0, 15Khz */ +#ifdef NR_TDD + duCfgParam.macCellCfg.initialDlBwp.bwp.scs = SCS_30KHZ; /* numerology is 1, 30Khz */ +#else + duCfgParam.macCellCfg.initialDlBwp.bwp.scs = SCS_15KHZ; /* numerology is 0, 15Khz */ +#endif 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; @@ -264,30 +302,56 @@ uint8_t readMacCfg() candidate.aggLevel8 = 1; duCfgParam.macCellCfg.initialDlBwp.pdcchCommon.commonSearchSpace. candidate.aggLevel16 = 0; - duCfgParam.macCellCfg.initialDlBwp.pdschCommon.k0 = PDSCH_K0; - duCfgParam.macCellCfg.initialDlBwp.pdschCommon.mappingType = + + duCfgParam.macCellCfg.initialDlBwp.pdschCommon.numTimeDomAlloc = 2; + idx = 0; + duCfgParam.macCellCfg.initialDlBwp.pdschCommon.timeDomRsrcAllocList[idx].k0 = PDSCH_K0_CFG1; + duCfgParam.macCellCfg.initialDlBwp.pdschCommon.timeDomRsrcAllocList[idx].mappingType = + PDSCH_MAPPING_TYPE_A; + duCfgParam.macCellCfg.initialDlBwp.pdschCommon.timeDomRsrcAllocList[idx].startSymbol = + PDSCH_START_SYMBOL; + duCfgParam.macCellCfg.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 = PDSCH_MAPPING_TYPE_A; - duCfgParam.macCellCfg.initialDlBwp.pdschCommon.startSymbol = + duCfgParam.macCellCfg.initialDlBwp.pdschCommon.timeDomRsrcAllocList[idx].startSymbol = PDSCH_START_SYMBOL; - duCfgParam.macCellCfg.initialDlBwp.pdschCommon.lengthSymbol = + duCfgParam.macCellCfg.initialDlBwp.pdschCommon.timeDomRsrcAllocList[idx].lengthSymbol = PDSCH_LENGTH_SYMBOL; + /* ra-searchSpace ID is set to 1 */ duCfgParam.macCellCfg.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 = SUBCARRIER_SPACING; /* numerology is 0, 15Khz */ +#ifdef NR_TDD + duCfgParam.macCellCfg.initialUlBwp.bwp.scs = SCS_30KHZ; /* numerology is 1, 30Khz */ +#else + duCfgParam.macCellCfg.initialUlBwp.bwp.scs = SCS_15KHZ; /* numerology is 0, 15Khz */ +#endif duCfgParam.macCellCfg.initialUlBwp.bwp.cyclicPrefix = NORMAL_CYCLIC_PREFIX; - duCfgParam.macCellCfg.initialUlBwp.puschCommon.k2 = PUSCH_K2; - duCfgParam.macCellCfg.initialUlBwp.puschCommon.mappingType = + duCfgParam.macCellCfg.initialUlBwp.puschCommon.numTimeDomRsrcAlloc = 2; + duCfgParam.macCellCfg.initialUlBwp.puschCommon.timeDomRsrcAllocList[0].k2 = PUSCH_K2_CFG1; + duCfgParam.macCellCfg.initialUlBwp.puschCommon.timeDomRsrcAllocList[0].mappingType = + PUSCH_MAPPING_TYPE_A; + duCfgParam.macCellCfg.initialUlBwp.puschCommon.timeDomRsrcAllocList[0].startSymbol = + PUSCH_START_SYMBOL; + duCfgParam.macCellCfg.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 = PUSCH_MAPPING_TYPE_A; - duCfgParam.macCellCfg.initialUlBwp.puschCommon.startSymbol = + duCfgParam.macCellCfg.initialUlBwp.puschCommon.timeDomRsrcAllocList[1].startSymbol = PUSCH_START_SYMBOL; - duCfgParam.macCellCfg.initialUlBwp.puschCommon.lengthSymbol = + duCfgParam.macCellCfg.initialUlBwp.puschCommon.timeDomRsrcAllocList[1].symbolLength = PUSCH_LENGTH_SYMBOL; duCfgParam.macCellCfg.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; @@ -313,9 +377,14 @@ uint8_t readMacCfg() * ****************************************************************/ uint8_t fillDuPort(uint16_t *duPort) { + +#ifdef O1_ENABLE + duPort[F1_INTERFACE] = g_cfg.DU_Port; + duPort[E2_INTERFACE] = g_cfg.RIC_Port; +#else duPort[F1_INTERFACE] = DU_PORT; /* DU Port idx 0 38472 */ duPort[E2_INTERFACE] = RIC_PORT; /* RIC Port idx 1 38482 */ - +#endif return ROK; } @@ -378,17 +447,22 @@ uint8_t fillServCellCfgCommSib(SrvCellCfgCommSib *srvCellCfgComm) TddUlDlCfgCommon tddCfg; /* Configuring DL Config Common for SIB1*/ - srvCellCfgComm->dlCfg.freqBandInd = NR_FREQ_BAND_IND; + srvCellCfgComm->dlCfg.freqBandInd = NR_FREQ_BAND; srvCellCfgComm->dlCfg.offsetToPointA = OFFSET_TO_POINT_A; srvCellCfgComm->dlCfg.dlScsCarrier.scsOffset = SSB_SUBCARRIER_OFFSET; - srvCellCfgComm->dlCfg.dlScsCarrier.scs = SUBCARRIER_SPACING; +#ifdef NR_TDD + srvCellCfgComm->dlCfg.dlScsCarrier.scs = SCS_30KHZ; + srvCellCfgComm->dlCfg.dlScsCarrier.scsBw = BANDWIDTH_100MHZ; +#else + srvCellCfgComm->dlCfg.dlScsCarrier.scs = SCS_15KHZ; srvCellCfgComm->dlCfg.dlScsCarrier.scsBw = BANDWIDTH_20MHZ; +#endif srvCellCfgComm->dlCfg.locAndBw = FREQ_LOC_BW; /* Configuring PDCCH Config Common For SIB1 */ pdcchCfg.present = BWP_DownlinkCommon__pdcch_ConfigCommon_PR_setup; - pdcchCfg.ctrlRsrcSetZero = PDCCH_CTRL_RSRC_SET_ZERO; - pdcchCfg.searchSpcZero = PDCCH_SEARCH_SPACE_ZERO; + pdcchCfg.ctrlRsrcSetZero = CORESET_0_INDEX; + pdcchCfg.searchSpcZero = SEARCHSPACE_0_INDEX; pdcchCfg.searchSpcId = PDCCH_SEARCH_SPACE_ID; pdcchCfg.ctrlRsrcSetId = PDCCH_CTRL_RSRC_SET_ID; pdcchCfg.monitorSlotPrdAndOffPresent = \ @@ -411,10 +485,16 @@ uint8_t fillServCellCfgCommSib(SrvCellCfgCommSib *srvCellCfgComm) /* Configuring PDSCH Config Common For SIB1 */ pdschCfg.present = BWP_DownlinkCommon__pdsch_ConfigCommon_PR_setup; - pdschCfg.k0 = PDSCH_K0; - pdschCfg.mapType = \ + pdschCfg.numTimeDomRsrcAlloc = 2; + pdschCfg.timeDomAlloc[0].k0 = PDSCH_K0_CFG1; + pdschCfg.timeDomAlloc[0].mapType = \ + PDSCH_TimeDomainResourceAllocation__mappingType_typeA; + pdschCfg.timeDomAlloc[0].sliv = calcSliv(PDSCH_START_SYMBOL,PDSCH_LENGTH_SYMBOL); + pdschCfg.timeDomAlloc[1].k0 = PDSCH_K0_CFG2; + pdschCfg.timeDomAlloc[1].mapType = \ PDSCH_TimeDomainResourceAllocation__mappingType_typeA; - pdschCfg.sliv = calcSliv(PDSCH_START_SYMBOL,PDSCH_LENGTH_SYMBOL); + pdschCfg.timeDomAlloc[1].sliv = calcSliv(PDSCH_START_SYMBOL,PDSCH_LENGTH_SYMBOL); + srvCellCfgComm->dlCfg.pdschCfg = pdschCfg; /* Configuring BCCH Config for SIB1 */ @@ -422,7 +502,7 @@ uint8_t fillServCellCfgCommSib(SrvCellCfgCommSib *srvCellCfgComm) BCCH_Config__modificationPeriodCoeff_n16; /* Configuring PCCH Config for SIB1 */ - pcchCfg.dfltPagingCycle = PagingCycle_rf64; + pcchCfg.dfltPagingCycle = PagingCycle_rf256; pcchCfg.nAndPagingFrmOffPresent = PCCH_Config__nAndPagingFrameOffset_PR_oneT; pcchCfg.numPagingOcc = PCCH_Config__ns_four; srvCellCfgComm->dlCfg.pcchCfg = pcchCfg; @@ -430,8 +510,13 @@ uint8_t fillServCellCfgCommSib(SrvCellCfgCommSib *srvCellCfgComm) /* Configuring UL Config Common */ srvCellCfgComm->ulCfg.ulScsCarrier.scsOffset = SSB_SUBCARRIER_OFFSET; - srvCellCfgComm->ulCfg.ulScsCarrier.scs = SUBCARRIER_SPACING; +#ifdef NR_TDD + srvCellCfgComm->ulCfg.ulScsCarrier.scs = SCS_30KHZ; + srvCellCfgComm->ulCfg.ulScsCarrier.scsBw = BANDWIDTH_100MHZ; +#else + srvCellCfgComm->ulCfg.ulScsCarrier.scs = SCS_15KHZ; srvCellCfgComm->ulCfg.ulScsCarrier.scsBw = BANDWIDTH_20MHZ; +#endif srvCellCfgComm->ulCfg.pMax = UL_P_MAX; srvCellCfgComm->ulCfg.locAndBw = FREQ_LOC_BW; srvCellCfgComm->ulCfg.timeAlignTimerComm = TimeAlignmentTimer_infinity; @@ -459,10 +544,14 @@ uint8_t fillServCellCfgCommSib(SrvCellCfgCommSib *srvCellCfgComm) srvCellCfgComm->ulCfg.rachCfg = rachCfg; /* Configuring PUSCH Config Common for SIB1 */ - puschCfg.present = BWP_UplinkCommon__pusch_ConfigCommon_PR_setup; - puschCfg.k2 = PUSCH_K2; - puschCfg.mapType = PUSCH_TimeDomainResourceAllocation__mappingType_typeA; - puschCfg.sliv = calcSliv(PUSCH_START_SYMBOL,PUSCH_LENGTH_SYMBOL); + puschCfg.puschCfgPresent = BWP_UplinkCommon__pusch_ConfigCommon_PR_setup; + puschCfg.numTimeDomRsrcAlloc = 2; + puschCfg.timeDomAllocList[0].k2 = PUSCH_K2_CFG1; + puschCfg.timeDomAllocList[0].mapType = PUSCH_TimeDomainResourceAllocation__mappingType_typeA; + puschCfg.timeDomAllocList[0].sliv = calcSliv(PUSCH_START_SYMBOL,PUSCH_LENGTH_SYMBOL); + puschCfg.timeDomAllocList[1].k2 = PUSCH_K2_CFG2; + puschCfg.timeDomAllocList[1].mapType = PUSCH_TimeDomainResourceAllocation__mappingType_typeA; + puschCfg.timeDomAllocList[1].sliv = calcSliv(PUSCH_START_SYMBOL,PUSCH_LENGTH_SYMBOL); puschCfg.msg3DeltaPreamble = PUSCH_MSG3_DELTA_PREAMBLE; puschCfg.p0NominalWithGrant = PUSCH_P0_NOMINAL_WITH_GRANT; srvCellCfgComm->ulCfg.puschCfg = puschCfg; @@ -476,7 +565,7 @@ uint8_t fillServCellCfgCommSib(SrvCellCfgCommSib *srvCellCfgComm) /* Configuring TDD UL DL config common */ tddCfg.refScs = SubcarrierSpacing_kHz30; - tddCfg.txPrd = TDD_UL_DL_Pattern__dl_UL_TransmissionPeriodicity_ms2p5; + tddCfg.txPrd = TDD_UL_DL_Pattern__dl_UL_TransmissionPeriodicity_ms5; tddCfg.numDlSlots = NUM_DL_SLOTS; tddCfg.numDlSymbols = NUM_DL_SYMBOLS; tddCfg.numUlSlots = NUM_UL_SLOTS; @@ -515,9 +604,26 @@ uint8_t readCfg() MibParams mib; Sib1Params sib1; +#ifdef O1_ENABLE + if( getStartupConfig(&g_cfg) != ROK ) + { + RETVALUE(RFAILED); + } + cmInetAddr((S8*)g_cfg.DU_IPV4_Addr, &ipv4_du); + cmInetAddr((S8*)g_cfg.CU_IPV4_Addr, &ipv4_cu); + cmInetAddr((S8*)g_cfg.RIC_IPV4_Addr, &ipv4_ric); + + duCfgParam.sctpParams.cuPort = g_cfg.CU_Port; + duCfgParam.sctpParams.ricPort = g_cfg.RIC_Port; +#else cmInetAddr((S8*)DU_IP_V4_ADDR, &ipv4_du); cmInetAddr((S8*)CU_IP_V4_ADDR, &ipv4_cu); cmInetAddr((S8*)RIC_IP_V4_ADDR, &ipv4_ric); + + duCfgParam.sctpParams.cuPort = CU_PORT; + duCfgParam.sctpParams.ricPort = RIC_PORT; +#endif + fillDuPort(duCfgParam.sctpParams.duPort); /* F1 DU IP Address and Port*/ @@ -525,11 +631,10 @@ uint8_t readCfg() /* F1 CU IP Address and Port*/ duCfgParam.sctpParams.cuIpAddr.ipV4Addr = ipv4_cu; - duCfgParam.sctpParams.cuPort = CU_PORT; /* Fill RIC Params */ duCfgParam.sctpParams.ricIpAddr.ipV4Addr = ipv4_ric; - duCfgParam.sctpParams.ricPort = RIC_PORT; + /* EGTP Parameters */ duCfgParam.egtpParams.localIp.ipV4Pres = TRUE; duCfgParam.egtpParams.localIp.ipV4Addr = ipv4_du; @@ -547,12 +652,16 @@ uint8_t readCfg() /* Mib Params */ mib.sysFrmNum = SYS_FRAME_NUM; +#ifdef NR_TDD + mib.subCarrierSpacingCommon = MIB__subCarrierSpacingCommon_scs30or120; +#else mib.subCarrierSpacingCommon = MIB__subCarrierSpacingCommon_scs15or60; - mib.ssb_SubcarrierOffset = SSB_SC_OFFSET; +#endif + mib.ssb_SubcarrierOffset = SSB_SC_OFFSET; //Kssb mib.dmrs_TypeA_Position = MIB__dmrs_TypeA_Position_pos2; - mib.controlResourceSetZero = CORESET_ZERO; - mib.searchSpaceZero = SEARCH_SPACE_ZERO; - mib.cellBarred = MIB__cellBarred_barred; + mib.controlResourceSetZero = CORESET_0_INDEX; + mib.searchSpaceZero = SEARCHSPACE_0_INDEX; + mib.cellBarred = MIB__cellBarred_notBarred; mib.intraFreqReselection = MIB__intraFreqReselection_notAllowed; duCfgParam.mibParams = mib; @@ -710,14 +819,13 @@ uint8_t readCfg() /*gnb DU System Info mib msg*/ BuildMibMsg(); - DU_ALLOC(duCfgParam.srvdCellLst[i].duSysInfo.mibMsg,\ - strlen(encBuf)); + DU_ALLOC(duCfgParam.srvdCellLst[i].duSysInfo.mibMsg, encBufSize); if(!(duCfgParam.srvdCellLst[i].duSysInfo.mibMsg)) { - DU_LOG("\nDU_APP: Memory allocation failure"); + DU_LOG("\nERROR --> DU APP : Memory allocation failure at readCfg"); return RFAILED; } - strcpy((char *)duCfgParam.srvdCellLst[i].duSysInfo.mibMsg, encBuf); + memcpy(duCfgParam.srvdCellLst[i].duSysInfo.mibMsg, encBuf, encBufSize); duCfgParam.srvdCellLst[i].duSysInfo.mibLen = encBufSize; /*gnb DU System Info mib msg*/ @@ -726,7 +834,7 @@ uint8_t readCfg() encBufSize); if(!(duCfgParam.srvdCellLst[i].duSysInfo.sib1Msg)) { - DU_LOG("\nDU_APP: Memory allocation failure"); + DU_LOG("\nERROR --> DU APP : Memory allocation failure at readCfg"); return RFAILED; } memcpy(duCfgParam.srvdCellLst[i].duSysInfo.sib1Msg,\ @@ -737,7 +845,7 @@ uint8_t readCfg() if(readMacCfg() != ROK) { - DU_LOG("\nDU_APP : Failed while reading MAC config"); + DU_LOG("\nERROR --> DU_APP : Failed while reading MAC config"); return RFAILED; } @@ -770,7 +878,7 @@ uint8_t duReadCfg() //Read configs into duCfgParams if(readCfg() != ROK) { - DU_LOG("\nDU_APP : Reading configuration failed"); + DU_LOG("\nERROR --> DU_APP : Reading configuration failed"); return RFAILED; } @@ -789,13 +897,13 @@ uint8_t duReadCfg() if(ODU_GET_MSG_BUF(DFLT_REGION, DU_POOL, &mBuf) != ROK) { - DU_LOG("\nDU_APP : Memory allocation failed in duReadCfg"); + DU_LOG("\nERROR --> DU_APP : Memory allocation failed in duReadCfg"); return RFAILED; } if (ODU_POST_TASK(&pst, mBuf) != ROK) { - DU_LOG("\nDU_APP : ODU_POST_TASK failed in duReadCfg"); + DU_LOG("\nERROR --> DU_APP : ODU_POST_TASK failed in duReadCfg"); return RFAILED; }