X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fdu_app%2Fdu_cfg.c;h=72b60e9d3d531e9a1f045f79181a8df50b0e7489;hb=4e803fe4bcf3a446b7082675d25d35ad102f16f6;hp=f3435616edd2854f9b0a9862149b47032f3c0d4f;hpb=eb178a8cc45a9cebc65df73f128f88b3a3dfefbb;p=o-du%2Fl2.git diff --git a/src/du_app/du_cfg.c b/src/du_app/du_cfg.c index f3435616e..72b60e9d3 100644 --- a/src/du_app/du_cfg.c +++ b/src/du_app/du_cfg.c @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # # limitations under the License. # ################################################################################ -*******************************************************************************/ + *******************************************************************************/ /* This file contains all utility functions */ #include "common_def.h" @@ -58,7 +58,7 @@ extern char encBuf[ENC_BUF_MAX_LEN]; * 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 -*/ + */ /******************************************************************* * @@ -83,7 +83,7 @@ void FillSlotConfig() for(slot = 0; slot <= 3; slot++) { for(symbol = 0; symbol < MAX_SYMB_PER_SLOT; symbol++) - duCfgParam.macCellCfg.tddCfg.slotCfg[slot][symbol] = DL_SLOT; + duCfgParam.macCellCfg.tddCfg.slotCfg[slot][symbol] = DL_SLOT; } duCfgParam.macCellCfg.tddCfg.slotCfg[3][10] = GUARD_SLOT; @@ -170,50 +170,50 @@ S16 readMacCfg() duCfgParam.macCellCfg.ssbCfg.ssbMask[0] = 1; /* only one SSB is transmitted */ duCfgParam.macCellCfg.ssbCfg.ssbMask[1] = 0; if(BuildMibPdu() != ROK) - { - DU_LOG("\nFailed to build MIB PDU"); - memset(&duCfgParam.macCellCfg.ssbCfg.mibPdu, 0, 3*sizeof(uint8_t)); + { + DU_LOG("\nFailed to build MIB PDU"); + memset(&duCfgParam.macCellCfg.ssbCfg.mibPdu, 0, 3*sizeof(uint8_t)); + } + else + { + for(uint8_t idx=0; idxdlCfg.dlScsCarrier.scs = SUBCARRIER_SPACING; srvCellCfgComm->dlCfg.dlScsCarrier.scsBw = SCS_CARRIER_BANDWIDTH; 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; @@ -391,7 +392,7 @@ S16 fillServCellCfgCommSib(SrvCellCfgCommSib *srvCellCfgComm) pdcchCfg.monitorSlotPrdAndOffPresent = \ SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl1; //pdcchCfg.monitorSlotPrdAndOff = \ - SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl1; + SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl1; pdcchCfg.monitorSymbolsInSlot[0] = 128; pdcchCfg.monitorSymbolsInSlot[1] = 0; pdcchCfg.numCandAggLvl1 = SearchSpace__nrofCandidates__aggregationLevel1_n8; @@ -509,13 +510,13 @@ S16 readCfg() { U8 i,j,k; U32 ipv4_du, ipv4_cu, ipv4_ric; - MibParams mib; + MibParams mib; Sib1Params sib1; cmInetAddr((S8*)DU_IP_V4_ADDR, &ipv4_du); cmInetAddr((S8*)CU_IP_V4_ADDR, &ipv4_cu); - cmInetAddr((S8*)RIC_IP_V4_ADDR, &ipv4_ric); - fillDuPort(duCfgParam.sctpParams.duPort); + cmInetAddr((S8*)RIC_IP_V4_ADDR, &ipv4_ric); + fillDuPort(duCfgParam.sctpParams.duPort); /* F1 DU IP Address and Port*/ duCfgParam.sctpParams.duIpAddr.ipV4Addr = ipv4_du; @@ -524,9 +525,9 @@ S16 readCfg() 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; + /* 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; @@ -543,29 +544,29 @@ S16 readCfg() strcpy((char*)duCfgParam.duName,DU_NAME); /* Mib Params */ - mib.sysFrmNum = SYS_FRAME_NUM; - mib.subCarrierSpacingCommon = MIB__subCarrierSpacingCommon_scs15or60; - mib.ssb_SubcarrierOffset = SSB_SC_OFFSET; - mib.dmrs_TypeA_Position = MIB__dmrs_TypeA_Position_pos2; - mib.controlResourceSetZero = CORESET_ZERO; - mib.searchSpaceZero = SEARCH_SPACE_ZERO; - mib.cellBarred = MIB__cellBarred_barred; - mib.intraFreqReselection = - MIB__intraFreqReselection_notAllowed; - duCfgParam.mibParams = mib; + mib.sysFrmNum = SYS_FRAME_NUM; + mib.subCarrierSpacingCommon = MIB__subCarrierSpacingCommon_scs15or60; + mib.ssb_SubcarrierOffset = SSB_SC_OFFSET; + mib.dmrs_TypeA_Position = MIB__dmrs_TypeA_Position_pos2; + mib.controlResourceSetZero = CORESET_ZERO; + mib.searchSpaceZero = SEARCH_SPACE_ZERO; + mib.cellBarred = MIB__cellBarred_barred; + mib.intraFreqReselection = + MIB__intraFreqReselection_notAllowed; + duCfgParam.mibParams = mib; /* SIB1 Params */ - sib1.plmn.mcc[0] = PLMN_MCC0; - sib1.plmn.mcc[1] = PLMN_MCC1; - sib1.plmn.mcc[2] = PLMN_MCC2; - sib1.plmn.mnc[0] = PLMN_MNC0; - sib1.plmn.mnc[1] = PLMN_MNC1; - sib1.plmn.mnc[2] = PLMN_MNC2; - sib1.tac = DU_TAC; - sib1.ranac = DU_RANAC; - sib1.cellIdentity = CELL_IDENTITY; - sib1.cellResvdForOpUse =\ - PLMN_IdentityInfo__cellReservedForOperatorUse_notReserved; + sib1.plmn.mcc[0] = PLMN_MCC0; + sib1.plmn.mcc[1] = PLMN_MCC1; + sib1.plmn.mcc[2] = PLMN_MCC2; + sib1.plmn.mnc[0] = PLMN_MNC0; + sib1.plmn.mnc[1] = PLMN_MNC1; + sib1.plmn.mnc[2] = PLMN_MNC2; + sib1.tac = DU_TAC; + sib1.ranac = DU_RANAC; + sib1.cellIdentity = CELL_IDENTITY; + sib1.cellResvdForOpUse =\ + PLMN_IdentityInfo__cellReservedForOperatorUse_notReserved; sib1.connEstFailCnt = ConnEstFailureControl__connEstFailCount_n3; sib1.connEstFailOffValidity =\ ConnEstFailureControl__connEstFailOffsetValidity_s120; @@ -578,7 +579,7 @@ S16 readCfg() fillServCellCfgCommSib(&sib1.srvCellCfgCommSib); - duCfgParam.sib1Params = sib1; + duCfgParam.sib1Params = sib1; for(i=0; ibuf[idx]; - *val >>= bitString->bits_unused; + *val >>= bitString->bits_unused; return ROK; }