X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fdu_app%2Fdu_cfg.c;h=e9e8c2604e3fd64c011994d8854f8f4f64bf7dbf;hb=cbb5d8d83a41cbf191347d447a66c9cd062d4d81;hp=72b60e9d3d531e9a1f045f79181a8df50b0e7489;hpb=4e803fe4bcf3a446b7082675d25d35ad102f16f6;p=o-du%2Fl2.git diff --git a/src/du_app/du_cfg.c b/src/du_app/du_cfg.c index 72b60e9d3..e9e8c2604 100644 --- a/src/du_app/du_cfg.c +++ b/src/du_app/du_cfg.c @@ -22,8 +22,14 @@ #include "lrg.h" #include "lkw.x" #include "lrg.x" +#include "du_app_mac_inf.h" +#include "du_app_rlc_inf.h" #include "du_cfg.h" #include "du_mgr.h" +#include "du_utils.h" +#include "OCTET_STRING.h" +#include "BIT_STRING.h" +#include "odu_common_codec.h" #include "du_sys_info_hdl.h" #include "MIB.h" #include "SearchSpace.h" @@ -32,7 +38,6 @@ #include "SI-SchedulingInfo.h" #include "ConnEstFailureControl.h" #include "PLMN-IdentityInfo.h" -#include "odu_common_codec.h" #include "PDSCH-TimeDomainResourceAllocation.h" #include "BCCH-Config.h" #include "PagingCycle.h" @@ -47,8 +52,13 @@ #include "BWP-DownlinkCommon.h" #include "BWP-UplinkCommon.h" -extern DuCfgParams duCfgParam; -extern char encBuf[ENC_BUF_MAX_LEN]; +#ifdef O1_ENABLE +#include "ConfigInterface.h" +extern StartupConfig g_cfg; +#endif + +DuCfgParams duCfgParam; +char encBuf[ENC_BUF_MAX_LEN]; /* Filling Slot configuration as : @@ -56,10 +66,15 @@ extern 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 @@ -77,27 +92,35 @@ extern char encBuf[ENC_BUF_MAX_LEN]; * ****************************************************************/ void FillSlotConfig() { - U8 slot; - U8 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 @@ -116,25 +139,30 @@ void FillSlotConfig() /* This function is used to fill up the cell configuration for CL */ -S16 readMacCfg() +uint8_t readMacCfg() { 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; - duCfgParam.macCellCfg.dlCarrCfg.bw = BANDWIDTH; - duCfgParam.macCellCfg.dlCarrCfg.freq = NR_ARFCN; +#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; duCfgParam.macCellCfg.dlCarrCfg.k0[2] = 1; duCfgParam.macCellCfg.dlCarrCfg.k0[3] = 1; duCfgParam.macCellCfg.dlCarrCfg.k0[4] = 1; - duCfgParam.macCellCfg.dlCarrCfg.gridSize[0] = 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; @@ -143,8 +171,12 @@ S16 readMacCfg() /* UL Carrier configuration */ duCfgParam.macCellCfg.ulCarrCfg.pres = TRUE; - duCfgParam.macCellCfg.ulCarrCfg.bw = SUL_ARFCN; - duCfgParam.macCellCfg.ulCarrCfg.freq = NR_ARFCN; +#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; duCfgParam.macCellCfg.ulCarrCfg.k0[2] = 1; @@ -162,16 +194,20 @@ S16 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_PERIODICITY_20MS; + duCfgParam.macCellCfg.ssbCfg.ssbPeriod = SSB_PRDCTY_MS_20; duCfgParam.macCellCfg.ssbCfg.ssbScOffset = SSB_SUBCARRIER_OFFSET; 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"); + DU_LOG("\nERROR --> Failed to build MIB PDU"); memset(&duCfgParam.macCellCfg.ssbCfg.mibPdu, 0, 3*sizeof(uint8_t)); } else @@ -195,41 +231,42 @@ S16 readMacCfg() 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 = 1; + 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(duCfgParam.macCellCfg.prachCfg.fdm[0].unsuedRootSeq, - NUM_UNUSED_ROOT_SEQ * sizeof(U8)); - if(duCfgParam.macCellCfg.prachCfg.fdm[0].unsuedRootSeq == NULLP) - { - DU_LOG("\nDU_APP : Memory allocation failed"); - RETVALUE(RFAILED); - } - *(duCfgParam.macCellCfg.prachCfg.fdm[0].unsuedRootSeq) = UNUSED_ROOT_SEQ; - } + 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.ssbPerRach = SSB_PER_RACH; 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; duCfgParam.macCellCfg.tddCfg.tddPeriod = TDD_PERIODICITY; 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(duCfgParam.macCellCfg.sib1Cfg.sib1Pdu,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.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; @@ -238,8 +275,12 @@ S16 readMacCfg() /* fill Intial DL BWP */ duCfgParam.macCellCfg.initialDlBwp.bwp.firstPrb = 0; - duCfgParam.macCellCfg.initialDlBwp.bwp.numPrb = TOTAL_PRB_BW; /* configured to total BW */ - duCfgParam.macCellCfg.initialDlBwp.bwp.scs = SUBCARRIER_SPACING; /* numerology is 0, 15Khz */ + 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.cyclicPrefix = NORMAL_CYCLIC_PREFIX; duCfgParam.macCellCfg.initialDlBwp.pdcchCommon.commonSearchSpace.searchSpaceId = SEARCHSPACE_1_INDEX; duCfgParam.macCellCfg.initialDlBwp.pdcchCommon.commonSearchSpace.coresetId = CORESET_0_INDEX; @@ -270,8 +311,12 @@ S16 readMacCfg() /* fill Intial UL BWP */ duCfgParam.macCellCfg.initialUlBwp.bwp.firstPrb = 0; - duCfgParam.macCellCfg.initialUlBwp.bwp.numPrb = TOTAL_PRB_BW; /* configured to total BW */ - duCfgParam.macCellCfg.initialUlBwp.bwp.scs = SUBCARRIER_SPACING; /* numerology is 0, 15Khz */ + 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.cyclicPrefix = NORMAL_CYCLIC_PREFIX; duCfgParam.macCellCfg.initialUlBwp.puschCommon.k2 = PUSCH_K2; duCfgParam.macCellCfg.initialUlBwp.puschCommon.mappingType = @@ -286,11 +331,7 @@ S16 readMacCfg() duCfgParam.macCellCfg.initialUlBwp.pucchCommon.pucchResourceCommon = PUCCH_RSRC_COMMON; duCfgParam.macCellCfg.initialUlBwp.pucchCommon.pucchGroupHopping = PUCCH_GROUP_HOPPING; - /* This should be calculated based on - (number of mandatory parameters) + (number of otional parameters being filled) */ - duCfgParam.macCellCfg.numTlv = 40; - - RETVALUE(ROK); + return ROK; } /******************************************************************* @@ -309,12 +350,17 @@ S16 readMacCfg() * RFAILED - failure * * ****************************************************************/ -S16 fillDuPort(U16 *duPort) +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 */ - - RETVALUE(ROK); +#endif + return ROK; } /******************************************************************* @@ -365,7 +411,7 @@ uint16_t calcSliv(uint8_t startSymbol, uint8_t lengthSymbol) * RFAILED - failure * ** ****************************************************************/ -S16 fillServCellCfgCommSib(SrvCellCfgCommSib *srvCellCfgComm) +uint8_t fillServCellCfgCommSib(SrvCellCfgCommSib *srvCellCfgComm) { PdcchCfgCommon pdcchCfg; PdschCfgCommon pdschCfg; @@ -376,17 +422,22 @@ S16 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; - srvCellCfgComm->dlCfg.dlScsCarrier.scsBw = SCS_CARRIER_BANDWIDTH; +#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 = \ @@ -420,7 +471,7 @@ S16 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; @@ -428,8 +479,13 @@ S16 fillServCellCfgCommSib(SrvCellCfgCommSib *srvCellCfgComm) /* Configuring UL Config Common */ srvCellCfgComm->ulCfg.ulScsCarrier.scsOffset = SSB_SUBCARRIER_OFFSET; - srvCellCfgComm->ulCfg.ulScsCarrier.scs = SUBCARRIER_SPACING; - srvCellCfgComm->ulCfg.ulScsCarrier.scsBw = SCS_CARRIER_BANDWIDTH; +#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; @@ -474,7 +530,7 @@ S16 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; @@ -506,16 +562,33 @@ S16 fillServCellCfgCommSib(SrvCellCfgCommSib *srvCellCfgComm) * * ****************************************************************/ -S16 readCfg() +uint8_t readCfg() { - U8 i,j,k; - U32 ipv4_du, ipv4_cu, ipv4_ric; + uint8_t i,j,k; + uint32_t ipv4_du, ipv4_cu, ipv4_ric; 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*/ @@ -523,11 +596,10 @@ S16 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; @@ -545,23 +617,27 @@ S16 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; /* SIB1 Params */ + memset(&sib1.plmn, 0, sizeof(Plmn)); 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; @@ -583,12 +659,12 @@ S16 readCfg() for(i=0; i 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*/ @@ -724,7 +799,7 @@ S16 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,\ @@ -735,11 +810,11 @@ S16 readCfg() if(readMacCfg() != ROK) { - DU_LOG("\nDU_APP : Failed while reading MAC config"); - RETVALUE(RFAILED); + DU_LOG("\nERROR --> DU_APP : Failed while reading MAC config"); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /******************************************************************* @@ -759,21 +834,21 @@ S16 readCfg() * RFAILED - failure * * ****************************************************************/ -S16 duReadCfg() +uint8_t duReadCfg() { Pst pst; Buffer *mBuf; - cmMemset((U8 *)&duCfgParam, 0, sizeof(DuCfgParams)); + memset(&duCfgParam, 0, sizeof(DuCfgParams)); //Read configs into duCfgParams if(readCfg() != ROK) { - DU_LOG("\nDU_APP : Reading configuration failed"); - RETVALUE(RFAILED); + DU_LOG("\nERROR --> DU_APP : Reading configuration failed"); + return RFAILED; } //Fill pst structure - cmMemset((U8 *)&(pst), 0, sizeof(Pst)); + memset(&(pst), 0, sizeof(Pst)); pst.srcEnt = (Ent)ENTDUAPP; pst.srcInst = (Inst)DU_INST; pst.srcProcId = DU_PROC; @@ -785,59 +860,21 @@ S16 duReadCfg() pst.pool= DU_POOL; - if(SGetMsg(DFLT_REGION, DU_POOL, &mBuf) != ROK) + 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 (SPstTsk(&pst, mBuf) != ROK) + if (ODU_POST_TASK(&pst, mBuf) != ROK) { - DU_LOG("\nDU_APP : SPstTsk failed in duReadCfg"); + DU_LOG("\nERROR --> DU_APP : ODU_POST_TASK failed in duReadCfg"); return RFAILED; } return ROK; } -/******************************************************************* - * - * @brief Converts bit strings to integer - * - * @details - * - * Function : bitStringToInt - * - * Functionality: - * - Converts ASN bit string format IEs to integer type - * - * @params[in] void - * @return ROK - success - * RFAILED - failure - * - * ****************************************************************/ -S16 bitStringToInt(BIT_STRING_t *bitString, U16 *val) -{ - U16 idx; - if(bitString->buf == NULL || bitString->size <= 0) - { - DU_LOG("\nDU_APP : Bit string is empty"); - return RFAILED; - } - - for(idx=0; idx< bitString->size-1; idx++) - { - *val |= bitString->buf[idx]; - *val <<= 8; - } - - *val |= bitString->buf[idx]; - *val >>= bitString->bits_unused; - - return ROK; -} - - /********************************************************************** End of file **********************************************************************/