X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fdu_app%2Fdu_cfg.c;h=34308d759a755842c156f7bcf1ef00d90f8c0b51;hb=5b0a8c1ccec481f354d22c1dff57b35bf72a1622;hp=8392ff49547f51f661713bda001016a51f3f9297;hpb=6a921a2e24077727de299706bf23ceec317f1c5c;p=o-du%2Fl2.git diff --git a/src/du_app/du_cfg.c b/src/du_app/du_cfg.c index 8392ff495..34308d759 100644 --- a/src/du_app/du_cfg.c +++ b/src/du_app/du_cfg.c @@ -18,12 +18,14 @@ /* This file contains all utility functions */ #include "common_def.h" +#include "du_tmr.h" #include "legtp.h" #include "lrg.h" #include "lkw.x" #include "lrg.x" #include "du_app_mac_inf.h" #include "du_app_rlc_inf.h" +#include "du_e2ap_mgr.h" #include "du_cfg.h" #include "du_mgr.h" #include "du_utils.h" @@ -43,6 +45,7 @@ #include "PagingCycle.h" #include "PCCH-Config.h" #include "TimeAlignmentTimer.h" +#include "BCCH-DL-SCH-Message.h" #include "RACH-ConfigGeneric.h" #include "PUSCH-TimeDomainResourceAllocation.h" #include "PUCCH-ConfigCommon.h" @@ -77,53 +80,6 @@ char encBuf[ENC_BUF_MAX_LEN]; 9 UL UL UL UL UL UL UL UL UL UL UL UL UL UL */ -#ifdef NR_TDD -/******************************************************************* - * - * @brief Fills the Slot configuration - * - * @details - * - * Function : FillSlotConfig - * - * Functionality:Fill the Slot configuration values - * - * @params[in] void - * @return ROK - success - * RFAILED - failure - * - * ****************************************************************/ -void FillSlotConfig() -{ - 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++) - { - duCfgParam.macCellCfg.tddCfg.slotCfg[slot][symbol] = DL_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. * @@ -143,63 +99,78 @@ void FillSlotConfig() uint8_t readMacCfg() { - uint8_t idx=0, sliceIdx=0; + uint8_t idx=0, sliceIdx=0,plmnIdx = 0; F1TaiSliceSuppLst *taiSliceSuppLst; - duCfgParam.macCellCfg.carrierId = CARRIER_IDX; - - /* Cell configuration */ - duCfgParam.macCellCfg.numerology = NR_NUMEROLOGY; - duCfgParam.macCellCfg.dupType = DUPLEX_MODE; - /* DL carrier configuration */ - duCfgParam.macCellCfg.dlCarrCfg.pres = TRUE; #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; + duCfgParam.macCellCfg.carrCfg.dlBw = cellParams.bSChannelBwDL; + duCfgParam.macCellCfg.carrCfg.dlFreq = convertArfcnToFreqKhz(cellParams.arfcnDL); #else duCfgParam.macCellCfg.cellId = NR_CELL_ID; - duCfgParam.macCellCfg.phyCellId = NR_PCI; - duCfgParam.macCellCfg.dlCarrCfg.bw = NR_BANDWIDTH; - duCfgParam.macCellCfg.dlCarrCfg.freq = NR_DL_ARFCN; + duCfgParam.macCellCfg.carrCfg.dlBw = NR_BANDWIDTH; + duCfgParam.macCellCfg.carrCfg.dlFreq = convertArfcnToFreqKhz(NR_DL_ARFCN); #endif - - duCfgParam.macCellCfg.dlCarrCfg.k0[0] = 1; - duCfgParam.macCellCfg.dlCarrCfg.k0[1] = 1; - duCfgParam.macCellCfg.dlCarrCfg.k0[2] = 1; - duCfgParam.macCellCfg.dlCarrCfg.k0[3] = 1; - duCfgParam.macCellCfg.dlCarrCfg.k0[4] = 1; - duCfgParam.macCellCfg.dlCarrCfg.gridSize[0] = 273; - duCfgParam.macCellCfg.dlCarrCfg.gridSize[1] = 1; - duCfgParam.macCellCfg.dlCarrCfg.gridSize[2] = 1; - duCfgParam.macCellCfg.dlCarrCfg.gridSize[3] = 1; - duCfgParam.macCellCfg.dlCarrCfg.gridSize[4] = 1; - duCfgParam.macCellCfg.dlCarrCfg.numAnt = NUM_TX_ANT; - + duCfgParam.macCellCfg.carrCfg.numTxAnt = NUM_TX_ANT; /* UL Carrier configuration */ - duCfgParam.macCellCfg.ulCarrCfg.pres = TRUE; #ifdef O1_ENABLE - duCfgParam.macCellCfg.ulCarrCfg.bw = cellParams.bSChannelBwUL; - duCfgParam.macCellCfg.ulCarrCfg.freq = cellParams.bSChannelBwDL; + duCfgParam.macCellCfg.carrCfg.ulBw = cellParams.bSChannelBwUL; + duCfgParam.macCellCfg.carrCfg.ulFreq = convertArfcnToFreqKhz(cellParams.arfcnUL); #else - duCfgParam.macCellCfg.ulCarrCfg.bw = NR_BANDWIDTH; - duCfgParam.macCellCfg.ulCarrCfg.freq = NR_UL_ARFCN; + duCfgParam.macCellCfg.carrCfg.ulBw = NR_BANDWIDTH; + duCfgParam.macCellCfg.carrCfg.ulFreq = convertArfcnToFreqKhz(NR_UL_ARFCN); #endif - duCfgParam.macCellCfg.ulCarrCfg.k0[0] = 1; - duCfgParam.macCellCfg.ulCarrCfg.k0[1] = 1; - duCfgParam.macCellCfg.ulCarrCfg.k0[2] = 1; - duCfgParam.macCellCfg.ulCarrCfg.k0[3] = 1; - duCfgParam.macCellCfg.ulCarrCfg.k0[4] = 1; - duCfgParam.macCellCfg.ulCarrCfg.gridSize[0] = 1; - duCfgParam.macCellCfg.ulCarrCfg.gridSize[1] = 1; - duCfgParam.macCellCfg.ulCarrCfg.gridSize[2] = 1; - duCfgParam.macCellCfg.ulCarrCfg.gridSize[3] = 1; - duCfgParam.macCellCfg.ulCarrCfg.gridSize[4] = 1; - duCfgParam.macCellCfg.ulCarrCfg.numAnt = NUM_RX_ANT; - - duCfgParam.macCellCfg.freqShft = FREQ_SHIFT_7P5KHZ; + duCfgParam.macCellCfg.carrCfg.numRxAnt = NUM_RX_ANT; + + /* Cell configuration */ +#ifdef O1_ENABLE + duCfgParam.macCellCfg.cellCfg.opState = cellParams.operationalState; + duCfgParam.macCellCfg.cellCfg.adminState = cellParams.administrativeState; + 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); +#else + duCfgParam.macCellCfg.cellCfg.opState = OP_DISABLED; + duCfgParam.macCellCfg.cellCfg.adminState = ADMIN_UNLOCKED; + duCfgParam.macCellCfg.cellCfg.cellState = CELL_INACTIVE; + duCfgParam.macCellCfg.cellCfg.phyCellId = NR_PCI; + duCfgParam.macCellCfg.cellCfg.tac = DU_TAC; + duCfgParam.macCellCfg.cellCfg.ssbFreq = SSB_FREQUENCY; +#endif + /* Plmn And SNSSAI Configuration */ + for(plmnIdx = 0; plmnIdx < MAX_PLMN; plmnIdx++) + { + memcpy(&duCfgParam.macCellCfg.cellCfg.plmnInfoList[plmnIdx].plmn, &duCfgParam.srvdCellLst[0].duCellInfo.cellInfo.srvdPlmn[plmnIdx].plmn,\ + sizeof(Plmn)); + taiSliceSuppLst = &duCfgParam.srvdCellLst[0].duCellInfo.cellInfo.srvdPlmn[plmnIdx].taiSliceSuppLst; + duCfgParam.macCellCfg.cellCfg.plmnInfoList[plmnIdx].numSupportedSlice = taiSliceSuppLst->numSupportedSlices; + if(taiSliceSuppLst->snssai) + { + DU_ALLOC_SHRABL_BUF(duCfgParam.macCellCfg.cellCfg.plmnInfoList[plmnIdx].snssai, (duCfgParam.macCellCfg.cellCfg.plmnInfoList[plmnIdx].numSupportedSlice) * sizeof(Snssai*)); + if(duCfgParam.macCellCfg.cellCfg.plmnInfoList[plmnIdx].snssai == NULLP) + { + DU_LOG("\nERROR --> DU_APP: Memory allocation failed at readMacCfg"); + return RFAILED; + } + } + for(sliceIdx=0; sliceIdx < taiSliceSuppLst->numSupportedSlices; sliceIdx++) + { + if(taiSliceSuppLst->snssai[sliceIdx] != NULLP) + { + DU_ALLOC_SHRABL_BUF(duCfgParam.macCellCfg.cellCfg.plmnInfoList[plmnIdx].snssai[sliceIdx], sizeof(Snssai)); + if(duCfgParam.macCellCfg.cellCfg.plmnInfoList[plmnIdx].snssai[sliceIdx] == NULLP) + { + DU_LOG("\nERROR --> DU_APP: Memory allocation failed at readMacCfg"); + return RFAILED; + } + memcpy(duCfgParam.macCellCfg.cellCfg.plmnInfoList[plmnIdx].snssai[sliceIdx], taiSliceSuppLst->snssai[sliceIdx], sizeof(Snssai)); + } + } + } + duCfgParam.macCellCfg.cellCfg.numerology = NR_NUMEROLOGY; + duCfgParam.macCellCfg.cellCfg.dupType = DUPLEX_MODE; /* SSB configuration */ duCfgParam.macCellCfg.ssbCfg.ssbPbchPwr = SSB_PBCH_PWR; @@ -208,7 +179,7 @@ uint8_t readMacCfg() duCfgParam.macCellCfg.ssbCfg.betaPss = BETA_PSS; #ifdef O1_ENABLE duCfgParam.macCellCfg.ssbCfg.scsCmn = convertScsValToScsEnum(cellParams.ssbSubCarrierSpacing); - duCfgParam.macCellCfg.ssbCfg.ssbPeriod = convertScsPeriodicityToEnum(cellParams.ssbPeriodicity); + duCfgParam.macCellCfg.ssbCfg.ssbPeriod = convertSSBPeriodicityToEnum(cellParams.ssbPeriodicity); duCfgParam.macCellCfg.ssbCfg.ssbScOffset = cellParams.ssbOffset; #else duCfgParam.macCellCfg.ssbCfg.scsCmn = NR_SCS; @@ -225,75 +196,55 @@ uint8_t readMacCfg() { memcpy(&duCfgParam.macCellCfg.ssbCfg.mibPdu, encBuf,encBufSize); } - duCfgParam.macCellCfg.ssbCfg.multCarrBand = SSB_MULT_CARRIER_BAND; - duCfgParam.macCellCfg.ssbCfg.multCellCarr = MULT_CELL_CARRIER; /* PRACH configuration */ - duCfgParam.macCellCfg.prachCfg.pres = TRUE; - duCfgParam.macCellCfg.prachCfg.prachCfgIdx = PRACH_CONFIG_IDX; duCfgParam.macCellCfg.prachCfg.prachSeqLen = PRACH_SEQ_LEN; duCfgParam.macCellCfg.prachCfg.prachSubcSpacing = convertScsEnumValToScsVal(PRACH_SUBCARRIER_SPACING); - duCfgParam.macCellCfg.prachCfg.prachRstSetCfg = PRACH_RESTRICTED_SET_CFG; + duCfgParam.macCellCfg.prachCfg.prachCfgIdx = PRACH_CONFIG_IDX; duCfgParam.macCellCfg.prachCfg.msg1Fdm = NUM_PRACH_FDM; - duCfgParam.macCellCfg.prachCfg.msg1FreqStart = PRACH_FREQ_START; - duCfgParam.macCellCfg.prachCfg.rootSeqLen = ROOT_SEQ_LEN; duCfgParam.macCellCfg.prachCfg.fdm[0].rootSeqIdx = ROOT_SEQ_IDX; duCfgParam.macCellCfg.prachCfg.fdm[0].numRootSeq = NUM_ROOT_SEQ; duCfgParam.macCellCfg.prachCfg.fdm[0].k1 = 0; duCfgParam.macCellCfg.prachCfg.fdm[0].zeroCorrZoneCfg = ZERO_CORRELATION_ZONE_CFG; - duCfgParam.macCellCfg.prachCfg.fdm[0].numUnusedRootSeq = NUM_UNUSED_ROOT_SEQ; - if(duCfgParam.macCellCfg.prachCfg.fdm[0].numUnusedRootSeq != 0) - { - DU_ALLOC_SHRABL_BUF(duCfgParam.macCellCfg.prachCfg.fdm[0].unsuedRootSeq, - NUM_UNUSED_ROOT_SEQ * sizeof(uint8_t)); - if(duCfgParam.macCellCfg.prachCfg.fdm[0].unsuedRootSeq == NULLP) - { - DU_LOG("\nERROR --> DU_APP : Memory allocation failed at readMacCfg"); - return RFAILED; - } - *(duCfgParam.macCellCfg.prachCfg.fdm[0].unsuedRootSeq) = UNUSED_ROOT_SEQ; - } + duCfgParam.macCellCfg.prachCfg.prachRstSetCfg = PRACH_RESTRICTED_SET_CFG; + duCfgParam.macCellCfg.prachCfg.ssbPerRach = SSB_PER_RACH; + duCfgParam.macCellCfg.prachCfg.msg1FreqStart = PRACH_FREQ_START; duCfgParam.macCellCfg.prachCfg.totalNumRaPreamble = NUM_RA_PREAMBLE; - duCfgParam.macCellCfg.prachCfg.ssbPerRach = SSB_PER_RACH; duCfgParam.macCellCfg.prachCfg.numCbPreamblePerSsb = CB_PREAMBLE_PER_SSB; - duCfgParam.macCellCfg.prachCfg.prachMultCarrBand = PRACH_MULT_CARRIER_BAND; - duCfgParam.macCellCfg.prachCfg.raContResTmr = RA_CONT_RES_TIMER; - 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; +#ifdef NR_TDD duCfgParam.macCellCfg.tddCfg.tddPeriod = TDD_PERIODICITY; + duCfgParam.macCellCfg.tddCfg.nrOfDlSlots = NUM_DL_SLOTS; + duCfgParam.macCellCfg.tddCfg.nrOfDlSymbols = NUM_DL_SYMBOLS; + duCfgParam.macCellCfg.tddCfg.nrOfUlSlots = NUM_UL_SLOTS; + duCfgParam.macCellCfg.tddCfg.nrOfUlSymbols = NUM_UL_SYMBOLS; - FillSlotConfig(); + //FillSlotConfig(); #endif - /* RSSI Measurement configuration */ - duCfgParam.macCellCfg.rssiUnit = RSS_MEASUREMENT_UNIT; /* fill SIB1 configuration */ - duCfgParam.macCellCfg.sib1Cfg.sib1PduLen = duCfgParam.srvdCellLst[0].duSysInfo.sib1Len; - 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.sib1RepetitionPeriod = SIB1_REPETITION_PERIOD; - duCfgParam.macCellCfg.sib1Cfg.coresetZeroIndex = CORESET_0_INDEX; - duCfgParam.macCellCfg.sib1Cfg.searchSpaceZeroIndex = SEARCHSPACE_0_INDEX; - duCfgParam.macCellCfg.sib1Cfg.sib1Mcs = DEFAULT_MCS; - - duCfgParam.macCellCfg.sib1Cfg.pagingCfg.numPO = duCfgParam.sib1Params.srvCellCfgCommSib.dlCfg.pcchCfg.ns; + duCfgParam.macCellCfg.cellCfg.sib1Cfg.sib1PduLen = duCfgParam.srvdCellLst[0].duSysInfo.sib1Len; + DU_ALLOC_SHRABL_BUF(duCfgParam.macCellCfg.cellCfg.sib1Cfg.sib1Pdu,duCfgParam.srvdCellLst[0].duSysInfo.sib1Len); + memcpy(duCfgParam.macCellCfg.cellCfg.sib1Cfg.sib1Pdu, duCfgParam.srvdCellLst[0].duSysInfo.sib1Msg, \ + duCfgParam.srvdCellLst[0].duSysInfo.sib1Len); + duCfgParam.macCellCfg.cellCfg.sib1Cfg.pdcchCfgSib1.coresetZeroIndex = CORESET_0_INDEX; + duCfgParam.macCellCfg.cellCfg.sib1Cfg.pdcchCfgSib1.searchSpaceZeroIndex = SEARCHSPACE_0_INDEX; + + duCfgParam.macCellCfg.cellCfg.sib1Cfg.pagingCfg.numPO = duCfgParam.sib1Params.srvCellCfgCommSib.dlCfg.pcchCfg.ns; if((duCfgParam.sib1Params.srvCellCfgCommSib.dlCfg.pcchCfg.firstPDCCHMontioringType != \ - PCCH_Config__firstPDCCH_MonitoringOccasionOfPO_PR_NOTHING) && (duCfgParam.macCellCfg.sib1Cfg.pagingCfg.numPO != 0)) + PCCH_Config__firstPDCCH_MonitoringOccasionOfPO_PR_NOTHING) && (duCfgParam.macCellCfg.cellCfg.sib1Cfg.pagingCfg.numPO != 0)) { - duCfgParam.macCellCfg.sib1Cfg.pagingCfg.poPresent = TRUE; - memcpy(duCfgParam.macCellCfg.sib1Cfg.pagingCfg.pagingOcc, - duCfgParam.sib1Params.srvCellCfgCommSib.dlCfg.pcchCfg.firstPDCCHMontioringInfo,MAX_PO_PER_PF); + duCfgParam.macCellCfg.cellCfg.sib1Cfg.pagingCfg.poPresent = TRUE; + memcpy(duCfgParam.macCellCfg.cellCfg.sib1Cfg.pagingCfg.pagingOcc, + duCfgParam.sib1Params.srvCellCfgCommSib.dlCfg.pcchCfg.firstPDCCHMontioringInfo,MAX_PO_PER_PF); } else { - duCfgParam.macCellCfg.sib1Cfg.pagingCfg.poPresent = FALSE; + duCfgParam.macCellCfg.cellCfg.sib1Cfg.pagingCfg.poPresent = FALSE; } /* fill Intial DL BWP */ @@ -328,7 +279,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 = @@ -363,39 +314,12 @@ uint8_t readMacCfg() duCfgParam.macCellCfg.initialUlBwp.puschCommon.timeDomRsrcAllocList[1].symbolLength = PUSCH_LENGTH_SYMBOL; - duCfgParam.macCellCfg.dmrsTypeAPos = DMRS_TYPE_A_POS; + 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; - - /* Plmn And SNSSAI Configuration */ - memcpy(&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)); - } - } + #ifndef O1_ENABLE @@ -404,8 +328,8 @@ uint8_t readMacCfg() rrmPolicy.id[0] = 1; rrmPolicy.resourceType = PRB; rrmPolicy.rRMMemberNum = 1; - memcpy(rrmPolicy.rRMPolicyMemberList[0].mcc,duCfgParam.macCellCfg.plmnInfoList.plmn.mcc, 3*sizeof(uint8_t)); - memcpy(rrmPolicy.rRMPolicyMemberList[0].mnc,duCfgParam.macCellCfg.plmnInfoList.plmn.mnc, 3*sizeof(uint8_t)); + memcpy(rrmPolicy.rRMPolicyMemberList[0].mcc,duCfgParam.macCellCfg.cellCfg.plmnInfoList[0].plmn.mcc, 3*sizeof(uint8_t)); + memcpy(rrmPolicy.rRMPolicyMemberList[0].mnc,duCfgParam.macCellCfg.cellCfg.plmnInfoList[0].plmn.mnc, 3*sizeof(uint8_t)); rrmPolicy.rRMPolicyMemberList[0].sst = 1; rrmPolicy.rRMPolicyMemberList[0].sd[0] = 2; rrmPolicy.rRMPolicyMemberList[0].sd[1] = 3; @@ -415,7 +339,7 @@ uint8_t readMacCfg() rrmPolicy.rRMPolicyDedicatedRatio = 10; cpyRrmPolicyInDuCfgParams(&rrmPolicy, 1, &duCfgParam.tempSliceCfg); - + #endif return ROK; @@ -445,7 +369,7 @@ uint8_t fillDuPort(uint16_t *duPort) duPort[E2_INTERFACE] = g_cfg.RIC_Port; #else duPort[F1_INTERFACE] = F1_SCTP_PORT; /* DU Port idx 0 38472 */ - duPort[E2_INTERFACE] = E2_SCTP_PORT; /* RIC Port idx 1 38482 */ + duPort[E2_INTERFACE] = E2_SCTP_PORT; /* RIC Port idx 1 36421 */ #endif return ROK; } @@ -671,12 +595,19 @@ uint8_t fillServCellCfgCommSib(SrvCellCfgCommSib *srvCellCfgComm) 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; + 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*/ @@ -717,18 +648,93 @@ uint8_t readCfg() /* EGTP Parameters */ duCfgParam.egtpParams.localIp.ipV4Pres = TRUE; duCfgParam.egtpParams.localIp.ipV4Addr = ipv4_du; - duCfgParam.egtpParams.localPort = DU_EGTP_PORT; + duCfgParam.egtpParams.localPort = F1_EGTP_PORT; duCfgParam.egtpParams.destIp.ipV4Pres = TRUE; duCfgParam.egtpParams.destIp.ipV4Addr = ipv4_cu; - duCfgParam.egtpParams.destPort = CU_EGTP_PORT; + duCfgParam.egtpParams.destPort = F1_EGTP_PORT; duCfgParam.egtpParams.minTunnelId = MIN_TEID; duCfgParam.egtpParams.maxTunnelId = MAX_TEID; duCfgParam.maxUe = 32; //TODO: Check - /* DU Info */ - duCfgParam.duId = DU_ID; + + /* DU Info */ + duCfgParam.duId = DU_ID; + DU_ALLOC(duCfgParam.duName, sizeof(DU_NAME)); + if(!duCfgParam.duName) + { + DU_LOG("\nDEBUG --> DU_APP: readCfg(): Memory allocation failure for DU name"); + return RFAILED; + } 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; tnlAssocIdxmeasurementTypeId = 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 @@ -741,8 +747,7 @@ uint8_t readCfg() mib.controlResourceSetZero = CORESET_0_INDEX; mib.searchSpaceZero = SEARCHSPACE_0_INDEX; mib.cellBarred = MIB__cellBarred_notBarred; - mib.intraFreqReselection = - MIB__intraFreqReselection_notAllowed; + mib.intraFreqReselection = MIB__intraFreqReselection_notAllowed; duCfgParam.mibParams = mib; /* SIB1 Params */ @@ -757,7 +762,7 @@ uint8_t readCfg() #ifdef O1_ENABLE sib1.tac = cellParams.nRTAC; sib1.cellIdentity = CELL_IDENTITY * cellParams.cellLocalId; - DU_LOG("\n*********DEBUG --> DU_APP: readCfg(): OAM CellLocalId=%d", \ + DU_LOG("\nDEBUG --> DU_APP: readCfg(): OAM CellLocalId=%d", \ sib1.cellIdentity); #else sib1.tac = DU_TAC; @@ -765,7 +770,8 @@ uint8_t readCfg() #endif sib1.cellResvdForOpUse = PLMN_IdentityInfo__cellReservedForOperatorUse_notReserved; sib1.connEstFailCnt = ConnEstFailureControl__connEstFailCount_n3; - sib1.connEstFailOffValidity = ConnEstFailureControl__connEstFailOffsetValidity_s120; + sib1.connEstFailOffValidity = ConnEstFailureControl__connEstFailOffsetValidity_s900; + sib1.connEstFailOffset = 15; sib1.siSchedInfo.winLen = SI_SchedulingInfo__si_WindowLength_s5; sib1.siSchedInfo.broadcastSta = SchedulingInfo__si_BroadcastStatus_broadcasting; sib1.siSchedInfo.preiodicity = SchedulingInfo__si_Periodicity_rf8; @@ -874,13 +880,13 @@ 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 = convertScsPeriodicityToEnum(cellParams.ssbPeriodicity); + duCfgParam.srvdCellLst[srvdCellIdx].duCellInfo.f1Mode.mode.tdd.nrFreqInfo.sulInfo.sulTxBw.nrScs = 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; - duCfgParam.srvdCellLst[srvdCellIdx].duCellInfo.f1Mode.mode.tdd.nrFreqInfo.sulInfo.sulTxBw.nrScs = SSB_PRDCTY_MS_20; + duCfgParam.srvdCellLst[srvdCellIdx].duCellInfo.f1Mode.mode.tdd.nrFreqInfo.sulInfo.sulTxBw.nrScs = NR_SCS; #endif - duCfgParam.srvdCellLst[srvdCellIdx].duCellInfo.f1Mode.mode.tdd.nrFreqInfo.sulInfo.sulTxBw.nrb = NRB_106; + duCfgParam.srvdCellLst[srvdCellIdx].duCellInfo.f1Mode.mode.tdd.nrFreqInfo.sulInfo.sulTxBw.nrb = NRB_273; for(freqBandIdx=0; freqBandIdxtotalRrmPolicy = policyNum; - DU_ALLOC(tempSliceCfg->rrmPolicy, tempSliceCfg->totalRrmPolicy * sizeof(RrmPolicy*)); - if(tempSliceCfg->rrmPolicy == NULLP) + tempSliceCfg->numOfRrmPolicy = policyNum; + DU_ALLOC_SHRABL_BUF(tempSliceCfg->listOfRrmPolicy, tempSliceCfg->numOfRrmPolicy * sizeof(MacSliceRrmPolicy*)); + if(!tempSliceCfg->listOfRrmPolicy) { DU_LOG("\nERROR --> DU APP : Memory allocation failed in cpyRrmPolicyInDuCfgParams"); return RFAILED; } - for(policyIdx = 0; policyIdxtotalRrmPolicy; policyIdx++) + for(policyIdx = 0; policyIdxnumOfRrmPolicy; policyIdx++) { - DU_ALLOC(tempSliceCfg->rrmPolicy[policyIdx], sizeof(RrmPolicy)); - if(tempSliceCfg->rrmPolicy[policyIdx] == NULLP) + DU_ALLOC_SHRABL_BUF(tempSliceCfg->listOfRrmPolicy[policyIdx], sizeof(MacSliceRrmPolicy)); + if(!tempSliceCfg->listOfRrmPolicy[policyIdx]) { DU_LOG("\nERROR --> DU APP : Memory allocation failed in cpyRrmPolicyInDuCfgParams"); return RFAILED; } - - if(rrmPolicy[policyIdx].rRMMemberNum) + + tempSliceCfg->listOfRrmPolicy[policyIdx]->resourceType = rrmPolicy[policyIdx].resourceType; + + tempSliceCfg->listOfRrmPolicy[policyIdx]->numOfRrmPolicyMem = rrmPolicy[policyIdx].rRMMemberNum; + + if(tempSliceCfg->listOfRrmPolicy[policyIdx]->numOfRrmPolicyMem) { - 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_ALLOC_SHRABL_BUF(tempSliceCfg->listOfRrmPolicy[policyIdx]->rRMPolicyMemberList,\ + tempSliceCfg->listOfRrmPolicy[policyIdx]->numOfRrmPolicyMem * sizeof(RrmPolicyMemberList*)); + + if(!tempSliceCfg->listOfRrmPolicy[policyIdx]->rRMPolicyMemberList) { DU_LOG("\nERROR --> DU APP : Memory allocation failed in cpyRrmPolicyInDuCfgParams"); return RFAILED; } - for(memberListIdx = 0; memberListIdxrrmPolicy[policyIdx]->numMemberList; memberListIdx++) + + for(memberListIdx = 0; memberListIdxlistOfRrmPolicy[policyIdx]->numOfRrmPolicyMem; memberListIdx++) { - DU_ALLOC(tempSliceCfg->rrmPolicy[policyIdx]->memberList[memberListIdx], sizeof(PolicyMemberList)) - if(tempSliceCfg->rrmPolicy[policyIdx]->memberList[memberListIdx] == NULLP) + DU_ALLOC_SHRABL_BUF(tempSliceCfg->listOfRrmPolicy[policyIdx]->rRMPolicyMemberList[memberListIdx], sizeof(RrmPolicyMemberList)); + if(!tempSliceCfg->listOfRrmPolicy[policyIdx]->rRMPolicyMemberList[memberListIdx]) { 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++; + memcpy(&tempSliceCfg->listOfRrmPolicy[policyIdx]->rRMPolicyMemberList[memberListIdx]->snssai.sd,\ + &rrmPolicy[policyIdx].rRMPolicyMemberList[memberListIdx].sd, 3 * sizeof(uint8_t)); + memcpy(&tempSliceCfg->listOfRrmPolicy[policyIdx]->rRMPolicyMemberList[memberListIdx]->snssai.sst,\ + &rrmPolicy[policyIdx].rRMPolicyMemberList[memberListIdx].sst, sizeof(uint8_t)); + memcpy(&tempSliceCfg->listOfRrmPolicy[policyIdx]->rRMPolicyMemberList[memberListIdx]->plmn.mcc,\ + &rrmPolicy[policyIdx].rRMPolicyMemberList[memberListIdx].mcc, 3 * sizeof(uint8_t)); + memcpy(&tempSliceCfg->listOfRrmPolicy[policyIdx]->rRMPolicyMemberList[memberListIdx]->plmn.mnc,\ + &rrmPolicy[policyIdx].rRMPolicyMemberList[memberListIdx].mnc, 3 * sizeof(uint8_t)); } + tempSliceCfg->listOfRrmPolicy[policyIdx]->policyRatio.maxRatio = rrmPolicy[policyIdx].rRMPolicyMaxRatio; + tempSliceCfg->listOfRrmPolicy[policyIdx]->policyRatio.minRatio = rrmPolicy[policyIdx].rRMPolicyMinRatio; + tempSliceCfg->listOfRrmPolicy[policyIdx]->policyRatio.dedicatedRatio = rrmPolicy[policyIdx].rRMPolicyDedicatedRatio; } - - 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; } + /******************************************************************* * * @brief Reads config and posts message to du_app on completion @@ -1148,7 +1160,26 @@ uint8_t duReadCfg() pst.selector = ODU_SELECTOR_TC; pst.pool= DU_POOL; + /* Initialize the timer blocks */ + cmInitTimers(&(duCb.e2apDb.e2TimersInfo.e2Timers.e2SetupTimer), 1); + /* Initialzie the timer queue */ + memset(&(duCb.duTimersInfo.tmrTq), 0, sizeof(CmTqType) * DU_TQ_SIZE); + + /* Initialize the timer control point */ + memset(&(duCb.duTimersInfo.tmrTqCp), 0, sizeof(CmTqCp)); + duCb.duTimersInfo.tmrTqCp.tmrLen = DU_TQ_SIZE; + + /* Initialize the timer resolution */ + duCb.duTimersInfo.tmrRes = DU_TIMER_RESOLUTION; + + /* Timer Registration request to system services */ + if (ODU_REG_TMR_MT(pst.srcEnt, pst.srcInst, duCb.duTimersInfo.tmrRes, duActvTmr) != ROK) + { + DU_LOG("\nERROR --> DU_APP : Failed to register timer"); + return RFAILED; + } + if(ODU_GET_MSG_BUF(DFLT_REGION, DU_POOL, &mBuf) != ROK) { DU_LOG("\nERROR --> DU_APP : Memory allocation failed in duReadCfg");