X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fdu_app%2Fdu_cfg.c;h=f5ee3b34388cff0ab3e8448397f7f0ad76c4fd56;hb=0b405462775bb65021e41dc4494ed38ce3a9c4f4;hp=92feca71c6ef8f09f9b41aa1e2314438dd940493;hpb=95ccd3329a26f43a37bd32a722b0fa5311ce0563;p=o-du%2Fl2.git diff --git a/src/du_app/du_cfg.c b/src/du_app/du_cfg.c index 92feca71c..f5ee3b343 100644 --- a/src/du_app/du_cfg.c +++ b/src/du_app/du_cfg.c @@ -53,11 +53,11 @@ #include "BWP-UplinkCommon.h" #ifdef O1_ENABLE -#include "ConfigInterface.h" +#include "CmInterface.h" extern StartupConfig g_cfg; +extern NRCellDU cellParams; #endif -DuCfgParams duCfgParam; char encBuf[ENC_BUF_MAX_LEN]; @@ -142,24 +142,29 @@ void FillSlotConfig() /* This function is used to fill up the cell configuration for CL */ uint8_t readMacCfg() { - uint8_t idx; + uint8_t idx=0, sliceIdx=0; + F1TaiSliceSuppLst *taiSliceSuppLst; duCfgParam.macCellCfg.carrierId = CARRIER_IDX; /* Cell configuration */ - duCfgParam.macCellCfg.cellId = NR_CELL_ID; - duCfgParam.macCellCfg.phyCellId = NR_PCI; duCfgParam.macCellCfg.numerology = NR_NUMEROLOGY; duCfgParam.macCellCfg.dupType = DUPLEX_MODE; /* DL carrier configuration */ duCfgParam.macCellCfg.dlCarrCfg.pres = TRUE; -#ifdef NR_TDD - duCfgParam.macCellCfg.dlCarrCfg.bw = BANDWIDTH_100MHZ; +#ifdef O1_ENABLE + duCfgParam.macCellCfg.cellId = cellParams.cellLocalId; + duCfgParam.macCellCfg.phyCellId = cellParams.nRPCI; + duCfgParam.macCellCfg.dlCarrCfg.bw = cellParams.bSChannelBwUL; + duCfgParam.macCellCfg.dlCarrCfg.freq = cellParams.bSChannelBwDL; #else - duCfgParam.macCellCfg.dlCarrCfg.bw = BANDWIDTH_20MHZ; -#endif + duCfgParam.macCellCfg.cellId = NR_CELL_ID; + duCfgParam.macCellCfg.phyCellId = NR_PCI; + duCfgParam.macCellCfg.dlCarrCfg.bw = NR_BANDWIDTH; duCfgParam.macCellCfg.dlCarrCfg.freq = NR_DL_ARFCN; +#endif + duCfgParam.macCellCfg.dlCarrCfg.k0[0] = 1; duCfgParam.macCellCfg.dlCarrCfg.k0[1] = 1; duCfgParam.macCellCfg.dlCarrCfg.k0[2] = 1; @@ -174,12 +179,13 @@ 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; +#ifdef O1_ENABLE + duCfgParam.macCellCfg.ulCarrCfg.bw = cellParams.bSChannelBwUL; + duCfgParam.macCellCfg.ulCarrCfg.freq = cellParams.bSChannelBwDL; +#else + duCfgParam.macCellCfg.ulCarrCfg.bw = NR_BANDWIDTH; + duCfgParam.macCellCfg.ulCarrCfg.freq = NR_UL_ARFCN; +#endif duCfgParam.macCellCfg.ulCarrCfg.k0[0] = 1; duCfgParam.macCellCfg.ulCarrCfg.k0[1] = 1; duCfgParam.macCellCfg.ulCarrCfg.k0[2] = 1; @@ -197,15 +203,17 @@ uint8_t readMacCfg() /* SSB configuration */ duCfgParam.macCellCfg.ssbCfg.ssbPbchPwr = SSB_PBCH_PWR; duCfgParam.macCellCfg.ssbCfg.bchPayloadFlag = BCH_PAYLOAD; -#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; +#ifdef O1_ENABLE + duCfgParam.macCellCfg.ssbCfg.scsCmn = cellParams.ssbSubCarrierSpacing; + duCfgParam.macCellCfg.ssbCfg.ssbPeriod = cellParams.ssbPeriodicity; + duCfgParam.macCellCfg.ssbCfg.ssbScOffset = cellParams.ssbOffset; +#else + duCfgParam.macCellCfg.ssbCfg.scsCmn = NR_SCS; duCfgParam.macCellCfg.ssbCfg.ssbPeriod = SSB_PRDCTY_MS_20; duCfgParam.macCellCfg.ssbCfg.ssbScOffset = SSB_SUBCARRIER_OFFSET; +#endif duCfgParam.macCellCfg.ssbCfg.ssbMask[0] = 1; /* only one SSB is transmitted */ duCfgParam.macCellCfg.ssbCfg.ssbMask[1] = 0; if(BuildMibPdu() != ROK) @@ -224,7 +232,7 @@ uint8_t readMacCfg() duCfgParam.macCellCfg.prachCfg.pres = TRUE; duCfgParam.macCellCfg.prachCfg.prachCfgIdx = PRACH_CONFIG_IDX; duCfgParam.macCellCfg.prachCfg.prachSeqLen = PRACH_SEQ_LEN; - duCfgParam.macCellCfg.prachCfg.prachSubcSpacing = PRACH_SUBCARRIER_SPACING; + duCfgParam.macCellCfg.prachCfg.prachSubcSpacing = fetchScsValue(PRACH_SUBCARRIER_SPACING); duCfgParam.macCellCfg.prachCfg.prachRstSetCfg = PRACH_RESTRICTED_SET_CFG; duCfgParam.macCellCfg.prachCfg.msg1Fdm = NUM_PRACH_FDM; duCfgParam.macCellCfg.prachCfg.msg1FreqStart = PRACH_FREQ_START; @@ -270,17 +278,13 @@ uint8_t readMacCfg() duCfgParam.macCellCfg.sib1Cfg.sib1RepetitionPeriod = SIB1_REPETITION_PERIOD; duCfgParam.macCellCfg.sib1Cfg.coresetZeroIndex = CORESET_0_INDEX; duCfgParam.macCellCfg.sib1Cfg.searchSpaceZeroIndex = SEARCHSPACE_0_INDEX; - duCfgParam.macCellCfg.sib1Cfg.sib1Mcs = SIB1_MCS; + duCfgParam.macCellCfg.sib1Cfg.sib1Mcs = DEFAULT_MCS; /* fill Intial DL BWP */ duCfgParam.macCellCfg.initialDlBwp.bwp.firstPrb = 0; duCfgParam.macCellCfg.initialDlBwp.bwp.numPrb = TOTAL_PRB_20MHZ_MU0; /* configured to total BW */ -#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.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; @@ -309,6 +313,7 @@ uint8_t readMacCfg() 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 = @@ -324,11 +329,7 @@ uint8_t readMacCfg() /* fill Intial UL BWP */ duCfgParam.macCellCfg.initialUlBwp.bwp.firstPrb = 0; duCfgParam.macCellCfg.initialUlBwp.bwp.numPrb = TOTAL_PRB_20MHZ_MU0; /* configured to total BW */ -#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.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; @@ -352,7 +353,34 @@ uint8_t readMacCfg() /* fill PUCCH config common */ duCfgParam.macCellCfg.initialUlBwp.pucchCommon.pucchResourceCommon = PUCCH_RSRC_COMMON; duCfgParam.macCellCfg.initialUlBwp.pucchCommon.pucchGroupHopping = PUCCH_GROUP_HOPPING; - + + /* Plmn And SNSSAI Configuration */ + memset(&duCfgParam.macCellCfg.plmnInfoList.plmn, &duCfgParam.srvdCellLst[0].duCellInfo.cellInfo.srvdPlmn[0].plmn,\ + sizeof(Plmn)); + taiSliceSuppLst = &duCfgParam.srvdCellLst[0].duCellInfo.cellInfo.srvdPlmn[0].taiSliceSuppLst; + duCfgParam.macCellCfg.plmnInfoList.numSupportedSlice = taiSliceSuppLst->numSupportedSlices; + if(taiSliceSuppLst->snssai) + { + DU_ALLOC_SHRABL_BUF(duCfgParam.macCellCfg.plmnInfoList.snssai, (duCfgParam.macCellCfg.plmnInfoList.numSupportedSlice) * sizeof(Snssai*)); + if(duCfgParam.macCellCfg.plmnInfoList.snssai == NULLP) + { + DU_LOG("\nERROR --> DU_APP: Memory allocation failed at readMacCfg"); + return RFAILED; + } + } + for(sliceIdx=0; sliceIdxnumSupportedSlices; sliceIdx++) + { + if(taiSliceSuppLst->snssai[sliceIdx] != NULLP) + { + DU_ALLOC_SHRABL_BUF(duCfgParam.macCellCfg.plmnInfoList.snssai[sliceIdx], sizeof(Snssai)); + if(duCfgParam.macCellCfg.plmnInfoList.snssai[sliceIdx] == NULLP) + { + DU_LOG("\nERROR --> DU_APP: Memory allocation failed at readMacCfg"); + return RFAILED; + } + memcpy(duCfgParam.macCellCfg.plmnInfoList.snssai[sliceIdx], taiSliceSuppLst->snssai[sliceIdx], sizeof(Snssai)); + } + } return ROK; } @@ -446,14 +474,15 @@ uint8_t fillServCellCfgCommSib(SrvCellCfgCommSib *srvCellCfgComm) /* Configuring DL Config Common for SIB1*/ srvCellCfgComm->dlCfg.freqBandInd = NR_FREQ_BAND; srvCellCfgComm->dlCfg.offsetToPointA = OFFSET_TO_POINT_A; - srvCellCfgComm->dlCfg.dlScsCarrier.scsOffset = SSB_SUBCARRIER_OFFSET; -#ifdef NR_TDD - srvCellCfgComm->dlCfg.dlScsCarrier.scs = SCS_30KHZ; - srvCellCfgComm->dlCfg.dlScsCarrier.scsBw = BANDWIDTH_100MHZ; +#ifdef O1_ENABLE + srvCellCfgComm->dlCfg.dlScsCarrier.scsOffset = cellParams.ssbOffset; + srvCellCfgComm->dlCfg.dlScsCarrier.scs = cellParams.ssbSubCarrierSpacing; + srvCellCfgComm->dlCfg.dlScsCarrier.scsBw = cellParams.bSChannelBwUL; #else - srvCellCfgComm->dlCfg.dlScsCarrier.scs = SCS_15KHZ; - srvCellCfgComm->dlCfg.dlScsCarrier.scsBw = BANDWIDTH_20MHZ; -#endif + srvCellCfgComm->dlCfg.dlScsCarrier.scsOffset = SSB_SUBCARRIER_OFFSET; + srvCellCfgComm->dlCfg.dlScsCarrier.scs = NR_SCS; + srvCellCfgComm->dlCfg.dlScsCarrier.scsBw = NR_BANDWIDTH; +#endif srvCellCfgComm->dlCfg.locAndBw = FREQ_LOC_BW; /* Configuring PDCCH Config Common For SIB1 */ @@ -488,6 +517,7 @@ uint8_t fillServCellCfgCommSib(SrvCellCfgCommSib *srvCellCfgComm) 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; @@ -507,14 +537,15 @@ uint8_t fillServCellCfgCommSib(SrvCellCfgCommSib *srvCellCfgComm) /* Configuring UL Config Common */ - srvCellCfgComm->ulCfg.ulScsCarrier.scsOffset = SSB_SUBCARRIER_OFFSET; -#ifdef NR_TDD - srvCellCfgComm->ulCfg.ulScsCarrier.scs = SCS_30KHZ; - srvCellCfgComm->ulCfg.ulScsCarrier.scsBw = BANDWIDTH_100MHZ; +#ifdef O1_ENABLE + srvCellCfgComm->ulCfg.ulScsCarrier.scsOffset = cellParams.ssbOffset; + srvCellCfgComm->ulCfg.ulScsCarrier.scs = cellParams.ssbSubCarrierSpacing; + srvCellCfgComm->ulCfg.ulScsCarrier.scsBw = cellParams.bSChannelBwUL; #else - srvCellCfgComm->ulCfg.ulScsCarrier.scs = SCS_15KHZ; - srvCellCfgComm->ulCfg.ulScsCarrier.scsBw = BANDWIDTH_20MHZ; -#endif + srvCellCfgComm->ulCfg.ulScsCarrier.scsOffset = SSB_SUBCARRIER_OFFSET; + srvCellCfgComm->ulCfg.ulScsCarrier.scs = NR_SCS; + srvCellCfgComm->ulCfg.ulScsCarrier.scsBw = NR_BANDWIDTH; +#endif srvCellCfgComm->ulCfg.pMax = UL_P_MAX; srvCellCfgComm->ulCfg.locAndBw = FREQ_LOC_BW; srvCellCfgComm->ulCfg.timeAlignTimerComm = TimeAlignmentTimer_infinity; @@ -528,7 +559,7 @@ uint8_t fillServCellCfgCommSib(SrvCellCfgCommSib *srvCellCfgComm) rachCfg.preambleRcvdTgtPwr = PRACH_PREAMBLE_RCVD_TGT_PWR; rachCfg.preambleTransMax = RACH_ConfigGeneric__preambleTransMax_n200; rachCfg.pwrRampingStep = RACH_ConfigGeneric__powerRampingStep_dB2; - rachCfg.raRspWindow = RACH_ConfigGeneric__ra_ResponseWindow_sl20; + rachCfg.raRspWindow = RACH_ConfigGeneric__ra_ResponseWindow_sl10; rachCfg.numRaPreamble = NUM_RA_PREAMBLE; rachCfg.ssbPerRachOccPresent = \ RACH_ConfigCommon__ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR_one; @@ -603,17 +634,10 @@ uint8_t readCfg() MibParams mib; Sib1Params sib1; F1TaiSliceSuppLst *taiSliceSuppLst; - RrmPolicy *rrmPolicy; /* TODO Added these below variable for local testing, once we will receive the * configuration from O1 we can remove these variable */ - F1Snsaai snsaai[NUM_OF_SUPPORTED_SLICE] = {{1,{2,3,4}},{5,{6,7,8}}}; - ResourceType rsrcType = PRB; - RrmPolicyRatio policyRatio= {10,20,30}; - PolicyMemberList memberList; - - memset(&memberList, 0, sizeof(PolicyMemberList)); - memberList.snsaai = snsaai[DEDICATED_SLICE_INDEX]; + Snssai snssai[NUM_OF_SUPPORTED_SLICE] = {{1,{2,3,4}},{5,{6,7,8}}}; #ifdef O1_ENABLE if( getStartupConfig(&g_cfg) != ROK ) @@ -684,9 +708,17 @@ uint8_t readCfg() sib1.plmn.mcc[2] = PLMN_MCC2; sib1.plmn.mnc[0] = PLMN_MNC0; sib1.plmn.mnc[1] = PLMN_MNC1; - sib1.tac = DU_TAC; sib1.ranac = DU_RANAC; - sib1.cellIdentity = CELL_IDENTITY; + +#ifdef O1_ENABLE + sib1.tac = cellParams.nRTAC; + sib1.cellIdentity = CELL_IDENTITY * cellParams.cellLocalId; + DU_LOG("\n*********DEBUG --> DU_APP: readCfg(): OAM CellLocalId=%d", \ + sib1.cellIdentity); +#else + sib1.tac = DU_TAC; + sib1.cellIdentity = CELL_IDENTITY * NR_CELL_ID; +#endif sib1.cellResvdForOpUse = PLMN_IdentityInfo__cellReservedForOperatorUse_notReserved; sib1.connEstFailCnt = ConnEstFailureControl__connEstFailCount_n3; sib1.connEstFailOffValidity = ConnEstFailureControl__connEstFailOffsetValidity_s120; @@ -710,9 +742,11 @@ uint8_t readCfg() duCfgParam.srvdCellLst[srvdCellIdx].duCellInfo.cellInfo.nrCgi.plmn.mnc[1] = PLMN_MNC1; /*Cell ID */ - duCfgParam.srvdCellLst[srvdCellIdx].duCellInfo.cellInfo.nrCgi.cellId = NR_CELL_ID; + #ifdef O1_ENABLE + duCfgParam.srvdCellLst[srvdCellIdx].duCellInfo.cellInfo.nrPci = cellParams.nRPCI; + #else duCfgParam.srvdCellLst[srvdCellIdx].duCellInfo.cellInfo.nrPci = NR_PCI; - +#endif /* List of Available PLMN */ for(srvdPlmnIdx=0; srvdPlmnIdxpres = true; + taiSliceSuppLst = &duCfgParam.srvdCellLst[srvdCellIdx].duCellInfo.cellInfo.srvdPlmn[srvdPlmnIdx].\ + taiSliceSuppLst; + + /* TODO Calculte the exact number of supported slices once will get + * cell configuration from O1 */ taiSliceSuppLst->numSupportedSlices = NUM_OF_SUPPORTED_SLICE; + if(taiSliceSuppLst->numSupportedSlices > MAX_NUM_OF_SLICE_ITEMS) + { + DU_LOG("\nERROR --> DU_APP: readCfg(): Number of supported slice [%d] is more than 1024",\ + taiSliceSuppLst->numSupportedSlices); + return RFAILED; + } - memset(&taiSliceSuppLst->snssai, 0, sizeof(F1Snsaai)); - for(sliceIdx=0; sliceIdxsnssai, taiSliceSuppLst->numSupportedSlices*sizeof(Snssai*)); + if(taiSliceSuppLst->snssai == NULLP) + { + DU_LOG("\nERROR --> DU_APP: readCfg():Memory allocation failed"); + return RFAILED; + } + + for(sliceIdx=0; sliceIdxnumSupportedSlices; sliceIdx++) { - DU_ALLOC(taiSliceSuppLst->snssai[sliceIdx], sizeof(F1Snsaai)); + DU_ALLOC(taiSliceSuppLst->snssai[sliceIdx], sizeof(Snssai)); if(taiSliceSuppLst->snssai[sliceIdx] == NULLP) { DU_LOG("\nERROR --> DU_APP: readCfg():Memory allocation failed"); return RFAILED; } - memcpy(taiSliceSuppLst->snssai[sliceIdx], &snsaai[sliceIdx], sizeof(F1Snsaai)); - - /* Checking rrmPolicy Slice list available or not */ - if(!memcmp(&snsaai[sliceIdx], &memberList.snsaai, sizeof(F1Snsaai))) - { - rrmPolicy = &duCfgParam.srvdCellLst[srvdCellIdx].duCellInfo.cellInfo.srvdPlmn[srvdPlmnIdx].rrmPolicy; - rrmPolicy->present = true; - rrmPolicy->rsrcType = rsrcType; - rrmPolicy->memberList.snsaai = memberList.snsaai; - rrmPolicy->rrmPolicyRatio = policyRatio; - } - } +#ifdef O1_ENABLE + memcpy(taiSliceSuppLst->snssai[sliceIdx]->sd, cellParams.plmnList[sliceIdx].sd, \ +SD_SIZE*sizeof(uint8_t)); + taiSliceSuppLst->snssai[sliceIdx]->sst = cellParams.plmnList[sliceIdx].sst; +#else + memcpy(taiSliceSuppLst->snssai[sliceIdx], &snssai[sliceIdx], sizeof(Snssai)); +#endif + } } + /* NR Mode info */ +#ifdef O1_ENABLE + /* TAC and EPSTAC */ + duCfgParam.srvdCellLst[srvdCellIdx].duCellInfo.epsTac = cellParams.nRTAC; //to check and fill + duCfgParam.srvdCellLst[srvdCellIdx].duCellInfo.tac = cellParams.nRTAC; + duCfgParam.srvdCellLst[srvdCellIdx].duCellInfo.f1Mode.mode.fdd.ulNrFreqInfo.nrArfcn = cellParams.arfcnUL; + duCfgParam.srvdCellLst[srvdCellIdx].duCellInfo.f1Mode.mode.fdd.ulNrFreqInfo.sulInfo.sulArfcn = cellParams.arfcnSUL; +#else /* TAC and EPSTAC */ - duCfgParam.srvdCellLst[srvdCellIdx].duCellInfo.tac = DU_TAC; duCfgParam.srvdCellLst[srvdCellIdx].duCellInfo.epsTac = DU_TAC; //to check and fill - /* NR Mode info */ + duCfgParam.srvdCellLst[srvdCellIdx].duCellInfo.tac = DU_TAC; duCfgParam.srvdCellLst[srvdCellIdx].duCellInfo.f1Mode.mode.fdd.ulNrFreqInfo.nrArfcn = NR_UL_ARFCN; duCfgParam.srvdCellLst[srvdCellIdx].duCellInfo.f1Mode.mode.fdd.ulNrFreqInfo.sulInfo.sulArfcn = SUL_ARFCN; +#endif duCfgParam.srvdCellLst[srvdCellIdx].duCellInfo.f1Mode.mode.fdd.ulNrFreqInfo.sulInfo.sulTxBw.nrScs = SCS_15; duCfgParam.srvdCellLst[srvdCellIdx].duCellInfo.f1Mode.mode.fdd.ulNrFreqInfo.sulInfo.sulTxBw.nrb = NRB_106; @@ -807,8 +868,13 @@ uint8_t readCfg() sulBand[bandIdx] = SUL_BAND; } } +#ifdef O1_ENABLE + duCfgParam.srvdCellLst[srvdCellIdx].duCellInfo.f1Mode.mode.fdd.dlNrFreqInfo.nrArfcn = cellParams.arfcnDL; + duCfgParam.srvdCellLst[srvdCellIdx].duCellInfo.f1Mode.mode.fdd.dlNrFreqInfo.sulInfo.sulArfcn = cellParams.arfcnSUL; +#else duCfgParam.srvdCellLst[srvdCellIdx].duCellInfo.f1Mode.mode.fdd.dlNrFreqInfo.nrArfcn = NR_DL_ARFCN; duCfgParam.srvdCellLst[srvdCellIdx].duCellInfo.f1Mode.mode.fdd.dlNrFreqInfo.sulInfo.sulArfcn = SUL_ARFCN; +#endif duCfgParam.srvdCellLst[srvdCellIdx].duCellInfo.f1Mode.mode.fdd.dlNrFreqInfo.sulInfo.sulTxBw.nrScs = SCS_15; duCfgParam.srvdCellLst[srvdCellIdx].duCellInfo.f1Mode.mode.fdd.dlNrFreqInfo.sulInfo.sulTxBw.nrb = NRB_106; for(freqBandIdx=0; freqBandIdxtotalRrmPolicy = policyNum; + DU_ALLOC(tempSliceCfg->rrmPolicy, tempSliceCfg->totalRrmPolicy * sizeof(RrmPolicy*)); + if(tempSliceCfg->rrmPolicy == NULLP) + { + DU_LOG("\nERROR --> DU APP : Memory allocation failed in cpyRrmPolicyInDuCfgParams"); + return RFAILED; + } + + for(policyIdx = 0; policyIdxtotalRrmPolicy; policyIdx++) + { + DU_ALLOC(tempSliceCfg->rrmPolicy[policyIdx], sizeof(RrmPolicy)); + if(tempSliceCfg->rrmPolicy[policyIdx] == NULLP) + { + DU_LOG("\nERROR --> DU APP : Memory allocation failed in cpyRrmPolicyInDuCfgParams"); + return RFAILED; + } + + if(rrmPolicy[policyIdx].rRMMemberNum) + { + tempSliceCfg->rrmPolicy[policyIdx]->numMemberList = rrmPolicy[policyIdx].rRMMemberNum; + DU_ALLOC(tempSliceCfg->rrmPolicy[policyIdx]->memberList, tempSliceCfg->rrmPolicy[policyIdx]->numMemberList * sizeof(PolicyMemberList*)) + if(tempSliceCfg->rrmPolicy[policyIdx]->memberList == NULLP) + { + DU_LOG("\nERROR --> DU APP : Memory allocation failed in cpyRrmPolicyInDuCfgParams"); + return RFAILED; + } + + for(memberListIdx = 0; memberListIdxrrmPolicy[policyIdx]->numMemberList; memberListIdx++) + { + DU_ALLOC(tempSliceCfg->rrmPolicy[policyIdx]->memberList[memberListIdx], sizeof(PolicyMemberList)) + if(tempSliceCfg->rrmPolicy[policyIdx]->memberList[memberListIdx] == NULLP) + { + DU_LOG("\nERROR --> DU APP : Memory allocation failed in cpyRrmPolicyInDuCfgParams"); + return RFAILED; + } + memcpy(&tempSliceCfg->rrmPolicy[policyIdx]->memberList[memberListIdx]->snssai.sd, &rrmPolicy[policyIdx].rRMPolicyMemberList[memberListIdx].sd, 3 * sizeof(uint8_t)); + memcpy(&tempSliceCfg->rrmPolicy[policyIdx]->memberList[memberListIdx]->snssai.sst, &rrmPolicy[policyIdx].rRMPolicyMemberList[memberListIdx].sst, sizeof(uint8_t)); + memcpy(&tempSliceCfg->rrmPolicy[policyIdx]->memberList[memberListIdx]->plmn.mcc, &rrmPolicy[policyIdx].rRMPolicyMemberList[memberListIdx].mcc, 3 * sizeof(uint8_t)); + memcpy(&tempSliceCfg->rrmPolicy[policyIdx]->memberList[memberListIdx]->plmn.mnc, &rrmPolicy[policyIdx].rRMPolicyMemberList[memberListIdx].mnc, 3 * sizeof(uint8_t)); + count++; + } + } + + tempSliceCfg->rrmPolicy[policyIdx]->rsrcType = rrmPolicy[policyIdx].resourceType; + tempSliceCfg->rrmPolicy[policyIdx]->policyMaxRatio = rrmPolicy[policyIdx].rRMPolicyMaxRatio; + tempSliceCfg->rrmPolicy[policyIdx]->policyMinRatio = rrmPolicy[policyIdx].rRMPolicyMinRatio; + tempSliceCfg->rrmPolicy[policyIdx]->policyDedicatedRatio = rrmPolicy[policyIdx].rRMPolicyDedicatedRatio; + + } + tempSliceCfg->totalSliceCount = count; + } + return ROK; +} +#endif /******************************************************************* * * @brief Reads config and posts message to du_app on completion