/* This file contains F1AP message handler functions */
#include "common_def.h"
+#include "ckw.h"
+#include "ckw.x"
+#include "kwu.h"
+#include "kwu.x"
+#include "lkw.h"
#include "lrg.h"
#include "legtp.h"
#include "lkw.x"
#include "du_cfg.h"
#include "du_app_rlc_inf.h"
#include "du_mgr_main.h"
+#include "du_mgr.h"
#include "du_utils.h"
+#include "du_ue_mgr.h"
#include "RAT-Type.h"
#include "FeatureSetUplinkPerCC.h"
#include "FeatureSetDownlinkPerCC.h"
#include "DMRS-DownlinkConfig.h"
#include "PDSCH-Config.h"
#include "BWP-DownlinkDedicated.h"
+#include "BWP-Downlink.h"
#include "PUSCH-TimeDomainResourceAllocation.h"
#include "PUSCH-TimeDomainResourceAllocationList.h"
#include "DMRS-UplinkConfig.h"
#include "DLUPTNLInformation-ToBeSetup-Item.h"
#include "UPTransportLayerInformation.h"
#include "GTPTunnel.h"
+#include "SupportedSULFreqBandItem.h"
+#include "du_sys_info_hdl.h"
+#include "du_e2ap_msg_hdl.h"
+#include "du_f1ap_conversions.h"
#ifdef O1_ENABLE
-#include "ConfigInterface.h"
+#include "CmInterface.h"
extern StartupConfig g_cfg;
#endif
DuCfgParams duCfgParam;
-/************************************************************************
- *
- * @brief Converts enum values into actual value of Poll retransmit timer
- *
- * @details
- *
- * Function : getPollPdu
- *
- * Functionality: Converts enum values into actual value of poll
- * retransmit timer
- *
- * @params[in] Enum value of pollPdu
- * @return Actual value of pollPdu
- *
- * **********************************************************************/
-
-uint16_t getPollRetxTmr(uint8_t pollRetxTmrCfg)
-{
- uint16_t pollRetxTmr;
-
- /* All values of poll retx timer are at interval of 5ms.
- * This is valid upto 250ms
- * Hence converting the enum value to actual value by multiplying it to 5
- */
- if(pollRetxTmrCfg <= T_PollRetransmit_ms250)
- pollRetxTmr = (pollRetxTmrCfg + 1) * 5;
- else
- {
- switch(pollRetxTmrCfg)
- {
- case T_PollRetransmit_ms300:
- pollRetxTmr = 300;
- break;
- case T_PollRetransmit_ms350:
- pollRetxTmr = 350;
- break;
- case T_PollRetransmit_ms400:
- pollRetxTmr = 400;
- break;
- case T_PollRetransmit_ms450:
- pollRetxTmr = 450;
- break;
- case T_PollRetransmit_ms500:
- pollRetxTmr = 500;
- break;
- case T_PollRetransmit_ms800:
- pollRetxTmr = 800;
- break;
- default:
- DU_LOG("\nERROR --> F1AP: Invalid value of Poll Retransmit timer");
- pollRetxTmr = 0;
- }
- }
- return pollRetxTmr;
-}
-
-/*******************************************************************
- *
- * @brief Converts enum values into actual value of PollPdu
- *
- * @details
- *
- * Function : getPollPdu
- *
- * Functionality: Converts enum values into actual value of PollPdu
- *
- * @params[in] Enum value of pollPdu
- * @return Actual value of pollPdu
- *
- * ****************************************************************/
-int32_t getPollPdu(uint8_t pollPduCfg)
-{
- int32_t pollPdu;
- switch(pollPduCfg)
- {
- case PollPDU_p4:
- pollPdu = 4;
- break;
- case PollPDU_p8:
- pollPdu = 8;
- break;
- case PollPDU_p16:
- pollPdu = 16;
- break;
- case PollPDU_p32:
- pollPdu = 32;
- break;
- case PollPDU_p64:
- pollPdu = 64;
- break;
- case PollPDU_p128:
- pollPdu = 128;
- break;
- case PollPDU_p256:
- pollPdu = 256;
- break;
- case PollPDU_p512:
- pollPdu = 512;
- break;
- case PollPDU_p1024:
- pollPdu = 1024;
- break;
- case PollPDU_p2048:
- pollPdu = 2048;
- break;
- case PollPDU_p4096:
- pollPdu = 4096;
- break;
- case PollPDU_p6144:
- pollPdu = 6144;
- break;
- case PollPDU_p8192:
- pollPdu = 8192;
- break;
- case PollPDU_p12288:
- pollPdu = 12288;
- break;
- case PollPDU_p16384:
- pollPdu = 16384;
- break;
- case PollPDU_p20480:
- pollPdu = 20480;
- break;
- case PollPDU_p24576:
- pollPdu = 24576;
- break;
- case PollPDU_p28672:
- pollPdu = 28672;
- break;
- case PollPDU_p32768:
- pollPdu = 32768;
- break;
- case PollPDU_p40960:
- pollPdu = 40960;
- break;
- case PollPDU_p49152:
- pollPdu = 49152;
- break;
- case PollPDU_p57344:
- pollPdu = 57344;
- break;
- case PollPDU_p65536:
- pollPdu = 65536;
- break;
- case PollPDU_infinity:
- pollPdu = -1;
- break;
- default:
- DU_LOG("\nERROR --> F1AP: Invalid value of poll pdu");
- pollPdu = 0;
- break;
- }
- return pollPdu;
-}
-
-/*******************************************************************
- *
- * @brief Converts enum values into actual value of poll bytes
- *
- * @details
- *
- * Function : getPollByte
- *
- * Functionality: Converts enum values into actual value of pollBytes
- *
- * @params[in] Enum value
- * @return Actual value
- *
- * ****************************************************************/
-int32_t getPollByte(uint16_t pollBytesCfg)
-{
- int32_t pollBytes;
- switch(pollBytesCfg)
- {
- case PollByte_kB1:
- pollBytes = 1000;
- break;
- case PollByte_kB2:
- pollBytes = 2000;
- break;
- case PollByte_kB5:
- pollBytes = 5000;
- break;
- case PollByte_kB8:
- pollBytes = 8000;
- break;
- case PollByte_kB10:
- pollBytes = 10000;
- break;
- case PollByte_kB15:
- pollBytes = 15000;
- break;
- case PollByte_kB25:
- pollBytes = 25000;
- break;
- case PollByte_kB50:
- pollBytes = 50000;
- break;
- case PollByte_kB75:
- pollBytes = 75000;
- break;
- case PollByte_kB100:
- pollBytes = 100000;
- break;
- case PollByte_kB125:
- pollBytes = 125000;
- break;
- case PollByte_kB250:
- pollBytes = 250000;
- break;
- case PollByte_kB375:
- pollBytes = 375000;
- break;
- case PollByte_kB500:
- pollBytes = 500000;
- break;
- case PollByte_kB750:
- pollBytes = 750000;
- break;
- case PollByte_kB1000:
- pollBytes = 1000000;
- break;
- case PollByte_kB1250:
- pollBytes = 1250000;
- break;
- case PollByte_kB1500:
- pollBytes = 1500000;
- break;
- case PollByte_kB2000:
- pollBytes = 2000000;
- break;
- case PollByte_kB3000:
- pollBytes = 3000000;
- break;
- case PollByte_kB4000:
- pollBytes = 4000000;
- break;
- case PollByte_kB4500:
- pollBytes = 4500000;
- break;
- case PollByte_kB5000:
- pollBytes = 5000000;
- break;
- case PollByte_kB5500:
- pollBytes = 5500000;
- break;
- case PollByte_kB6000:
- pollBytes = 6000000;
- break;
- case PollByte_kB6500:
- pollBytes = 6500000;
- break;
- case PollByte_kB7000:
- pollBytes = 7000000;
- break;
- case PollByte_kB7500:
- pollBytes = 7500000;
- break;
- case PollByte_mB8:
- pollBytes = 8000000;
- break;
- case PollByte_mB9:
- pollBytes = 9000000;
- break;
- case PollByte_mB10:
- pollBytes = 10000000;
- break;
- case PollByte_mB11:
- pollBytes = 11000000;
- break;
- case PollByte_mB12:
- pollBytes = 12000000;
- break;
- case PollByte_mB13:
- pollBytes = 13000000;
- break;
- case PollByte_mB14:
- pollBytes = 14000000;
- break;
- case PollByte_mB15:
- pollBytes = 15000000;
- break;
- case PollByte_mB16:
- pollBytes = 16000000;
- break;
- case PollByte_mB17:
- pollBytes = 17000000;
- break;
- case PollByte_mB18:
- pollBytes = 18000000;
- break;
- case PollByte_mB20:
- pollBytes = 20000000;
- break;
- case PollByte_mB25:
- pollBytes = 25000000;
- break;
- case PollByte_mB30:
- pollBytes = 30000000;
- break;
- case PollByte_mB40:
- pollBytes = 40000000;
- break;
- case PollByte_infinity:
- pollBytes = -1;
- break;
- default:
- DU_LOG("\nERROR --> F1AP: Invalid value of poll bytes");
- pollBytes = 0;
- }
- return pollBytes;
-}
-
-/*******************************************************************
- *
- * @brief Converts enum values into actual value of maxRetx
- *
- * @details
- *
- * Function : getMaxRetx
- *
- * Functionality: Converts enum values into actual value of maxRetx
- *
- * @params[in] Enum value
- * @return Actual value
+/******************************************************************
*
- * ****************************************************************/
-uint8_t getMaxRetx(uint8_t maxRetxCfg)
-{
- uint8_t maxRetx;
- switch(maxRetxCfg)
- {
- case UL_AM_RLC__maxRetxThreshold_t1:
- maxRetx = 1;
- break;
- case UL_AM_RLC__maxRetxThreshold_t2:
- maxRetx = 2;
- break;
- case UL_AM_RLC__maxRetxThreshold_t3:
- maxRetx = 3;
- break;
- case UL_AM_RLC__maxRetxThreshold_t4:
- maxRetx = 4;
- break;
- case UL_AM_RLC__maxRetxThreshold_t6:
- maxRetx = 6;
- break;
- case UL_AM_RLC__maxRetxThreshold_t8:
- maxRetx = 8;
- break;
- case UL_AM_RLC__maxRetxThreshold_t16:
- maxRetx = 16;
- break;
- case UL_AM_RLC__maxRetxThreshold_t32:
- maxRetx = 32;
- break;
- default:
- DU_LOG("\nERROR --> F1AP: Invalid configuration for Max retransmission threshold");
- maxRetx = 0;
- }
- return maxRetx;
-}
-
-/*******************************************************************
- * @brief Converts enum values into actual value of reassembly timer
+ * @brief Function to fetch lcId based on DRB Id
*
* @details
*
- * Function : getReAsmblTmr
+ * Function : fetchLcId
*
- * Functionality: Converts enum values into actual value of reassembly
- * timer
+ * @params[in] drbId
*
- * @params[in] Enum value of reassembly timer
- * @return Actual value of reassembly timer
+ * Functionality: Function to fetch lcId based on DRB Id
*
- * **********************************************************************/
+ * Returns: lcId - SUCCESS
+ * RFAILED - FAILURE
+ *****************************************************************/
-int8_t getReAsmblTmr(uint8_t reAsmblTmrCfg)
+uint8_t fetchLcId(uint8_t drbId)
{
- int8_t reAsmblTmr = 0;
-
- if(reAsmblTmrCfg == T_Reassembly_ms0)
- {
- reAsmblTmr = 0;
- }
- else if(reAsmblTmrCfg >= T_Reassembly_ms5 || reAsmblTmrCfg <= T_Reassembly_ms100)
- {
- /* All values of re assembly timer are at interval of 5ms.
- * This is valid upto 100ms
- * Hence converting the enum value to actual value by multiplying it to 5
- */
- reAsmblTmr = reAsmblTmrCfg * 5;
- }
- else if(reAsmblTmrCfg >= T_Reassembly_ms110 || reAsmblTmrCfg <= T_Reassembly_ms200)
- {
- /* All values of re assembly timer are at interval of 10ms.
- * This is valid upto 200ms
- * since enum value starts from 20 for 100ms, subtracting 10 and
- * converting the enum value to actual value by multiplying it to 10
- */
- reAsmblTmr = ((reAsmblTmrCfg-10) * 10);
- }
- else
- {
- DU_LOG("\nERROR --> F1AP : Invalid value of Re Assembly timer %d", reAsmblTmrCfg);
- reAsmblTmr = -1;
- }
- return reAsmblTmr;
-}
+ uint8_t cellIdx = 0, ueIdx = 0, lcIdx = 0, numLcs = 0, lcId = 0;
-/************************************************************************
- *
- * @brief Converts enum values into actual value of status prohibit timer
- *
- * @details
- *
- * Function : getStatProhTmr
- *
- * Functionality: Converts enum values into actual value of status prohibit
- * timer
- *
- * @params[in] Enum value of status prohibit timer
- * @return Actual value of status prohibit timer
- *
- * **********************************************************************/
-
-int16_t getStatProhTmr(uint8_t statProhTmrCfg)
-{
- int16_t statProhTmr =0;
-
- if(statProhTmrCfg == T_StatusProhibit_ms0)
- {
- statProhTmr = 0;
- }
- else if(statProhTmrCfg >= T_StatusProhibit_ms5 || statProhTmrCfg <= T_StatusProhibit_ms250)
- {
- /* All values of re assembly timer are at interval of 5ms.
- * This is valid upto 250ms
- * Hence converting the enum value to actual value by multiplying it to 5
- */
- statProhTmr = statProhTmrCfg * 5;
- }
- else
+ for(cellIdx = 0; cellIdx < MAX_NUM_CELL; cellIdx++)
{
- switch(statProhTmrCfg)
+ for(ueIdx = 0; ueIdx < MAX_NUM_UE; ueIdx++)
{
- case T_StatusProhibit_ms300:
- statProhTmr = 300;
- break;
- case T_StatusProhibit_ms350:
- statProhTmr = 350;
- break;
- case T_StatusProhibit_ms400:
- statProhTmr = 400;
- break;
- case T_StatusProhibit_ms450:
- statProhTmr = 450;
- break;
- case T_StatusProhibit_ms500:
- statProhTmr = 500;
- break;
- case T_StatusProhibit_ms800:
- statProhTmr = 800;
- break;
- case T_StatusProhibit_ms1000:
- statProhTmr = 1000;
- break;
- case T_StatusProhibit_ms1200:
- statProhTmr = 1200;
- break;
- case T_StatusProhibit_ms1600:
- statProhTmr = 1600;
- break;
- case T_StatusProhibit_ms2000:
- statProhTmr = 2000;
- break;
- case T_StatusProhibit_ms2400:
- statProhTmr = 2400;
- break;
- default:
- DU_LOG("\nInvalid value of Status Prohibit timer %d", statProhTmrCfg);
- statProhTmr = -1;
- break;
+ if(duCb.actvCellLst[cellIdx] != NULLP)
+ {
+ numLcs = duCb.actvCellLst[cellIdx]->ueCb[ueIdx].rlcUeCfg.numLcs;
+ for(lcIdx = 0; lcIdx < numLcs; lcIdx++)
+ {
+ if(duCb.actvCellLst[cellIdx]->ueCb[ueIdx].rlcUeCfg.rlcLcCfg[lcIdx].rbId == drbId && \
+ duCb.actvCellLst[cellIdx]->ueCb[ueIdx].rlcUeCfg.rlcLcCfg[lcIdx].rbType == RB_TYPE_DRB)
+ {
+ lcId = duCb.actvCellLst[cellIdx]->ueCb[ueIdx].rlcUeCfg.rlcLcCfg[lcIdx].lcId;
+ return lcId;
+ }
+ }
+ }
}
}
- return statProhTmr;
+ DU_LOG("\nERROR --> DU_APP: fetchLcId() failed for drbId %d", drbId);
+ return RFAILED;
}
/*******************************************************************
* RFAILED - failure
*
* ****************************************************************/
-
void addToReservedF1apPduList(uint8_t transId, F1AP_PDU_t *f1apPdu)
{
CmLList *node = NULLP;
S16 BuildNrCellId(BIT_STRING_t *nrcell)
{
memset(nrcell->buf, 0, nrcell->size);
- nrcell->buf[4] = 16;
+ nrcell->buf[4] = duCfgParam.sib1Params.cellIdentity;
nrcell->bits_unused = 4;
return ROK;
}
servcell->fiveGS_TAC->buf[2] = duCfgParam.srvdCellLst[0].duCellInfo.tac;
return ROK;
}
+
+/*******************************************************************
+ *
+ * @brief fill nr frequency information
+ *
+ * @details
+ *
+ * Function : fillNrTddInfo
+ *
+ * Functionality: fill nr frequency information
+ *
+ * @params[in] NRFreqInfo_t freqInfo
+ * @return ROK - success
+ * RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t fillNrTddInfo(TDD_Info_t *tddInfo)
+{
+ uint8_t elementCnt = 1, freqBandListIdx = 0, supportedBandIdx = 0;
+ NRFreqInfo_t *freqInfo = NULLP;
+
+ if(tddInfo == NULLP)
+ {
+ DU_LOG("\nERROR --> DU APP : Null pointer received at fillNrTddInfo");
+ return RFAILED;
+ }
+
+ freqInfo = &tddInfo->nRFreqInfo;
+ freqInfo->nRARFCN = duCfgParam.srvdCellLst[0].duCellInfo.f1Mode.mode.tdd.nrFreqInfo.nrArfcn;
+
+ freqInfo->freqBandListNr.list.count = elementCnt;
+ freqInfo->freqBandListNr.list.size = freqInfo->freqBandListNr.list.count * sizeof(FreqBandNrItem_t *);
+ DU_ALLOC(freqInfo->freqBandListNr.list.array, freqInfo->freqBandListNr.list.size );
+ if(!freqInfo->freqBandListNr.list.array)
+ {
+ DU_LOG("\nERROR --> DU APP : Memory allocation failed at fillNrTddInfo");
+ return RFAILED;
+ }
+
+ for(freqBandListIdx = 0; freqBandListIdx<freqInfo->freqBandListNr.list.count; freqBandListIdx++)
+ {
+ DU_ALLOC(freqInfo->freqBandListNr.list.array[freqBandListIdx], sizeof(FreqBandNrItem_t ));
+ if(!freqInfo->freqBandListNr.list.array[freqBandListIdx])
+ {
+ DU_LOG("\nERROR --> DU APP : Memory allocation failed at fillNrTddInfo");
+ return RFAILED;
+ }
+
+ freqInfo->freqBandListNr.list.array[freqBandListIdx]->freqBandIndicatorNr = duCfgParam.srvdCellLst[0].duCellInfo.\
+ f1Mode.mode.tdd.nrFreqInfo.freqBand[0].nrFreqBand;
+ freqInfo->freqBandListNr.list.array[freqBandListIdx]->supportedSULBandList.list.count = elementCnt;
+ freqInfo->freqBandListNr.list.array[freqBandListIdx]->supportedSULBandList.list.size = freqInfo->freqBandListNr.list.array[freqBandListIdx]->\
+ supportedSULBandList.list.count * sizeof(SupportedSULFreqBandItem_t*);
+
+ DU_ALLOC(freqInfo->freqBandListNr.list.array[freqBandListIdx]->supportedSULBandList.list.array,\
+ freqInfo->freqBandListNr.list.array[freqBandListIdx]->supportedSULBandList.list.size);
+ if(!freqInfo->freqBandListNr.list.array[freqBandListIdx]->supportedSULBandList.list.array)
+ {
+ DU_LOG("\nERROR --> DU APP : Memory allocation failed at fillNrTddInfo");
+ return RFAILED;
+ }
+
+ for(supportedBandIdx = 0; supportedBandIdx<freqInfo->freqBandListNr.list.array[freqBandListIdx]->supportedSULBandList.list.count; supportedBandIdx++)
+ {
+ DU_ALLOC(freqInfo->freqBandListNr.list.array[freqBandListIdx]->supportedSULBandList.list.array[supportedBandIdx],\
+ sizeof(SupportedSULFreqBandItem_t));
+ if(!freqInfo->freqBandListNr.list.array[freqBandListIdx]->supportedSULBandList.list.array[supportedBandIdx])
+ {
+ DU_LOG("\nERROR --> DU APP : Memory allocation failed at fillNrTddInfo");
+ return RFAILED;
+ }
+
+ freqInfo->freqBandListNr.list.array[freqBandListIdx]->supportedSULBandList.list.array[supportedBandIdx]->freqBandIndicatorNr =\
+ duCfgParam.srvdCellLst[0].duCellInfo.f1Mode.mode.tdd.nrFreqInfo.freqBand[0].sulBand[0];
+ }
+ }
+
+ tddInfo->transmission_Bandwidth.nRSCS = duCfgParam.srvdCellLst[0].duCellInfo.f1Mode.mode.tdd.nrFreqInfo.sulInfo.sulTxBw.nrScs;
+ tddInfo->transmission_Bandwidth.nRNRB = duCfgParam.srvdCellLst[0].duCellInfo.f1Mode.mode.tdd.nrFreqInfo.sulInfo.sulTxBw.nrb;
+
+ return ROK;
+}
+
/*******************************************************************
*
* @brief Builds NR Mode
{
uint8_t BuildDLNRInforet=0;
uint8_t BuildULNRInforet=0;
- /* FDD Mode */
+
+#ifdef NR_TDD
+ mode->present = NR_Mode_Info_PR_tDD;
+#else
mode->present = NR_Mode_Info_PR_fDD;
+#endif
+
if(mode->present == NR_Mode_Info_PR_fDD)
{
DU_ALLOC(mode->choice.fDD,sizeof(FDD_Info_t));
if(mode->choice.fDD == NULLP)
{
- return RFAILED;
+ DU_LOG("\nERROR --> Memory allocation failed in BuildNrMode");
+ return RFAILED;
}
BuildULNRInforet = BuildULNRInfo(&mode->choice.fDD->uL_NRFreqInfo);
if(BuildULNRInforet != ROK)
{
- return RFAILED;
+ DU_LOG("\nERROR --> Failed to build UlNrFreqInfo");
+ return RFAILED;
}
BuildDLNRInforet = BuildDLNRInfo(&mode->choice.fDD->dL_NRFreqInfo);
if(BuildDLNRInforet != ROK)
{
- return RFAILED;
+ DU_LOG("\nERROR --> Failed to build DlNrFreqInfo");
+ return RFAILED;
+ }
+ mode->choice.fDD->uL_Transmission_Bandwidth.nRSCS = \
+ duCfgParam.srvdCellLst[0].duCellInfo.\
+ f1Mode.mode.fdd.ulTxBw.nrScs;
+ mode->choice.fDD->uL_Transmission_Bandwidth.nRNRB = \
+ duCfgParam.srvdCellLst[0].duCellInfo.\
+ f1Mode.mode.fdd.ulTxBw.nrb;
+ mode->choice.fDD->dL_Transmission_Bandwidth.nRSCS = \
+ duCfgParam.srvdCellLst[0].duCellInfo.\
+ f1Mode.mode.fdd.dlTxBw.nrScs;
+ mode->choice.fDD->dL_Transmission_Bandwidth.nRNRB = \
+ duCfgParam.srvdCellLst[0].duCellInfo.\
+ f1Mode.mode.fdd.dlTxBw.nrb;
+ }
+ else if(mode->present == NR_Mode_Info_PR_tDD)
+ {
+ DU_ALLOC(mode->choice.tDD,sizeof(TDD_Info_t));
+ if(mode->choice.tDD == NULLP)
+ {
+ DU_LOG("\nERROR --> Memory allocation failed in BuildNrMode");
+ return RFAILED;
+ }
+
+ if(fillNrTddInfo(mode->choice.tDD) != ROK)
+ {
+ DU_LOG("\nERROR --> Failed to fill Nr TDD information");
+ return RFAILED;
}
+
}
- mode->choice.fDD->uL_Transmission_Bandwidth.nRSCS = \
- duCfgParam.srvdCellLst[0].duCellInfo.\
- f1Mode.mode.fdd.ulTxBw.nrScs;
- mode->choice.fDD->uL_Transmission_Bandwidth.nRNRB = \
- duCfgParam.srvdCellLst[0].duCellInfo.\
- f1Mode.mode.fdd.ulTxBw.nrb;
- mode->choice.fDD->dL_Transmission_Bandwidth.nRSCS = \
- duCfgParam.srvdCellLst[0].duCellInfo.\
- f1Mode.mode.fdd.dlTxBw.nrScs;
- mode->choice.fDD->dL_Transmission_Bandwidth.nRNRB = \
- duCfgParam.srvdCellLst[0].duCellInfo.\
- f1Mode.mode.fdd.dlTxBw.nrb;
+
return ROK;
}
/*******************************************************************
* ****************************************************************/
uint8_t BuildExtensions(ProtocolExtensionContainer_4624P3_t **ieExtend)
{
- uint8_t idx;
- uint8_t plmnidx;
- uint8_t extensionCnt=1;
- uint8_t sliceId=0;
- uint8_t sdId;
+ uint8_t idx=0, plmnidx=0, sliceLstIdx=0;
+ uint8_t elementCnt=0, extensionCnt=0;
+
+ extensionCnt=IE_EXTENSION_LIST_COUNT;
DU_ALLOC(*ieExtend,sizeof(ProtocolExtensionContainer_4624P3_t));
if((*ieExtend) == NULLP)
{
+ DU_LOG("ERROR --> DU_APP : BuildExtensions(): Memory allocation failed");
return RFAILED;
}
(*ieExtend)->list.count = extensionCnt;
(*ieExtend)->list.size = \
- extensionCnt * sizeof(ServedPLMNs_ItemExtIEs_t *);
+ extensionCnt * sizeof(ServedPLMNs_ItemExtIEs_t *);
DU_ALLOC((*ieExtend)->list.array,(*ieExtend)->list.size);
if((*ieExtend)->list.array == NULLP)
{
+ DU_LOG("ERROR --> DU_APP : BuildExtensions(): Memory allocation failed");
return RFAILED;
}
for(plmnidx=0;plmnidx<extensionCnt;plmnidx++)
{
DU_ALLOC((*ieExtend)->list.array[plmnidx],\
- sizeof(ServedPLMNs_ItemExtIEs_t));
+ sizeof(ServedPLMNs_ItemExtIEs_t));
if((*ieExtend)->list.array[plmnidx] == NULLP)
{
- return RFAILED;
+ DU_LOG("ERROR --> DU_APP : BuildExtensions(): Memory allocation failed");
+ return RFAILED;
}
}
+
+ elementCnt = duCfgParam.srvdCellLst[0].duCellInfo.cellInfo.srvdPlmn[0].taiSliceSuppLst.numSupportedSlices;
idx = 0;
(*ieExtend)->list.array[idx]->id = ProtocolIE_ID_id_TAISliceSupportList;
(*ieExtend)->list.array[idx]->criticality = Criticality_ignore;
(*ieExtend)->list.array[idx]->extensionValue.present = \
- ServedPLMNs_ItemExtIEs__extensionValue_PR_SliceSupportList;
- (*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList.\
- list.count = 1;
- (*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList.\
- list.size = sizeof(SliceSupportItem_t *);
- DU_ALLOC((*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList.\
- list.array,sizeof(SliceSupportItem_t *));
- if((*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList.\
- list.array == NULLP)
- {
- return RFAILED;
- }
- DU_ALLOC((*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList.\
- list.array[sliceId],sizeof(SliceSupportItem_t));
- if((*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList.\
- list.array[sliceId] == NULLP)
- {
- return RFAILED;
- }
+ ServedPLMNs_ItemExtIEs__extensionValue_PR_SliceSupportList;
(*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList.\
- list.array[sliceId]->sNSSAI.sST.size = sizeof(uint8_t);
- DU_ALLOC((*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList\
- .list.array[sliceId]->sNSSAI.sST.buf,(*ieExtend)->list.array[idx]->\
- extensionValue.choice.SliceSupportList.\
- list.array[sliceId]->sNSSAI.sST.size);
- if((*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList\
- .list.array[sliceId]->sNSSAI.sST.buf == NULLP)
- {
- return RFAILED;
- }
+ list.count = elementCnt;
(*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList.\
- list.array[sliceId]->sNSSAI.sST.buf[0] = 3;
+ list.size = (*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList.\
+ list.count * sizeof(SliceSupportItem_t *);
+
DU_ALLOC((*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList.\
- list.array[sliceId]->sNSSAI.sD,sizeof(OCTET_STRING_t));
+ list.array, elementCnt * sizeof(SliceSupportItem_t *));
if((*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList.\
- list.array[sliceId]->sNSSAI.sD == NULLP)
+ list.array == NULLP)
{
+ DU_LOG("ERROR --> DU_APP : BuildExtensions(): Memory allocation failed");
return RFAILED;
}
- (*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList.\
- list.array[sliceId]->sNSSAI.sD->size = 3*sizeof(uint8_t);
- DU_ALLOC((*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList.\
- list.array[sliceId]->sNSSAI.sD->buf,(*ieExtend)->list.array[idx]->extensionValue.choice.\
- SliceSupportList.list.array[sliceId]->sNSSAI.sD->size);
- if((*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList.\
- list.array[sliceId]->sNSSAI.sD->buf == NULLP)
+
+ for(sliceLstIdx =0; sliceLstIdx<elementCnt; sliceLstIdx++)
{
- return RFAILED;
+ DU_ALLOC((*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList.\
+ list.array[sliceLstIdx],sizeof(SliceSupportItem_t));
+ if((*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList.\
+ list.array[sliceLstIdx] == NULLP)
+ {
+ DU_LOG("ERROR --> DU_APP : BuildExtensions(): Memory allocation failed");
+ return RFAILED;
+ }
+ (*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList.\
+ list.array[sliceLstIdx]->sNSSAI.sST.size = sizeof(uint8_t);
+ DU_ALLOC((*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList\
+ .list.array[sliceLstIdx]->sNSSAI.sST.buf,(*ieExtend)->list.array[idx]->\
+ extensionValue.choice.SliceSupportList.\
+ list.array[sliceLstIdx]->sNSSAI.sST.size);
+ if((*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList\
+ .list.array[sliceLstIdx]->sNSSAI.sST.buf == NULLP)
+ {
+ DU_LOG("ERROR --> DU_APP : BuildExtensions(): Memory allocation failed");
+ return RFAILED;
+ }
+ (*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList.\
+ list.array[sliceLstIdx]->sNSSAI.sST.buf[0] = duCfgParam.srvdCellLst[0].duCellInfo.\
+ cellInfo.srvdPlmn[0].taiSliceSuppLst.snssai[sliceLstIdx]->sst;
+
+ DU_ALLOC((*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList.\
+ list.array[sliceLstIdx]->sNSSAI.sD,sizeof(OCTET_STRING_t));
+ if((*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList.\
+ list.array[sliceLstIdx]->sNSSAI.sD == NULLP)
+ {
+ DU_LOG("ERROR --> DU_APP : BuildExtensions(): Memory allocation failed");
+ return RFAILED;
+ }
+ (*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList.\
+ list.array[sliceLstIdx]->sNSSAI.sD->size = 3 * sizeof(uint8_t);
+ DU_ALLOC((*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList.\
+ list.array[sliceLstIdx]->sNSSAI.sD->buf, (*ieExtend)->list.array[idx]->extensionValue.choice.\
+ SliceSupportList.list.array[sliceLstIdx]->sNSSAI.sD->size);
+ if((*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList.\
+ list.array[sliceLstIdx]->sNSSAI.sD->buf == NULLP)
+ {
+ DU_LOG("ERROR --> DU_APP : BuildExtensions(): Memory allocation failed");
+ return RFAILED;
+ }
+ memcpy((*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList.\
+ list.array[sliceLstIdx]->sNSSAI.sD->buf, duCfgParam.srvdCellLst[0].duCellInfo.\
+ cellInfo.srvdPlmn[0].taiSliceSuppLst.snssai[sliceLstIdx]->sd, (*ieExtend)->list.array[idx]->\
+ extensionValue.choice.SliceSupportList.list.array[sliceLstIdx]->sNSSAI.sD->size);
}
- sdId = 0;
- (*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList.\
- list.array[sliceId]->sNSSAI.sD->buf[sdId] = 3;
- sdId++;
- (*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList.\
- list.array[sliceId]->sNSSAI.sD->buf[sdId] = 6;
- sdId++;
- (*ieExtend)->list.array[idx]->extensionValue.choice.SliceSupportList.\
- list.array[sliceId]->sNSSAI.sD->buf[sdId] = 9;
return ROK;
}
/*******************************************************************
DU_FREE(rrcVer->latest_RRC_Version.buf,rrcVer->latest_RRC_Version.size);
}
}
+
+/*******************************************************************
+ *
+ * @brief Deallocating memory of TDD NrFreqInfo
+ *
+ * @details
+ *
+ * Function : freeTddNrFreqInfo
+ *
+ * Functionality: freeTddNrFreqInfo
+ *
+ * @params[in] F1AP_PDU_t *f1apDuCfg
+ *
+ * @return ROK - void
+ *
+ * ****************************************************************/
+void freeTddNrFreqInfo(NRFreqInfo_t *freqInfo)
+{
+ uint8_t freqBandListIdx = 0, supportedBandIdx = 0;
+
+ if(freqInfo->freqBandListNr.list.array)
+ {
+ for(freqBandListIdx = 0; freqBandListIdx<freqInfo->freqBandListNr.list.count; freqBandListIdx++)
+ {
+ if(freqInfo->freqBandListNr.list.array[freqBandListIdx])
+ {
+ if(freqInfo->freqBandListNr.list.array[freqBandListIdx]->supportedSULBandList.list.array)
+ {
+ for(supportedBandIdx = 0; supportedBandIdx<freqInfo->freqBandListNr.list.array[freqBandListIdx]->supportedSULBandList.list.count; supportedBandIdx++)
+ {
+ DU_FREE(freqInfo->freqBandListNr.list.array[freqBandListIdx]->supportedSULBandList.list.array[supportedBandIdx],\
+ sizeof(SupportedSULFreqBandItem_t));
+ }
+ DU_FREE(freqInfo->freqBandListNr.list.array[freqBandListIdx]->supportedSULBandList.list.array,\
+ freqInfo->freqBandListNr.list.array[freqBandListIdx]->supportedSULBandList.list.size);
+
+ }
+ DU_FREE(freqInfo->freqBandListNr.list.array[freqBandListIdx], sizeof(FreqBandNrItem_t ));
+ }
+ }
+ DU_FREE(freqInfo->freqBandListNr.list.array, freqInfo->freqBandListNr.list.size );
+ }
+}
+
+/*******************************************************************
+ *
+ * @brief Deallocating memory allocated for Nr fdd frequencey mode
+ *
+ * @details
+ *
+ * Function : freeFddNrFreqInfo
+ *
+ * Functionality:Free memory allocated for Nr fdd frequencey mode
+ *
+ * @params[in]
+ *
+ * @return ROK - void
+ *
+ * ****************************************************************/
+void freeFddNrFreqInfo(FDD_Info_t *fDD)
+{
+ uint8_t arrIdx =0;
+
+ if(fDD != NULLP)
+ {
+ if(fDD->uL_NRFreqInfo.freqBandListNr.list.array != NULLP)
+ {
+ DU_FREE(fDD->uL_NRFreqInfo.freqBandListNr.list.\
+ array[arrIdx], sizeof(FreqBandNrItem_t));
+ DU_FREE(fDD->uL_NRFreqInfo.freqBandListNr.list.array, \
+ fDD->uL_NRFreqInfo.freqBandListNr.list.size);
+ }
+
+ if(fDD->dL_NRFreqInfo.freqBandListNr.list.array != NULLP)
+ {
+ DU_FREE(fDD->dL_NRFreqInfo.freqBandListNr.list.\
+ array[arrIdx], sizeof(FreqBandNrItem_t));
+ DU_FREE(fDD->dL_NRFreqInfo.freqBandListNr.list.array,\
+ fDD->dL_NRFreqInfo.freqBandListNr.list.size);
+ }
+ DU_FREE(fDD,sizeof(FDD_Info_t));
+ }
+}
+
/*******************************************************************
*
* @brief deallocating the memory of function BuildAndSendF1SetupReq()
* ****************************************************************/
void FreeServedCellList( GNB_DU_Served_Cells_List_t *duServedCell)
{
- uint8_t plmnCnt=1;
- uint8_t sliceId=0;
- uint8_t extensionCnt=1;
- uint8_t plmnIdx=0;
+ uint8_t plmnCnt=MAX_PLMN;
+ uint8_t extensionCnt=IE_EXTENSION_LIST_COUNT;
+ uint8_t plmnIdx=0, sliceIdx=0;
GNB_DU_Served_Cells_Item_t *srvCellItem;
ServedPLMNs_Item_t *servedPlmnItem;
SliceSupportItem_t *sliceSupportItem;
if(srvCellItem->served_Cell_Information.servedPLMNs.list.array[plmnIdx] != NULLP)
{
servedPlmnItem = srvCellItem->served_Cell_Information.servedPLMNs.list.array[plmnIdx];
- DU_FREE(servedPlmnItem->pLMN_Identity.buf, servedPlmnItem->pLMN_Identity.size * sizeof(uint8_t));
+ DU_FREE(servedPlmnItem->pLMN_Identity.buf, servedPlmnItem->pLMN_Identity.size);
if(servedPlmnItem->iE_Extensions != NULLP)
{
{
if(servedPlmnItem->iE_Extensions->list.array[0] != NULLP)
{
- if(servedPlmnItem->iE_Extensions->list.array[0]->extensionValue.choice.SliceSupportList.list.\
- array != NULLP)
+ if(servedPlmnItem->iE_Extensions->list.array[0]->extensionValue.choice.\
+ SliceSupportList.list.array != NULLP)
{
- if(servedPlmnItem->iE_Extensions->list.array[0]->extensionValue.choice.SliceSupportList.list.\
- array[sliceId] != NULLP)
+ for(sliceIdx =0; sliceIdx<servedPlmnItem->iE_Extensions->list.array[0]->\
+ extensionValue.choice.SliceSupportList.list.count; sliceIdx++)
{
- sliceSupportItem = servedPlmnItem->iE_Extensions->list.array[0]->extensionValue.choice.\
- SliceSupportList.list.array[sliceId];
+ if(servedPlmnItem->iE_Extensions->list.array[0]->extensionValue.choice.\
+ SliceSupportList.list.array[sliceIdx] != NULLP)
+ {
+ sliceSupportItem = servedPlmnItem->iE_Extensions->list.array[0]->\
+ extensionValue.choice.SliceSupportList.list.array[sliceIdx];
- DU_FREE(sliceSupportItem->sNSSAI.sST.buf, sizeof(uint8_t));
+ DU_FREE(sliceSupportItem->sNSSAI.sST.buf, sizeof(uint8_t));
- if(sliceSupportItem->sNSSAI.sD != NULLP)
- {
- DU_FREE(sliceSupportItem->sNSSAI.sD->buf, sliceSupportItem->sNSSAI.sD->size);
- DU_FREE(sliceSupportItem->sNSSAI.sD, sizeof(OCTET_STRING_t));
- }
+ if(sliceSupportItem->sNSSAI.sD != NULLP)
+ {
+ DU_FREE(sliceSupportItem->sNSSAI.sD->buf,\
+ sliceSupportItem->sNSSAI.sD->size);
+ DU_FREE(sliceSupportItem->sNSSAI.sD, sizeof(OCTET_STRING_t));
+ }
- DU_FREE(servedPlmnItem->iE_Extensions->list.array[0]->extensionValue.choice.SliceSupportList.\
- list.array[sliceId], sizeof(SliceSupportItem_t));
+ DU_FREE(servedPlmnItem->iE_Extensions->list.array[0]->extensionValue.\
+ choice.SliceSupportList.list.array[sliceIdx], sizeof(SliceSupportItem_t));
+ }
}
- DU_FREE(servedPlmnItem->iE_Extensions->list.array[0]->extensionValue.choice.SliceSupportList.\
- list.array, sizeof(SliceSupportItem_t*));
+ DU_FREE(servedPlmnItem->iE_Extensions->list.array[0]->extensionValue.choice.\
+ SliceSupportList.list.array, servedPlmnItem->iE_Extensions->list.array[0]->\
+ extensionValue.choice.SliceSupportList.list.size);
}
- DU_FREE(servedPlmnItem->iE_Extensions->list.array[0], sizeof(ServedPLMNs_ItemExtIEs_t));
+ DU_FREE(servedPlmnItem->iE_Extensions->list.array[0],\
+ sizeof(ServedPLMNs_ItemExtIEs_t));
}
- DU_FREE(servedPlmnItem->iE_Extensions->list.array, extensionCnt*sizeof(ServedPLMNs_ItemExtIEs_t*));
+ DU_FREE(servedPlmnItem->iE_Extensions->list.array,\
+ extensionCnt*sizeof(ServedPLMNs_ItemExtIEs_t*));
}
DU_FREE(servedPlmnItem->iE_Extensions, sizeof(ProtocolExtensionContainer_4624P3_t));
}
- DU_FREE(srvCellItem->served_Cell_Information.servedPLMNs.list.array[plmnIdx], sizeof(ServedPLMNs_Item_t));
+ DU_FREE(srvCellItem->served_Cell_Information.servedPLMNs.list.array[plmnIdx],\
+ sizeof(ServedPLMNs_Item_t));
}
- DU_FREE(srvCellItem->served_Cell_Information.servedPLMNs.list.array, sizeof(ServedPLMNs_Item_t *));
+ DU_FREE(srvCellItem->served_Cell_Information.servedPLMNs.list.array,\
+ sizeof(ServedPLMNs_Item_t *));
}
- if(srvCellItem->served_Cell_Information.nR_Mode_Info.choice.fDD != NULLP)
+ if(srvCellItem->served_Cell_Information.nR_Mode_Info.present == NR_Mode_Info_PR_fDD)
{
- if(srvCellItem->served_Cell_Information.nR_Mode_Info.choice.fDD->uL_NRFreqInfo.\
- freqBandListNr.list.array != NULLP)
- {
- DU_FREE(srvCellItem->served_Cell_Information.nR_Mode_Info.choice.fDD->uL_NRFreqInfo.freqBandListNr.\
- list.array[0],sizeof(FreqBandNrItem_t));
- DU_FREE(srvCellItem->served_Cell_Information.nR_Mode_Info.choice.fDD->uL_NRFreqInfo.freqBandListNr.\
- list.array,sizeof(FreqBandNrItem_t*));
- }
-
- if(srvCellItem->served_Cell_Information.nR_Mode_Info.choice.fDD->dL_NRFreqInfo.\
- freqBandListNr.list.array)
+ freeFddNrFreqInfo(srvCellItem->served_Cell_Information.nR_Mode_Info.choice.fDD);
+ }
+ else
+ {
+ if(srvCellItem->served_Cell_Information.nR_Mode_Info.choice.tDD != NULLP)
{
- DU_FREE(srvCellItem->served_Cell_Information.nR_Mode_Info.choice.fDD->dL_NRFreqInfo.\
- freqBandListNr.list.array[0],sizeof(FreqBandNrItem_t));
- DU_FREE(srvCellItem->served_Cell_Information.nR_Mode_Info.choice.fDD->dL_NRFreqInfo.\
- freqBandListNr.list.array,sizeof(FreqBandNrItem_t *));
+ freeTddNrFreqInfo(&srvCellItem->served_Cell_Information.nR_Mode_Info.choice.tDD->nRFreqInfo);
+ DU_FREE(srvCellItem->served_Cell_Information.nR_Mode_Info.choice.tDD, sizeof(TDD_Info_t));
}
- DU_FREE(srvCellItem->served_Cell_Information.nR_Mode_Info.choice.fDD, sizeof(FDD_Info_t));
}
-
+
DU_FREE(srvCellItem->served_Cell_Information.measurementTimingConfiguration.buf,\
srvCellItem->served_Cell_Information.measurementTimingConfiguration.size);
/* Encode results */
if(encRetVal.encoded == ENCODE_FAIL)
{
- DU_LOG("\nERROR --> F1AP : Could not encode F1SetupRequest structure (at %s)\n",\
- encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
- break;
+ DU_LOG("\nERROR --> F1AP : Could not encode F1SetupRequest structure (at %s)\n",\
+ encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
+ break;
}
else
{
- DU_LOG("\nDEBUG --> F1AP : Created APER encoded buffer for F1SetupRequest\n");
- for(ieIdx=0; ieIdx< encBufSize; ieIdx++)
- {
- printf("%x",encBuf[ieIdx]);
- }
+ DU_LOG("\nDEBUG --> F1AP : Created APER encoded buffer for F1SetupRequest\n");
+ for(ieIdx=0; ieIdx< encBufSize; ieIdx++)
+ {
+ printf("%x",encBuf[ieIdx]);
+ }
+
+ duCb.f1SetupReqAndRspMsg.f1MsgReqBufSize = encBufSize;
+ DU_ALLOC(duCb.f1SetupReqAndRspMsg.f1MsgReqBuf, encBufSize);
+ if(duCb.f1SetupReqAndRspMsg.f1MsgReqBuf == NULLP)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed to store the encoding of f1setup req");
+ return RFAILED;
+ }
+ memcpy(duCb.f1SetupReqAndRspMsg.f1MsgReqBuf, &encBuf, duCb.f1SetupReqAndRspMsg.f1MsgReqBufSize);
}
/* Sending msg */
if(sendF1APMsg() != ROK)
{
- DU_LOG("\nERROR --> F1AP : Sending F1 Setup request failed");
- break;
+ DU_LOG("\nERROR --> F1AP : Sending F1 Setup request failed");
+ break;
}
ret=ROK;
void freeCellsToModifyItem(Served_Cells_To_Modify_Item_t *modifyItem)
{
- uint8_t arrIdx=0,i=0;
+ uint8_t arrIdx=0, servedPlmnIdx=0, sliceLstIdx=0;
ServedPLMNs_Item_t *servedPlmnItem = NULLP;
SliceSupportItem_t *sliceSupportItem = NULLP;
{
if(servedPlmnItem->iE_Extensions->list.array[arrIdx] != NULLP)
{
- if(servedPlmnItem->iE_Extensions->list.array[arrIdx]->extensionValue.choice.SliceSupportList.list.array != NULLP)
+ if(servedPlmnItem->iE_Extensions->list.array[arrIdx]->extensionValue.choice.SliceSupportList.\
+ list.array != NULLP)
{
- if(servedPlmnItem->iE_Extensions->list.array[arrIdx]->extensionValue.choice.SliceSupportList.list.array[arrIdx] != NULLP)
+ for(sliceLstIdx =0; sliceLstIdx<servedPlmnItem->iE_Extensions->list.array[arrIdx]->\
+ extensionValue.choice.SliceSupportList.list.count; sliceLstIdx++)
{
- sliceSupportItem = modifyItem->served_Cell_Information.servedPLMNs.list.array[arrIdx]->iE_Extensions->\
- list.array[arrIdx]->extensionValue.choice.SliceSupportList.list.array[arrIdx];
-
- DU_FREE(sliceSupportItem->sNSSAI.sST.buf, sliceSupportItem->sNSSAI.sST.size);
- if(sliceSupportItem->sNSSAI.sD != NULLP)
+ if(servedPlmnItem->iE_Extensions->list.array[arrIdx]->extensionValue.choice.SliceSupportList.\
+ list.array[sliceLstIdx] != NULLP)
{
- DU_FREE(sliceSupportItem->sNSSAI.sD->buf, sliceSupportItem->sNSSAI.sD->size);
- DU_FREE(sliceSupportItem->sNSSAI.sD,sizeof(OCTET_STRING_t));
+
+ sliceSupportItem = servedPlmnItem->iE_Extensions->list.array[arrIdx]->extensionValue.choice.\
+ SliceSupportList.list.array[sliceLstIdx];
+
+ DU_FREE(sliceSupportItem->sNSSAI.sST.buf, sliceSupportItem->sNSSAI.sST.size);
+ if(sliceSupportItem->sNSSAI.sD != NULLP)
+ {
+ DU_FREE(sliceSupportItem->sNSSAI.sD->buf, sliceSupportItem->sNSSAI.sD->size);
+ DU_FREE(sliceSupportItem->sNSSAI.sD,sizeof(OCTET_STRING_t));
+ }
+ DU_FREE(servedPlmnItem->iE_Extensions->list.array[arrIdx]->extensionValue.choice.\
+ SliceSupportList.list.array[sliceLstIdx], sizeof(SliceSupportItem_t));
}
- DU_FREE(servedPlmnItem->iE_Extensions->list.array[arrIdx]->extensionValue.choice.SliceSupportList.\
- list.array[arrIdx], sizeof(SliceSupportItem_t));
}
- DU_FREE(servedPlmnItem->iE_Extensions->list.array[arrIdx]->extensionValue.choice.SliceSupportList.list.array,
- servedPlmnItem->iE_Extensions->list.array[arrIdx]->extensionValue.choice.SliceSupportList.list.size);
+ DU_FREE(servedPlmnItem->iE_Extensions->list.array[arrIdx]->extensionValue.\
+ choice.SliceSupportList.list.array,\
+ servedPlmnItem->iE_Extensions->list.array[arrIdx]->\
+ extensionValue.choice.SliceSupportList.list.size);
}
}
- for(i=0; i < servedPlmnItem->iE_Extensions->list.count ; i++)
+ for(servedPlmnIdx=0; servedPlmnIdx< servedPlmnItem->iE_Extensions->list.count ; servedPlmnIdx++)
{
- DU_FREE(servedPlmnItem->iE_Extensions->list.array[i], sizeof(ServedPLMNs_ItemExtIEs_t ));
+ DU_FREE(servedPlmnItem->iE_Extensions->list.array[servedPlmnIdx], sizeof(ServedPLMNs_ItemExtIEs_t ));
}
DU_FREE(servedPlmnItem->iE_Extensions->list.array, servedPlmnItem->iE_Extensions->list.size);
}
DU_FREE(servedPlmnItem->iE_Extensions,sizeof(ProtocolExtensionContainer_4624P3_t));
}
}
- for(i=0;i<modifyItem->served_Cell_Information.servedPLMNs.list.count;i++)
+ for(servedPlmnIdx=0; servedPlmnIdx<modifyItem->served_Cell_Information.servedPLMNs.list.count; servedPlmnIdx++)
{
- DU_FREE(modifyItem->served_Cell_Information.servedPLMNs.list.array[i], sizeof(ServedPLMNs_Item_t));
+ DU_FREE(modifyItem->served_Cell_Information.servedPLMNs.list.array[servedPlmnIdx], sizeof(ServedPLMNs_Item_t));
}
DU_FREE(modifyItem->served_Cell_Information.servedPLMNs.list.array,\
- modifyItem->served_Cell_Information.servedPLMNs.list.size);
+ modifyItem->served_Cell_Information.servedPLMNs.list.size);
}
-
- if(modifyItem->served_Cell_Information.nR_Mode_Info.choice.fDD != NULLP)
+
+ if(modifyItem->served_Cell_Information.nR_Mode_Info.present == NR_Mode_Info_PR_fDD)
{
- if(modifyItem->served_Cell_Information.nR_Mode_Info.choice.fDD->uL_NRFreqInfo.freqBandListNr.list.array != NULLP)
- {
- DU_FREE(modifyItem->served_Cell_Information.nR_Mode_Info.choice.fDD->uL_NRFreqInfo.freqBandListNr.list.\
- array[arrIdx], sizeof(FreqBandNrItem_t));
- DU_FREE(modifyItem->served_Cell_Information.nR_Mode_Info.choice.fDD->uL_NRFreqInfo.freqBandListNr.list.array, \
- modifyItem->served_Cell_Information.nR_Mode_Info.choice.fDD->uL_NRFreqInfo.freqBandListNr.list.size);
- }
-
- if(modifyItem->served_Cell_Information.nR_Mode_Info.choice.fDD->dL_NRFreqInfo.freqBandListNr.list.array != NULLP)
+ freeFddNrFreqInfo(modifyItem->served_Cell_Information.nR_Mode_Info.choice.fDD);
+ }
+ else
+ {
+ if(modifyItem->served_Cell_Information.nR_Mode_Info.choice.tDD)
{
- DU_FREE(modifyItem->served_Cell_Information.nR_Mode_Info.choice.fDD->dL_NRFreqInfo.freqBandListNr.list.\
- array[arrIdx], sizeof(FreqBandNrItem_t));
- DU_FREE(modifyItem->served_Cell_Information.nR_Mode_Info.choice.fDD->dL_NRFreqInfo.freqBandListNr.list.array,\
- modifyItem->served_Cell_Information.nR_Mode_Info.choice.fDD->dL_NRFreqInfo.freqBandListNr.list.size);
+ freeTddNrFreqInfo(&modifyItem->served_Cell_Information.nR_Mode_Info.choice.tDD->nRFreqInfo);
+ DU_FREE(modifyItem->served_Cell_Information.nR_Mode_Info.choice.tDD, sizeof(TDD_Info_t));
}
- DU_FREE(modifyItem->served_Cell_Information.nR_Mode_Info.choice.fDD,sizeof(FDD_Info_t));
}
-
DU_FREE(modifyItem->served_Cell_Information.measurementTimingConfiguration.buf,\
modifyItem->served_Cell_Information.measurementTimingConfiguration.size);
}
uint8_t fillServedPlmns(ServedPLMNs_List_t *servedPlmn)
{
- uint8_t ieIdx, ieListCnt;
+ uint8_t ieIdx=0, arrayIdx=0, ieListCnt=0, elementCnt=0, sliceLstIdx=0;
- servedPlmn->list.array[0]->pLMN_Identity.size = 3*sizeof(uint8_t);
- DU_ALLOC(servedPlmn->list.array[0]->pLMN_Identity.buf, servedPlmn->list.\
- array[0]->pLMN_Identity.size);
- if(servedPlmn->list.array[0]->pLMN_Identity.buf == NULLP)
+ servedPlmn->list.array[arrayIdx]->pLMN_Identity.size = 3*sizeof(uint8_t);
+ DU_ALLOC(servedPlmn->list.array[arrayIdx]->pLMN_Identity.buf, servedPlmn->list.\
+ array[arrayIdx]->pLMN_Identity.size);
+ if(servedPlmn->list.array[arrayIdx]->pLMN_Identity.buf == NULLP)
{
+ DU_LOG("ERROR --> DU_APP : fillServedPlmns(): Memory allocation failed");
return RFAILED;
}
- buildPlmnId(duCfgParam.srvdCellLst[0].duCellInfo.cellInfo.plmn[0],\
- servedPlmn->list.array[0]->pLMN_Identity.buf);
- DU_ALLOC(servedPlmn->list.array[0]->iE_Extensions,sizeof(ProtocolExtensionContainer_4624P3_t));
- if(servedPlmn->list.array[0]->iE_Extensions == NULLP)
+ buildPlmnId(duCfgParam.srvdCellLst[arrayIdx].duCellInfo.cellInfo.srvdPlmn[arrayIdx].plmn,\
+ servedPlmn->list.array[arrayIdx]->pLMN_Identity.buf);
+ DU_ALLOC(servedPlmn->list.array[arrayIdx]->iE_Extensions,sizeof(ProtocolExtensionContainer_4624P3_t));
+ if(servedPlmn->list.array[arrayIdx]->iE_Extensions == NULLP)
{
+ DU_LOG("ERROR --> DU_APP : fillServedPlmns(): Memory allocation failed");
return RFAILED;
}
ieListCnt=1;
- servedPlmn->list.array[0]->iE_Extensions->list.count = ieListCnt;
- servedPlmn->list.array[0]->iE_Extensions->list.size = ieListCnt *sizeof(ServedPLMNs_ItemExtIEs_t *);
- DU_ALLOC(servedPlmn->list.array[0]->iE_Extensions->list.array,servedPlmn->list.array[0]->\
- iE_Extensions->list.size);
- if(servedPlmn->list.array[0]->iE_Extensions->list.array == NULLP)
+ servedPlmn->list.array[arrayIdx]->iE_Extensions->list.count = ieListCnt;
+ servedPlmn->list.array[arrayIdx]->iE_Extensions->list.size = ieListCnt *sizeof(ServedPLMNs_ItemExtIEs_t *);
+ DU_ALLOC(servedPlmn->list.array[arrayIdx]->iE_Extensions->list.array,servedPlmn->list.array[arrayIdx]->\
+ iE_Extensions->list.size);
+ if(servedPlmn->list.array[arrayIdx]->iE_Extensions->list.array == NULLP)
{
+ DU_LOG("ERROR --> DU_APP : fillServedPlmns(): Memory allocation failed");
return RFAILED;
}
- for(ieIdx=0;ieIdx<ieListCnt;ieIdx++)
+ for(ieIdx=arrayIdx;ieIdx<ieListCnt;ieIdx++)
{
- DU_ALLOC(servedPlmn->list.array[0]->iE_Extensions->list.array[ieIdx],\
- sizeof(ServedPLMNs_ItemExtIEs_t));
- if(servedPlmn->list.array[0]->iE_Extensions->list.array[ieIdx] == NULLP)
+ DU_ALLOC(servedPlmn->list.array[arrayIdx]->iE_Extensions->list.array[ieIdx],\
+ sizeof(ServedPLMNs_ItemExtIEs_t));
+ if(servedPlmn->list.array[arrayIdx]->iE_Extensions->list.array[ieIdx] == NULLP)
{
- return RFAILED;
+ DU_LOG("ERROR --> DU_APP : fillServedPlmns(): Memory allocation failed");
+ return RFAILED;
+ }
+ }
+
+ ieIdx = 0;
+ elementCnt = duCfgParam.srvdCellLst[0].duCellInfo.cellInfo.srvdPlmn[0].taiSliceSuppLst.numSupportedSlices;
+ servedPlmn->list.array[arrayIdx]->iE_Extensions->list.array[ieIdx]->id =ProtocolIE_ID_id_TAISliceSupportList;
+ servedPlmn->list.array[arrayIdx]->iE_Extensions->list.array[ieIdx]->criticality = Criticality_ignore;
+ servedPlmn->list.array[arrayIdx]->iE_Extensions->list.array[ieIdx]->extensionValue.present = \
+ ServedPLMNs_ItemExtIEs__extensionValue_PR_SliceSupportList;
+ servedPlmn->list.array[arrayIdx]->iE_Extensions->list.array[ieIdx]->extensionValue.choice.SliceSupportList.\
+ list.count = elementCnt;
+ servedPlmn->list.array[arrayIdx]->\
+ iE_Extensions->list.array[ieIdx]->extensionValue.choice.SliceSupportList.\
+ list.size = elementCnt * sizeof(SliceSupportItem_t *);
+ DU_ALLOC(servedPlmn->list.array[arrayIdx]->\
+ iE_Extensions->list.array[ieIdx]->extensionValue.choice.SliceSupportList.\
+ list.array,servedPlmn->list.array[arrayIdx]->\
+ iE_Extensions->list.array[ieIdx]->extensionValue.choice.SliceSupportList.list.size);
+ if(servedPlmn->list.array[arrayIdx]->\
+ iE_Extensions->list.array[ieIdx]->extensionValue.choice.SliceSupportList.\
+ list.array == NULLP)
+ {
+ DU_LOG("ERROR --> DU_APP : fillServedPlmns(): Memory allocation failed");
+ return RFAILED;
+ }
+
+ for(sliceLstIdx =0; sliceLstIdx< elementCnt; sliceLstIdx++)
+ {
+ DU_ALLOC(servedPlmn->list.array[arrayIdx]->\
+ iE_Extensions->list.array[ieIdx]->extensionValue.choice.SliceSupportList.\
+ list.array[sliceLstIdx],sizeof( SliceSupportItem_t));
+ if(servedPlmn->list.array[arrayIdx]->\
+ iE_Extensions->list.array[ieIdx]->extensionValue.choice.SliceSupportList.\
+ list.array[sliceLstIdx] == NULLP)
+ {
+ DU_LOG("ERROR --> DU_APP : fillServedPlmns(): Memory allocation failed");
+ return RFAILED;
}
+
+ servedPlmn->list.array[arrayIdx]->\
+ iE_Extensions->list.array[ieIdx]->extensionValue.choice.SliceSupportList.\
+ list.array[sliceLstIdx]->sNSSAI.sST.size = sizeof(uint8_t);
+ DU_ALLOC(servedPlmn->list.array[arrayIdx]->\
+ iE_Extensions->list.array[ieIdx]->extensionValue.choice.SliceSupportList.\
+ list.array[sliceLstIdx]->sNSSAI.sST.buf,servedPlmn->list.array[arrayIdx]->\
+ iE_Extensions->list.array[ieIdx]->extensionValue.choice.SliceSupportList.list.array[sliceLstIdx]->\
+ sNSSAI.sST.size);
+
+ if(servedPlmn->list.array[arrayIdx]->\
+ iE_Extensions->list.array[ieIdx]->extensionValue.choice.SliceSupportList.\
+ list.array[sliceLstIdx]->sNSSAI.sST.buf == NULLP)
+ {
+ DU_LOG("ERROR --> DU_APP : fillServedPlmns(): Memory allocation failed");
+ return RFAILED;
+ }
+ servedPlmn->list.array[arrayIdx]->\
+ iE_Extensions->list.array[ieIdx]->extensionValue.choice.SliceSupportList.\
+ list.array[sliceLstIdx]->sNSSAI.sST.buf[arrayIdx] = duCfgParam.srvdCellLst[arrayIdx].duCellInfo.\
+ cellInfo.srvdPlmn[arrayIdx].taiSliceSuppLst.snssai[sliceLstIdx]->sst;
+
+ DU_ALLOC(servedPlmn->list.array[arrayIdx]->\
+ iE_Extensions->list.array[ieIdx]->extensionValue.choice.SliceSupportList.\
+ list.array[sliceLstIdx]->sNSSAI.sD,sizeof(OCTET_STRING_t));
+ if(servedPlmn->list.array[arrayIdx]->\
+ iE_Extensions->list.array[ieIdx]->extensionValue.choice.SliceSupportList.\
+ list.array[sliceLstIdx]->sNSSAI.sD == NULLP)
+ {
+ DU_LOG("ERROR --> DU_APP : fillServedPlmns(): Memory allocation failed");
+ return RFAILED;
+ }
+ servedPlmn->list.array[arrayIdx]->\
+ iE_Extensions->list.array[ieIdx]->extensionValue.choice.SliceSupportList.\
+ list.array[sliceLstIdx]->sNSSAI.sD->size = 3 * sizeof(uint8_t);
+ DU_ALLOC(servedPlmn->list.array[arrayIdx]->\
+ iE_Extensions->list.array[ieIdx]->extensionValue.choice.SliceSupportList.\
+ list.array[sliceLstIdx]->sNSSAI.sD->buf,servedPlmn->list.array[arrayIdx]->\
+ iE_Extensions->list.array[ieIdx]->extensionValue.choice.SliceSupportList.\
+ list.array[sliceLstIdx]->sNSSAI.sD->size);
+ if(servedPlmn->list.array[arrayIdx]->\
+ iE_Extensions->list.array[ieIdx]->extensionValue.choice.SliceSupportList.\
+ list.array[sliceLstIdx]->sNSSAI.sD->buf == NULLP)
+ {
+ DU_LOG("ERROR --> DU_APP : fillServedPlmns(): Memory allocation failed");
+ return RFAILED;
+ }
+ memcpy(servedPlmn->list.array[arrayIdx]->\
+ iE_Extensions->list.array[ieIdx]->extensionValue.choice.SliceSupportList.\
+ list.array[sliceLstIdx]->sNSSAI.sD->buf, duCfgParam.srvdCellLst[arrayIdx].duCellInfo.\
+ cellInfo.srvdPlmn[arrayIdx].taiSliceSuppLst.snssai[sliceLstIdx]->sd,\
+ servedPlmn->list.array[arrayIdx]->iE_Extensions->list.array[ieIdx]->extensionValue.choice.SliceSupportList.\
+ list.array[sliceLstIdx]->sNSSAI.sD->size);
}
- //plmnIeExt = servedPlmn->list.array[0]->iE_Extensions;
- servedPlmn->list.array[0]->iE_Extensions->list.array[0]->id =ProtocolIE_ID_id_TAISliceSupportList;
- servedPlmn->list.array[0]->iE_Extensions->list.array[0]->criticality = Criticality_ignore;
- servedPlmn->list.array[0]->iE_Extensions->list.array[0]->extensionValue.present = \
- ServedPLMNs_ItemExtIEs__extensionValue_PR_SliceSupportList;
- servedPlmn->list.array[0]->iE_Extensions->list.array[0]->extensionValue.choice.SliceSupportList.\
- list.count = 1;
- servedPlmn->list.array[0]->\
- iE_Extensions->list.array[0]->extensionValue.choice.SliceSupportList.\
- list.size = sizeof(SliceSupportItem_t *);
- DU_ALLOC(servedPlmn->list.array[0]->\
- iE_Extensions->list.array[0]->extensionValue.choice.SliceSupportList.\
- list.array,servedPlmn->list.array[0]->\
- iE_Extensions->list.array[0]->extensionValue.choice.SliceSupportList.list.size);
- if(servedPlmn->list.array[0]->\
- iE_Extensions->list.array[0]->extensionValue.choice.SliceSupportList.\
- list.array == NULLP)
- {
- return RFAILED;
- }
-
- DU_ALLOC(servedPlmn->list.array[0]->\
- iE_Extensions->list.array[0]->extensionValue.choice.SliceSupportList.\
- list.array[0],sizeof( SliceSupportItem_t));
- if(servedPlmn->list.array[0]->\
- iE_Extensions->list.array[0]->extensionValue.choice.SliceSupportList.\
- list.array[0] == NULLP)
- {
- return RFAILED;
- }
- servedPlmn->list.array[0]->\
- iE_Extensions->list.array[0]->extensionValue.choice.SliceSupportList.\
- list.array[0]->sNSSAI.sST.size = sizeof(uint8_t);
- DU_ALLOC(servedPlmn->list.array[0]->\
- iE_Extensions->list.array[0]->extensionValue.choice.SliceSupportList.\
- list.array[0]->sNSSAI.sST.buf,servedPlmn->list.array[0]->\
- iE_Extensions->list.array[0]->extensionValue.choice.SliceSupportList.list.array[0]->sNSSAI.sST.size);
- if(servedPlmn->list.array[0]->\
- iE_Extensions->list.array[0]->extensionValue.choice.SliceSupportList.\
- list.array[0]->sNSSAI.sST.buf == NULLP)
- {
- return RFAILED;
- }
- servedPlmn->list.array[0]->\
- iE_Extensions->list.array[0]->extensionValue.choice.SliceSupportList.\
- list.array[0]->sNSSAI.sST.buf[0] = 3;
- DU_ALLOC(servedPlmn->list.array[0]->\
- iE_Extensions->list.array[0]->extensionValue.choice.SliceSupportList.\
- list.array[0]->sNSSAI.sD,sizeof(OCTET_STRING_t));
- if(servedPlmn->list.array[0]->\
- iE_Extensions->list.array[0]->extensionValue.choice.SliceSupportList.\
- list.array[0]->sNSSAI.sD == NULLP)
- {
- return RFAILED;
- }
- servedPlmn->list.array[0]->\
- iE_Extensions->list.array[0]->extensionValue.choice.SliceSupportList.\
- list.array[0]->sNSSAI.sD->size = 3*sizeof(uint8_t);
- DU_ALLOC(servedPlmn->list.array[0]->\
- iE_Extensions->list.array[0]->extensionValue.choice.SliceSupportList.\
- list.array[0]->sNSSAI.sD->buf,servedPlmn->list.array[0]->\
- iE_Extensions->list.array[0]->extensionValue.choice.SliceSupportList.\
- list.array[0]->sNSSAI.sD->size);
- if(servedPlmn->list.array[0]->\
- iE_Extensions->list.array[0]->extensionValue.choice.SliceSupportList.\
- list.array[0]->sNSSAI.sD->buf == NULLP)
- {
- return RFAILED;
- }
- servedPlmn->list.array[0]->\
- iE_Extensions->list.array[0]->extensionValue.choice.SliceSupportList.\
- list.array[0]->sNSSAI.sD->buf[0] = 3;
- servedPlmn->list.array[0]->\
- iE_Extensions->list.array[0]->extensionValue.choice.SliceSupportList.\
- list.array[0]->sNSSAI.sD->buf[1] = 6;
- servedPlmn->list.array[0]->\
- iE_Extensions->list.array[0]->extensionValue.choice.SliceSupportList.\
- list.array[0]->sNSSAI.sD->buf[2] = 9;
return ROK;
}
*
* Functionality: Fills Nr Fdd Info required in ServCellInfo IE
*
- * @params[in] Pointer to NR_Mode_Info_t *
+ * @params[in] FDD_Info_t *fDD
*
* @return ROK - success
* RFAILED - failure
*
*****************************************************************/
-uint8_t fillNrFddInfo(NR_Mode_Info_t *nrFdd)
+uint8_t fillNrFddInfo(FDD_Info_t *fDD)
{
- nrFdd->choice.fDD->uL_NRFreqInfo.nRARFCN = duCfgParam.srvdCellLst[0].duCellInfo.\
+ fDD->uL_NRFreqInfo.nRARFCN = duCfgParam.srvdCellLst[0].duCellInfo.\
f1Mode.mode.fdd.ulNrFreqInfo.nrArfcn;
- nrFdd->choice.fDD->uL_NRFreqInfo.freqBandListNr.list.count = 1;
- nrFdd->choice.fDD->uL_NRFreqInfo.freqBandListNr.list.size = sizeof(FreqBandNrItem_t*);
- DU_ALLOC(nrFdd->choice.fDD->uL_NRFreqInfo.freqBandListNr.list.\
- array, nrFdd->choice.fDD->uL_NRFreqInfo.freqBandListNr.list.size);
- if(nrFdd->choice.fDD->uL_NRFreqInfo.freqBandListNr.list.array == NULLP)
+ fDD->uL_NRFreqInfo.freqBandListNr.list.count = 1;
+ fDD->uL_NRFreqInfo.freqBandListNr.list.size = sizeof(FreqBandNrItem_t*);
+ DU_ALLOC(fDD->uL_NRFreqInfo.freqBandListNr.list.\
+ array, fDD->uL_NRFreqInfo.freqBandListNr.list.size);
+ if(fDD->uL_NRFreqInfo.freqBandListNr.list.array == NULLP)
{
+ DU_LOG("\nERROR --> Memory allocation failed in fillNrFddInfo");
return RFAILED;
}
- DU_ALLOC(nrFdd->choice.fDD->uL_NRFreqInfo.freqBandListNr.list.array[0], \
+
+ DU_ALLOC(fDD->uL_NRFreqInfo.freqBandListNr.list.array[0], \
sizeof(FreqBandNrItem_t));
- if(nrFdd->choice.fDD->uL_NRFreqInfo.freqBandListNr.list.array[0] == NULLP)
+ if(fDD->uL_NRFreqInfo.freqBandListNr.list.array[0] == NULLP)
{
+ DU_LOG("\nERROR --> Memory allocation failed in fillNrFddInfo");
return RFAILED;
}
- nrFdd->choice.fDD->uL_NRFreqInfo.freqBandListNr.list.array[0]->freqBandIndicatorNr = \
+
+ fDD->uL_NRFreqInfo.freqBandListNr.list.array[0]->freqBandIndicatorNr = \
duCfgParam.srvdCellLst[0].duCellInfo.f1Mode.mode.fdd.ulNrFreqInfo.\
freqBand[0].nrFreqBand;
- nrFdd->choice.fDD->uL_NRFreqInfo.freqBandListNr.list.array[0]->supportedSULBandList.list.count=0;
- nrFdd->choice.fDD->dL_NRFreqInfo.nRARFCN = duCfgParam.srvdCellLst[0].duCellInfo.f1Mode.mode.fdd.\
+ fDD->uL_NRFreqInfo.freqBandListNr.list.array[0]->supportedSULBandList.list.count=0;
+ fDD->dL_NRFreqInfo.nRARFCN = duCfgParam.srvdCellLst[0].duCellInfo.f1Mode.mode.fdd.\
dlNrFreqInfo.nrArfcn;
- nrFdd->choice.fDD->dL_NRFreqInfo.freqBandListNr.list.count = 1;
- nrFdd->choice.fDD->dL_NRFreqInfo.freqBandListNr.list.size = sizeof(FreqBandNrItem_t *);
- DU_ALLOC(nrFdd->choice.fDD->dL_NRFreqInfo.freqBandListNr.list.array,nrFdd->\
- choice.fDD->dL_NRFreqInfo.freqBandListNr.list.size);
- if(nrFdd->choice.fDD->dL_NRFreqInfo.freqBandListNr.list.array == NULLP)
+ fDD->dL_NRFreqInfo.freqBandListNr.list.count = 1;
+ fDD->dL_NRFreqInfo.freqBandListNr.list.size = sizeof(FreqBandNrItem_t *);
+ DU_ALLOC(fDD->dL_NRFreqInfo.freqBandListNr.list.array, fDD->dL_NRFreqInfo.freqBandListNr.list.size);
+ if(fDD->dL_NRFreqInfo.freqBandListNr.list.array == NULLP)
{
+ DU_LOG("\nERROR --> Memory allocation failed in fillNrFddInfo");
return RFAILED;
}
- DU_ALLOC(nrFdd->choice.fDD->dL_NRFreqInfo.freqBandListNr.list.array[0],\
- sizeof(FreqBandNrItem_t));
- if(nrFdd->choice.fDD->dL_NRFreqInfo.freqBandListNr.list.array[0] == NULLP)
+
+ DU_ALLOC(fDD->dL_NRFreqInfo.freqBandListNr.list.array[0], sizeof(FreqBandNrItem_t));
+ if(fDD->dL_NRFreqInfo.freqBandListNr.list.array[0] == NULLP)
{
+ DU_LOG("\nERROR --> Memory allocation failed in fillNrFddInfo");
return RFAILED;
}
- nrFdd->choice.fDD->dL_NRFreqInfo.freqBandListNr.list.array[0]->freqBandIndicatorNr = \
+
+ fDD->dL_NRFreqInfo.freqBandListNr.list.array[0]->freqBandIndicatorNr = \
duCfgParam.srvdCellLst[0].duCellInfo.f1Mode.mode.fdd.dlNrFreqInfo.\
freqBand[0].nrFreqBand;
- nrFdd->choice.fDD->dL_NRFreqInfo.freqBandListNr.list.array[0]->supportedSULBandList.list.count=0;
+ fDD->dL_NRFreqInfo.freqBandListNr.list.array[0]->supportedSULBandList.list.count=0;
/*Transmission Bandwidth*/
- nrFdd->choice.fDD->uL_Transmission_Bandwidth.nRSCS = duCfgParam.srvdCellLst[0].duCellInfo.\
+ fDD->uL_Transmission_Bandwidth.nRSCS = duCfgParam.srvdCellLst[0].duCellInfo.\
f1Mode.mode.fdd.ulTxBw.nrScs;
- nrFdd->choice.fDD->uL_Transmission_Bandwidth.nRNRB = duCfgParam.srvdCellLst[0].duCellInfo.\
+ fDD->uL_Transmission_Bandwidth.nRNRB = duCfgParam.srvdCellLst[0].duCellInfo.\
f1Mode.mode.fdd.ulTxBw.nrb;
- nrFdd->choice.fDD->dL_Transmission_Bandwidth.nRSCS = duCfgParam.srvdCellLst[0].duCellInfo.\
+ fDD->dL_Transmission_Bandwidth.nRSCS = duCfgParam.srvdCellLst[0].duCellInfo.\
f1Mode.mode.fdd.dlTxBw.nrScs;
- nrFdd->choice.fDD->dL_Transmission_Bandwidth.nRNRB = duCfgParam.srvdCellLst[0].duCellInfo.\
+ fDD->dL_Transmission_Bandwidth.nRNRB = duCfgParam.srvdCellLst[0].duCellInfo.\
f1Mode.mode.fdd.dlTxBw.nrb;
return ROK;
uint8_t fillServedCellInfo(Served_Cell_Information_t *srvCellInfo)
{
- uint8_t tmp, ieIdx, ieListCnt;
+ uint8_t ieIdx, ieListCnt;
/*nRCGI*/
srvCellInfo->nRCGI.pLMN_Identity.size =3*sizeof(uint8_t);
srvCellInfo->nRCGI.pLMN_Identity.size);
if(srvCellInfo->nRCGI.pLMN_Identity.buf == NULLP)
{
+ DU_LOG("\nERROR --> Memory allocation failed in fillServedCellInfo");
return RFAILED;
}
buildPlmnId(duCfgParam.srvdCellLst[0].duCellInfo.cellInfo.nrCgi.plmn,\
DU_ALLOC(srvCellInfo->nRCGI.nRCellIdentity.buf,\
srvCellInfo->nRCGI.nRCellIdentity.size);
if(srvCellInfo->nRCGI.nRCellIdentity.buf == NULLP)
- {
+ {
+ DU_LOG("\nERROR --> Memory allocation failed in fillServedCellInfo");
return RFAILED;
}
- for (tmp = 0 ; tmp < srvCellInfo->\
- nRCGI.nRCellIdentity.size-1 ; tmp++)
- {
- srvCellInfo->nRCGI.nRCellIdentity.buf[tmp] = 0;
- }
- srvCellInfo->nRCGI.nRCellIdentity.buf[4] = 16;
- srvCellInfo->nRCGI.nRCellIdentity.bits_unused =4;
-
+
+ fillBitString(&srvCellInfo->nRCGI.nRCellIdentity, ODU_VALUE_FOUR, ODU_VALUE_FIVE, duCfgParam.sib1Params.cellIdentity);
/*nRPCI*/
srvCellInfo->nRPCI = duCfgParam.srvdCellLst[0].duCellInfo.cellInfo.nrPci;
ieListCnt = 1;
srvCellInfo->servedPLMNs.list.count = ieListCnt;
srvCellInfo->servedPLMNs.list.size = ieListCnt*sizeof(ServedPLMNs_Item_t *);
- DU_ALLOC(srvCellInfo->servedPLMNs.list.array,\
- srvCellInfo->servedPLMNs.list.size);
+ DU_ALLOC(srvCellInfo->servedPLMNs.list.array, srvCellInfo->servedPLMNs.list.size);
if(srvCellInfo->servedPLMNs.list.array == NULLP)
{
+ DU_LOG("\nERROR --> Memory allocation failed in fillServedCellInfo");
return RFAILED;
}
for(ieIdx=0; ieIdx < ieListCnt; ieIdx++)
{
- DU_ALLOC(srvCellInfo->servedPLMNs.list.array[ieIdx],\
- sizeof(ServedPLMNs_Item_t));
+ DU_ALLOC(srvCellInfo->servedPLMNs.list.array[ieIdx], sizeof(ServedPLMNs_Item_t));
if(srvCellInfo->servedPLMNs.list.array[ieIdx]== NULLP)
{
- return RFAILED;
+ DU_LOG("\nERROR --> Memory allocation failed in fillServedCellInfo");
+ return RFAILED;
}
}
if(fillServedPlmns(&srvCellInfo->servedPLMNs))
{
+ DU_LOG("\nERROR --> Failed to fill Served Plmn info");
return RFAILED;
}
+#ifndef NR_TDD
/*nR Mode Info with FDD*/
srvCellInfo->nR_Mode_Info.present = NR_Mode_Info_PR_fDD;
- DU_ALLOC(srvCellInfo->nR_Mode_Info.choice.fDD,\
- sizeof(FDD_Info_t));
+ DU_ALLOC(srvCellInfo->nR_Mode_Info.choice.fDD, sizeof(FDD_Info_t));
if(srvCellInfo->nR_Mode_Info.choice.fDD == NULLP)
{
+ DU_LOG("\nERROR --> Memory allocation failed in fillServedCellInfo");
+ return RFAILED;
+ }
+ if(fillNrFddInfo(srvCellInfo->nR_Mode_Info.choice.fDD))
+ {
+ DU_LOG("\nERROR --> Failed to fill the Nr FDD information");
+ return RFAILED;
+ }
+#else
+ srvCellInfo->nR_Mode_Info.present = NR_Mode_Info_PR_tDD;
+ DU_ALLOC(srvCellInfo->nR_Mode_Info.choice.tDD, sizeof(TDD_Info_t));
+ if(srvCellInfo->nR_Mode_Info.choice.tDD == NULLP)
+ {
+ DU_LOG("\nERROR --> Memory allocation failed in fillServedCellInfo");
return RFAILED;
}
- if(fillNrFddInfo(&srvCellInfo->nR_Mode_Info))
+ if(fillNrTddInfo(srvCellInfo->nR_Mode_Info.choice.tDD) != ROK)
+ {
+ DU_LOG("\nERROR --> Failed to fill the Nr TDD information");
return RFAILED;
+ }
+#endif
/*Measurement timing Config*/
srvCellInfo->measurementTimingConfiguration.size = sizeof(uint8_t);
uint8_t fillServCellToModItem(Served_Cells_To_Modify_Item_t *modifyItem)
{
- uint8_t ieIdx;
-
/*pLMN_Identity*/
modifyItem->oldNRCGI.pLMN_Identity.size = 3*sizeof(uint8_t);
DU_ALLOC(modifyItem->oldNRCGI.pLMN_Identity.buf,modifyItem->oldNRCGI.pLMN_Identity.size);
{
return RFAILED;
}
- for(ieIdx = 0; ieIdx < modifyItem->oldNRCGI.nRCellIdentity.size-1; ieIdx++)
- {
- modifyItem->oldNRCGI.nRCellIdentity.buf[ieIdx] = 0;
- }
- modifyItem->oldNRCGI.nRCellIdentity.buf[4] = 16;
- modifyItem->oldNRCGI.nRCellIdentity.bits_unused = 4;
+ fillBitString(&modifyItem->oldNRCGI.nRCellIdentity, ODU_VALUE_FOUR, ODU_VALUE_FIVE, duCfgParam.sib1Params.cellIdentity);
if(fillServedCellInfo(&modifyItem->served_Cell_Information))
return RFAILED;
*****************************************************************/
uint8_t fillCellToDeleteItem(struct Served_Cells_To_Delete_ItemIEs *deleteItemIe)
{
- uint8_t arrIdx;
Served_Cells_To_Delete_Item_t *deleteItem=NULLP;
deleteItemIe->id = ProtocolIE_ID_id_Served_Cells_To_Delete_Item;
DU_LOG("ERROR --> F1AP: fillCellToDeleteItem(): Failed to allocate the memory");
return RFAILED;
}
- for(arrIdx = 0; arrIdx < deleteItem->oldNRCGI.nRCellIdentity.size-1; arrIdx++)
- {
- deleteItem->oldNRCGI.nRCellIdentity.buf[arrIdx] = 0;
- }
- deleteItem->oldNRCGI.nRCellIdentity.buf[4] = 16;
- deleteItem->oldNRCGI.nRCellIdentity.bits_unused = 4;
+ fillBitString(&deleteItem->oldNRCGI.nRCellIdentity, ODU_VALUE_FOUR, ODU_VALUE_FIVE, duCfgParam.sib1Params.cellIdentity);
return ROK;
}
/*******************************************************************
* RFAILED - failure
*
* ****************************************************************/
-uint8_t BuildTagConfig(struct TAG_Config *tagConfig)
+uint8_t BuildTagConfig(DuUeCb *ueCb, struct TAG_Config *tagConfig)
{
struct TAG_Config__tag_ToAddModList *tagList;
uint8_t idx, elementCnt;
return RFAILED;
}
- elementCnt = 1; //ODU_VALUE_ONE;
+ if(ueCb == NULLP)
+ elementCnt = ODU_VALUE_ONE;
+ else
+ elementCnt = ueCb->macUeCfg.macCellGrpCfg.tagCfg.addModListCount;
+
tagList = tagConfig->tag_ToAddModList;
tagList->list.count = elementCnt;
tagList->list.size = elementCnt * sizeof(struct TAG *);
DU_ALLOC(tagList->list.array[idx], sizeof(struct TAG));
if(!tagList->list.array[idx])
{
- DU_LOG("\nERROR --> F1AP : Memory allocation failure in BuildTagConfig");
- return RFAILED;
+ DU_LOG("\nERROR --> F1AP : Memory allocation failure in BuildTagConfig");
+ return RFAILED;
}
}
- idx = 0;
- tagList->list.array[idx]->tag_Id = TAG_ID;
- tagList->list.array[idx]->timeAlignmentTimer = TIME_ALIGNMENT_TMR;
+ if(ueCb == NULLP)
+ {
+ idx = 0;
+ tagList->list.array[idx]->tag_Id = TAG_ID;
+ tagList->list.array[idx]->timeAlignmentTimer = TIME_ALIGNMENT_TMR;
+ }
+ else
+ {
+ for(idx=0; idx<tagList->list.count; idx++)
+ {
+ tagList->list.array[idx]->tag_Id = ueCb->macUeCfg.macCellGrpCfg.tagCfg.addModList[idx].tagId;
+ tagList->list.array[idx]->timeAlignmentTimer = ueCb->macUeCfg.macCellGrpCfg.tagCfg.addModList[idx].timeAlignTimer;
+ }
+ }
return ROK;
}
* RFAILED - failure
*
* ****************************************************************/
-uint8_t BuildPhrConfig(struct MAC_CellGroupConfig__phr_Config *phrConfig)
+uint8_t BuildPhrConfig(DuUeCb *ueCb, struct MAC_CellGroupConfig__phr_Config *phrConfig)
{
phrConfig->present = MAC_CellGroupConfig__phr_Config_PR_setup;
return RFAILED;
}
- phrConfig->choice.setup->phr_PeriodicTimer = PHR_PERIODIC_TMR;
- phrConfig->choice.setup->phr_ProhibitTimer = PHR_PROHIBHIT_TMR;
- phrConfig->choice.setup->phr_Tx_PowerFactorChange = PHR_PWR_FACTOR_CHANGE;
- phrConfig->choice.setup->multiplePHR = false;
- phrConfig->choice.setup->dummy = false;
- phrConfig->choice.setup->phr_Type2OtherCell = false;
- phrConfig->choice.setup->phr_ModeOtherCG = PHR_MODE_OTHER_CG;
+ if(ueCb == NULLP)
+ {
+ phrConfig->choice.setup->phr_PeriodicTimer = PHR_PERIODIC_TMR;
+ phrConfig->choice.setup->phr_ProhibitTimer = PHR_PROHIBHIT_TMR;
+ phrConfig->choice.setup->phr_Tx_PowerFactorChange = PHR_PWR_FACTOR_CHANGE;
+ phrConfig->choice.setup->multiplePHR = false;
+ phrConfig->choice.setup->dummy = false;
+ phrConfig->choice.setup->phr_Type2OtherCell = false;
+ phrConfig->choice.setup->phr_ModeOtherCG = PHR_MODE_OTHER_CG;
+ }
+ else
+ {
+ phrConfig->choice.setup->phr_PeriodicTimer = ueCb->macUeCfg.macCellGrpCfg.phrCfg.periodicTimer;
+ phrConfig->choice.setup->phr_ProhibitTimer = ueCb->macUeCfg.macCellGrpCfg.phrCfg.prohibitTimer;
+ phrConfig->choice.setup->phr_Tx_PowerFactorChange = ueCb->macUeCfg.macCellGrpCfg.phrCfg.txPowerFactor;
+ phrConfig->choice.setup->multiplePHR = ueCb->macUeCfg.macCellGrpCfg.phrCfg.multiplePHR;
+ phrConfig->choice.setup->dummy = ueCb->macUeCfg.macCellGrpCfg.phrCfg.dummy;
+ phrConfig->choice.setup->phr_Type2OtherCell = ueCb->macUeCfg.macCellGrpCfg.phrCfg.phrType2OtherCell;
+ phrConfig->choice.setup->phr_ModeOtherCG = ueCb->macUeCfg.macCellGrpCfg.phrCfg.phrOtherCG;
+ }
return ROK;
}
* RFAILED - failure
*
* ****************************************************************/
-uint8_t BuildBsrConfig(struct BSR_Config *bsrConfig)
+uint8_t BuildBsrConfig(DuUeCb *ueCb, struct BSR_Config *bsrConfig)
{
- bsrConfig->periodicBSR_Timer = PERIODIC_BSR_TMR;
- bsrConfig->retxBSR_Timer = RETX_BSR_TMR;
- bsrConfig->logicalChannelSR_DelayTimer = NULLP;
+ if(ueCb == NULLP)
+ {
+ bsrConfig->periodicBSR_Timer = PERIODIC_BSR_TMR;
+ bsrConfig->retxBSR_Timer = RETX_BSR_TMR;
+ bsrConfig->logicalChannelSR_DelayTimer = NULLP;
+ }
+ else
+ {
+ bsrConfig->periodicBSR_Timer = convertBsrPeriodicTmrValueToEnum(ueCb->macUeCfg.macCellGrpCfg.bsrTmrCfg.periodicTimer);
+ bsrConfig->retxBSR_Timer = convertBsrRetxTmrValueToEnum(ueCb->macUeCfg.macCellGrpCfg.bsrTmrCfg.retxTimer);
+
+ bsrConfig->logicalChannelSR_DelayTimer = NULLP;
+ DU_ALLOC(bsrConfig->logicalChannelSR_DelayTimer, sizeof(long));
+ if(bsrConfig->logicalChannelSR_DelayTimer == NULLP)
+ {
+ DU_LOG("\nERROR --> DU APP: Memory allocation failed in BuildBsrConfig");
+ return RFAILED;
+ }
+ *(bsrConfig->logicalChannelSR_DelayTimer) = convertLcSrDelayTmrValueToEnum(ueCb->macUeCfg.macCellGrpCfg.bsrTmrCfg.srDelayTimer);
+ }
return ROK;
}
* RFAILED - failure
*
* ****************************************************************/
-uint8_t BuildSchedulingReqConfig(struct SchedulingRequestConfig *schedulingRequestConfig)
+uint8_t BuildSchedulingReqConfig(DuUeCb *ueCb, struct SchedulingRequestConfig *schedulingRequestConfig)
{
struct SchedulingRequestConfig__schedulingRequestToAddModList *schReqList;
uint8_t idx, elementCnt;
return RFAILED;
}
- elementCnt = 1; //ODU_VALUE_ONE;
+ if(ueCb == NULLP)
+ elementCnt = ODU_VALUE_ONE;
+ else
+ elementCnt = ueCb->macUeCfg.macCellGrpCfg.schReqCfg.addModListCount;
+
schReqList = schedulingRequestConfig->schedulingRequestToAddModList;
schReqList->list.count = elementCnt;
schReqList->list.size = elementCnt * sizeof(struct SchedulingRequestToAddMod *);
return RFAILED;
}
- for(idx=0;idx<schReqList->list.count; idx++)
+ for(idx=0; idx<schReqList->list.count; idx++)
{
schReqList->list.array[idx] = NULLP;
DU_ALLOC(schReqList->list.array[idx], sizeof(struct SchedulingRequestToAddMod));
if(!schReqList->list.array[idx])
{
- DU_LOG("\nERROR --> F1AP : Memory allocation failure in BuildSchedulingReqConfig");
- return RFAILED;
+ DU_LOG("\nERROR --> F1AP : Memory allocation failure in BuildSchedulingReqConfig");
+ return RFAILED;
}
}
- idx = 0;
- schReqList->list.array[idx]->schedulingRequestId = SCH_REQ_ID;
+ if(ueCb == NULLP)
+ {
+ idx = 0;
+ schReqList->list.array[idx]->schedulingRequestId = SCH_REQ_ID;
- schReqList->list.array[idx]->sr_ProhibitTimer = NULLP;
- DU_ALLOC(schReqList->list.array[idx]->sr_ProhibitTimer, sizeof(long));
- if(!schReqList->list.array[idx]->sr_ProhibitTimer)
+ schReqList->list.array[idx]->sr_ProhibitTimer = NULLP;
+ DU_ALLOC(schReqList->list.array[idx]->sr_ProhibitTimer, sizeof(long));
+ if(!schReqList->list.array[idx]->sr_ProhibitTimer)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failure in BuildSchedulingReqConfig");
+ return RFAILED;
+ }
+ *(schReqList->list.array[idx]->sr_ProhibitTimer) = SR_PROHIBIT_TMR;
+ schReqList->list.array[idx]->sr_TransMax = SR_TRANS_MAX;
+ }
+ else
{
- DU_LOG("\nERROR --> F1AP : Memory allocation failure in BuildSchedulingReqConfig");
- return RFAILED;
+ for(idx=0; idx<schReqList->list.count; idx++)
+ {
+ schReqList->list.array[idx]->schedulingRequestId = ueCb->macUeCfg.macCellGrpCfg.schReqCfg.addModList[idx].schedReqId;
+
+ schReqList->list.array[idx]->sr_ProhibitTimer = NULLP;
+ DU_ALLOC(schReqList->list.array[idx]->sr_ProhibitTimer, sizeof(long));
+ if(!schReqList->list.array[idx]->sr_ProhibitTimer)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failure in BuildSchedulingReqConfig");
+ return RFAILED;
+ }
+ *(schReqList->list.array[idx]->sr_ProhibitTimer) = ueCb->macUeCfg.macCellGrpCfg.schReqCfg.addModList[idx].srProhibitTmr;
+ schReqList->list.array[idx]->sr_TransMax = ueCb->macUeCfg.macCellGrpCfg.schReqCfg.addModList[idx].srTransMax;
+ }
}
- *(schReqList->list.array[idx]->sr_ProhibitTimer) = SR_PROHIBIT_TMR;
- schReqList->list.array[idx]->sr_TransMax = SR_TRANS_MAX;
+
schedulingRequestConfig->schedulingRequestToReleaseList = NULLP;
return ROK;
/*******************************************************************
*
- * @brief Builds RLC Config
+ * @brief Builds RLC Configuration for AM mode
*
* @details
*
- * Function : BuildRlcConfig
+ * Function : BuildRlcConfigAm
*
- * Functionality: Builds RLC Config in BuildRlcBearerToAddModList
+ * Functionality:
+ * Builds AM mode RLC Config in BuildRlcBearerToAddModList
*
- * @params[in] RLC_Config *rlcConfig
+ * @params[in] AmBearerCfg *amCfg
+ * RLC_Config_t *rlcConfig
*
* @return ROK - success
* RFAILED - failure
*
* ****************************************************************/
-uint8_t BuildRlcConfig(struct RLC_Config *rlcConfig)
+uint8_t BuildRlcConfigAm(AmBearerCfg *amCfg, struct RLC_Config *rlcConfig)
{
-
- rlcConfig->present = RLC_Config_PR_am;
-
rlcConfig->choice.am = NULLP;
DU_ALLOC(rlcConfig->choice.am, sizeof(struct RLC_Config__am));
if(!rlcConfig->choice.am)
{
- DU_LOG("\nERROR --> F1AP : Memory allocation failure in BuildRlcConfig");
+ DU_LOG("\nERROR --> F1AP : Memory allocation failure in BuildRlcConfigAm");
return RFAILED;
}
- /* UL */
+ /* Fill AM UL configuration */
rlcConfig->choice.am->ul_AM_RLC.sn_FieldLength = NULLP;
DU_ALLOC(rlcConfig->choice.am->ul_AM_RLC.sn_FieldLength, sizeof(SN_FieldLengthAM_t));
if(!rlcConfig->choice.am->ul_AM_RLC.sn_FieldLength)
{
- DU_LOG("\nERROR --> F1AP : Memory allocation failure in BuildRlcConfig");
+ DU_LOG("\nERROR --> F1AP : Memory allocation failure in BuildRlcConfigAm");
return RFAILED;
}
- *(rlcConfig->choice.am->ul_AM_RLC.sn_FieldLength) = SN_FIELD_LEN;
- rlcConfig->choice.am->ul_AM_RLC.t_PollRetransmit = T_POLL_RETRANSMIT;
- rlcConfig->choice.am->ul_AM_RLC.pollPDU = POLL_PDU;
- rlcConfig->choice.am->ul_AM_RLC.pollByte = POLL_BYTE;
- rlcConfig->choice.am->ul_AM_RLC.maxRetxThreshold = MAX_RETX_THRESHOLD;
- /* DL */
+ /* Fill default AM UL configuration if input pointer to DU database is NULL */
+ if(amCfg == NULLP)
+ {
+ *(rlcConfig->choice.am->ul_AM_RLC.sn_FieldLength) = SN_FIELD_LEN;
+ rlcConfig->choice.am->ul_AM_RLC.t_PollRetransmit = T_POLL_RETRANSMIT;
+ rlcConfig->choice.am->ul_AM_RLC.pollPDU = POLL_PDU;
+ rlcConfig->choice.am->ul_AM_RLC.pollByte = POLL_BYTE;
+ rlcConfig->choice.am->ul_AM_RLC.maxRetxThreshold = MAX_RETX_THRESHOLD;
+ }
+ else
+ {
+ *(rlcConfig->choice.am->ul_AM_RLC.sn_FieldLength) = covertAmSnLenFromIntEnumToRrcEnum(amCfg->dlAmCfg.snLenDl);
+ rlcConfig->choice.am->ul_AM_RLC.t_PollRetransmit = covertPollRetxTmrValueToEnum(amCfg->dlAmCfg.pollRetxTmr);
+ rlcConfig->choice.am->ul_AM_RLC.pollPDU = covertPollPduValueToEnum(amCfg->dlAmCfg.pollPdu);
+ rlcConfig->choice.am->ul_AM_RLC.pollByte = covertPollByteValueToEnum(amCfg->dlAmCfg.pollByte);
+ rlcConfig->choice.am->ul_AM_RLC.maxRetxThreshold = covertMaxRetxValueToEnum(amCfg->dlAmCfg.maxRetxTh);
+ }
+
+ /* Fill AM DL configuraion */
rlcConfig->choice.am->dl_AM_RLC.sn_FieldLength = NULLP;
DU_ALLOC(rlcConfig->choice.am->dl_AM_RLC.sn_FieldLength, sizeof(SN_FieldLengthAM_t));
if(!rlcConfig->choice.am->dl_AM_RLC.sn_FieldLength)
{
- DU_LOG("\nERROR --> F1AP : Memory allocation failure in BuildRlcConfig");
+ DU_LOG("\nERROR --> F1AP : Memory allocation failure in BuildRlcConfigAm");
return RFAILED;
}
- *(rlcConfig->choice.am->dl_AM_RLC.sn_FieldLength) = SN_FIELD_LEN;
- rlcConfig->choice.am->dl_AM_RLC.t_Reassembly = T_REASSEMBLY;
- rlcConfig->choice.am->dl_AM_RLC.t_StatusProhibit = T_STATUS_PROHIBHIT;
+ /* Fill default AM DL configuration if input pointer to DU database is NULL */
+ if(amCfg == NULLP)
+ {
+ *(rlcConfig->choice.am->dl_AM_RLC.sn_FieldLength) = SN_FIELD_LEN;
+ rlcConfig->choice.am->dl_AM_RLC.t_Reassembly = T_REASSEMBLY;
+ rlcConfig->choice.am->dl_AM_RLC.t_StatusProhibit = T_STATUS_PROHIBHIT;
+ }
+ else /* Fill AM configuration from DU database */
+ {
+ *(rlcConfig->choice.am->dl_AM_RLC.sn_FieldLength) = covertAmSnLenFromIntEnumToRrcEnum(amCfg->ulAmCfg.snLenUl);
+ rlcConfig->choice.am->dl_AM_RLC.t_Reassembly = convertReasmblTmrValueToEnum(amCfg->ulAmCfg.reAssemTmr);
+ rlcConfig->choice.am->dl_AM_RLC.t_StatusProhibit = convertProhibitTmrValueToEnum(amCfg->ulAmCfg.statProhTmr);
+ }
return ROK;
}
/*******************************************************************
*
- * @brief Builds MAC LC Config
+ * @brief Builds RLC Config for UM Bidirection
*
* @details
*
- * Function : BuildMacLCConfig
+ * Function : BuildRlcConfig UmBiDir
*
- * Functionality: Builds MAC LC Config in BuildRlcBearerToAddModList
+ * Functionality:
+ * Builds RLC Config for UM Bidirection in BuildRlcBearerToAddModList
*
- * @params[in] struct LogicalChannelConfig macLcConfig
+ * @params[in] UmBiDirBearerCfg *umBiDirCfg
+ * RLC_Config_t *rlcConfig
*
* @return ROK - success
* RFAILED - failure
*
* ****************************************************************/
-uint8_t BuildMacLCConfig(struct LogicalChannelConfig *macLcConfig)
+uint8_t BuildRlcConfigUmBiDir(UmBiDirBearerCfg *umBiDirCfg, struct RLC_Config *rlcConfig)
{
-
- macLcConfig->ul_SpecificParameters = NULLP;
- DU_ALLOC(macLcConfig->ul_SpecificParameters, sizeof(struct LogicalChannelConfig__ul_SpecificParameters));
- if(!macLcConfig->ul_SpecificParameters)
+ rlcConfig->choice.um_Bi_Directional = NULLP;
+ DU_ALLOC(rlcConfig->choice.um_Bi_Directional, sizeof(struct RLC_Config__um_Bi_Directional));
+ if(rlcConfig->choice.um_Bi_Directional == NULLP)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failure in BuildRlcConfigUmBiDir");
+ return RFAILED;
+ }
+
+ /* Fill UM Bidirectional UL configuration */
+ rlcConfig->choice.um_Bi_Directional->ul_UM_RLC.sn_FieldLength = NULLP;
+ DU_ALLOC(rlcConfig->choice.um_Bi_Directional->ul_UM_RLC.sn_FieldLength, sizeof(SN_FieldLengthUM_t));
+ if(rlcConfig->choice.um_Bi_Directional->ul_UM_RLC.sn_FieldLength == NULLP)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failure in BuildRlcConfigUmBiDir");
+ return RFAILED;
+ }
+
+ if(umBiDirCfg != NULLP)
+ {
+ *(rlcConfig->choice.um_Bi_Directional->ul_UM_RLC.sn_FieldLength) = covertUmSnLenFromIntEnumToRrcEnum(umBiDirCfg->dlUmCfg.snLenDlUm);
+ }
+
+ /* Fill UM Bidirectional DL configuration */
+ rlcConfig->choice.um_Bi_Directional->dl_UM_RLC.sn_FieldLength = NULLP;
+ DU_ALLOC(rlcConfig->choice.um_Bi_Directional->dl_UM_RLC.sn_FieldLength, sizeof(SN_FieldLengthUM_t));
+ if(rlcConfig->choice.um_Bi_Directional->dl_UM_RLC.sn_FieldLength == NULLP)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failure in BuildRlcConfigUmBiDir");
+ return RFAILED;
+ }
+
+ if(umBiDirCfg != NULLP)
+ {
+ *(rlcConfig->choice.um_Bi_Directional->dl_UM_RLC.sn_FieldLength) = covertUmSnLenFromIntEnumToRrcEnum(umBiDirCfg->ulUmCfg.snLenUlUm);
+ rlcConfig->choice.um_Bi_Directional->dl_UM_RLC.t_Reassembly = convertReasmblTmrValueToEnum(umBiDirCfg->ulUmCfg.reAssemTmr);
+ }
+
+ return ROK;
+}
+
+/*******************************************************************
+ *
+ * @brief Builds RLC Config for UM Uni directional UL
+ *
+ * @details
+ *
+ * Function : BuildRlcConfigUmUniDirUl
+ *
+ * Functionality:
+ * Builds RLC Config for UM Unidirection UL in BuildRlcBearerToAddModList
+ *
+ * @params[in] UmUniDirDlBearerCfg *umUniDirDlCfg
+ * RLC_Config_t *rlcConfig
+ *
+ * @return ROK - success
+ * RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t BuildRlcConfigUmUniDirUl(UmUniDirDlBearerCfg *umUniDirDlCfg, RLC_Config_t *rlcConfig)
+{
+ rlcConfig->choice.um_Uni_Directional_UL = NULLP;
+ DU_ALLOC(rlcConfig->choice.um_Uni_Directional_UL , sizeof(struct RLC_Config__um_Uni_Directional_UL));
+ if(rlcConfig->choice.um_Uni_Directional_UL == NULLP)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failure in BuildRlcConfigUmUniDirUl");
+ return RFAILED;
+ }
+
+ rlcConfig->choice.um_Uni_Directional_UL->ul_UM_RLC.sn_FieldLength = NULLP;
+ DU_ALLOC(rlcConfig->choice.um_Uni_Directional_UL->ul_UM_RLC.sn_FieldLength, sizeof(SN_FieldLengthUM_t));
+ if(rlcConfig->choice.um_Uni_Directional_UL->ul_UM_RLC.sn_FieldLength == NULLP)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failure in BuildRlcConfigUmUniDirUl");
+ return RFAILED;
+ }
+
+ if(umUniDirDlCfg != NULLP)
+ {
+ *(rlcConfig->choice.um_Uni_Directional_UL->ul_UM_RLC.sn_FieldLength) = covertUmSnLenFromIntEnumToRrcEnum(umUniDirDlCfg->dlUmCfg.snLenDlUm);
+ }
+
+ return ROK;
+}
+
+/*******************************************************************
+ *
+ * @brief Builds RLC Config for UM Uni directional DL
+ *
+ * @details
+ *
+ * Function : BuildRlcConfigUmUniDirDl
+ *
+ * Functionality:
+ * Builds RLC Config for UM Unidirection DL in BuildRlcBearerToAddModList
+ *
+ * @params[in] UmUniDirUlBearerCfg *umUniDirUlCfg
+ * RLC_Config_t *rlcConfig
+ *
+ * @return ROK - success
+ * RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t BuildRlcConfigUmUniDirDl(UmUniDirUlBearerCfg *umUniDirUlCfg, RLC_Config_t *rlcConfig)
+{
+ rlcConfig->choice.um_Uni_Directional_DL = NULLP;
+ DU_ALLOC(rlcConfig->choice.um_Uni_Directional_DL , sizeof(struct RLC_Config__um_Uni_Directional_DL));
+ if(rlcConfig->choice.um_Uni_Directional_DL == NULLP)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failure in BuildRlcConfigUmUniDirDl");
+ return RFAILED;
+ }
+
+ rlcConfig->choice.um_Uni_Directional_DL->dl_UM_RLC.sn_FieldLength = NULLP;
+ DU_ALLOC(rlcConfig->choice.um_Uni_Directional_DL->dl_UM_RLC.sn_FieldLength, sizeof(SN_FieldLengthUM_t));
+ if(rlcConfig->choice.um_Uni_Directional_DL->dl_UM_RLC.sn_FieldLength == NULLP)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failure in BuildRlcConfigUmUniDirDl");
+ return RFAILED;
+ }
+
+ if(umUniDirUlCfg != NULLP)
+ {
+ *(rlcConfig->choice.um_Uni_Directional_DL->dl_UM_RLC.sn_FieldLength) = covertUmSnLenFromIntEnumToRrcEnum(umUniDirUlCfg->ulUmCfg.snLenUlUm);
+ rlcConfig->choice.um_Uni_Directional_DL->dl_UM_RLC.t_Reassembly = convertReasmblTmrValueToEnum(umUniDirUlCfg->ulUmCfg.reAssemTmr);
+ }
+
+ return ROK;
+}
+
+/*******************************************************************
+ *
+ * @brief Builds RLC Config
+ *
+ * @details
+ *
+ * Function : BuildRlcConfig
+ *
+ * Functionality: Builds RLC Config in BuildRlcBearerToAddModList
+ *
+ * @params[in] RLC_Config_t *rlcConfig
+ *
+ * @return ROK - success
+ * RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t BuildRlcConfig(RlcBearerCfg *rbCfg, struct RLC_Config *rlcConfig)
+{
+
+ /* Fill default values if rbCfg is NULL */
+ if(rbCfg == NULLP)
+ {
+ rlcConfig->present = RLC_Config_PR_am;
+ BuildRlcConfigAm(NULLP, rlcConfig);
+ }
+ /* If RbCfg is present, fill RLC configurations from DU Database */
+ else
+ {
+ rlcConfig->present = covertRlcModeFromIntEnumToRrcEnum(rbCfg->rlcMode);
+ switch(rlcConfig->present)
+ {
+ case RLC_Config_PR_am:
+ BuildRlcConfigAm(rbCfg->u.amCfg, rlcConfig);
+ break;
+ case RLC_Config_PR_um_Bi_Directional:
+ BuildRlcConfigUmBiDir(rbCfg->u.umBiDirCfg, rlcConfig);
+ break;
+ case RLC_Config_PR_um_Uni_Directional_UL:
+ BuildRlcConfigUmUniDirUl(rbCfg->u.umUniDirDlCfg, rlcConfig);
+ break;
+ case RLC_Config_PR_um_Uni_Directional_DL:
+ BuildRlcConfigUmUniDirDl(rbCfg->u.umUniDirUlCfg, rlcConfig);
+ break;
+ case RLC_Config_PR_NOTHING:
+ default:
+ break;
+ }
+ }
+
+ return ROK;
+}
+
+/*******************************************************************
+ *
+ * @brief Builds MAC LC Config
+ *
+ * @details
+ *
+ * Function : BuildMacLCConfig
+ *
+ * Functionality: Builds MAC LC Config in BuildRlcBearerToAddModList
+ *
+ * @params[in] struct LogicalChannelConfig macLcConfig
+ *
+ * @return ROK - success
+ * RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t BuildMacLCConfig(LcCfg *lcCfgDb, struct LogicalChannelConfig *macLcConfig)
+{
+ macLcConfig->ul_SpecificParameters = NULLP;
+ DU_ALLOC(macLcConfig->ul_SpecificParameters, sizeof(struct LogicalChannelConfig__ul_SpecificParameters));
+ if(!macLcConfig->ul_SpecificParameters)
{
DU_LOG("\nERROR --> F1AP : Memory allocation failure in BuildMacLCConfig");
return RFAILED;
}
- macLcConfig->ul_SpecificParameters->priority = MAC_LC_PRIORITY;
- macLcConfig->ul_SpecificParameters->prioritisedBitRate = PRIORTISIED_BIT_RATE;
- macLcConfig->ul_SpecificParameters->bucketSizeDuration = BUCKET_SIZE_DURATION;
+ if(lcCfgDb == NULLP)
+ {
+ macLcConfig->ul_SpecificParameters->priority = MAC_LC_PRIORITY;
+ macLcConfig->ul_SpecificParameters->prioritisedBitRate = PRIORTISIED_BIT_RATE;
+ macLcConfig->ul_SpecificParameters->bucketSizeDuration = BUCKET_SIZE_DURATION;
+ }
+ else
+ {
+ macLcConfig->ul_SpecificParameters->priority = lcCfgDb->ulLcCfg.priority;
+ macLcConfig->ul_SpecificParameters->prioritisedBitRate = lcCfgDb->ulLcCfg.pbr;
+ macLcConfig->ul_SpecificParameters->bucketSizeDuration = lcCfgDb->ulLcCfg.bsd;
+ }
+
macLcConfig->ul_SpecificParameters->allowedServingCells = NULLP;
macLcConfig->ul_SpecificParameters->allowedSCS_List = NULLP;
macLcConfig->ul_SpecificParameters->maxPUSCH_Duration = NULLP;
DU_LOG("\nERROR --> F1AP : Memory allocation failure in BuildMacLCConfig");
return RFAILED;
}
- *(macLcConfig->ul_SpecificParameters->logicalChannelGroup) = LC_GRP;
+
+ if(lcCfgDb == NULLP)
+ *(macLcConfig->ul_SpecificParameters->logicalChannelGroup) = LC_GRP;
+ else
+ *(macLcConfig->ul_SpecificParameters->logicalChannelGroup) = lcCfgDb->ulLcCfg.lcGroup;
macLcConfig->ul_SpecificParameters->schedulingRequestID = NULLP;
DU_ALLOC(macLcConfig->ul_SpecificParameters->schedulingRequestID, sizeof(SchedulingRequestId_t));
DU_LOG("\nERROR --> F1AP : Memory allocation failure in BuildMacLCConfig");
return RFAILED;
}
- *(macLcConfig->ul_SpecificParameters->schedulingRequestID) = SCH_REQ_ID;
+
+ if(lcCfgDb == NULLP)
+ *(macLcConfig->ul_SpecificParameters->schedulingRequestID) = SCH_REQ_ID;
+ else
+ *(macLcConfig->ul_SpecificParameters->schedulingRequestID) = lcCfgDb->ulLcCfg.schReqId;
macLcConfig->ul_SpecificParameters->logicalChannelSR_Mask = false;
macLcConfig->ul_SpecificParameters->logicalChannelSR_DelayTimerApplied = false;
* RFAILED - failure
*
* ****************************************************************/
-uint8_t BuildRlcBearerToAddModList(struct CellGroupConfigRrc__rlc_BearerToAddModList *rlcBearerList)
+uint8_t BuildRlcBearerToAddModList(DuUeCb *ueCb, struct CellGroupConfigRrc__rlc_BearerToAddModList *rlcBearerList)
{
- uint8_t idx, elementCnt;
+ uint8_t idx = 0, lcIdx=0, macLcIdx = 0, elementCnt = 0;
- elementCnt = 1;
+ if(ueCb == NULLP)
+ elementCnt = 1;
+ else if(ueCb->f1UeDb->actionType == UE_CTXT_CFG_QUERY)
+ elementCnt = ueCb->rlcUeCfg.numLcs;
+ else
+ {
+ for(lcIdx = 0; lcIdx<ueCb->rlcUeCfg.numLcs; lcIdx++)
+ {
+ if(ueCb->rlcUeCfg.rlcLcCfg[lcIdx].isLcAddModRspSent == false)
+ elementCnt++;
+ }
+ }
rlcBearerList->list.count = elementCnt;
rlcBearerList->list.size = elementCnt * sizeof(struct RLC_BearerConfig *);
DU_ALLOC(rlcBearerList->list.array[idx], sizeof(struct RLC_BearerConfig));
if(!rlcBearerList->list.array[idx])
{
- DU_LOG("\nERROR --> F1AP : Memory allocation failure in BuildRlcBearerToAddModList");
- return RFAILED;
+ DU_LOG("\nERROR --> F1AP : Memory allocation failure in BuildRlcBearerToAddModList");
+ return RFAILED;
}
}
- idx = 0;
- rlcBearerList->list.array[idx]->logicalChannelIdentity = SRB1_LCID;
-
- DU_ALLOC(rlcBearerList->list.array[idx]->servedRadioBearer, \
- sizeof(struct RLC_BearerConfig__servedRadioBearer));
- if(!rlcBearerList->list.array[idx]->servedRadioBearer)
+ if(ueCb == NULLP)
{
- DU_LOG("\nERROR --> F1AP : Memory allocation failure in BuildRlcBearerToAddModList");
- return RFAILED;
- }
+ idx=0;
+ rlcBearerList->list.array[idx]->logicalChannelIdentity = SRB1_LCID;
+ DU_ALLOC(rlcBearerList->list.array[idx]->servedRadioBearer, sizeof(struct RLC_BearerConfig__servedRadioBearer));
+ if(!rlcBearerList->list.array[idx]->servedRadioBearer)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failure in BuildRlcBearerToAddModList");
+ return RFAILED;
+ }
+ rlcBearerList->list.array[idx]->servedRadioBearer->present = RLC_BearerConfig__servedRadioBearer_PR_srb_Identity;
+ rlcBearerList->list.array[idx]->servedRadioBearer->choice.srb_Identity = SRB1_LCID;
+ rlcBearerList->list.array[idx]->reestablishRLC = NULLP;
- rlcBearerList->list.array[idx]->servedRadioBearer->present = \
- RLC_BearerConfig__servedRadioBearer_PR_srb_Identity;
- rlcBearerList->list.array[idx]->servedRadioBearer->choice.srb_Identity = \
- SRB1_LCID;
+ /* Fill RLC related Configurations for this Radio Bearer */
+ rlcBearerList->list.array[idx]->rlc_Config = NULLP;
+ DU_ALLOC(rlcBearerList->list.array[idx]->rlc_Config, sizeof(struct RLC_Config));
+ if(!rlcBearerList->list.array[idx]->rlc_Config)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failure in BuildRlcBearerToAddModList");
+ return RFAILED;
+ }
+ if(BuildRlcConfig(NULLP, rlcBearerList->list.array[idx]->rlc_Config) != ROK)
+ {
+ DU_LOG("\nERROR --> F1AP : BuildRlcConfig failed");
+ return RFAILED;
+ }
- rlcBearerList->list.array[idx]->reestablishRLC = NULLP;
- rlcBearerList->list.array[idx]->rlc_Config = NULLP;
- DU_ALLOC(rlcBearerList->list.array[idx]->rlc_Config, sizeof(struct RLC_Config));
- if(!rlcBearerList->list.array[idx]->rlc_Config)
- {
- DU_LOG("\nERROR --> F1AP : Memory allocation failure in BuildRlcBearerToAddModList");
- return RFAILED;
+ /* Fill MAC related configurations for this Radio Bearer */
+ rlcBearerList->list.array[idx]->mac_LogicalChannelConfig = NULLP;
+ DU_ALLOC(rlcBearerList->list.array[idx]->mac_LogicalChannelConfig, sizeof(struct LogicalChannelConfig));
+ if(!rlcBearerList->list.array[idx]->mac_LogicalChannelConfig)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failure in BuildRlcBearerToAddModList");
+ return RFAILED;
+ }
+ if(BuildMacLCConfig(NULLP, rlcBearerList->list.array[idx]->mac_LogicalChannelConfig) != ROK)
+ {
+ DU_LOG("\nERROR --> F1AP : BuildMacLCConfig failed");
+ return RFAILED;
+ }
}
-
- if(BuildRlcConfig(rlcBearerList->list.array[idx]->rlc_Config) != ROK)
+ else
{
- DU_LOG("\nERROR --> F1AP : BuildRlcConfig failed");
- return RFAILED;
- }
+ idx=0;
+ for(lcIdx=0; lcIdx<ueCb->rlcUeCfg.numLcs; lcIdx++)
+ {
+ if((ueCb->f1UeDb->actionType != UE_CTXT_CFG_QUERY) && (ueCb->rlcUeCfg.rlcLcCfg[lcIdx].isLcAddModRspSent == true))
+ continue;
- rlcBearerList->list.array[idx]->mac_LogicalChannelConfig = NULLP;
- DU_ALLOC(rlcBearerList->list.array[idx]->mac_LogicalChannelConfig, \
- sizeof(struct LogicalChannelConfig));
- if(!rlcBearerList->list.array[idx]->mac_LogicalChannelConfig)
- {
- DU_LOG("\nERROR --> F1AP : Memory allocation failure in BuildRlcBearerToAddModList");
- return RFAILED;
- }
+ /* Fill Logical channel identity */
+ rlcBearerList->list.array[idx]->logicalChannelIdentity = ueCb->rlcUeCfg.rlcLcCfg[lcIdx].lcId;
- if(BuildMacLCConfig(rlcBearerList->list.array[idx]->mac_LogicalChannelConfig) != ROK)
- {
- DU_LOG("\nERROR --> F1AP : BuildMacLCConfig failed");
- return RFAILED;
- }
+ /* Fill Radio Bearer Id and type (DRB/SRB) for this logical channel */
+ DU_ALLOC(rlcBearerList->list.array[idx]->servedRadioBearer, sizeof(struct RLC_BearerConfig__servedRadioBearer));
+ if(!rlcBearerList->list.array[idx]->servedRadioBearer)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failure in BuildRlcBearerToAddModList");
+ return RFAILED;
+ }
+ rlcBearerList->list.array[idx]->servedRadioBearer->present = \
+ covertRbTypeFromIntEnumToRrcEnum(ueCb->rlcUeCfg.rlcLcCfg[lcIdx].rbType);
+ switch(rlcBearerList->list.array[idx]->servedRadioBearer->present)
+ {
+ case RLC_BearerConfig__servedRadioBearer_PR_srb_Identity:
+ rlcBearerList->list.array[idx]->servedRadioBearer->choice.srb_Identity = ueCb->rlcUeCfg.rlcLcCfg[lcIdx].rbId;
+ break;
+ case RLC_BearerConfig__servedRadioBearer_PR_drb_Identity:
+ rlcBearerList->list.array[idx]->servedRadioBearer->choice.drb_Identity = ueCb->rlcUeCfg.rlcLcCfg[lcIdx].rbId;
+ break;
+ case RLC_BearerConfig__servedRadioBearer_PR_NOTHING:
+ default:
+ break;
+ }
+ ueCb->rlcUeCfg.rlcLcCfg[lcIdx].isLcAddModRspSent = true;
+ rlcBearerList->list.array[idx]->reestablishRLC = NULLP;
+
+ /* Fill RLC related Configurations for this Radio Bearer */
+ rlcBearerList->list.array[idx]->rlc_Config = NULLP;
+ DU_ALLOC(rlcBearerList->list.array[idx]->rlc_Config, sizeof(struct RLC_Config));
+ if(!rlcBearerList->list.array[idx]->rlc_Config)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failure in BuildRlcBearerToAddModList");
+ return RFAILED;
+ }
+ if(BuildRlcConfig(&ueCb->rlcUeCfg.rlcLcCfg[lcIdx], rlcBearerList->list.array[idx]->rlc_Config) != ROK)
+ {
+ DU_LOG("\nERROR --> F1AP : BuildRlcConfig failed");
+ return RFAILED;
+ }
+
+ /* Fill MAC related configurations for this Radio Bearer */
+ rlcBearerList->list.array[idx]->mac_LogicalChannelConfig = NULLP;
+ DU_ALLOC(rlcBearerList->list.array[idx]->mac_LogicalChannelConfig, sizeof(struct LogicalChannelConfig));
+ if(!rlcBearerList->list.array[idx]->mac_LogicalChannelConfig)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failure in BuildRlcBearerToAddModList");
+ return RFAILED;
+ }
+ for(macLcIdx = 0; macLcIdx < ueCb->macUeCfg.numLcs; macLcIdx++)
+ {
+ if(ueCb->macUeCfg.lcCfgList[macLcIdx].lcId == ueCb->rlcUeCfg.rlcLcCfg[lcIdx].lcId)
+ {
+ if(BuildMacLCConfig(&ueCb->macUeCfg.lcCfgList[macLcIdx], rlcBearerList->list.array[idx]->mac_LogicalChannelConfig) != ROK)
+ {
+ DU_LOG("\nERROR --> F1AP : BuildMacLCConfig failed");
+ return RFAILED;
+ }
+ break;
+ }
+ }
+
+ idx++;
+ }
+ }
return ROK;
}
* RFAILED - failure
*
* ****************************************************************/
- uint8_t BuildControlRSetToAddModList
-(
- struct PDCCH_Config__controlResourceSetToAddModList *controlRSetList
- )
+uint8_t BuildControlRSetToAddModList(PdcchConfig *pdcchCfg, struct PDCCH_Config__controlResourceSetToAddModList *controlRSetList)
{
uint8_t idx;
uint8_t elementCnt;
uint8_t freqDomainResource[FREQ_DOM_RSRC_SIZE] = {0};
uint8_t coreset0EndPrb, coreset1StartPrb, coreset1NumPrb;
+ if(pdcchCfg == NULLP)
+ elementCnt = 1;
+ else
+ elementCnt = pdcchCfg->numCRsetToAddMod;
- elementCnt = 1;
controlRSetList->list.count = elementCnt;
- controlRSetList->list.size = \
- elementCnt * sizeof(struct ControlResourceSet *);
+ controlRSetList->list.size = elementCnt * sizeof(struct ControlResourceSet *);
controlRSetList->list.array = NULLP;
DU_ALLOC(controlRSetList->list.array, controlRSetList->list.size);
DU_ALLOC(controlRSetList->list.array[idx], sizeof(struct ControlResourceSet));
if(!controlRSetList->list.array[idx])
{
- DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildControlRSetToAddModList");
- return RFAILED;
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildControlRSetToAddModList");
+ return RFAILED;
}
}
- idx=0;
- controlRSet = controlRSetList->list.array[idx];
+ for(idx = 0; idx < elementCnt; idx++)
+ {
+ controlRSet = controlRSetList->list.array[idx];
- controlRSet->controlResourceSetId = PDCCH_CTRL_RSRC_SET_ONE_ID;
+ if(pdcchCfg == NULLP)
+ controlRSet->controlResourceSetId = PDCCH_CTRL_RSRC_SET_ONE_ID;
+ else
+ controlRSet->controlResourceSetId = pdcchCfg->cRSetToAddModList[idx].cRSetId;
- /* size 6 bytes
- * 3 LSBs unsued
- * Bit string stored ff0000000000
- */
- numBytes = 6;
- bitsUnused = 3;
- controlRSet->frequencyDomainResources.size = numBytes * sizeof(uint8_t);
+ /* size 6 bytes
+ * 3 LSBs unsued
+ * Bit string stored ff0000000000
+ */
+ numBytes = 6;
+ bitsUnused = 3;
+ controlRSet->frequencyDomainResources.size = numBytes * sizeof(uint8_t);
- controlRSet->frequencyDomainResources.buf = NULLP;
- DU_ALLOC(controlRSet->frequencyDomainResources.buf, \
- controlRSet->frequencyDomainResources.size);
- if(!controlRSet->frequencyDomainResources.buf)
- {
- DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildControlRSetToAddModList");
- return RFAILED;
- }
+ controlRSet->frequencyDomainResources.buf = NULLP;
+ DU_ALLOC(controlRSet->frequencyDomainResources.buf, controlRSet->frequencyDomainResources.size);
+ if(!controlRSet->frequencyDomainResources.buf)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildControlRSetToAddModList");
+ return RFAILED;
+ }
- memset(controlRSet->frequencyDomainResources.buf, 0, FREQ_DOM_RSRC_SIZE);
- coreset0EndPrb = CORESET0_END_PRB;
- coreset1StartPrb = coreset0EndPrb + 6;
- coreset1NumPrb = CORESET1_NUM_PRB;
- /* calculate the PRBs */
- freqDomRscAllocType0(((coreset1StartPrb)/6), (coreset1NumPrb/6), freqDomainResource);
- memcpy(controlRSet->frequencyDomainResources.buf, freqDomainResource, FREQ_DOM_RSRC_SIZE);
- controlRSet->frequencyDomainResources.bits_unused = bitsUnused;
+ memset(controlRSet->frequencyDomainResources.buf, 0, FREQ_DOM_RSRC_SIZE);
- controlRSet->duration = PDCCH_CTRL_RSRC_SET_ONE_DURATION;
- controlRSet->cce_REG_MappingType.present = \
- ControlResourceSet__cce_REG_MappingType_PR_nonInterleaved;
+ if(pdcchCfg == NULLP)
+ {
+ coreset0EndPrb = CORESET0_END_PRB;
+ coreset1StartPrb = coreset0EndPrb + 6;
+ coreset1NumPrb = CORESET1_NUM_PRB;
+ /* calculate the PRBs */
+ fillCoresetFeqDomAllocMap(((coreset1StartPrb)/6), (coreset1NumPrb/6), freqDomainResource);
+ memcpy(controlRSet->frequencyDomainResources.buf, freqDomainResource, FREQ_DOM_RSRC_SIZE);
+ controlRSet->frequencyDomainResources.bits_unused = bitsUnused;
- controlRSet->precoderGranularity = PDCCH_CTRL_RSRC_SET_ONE_PRECOD_GRANULARITY;
- controlRSet->tci_StatesPDCCH_ToAddList = NULLP;
- controlRSet->tci_StatesPDCCH_ToReleaseList = NULLP;
- controlRSet->tci_PresentInDCI = NULLP;
-#if 0
- uint8_t tciStateIdx;
+ controlRSet->duration = PDCCH_CTRL_RSRC_SET_ONE_DURATION;
+ controlRSet->cce_REG_MappingType.present = ControlResourceSet__cce_REG_MappingType_PR_nonInterleaved;
+ controlRSet->precoderGranularity = PDCCH_CTRL_RSRC_SET_ONE_PRECOD_GRANULARITY;
+ }
+ else
+ {
+ memcpy(controlRSet->frequencyDomainResources.buf, pdcchCfg->cRSetToAddModList[idx].freqDomainRsrc, FREQ_DOM_RSRC_SIZE);
+ controlRSet->frequencyDomainResources.bits_unused = bitsUnused;
+ controlRSet->duration = pdcchCfg->cRSetToAddModList[idx].duration;
+ controlRSet->cce_REG_MappingType.present = pdcchCfg->cRSetToAddModList[idx].cceRegMappingType;
+ controlRSet->precoderGranularity = pdcchCfg->cRSetToAddModList[idx].precoderGranularity;
+ }
+ controlRSet->tci_StatesPDCCH_ToAddList = NULLP;
+ controlRSet->tci_StatesPDCCH_ToReleaseList = NULLP;
+ controlRSet->tci_PresentInDCI = NULLP;
- DU_ALLOC(controlRset->tci_StatesPDCCH_ToAddList, \
- sizeof(struct ControlResourceSet__tci_StatesPDCCH_ToAddList));
- if(!controlRset->tci_StatesPDCCH_ToAddList)
- {
- DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildControlRSetToAddModList");
- return RFAILED;
- }
+#if 0
+ uint8_t tciStateIdx;
- elementCnt = 1;
- controlRset->tci_StatesPDCCH_ToAddList->list.count = elementCnt;
- controlRset->tci_StatesPDCCH_ToAddList->list.size = elementCnt * sizeof(TCI_StateId_t *);
- DU_ALLOC(controlRset->tci_StatesPDCCH_ToAddList->list.array, \
- controlRset->tci_StatesPDCCH_ToAddList->list.size)
- if(!controlRset->tci_StatesPDCCH_ToAddList->list.array)
+ DU_ALLOC(controlRset->tci_StatesPDCCH_ToAddList, \
+ sizeof(struct ControlResourceSet__tci_StatesPDCCH_ToAddList));
+ if(!controlRset->tci_StatesPDCCH_ToAddList)
{
- DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildControlRSetToAddModList");
- return RFAILED;
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildControlRSetToAddModList");
+ return RFAILED;
}
- for(tciStateIdx = 0; tciStateIdx <elementCntl; tciStateIdx++)
- {
- DU_ALLOC(controlRset->tci_StatesPDCCH_ToAddList->list.array[tciStateIdx], sizeof(TCI_StateId_t));
- if(!controlRset->tci_StatesPDCCH_ToAddList->list.array[tciStateIdx])
+ elementCnt = 1;
+ controlRset->tci_StatesPDCCH_ToAddList->list.count = elementCnt;
+ controlRset->tci_StatesPDCCH_ToAddList->list.size = elementCnt * sizeof(TCI_StateId_t *);
+ DU_ALLOC(controlRset->tci_StatesPDCCH_ToAddList->list.array, \
+ controlRset->tci_StatesPDCCH_ToAddList->list.size)
+ if(!controlRset->tci_StatesPDCCH_ToAddList->list.array)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildControlRSetToAddModList");
+ return RFAILED;
+ }
+
+ for(tciStateIdx = 0; tciStateIdx <elementCntl; tciStateIdx++)
{
- DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildControlRSetToAddModList");
- return RFAILED;
+ DU_ALLOC(controlRset->tci_StatesPDCCH_ToAddList->list.array[tciStateIdx], sizeof(TCI_StateId_t));
+ if(!controlRset->tci_StatesPDCCH_ToAddList->list.array[tciStateIdx])
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildControlRSetToAddModList");
+ return RFAILED;
+ }
}
- }
- tciStateIdx = 0;
- /* TODO */
- *(controlRset->tci_StatesPDCCH_ToAddList->list.array[tciStateIdx]);
+ tciStateIdx = 0;
+ /* TODO */
+ *(controlRset->tci_StatesPDCCH_ToAddList->list.array[tciStateIdx]);
- DU_ALLOC(controlRset->tci_PresentInDCI, sizeof(long));
- if(!controlRset->tci_PresentInDCI)
- {
- DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildControlRSetToAddModList");
- return RFAILED;
- }
- /* TODO */
- *(controlRset->tci_PresentInDCI);
-#endif
+ DU_ALLOC(controlRset->tci_PresentInDCI, sizeof(long));
+ if(!controlRset->tci_PresentInDCI)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildControlRSetToAddModList");
+ return RFAILED;
+ }
+ /* TODO */
+ *(controlRset->tci_PresentInDCI);
+#endif
- controlRSet->pdcch_DMRS_ScramblingID = NULLP;
- DU_ALLOC(controlRSet->pdcch_DMRS_ScramblingID, sizeof(long));
- if(!controlRSet->pdcch_DMRS_ScramblingID)
- {
- DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildControlRSetToAddModList");
- return RFAILED;
+ controlRSet->pdcch_DMRS_ScramblingID = NULLP;
+ DU_ALLOC(controlRSet->pdcch_DMRS_ScramblingID, sizeof(long));
+ if(!controlRSet->pdcch_DMRS_ScramblingID)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildControlRSetToAddModList");
+ return RFAILED;
+ }
+ if(pdcchCfg == NULLP)
+ *(controlRSet->pdcch_DMRS_ScramblingID) = SCRAMBLING_ID;
+ else
+ *(controlRSet->pdcch_DMRS_ScramblingID) = pdcchCfg->cRSetToAddModList[idx].dmrsScramblingId;
}
- *(controlRSet->pdcch_DMRS_ScramblingID) = SCRAMBLING_ID;
-
return ROK;
} /* End BuildControlRSetToAddModList */
* RFAILED - failure
*
* ****************************************************************/
- uint8_t BuildSearchSpcToAddModList
-(
- struct PDCCH_Config__searchSpacesToAddModList *searchSpcList
- )
+uint8_t BuildSearchSpcToAddModList(PdcchConfig *pdcchCfg, struct PDCCH_Config__searchSpacesToAddModList *searchSpcList)
{
uint8_t idx;
uint8_t numBytes;
uint8_t elementCnt;
struct SearchSpace *searchSpc;
- elementCnt = 1;
+ if(pdcchCfg == NULLP)
+ elementCnt = 1;
+ else
+ elementCnt = pdcchCfg->numSearchSpcToAddMod;
+
searchSpcList->list.count = elementCnt;
searchSpcList->list.size = elementCnt * sizeof(struct SearchSpace *);
DU_ALLOC(searchSpcList->list.array[idx], sizeof(struct SearchSpace));
if(!searchSpcList->list.array[idx])
{
- DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildSearchSpcToAddModList");
- return RFAILED;
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildSearchSpcToAddModList");
+ return RFAILED;
}
}
- idx = 0;
- searchSpc = searchSpcList->list.array[idx];
-
- searchSpc->searchSpaceId = PDCCH_SRCH_SPC_TWO_ID;
-
- searchSpc->controlResourceSetId = NULLP;
- DU_ALLOC(searchSpc->controlResourceSetId, sizeof(ControlResourceSetId_t));
- if(!searchSpc->controlResourceSetId)
- {
- DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildSearchSpcToAddModList");
- return RFAILED;
- }
- *(searchSpc->controlResourceSetId) = PDCCH_CTRL_RSRC_SET_ONE_ID;
-
- searchSpc->monitoringSlotPeriodicityAndOffset = NULLP;
- DU_ALLOC(searchSpc->monitoringSlotPeriodicityAndOffset, \
- sizeof(struct SearchSpace__monitoringSlotPeriodicityAndOffset));
- if(!searchSpc->monitoringSlotPeriodicityAndOffset)
- {
- DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildSearchSpcToAddModList");
- return RFAILED;
- }
- searchSpc->monitoringSlotPeriodicityAndOffset->present = \
- SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl1;
-
- searchSpc->duration = NULLP;
- searchSpc->monitoringSymbolsWithinSlot = NULLP;
- DU_ALLOC(searchSpc->monitoringSymbolsWithinSlot, sizeof(BIT_STRING_t));
- if(!searchSpc->monitoringSymbolsWithinSlot)
+ for(idx = 0; idx < elementCnt; idx++)
{
- DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildSearchSpcToAddModList");
- return RFAILED;
- }
+ searchSpc = searchSpcList->list.array[idx];
- /* Values taken from reference logs :
- * size 2 bytes
- * 2 LSBs unsued
- * Bit string stores 8000
- */
- numBytes = 2;
- bitsUnused = 2;
+ if(pdcchCfg == NULLP)
+ searchSpc->searchSpaceId = PDCCH_SRCH_SPC_TWO_ID;
+ else
+ searchSpc->searchSpaceId = pdcchCfg->searchSpcToAddModList[idx].searchSpaceId;
- searchSpc->monitoringSymbolsWithinSlot->size = numBytes * sizeof(uint8_t);
- searchSpc->monitoringSymbolsWithinSlot->buf = NULLP;
- DU_ALLOC(searchSpc->monitoringSymbolsWithinSlot->buf, \
- searchSpc->monitoringSymbolsWithinSlot->size);
- if(!searchSpc->monitoringSymbolsWithinSlot->buf)
- {
- DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildSearchSpcToAddModList");
- return RFAILED;
- }
+ searchSpc->controlResourceSetId = NULLP;
+ DU_ALLOC(searchSpc->controlResourceSetId, sizeof(ControlResourceSetId_t));
+ if(!searchSpc->controlResourceSetId)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildSearchSpcToAddModList");
+ return RFAILED;
+ }
+ if(pdcchCfg == NULLP)
+ *(searchSpc->controlResourceSetId) = PDCCH_CTRL_RSRC_SET_ONE_ID;
+ else
+ *(searchSpc->controlResourceSetId) = pdcchCfg->searchSpcToAddModList[idx].cRSetId;
- byteIdx = 0;
- searchSpc->monitoringSymbolsWithinSlot->buf[byteIdx++] = \
- PDCCH_SYMBOL_WITHIN_SLOT /* setting MSB to 128 i.e. 0x80 */;
- searchSpc->monitoringSymbolsWithinSlot->buf[byteIdx++] = 0;
- searchSpc->monitoringSymbolsWithinSlot->bits_unused = bitsUnused;
+ searchSpc->monitoringSlotPeriodicityAndOffset = NULLP;
+ DU_ALLOC(searchSpc->monitoringSlotPeriodicityAndOffset, sizeof(struct SearchSpace__monitoringSlotPeriodicityAndOffset));
+ if(!searchSpc->monitoringSlotPeriodicityAndOffset)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildSearchSpcToAddModList");
+ return RFAILED;
+ }
+ if(pdcchCfg == NULLP)
+ searchSpc->monitoringSlotPeriodicityAndOffset->present = SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl1;
+ else
+ searchSpc->monitoringSlotPeriodicityAndOffset->present = pdcchCfg->searchSpcToAddModList[idx].mSlotPeriodicityAndOffset;
- searchSpc->nrofCandidates = NULLP;
- DU_ALLOC(searchSpc->nrofCandidates, sizeof(struct SearchSpace__nrofCandidates));
- if(!searchSpc->nrofCandidates)
- {
- DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildSearchSpcToAddModList");
- return RFAILED;
- }
+ searchSpc->duration = NULLP;
+ searchSpc->monitoringSymbolsWithinSlot = NULLP;
+ DU_ALLOC(searchSpc->monitoringSymbolsWithinSlot, sizeof(BIT_STRING_t));
+ if(!searchSpc->monitoringSymbolsWithinSlot)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildSearchSpcToAddModList");
+ return RFAILED;
+ }
- searchSpc->nrofCandidates->aggregationLevel1 = \
- PDCCH_SRCH_SPC_TWO_AGG_LVL1_CANDIDATE;
- searchSpc->nrofCandidates->aggregationLevel2 = \
- PDCCH_SRCH_SPC_TWO_AGG_LVL2_CANDIDATE;
- searchSpc->nrofCandidates->aggregationLevel4 = \
- PDCCH_SRCH_SPC_TWO_AGG_LVL4_CANDIDATE;
- searchSpc->nrofCandidates->aggregationLevel8 = \
- PDCCH_SRCH_SPC_TWO_AGG_LVL8_CANDIDATE;
- searchSpc->nrofCandidates->aggregationLevel16 = \
- PDCCH_SRCH_SPC_TWO_AGG_LVL16_CANDIDATE;
+ /* Values taken from reference logs :
+ * size 2 bytes
+ * 2 LSBs unsued
+ * Bit string stores 8000
+ */
+ numBytes = 2;
+ bitsUnused = 2;
+ searchSpc->monitoringSymbolsWithinSlot->size = numBytes * sizeof(uint8_t);
+ searchSpc->monitoringSymbolsWithinSlot->buf = NULLP;
+ DU_ALLOC(searchSpc->monitoringSymbolsWithinSlot->buf, searchSpc->monitoringSymbolsWithinSlot->size);
+ if(!searchSpc->monitoringSymbolsWithinSlot->buf)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildSearchSpcToAddModList");
+ return RFAILED;
+ }
+ if(pdcchCfg == NULLP)
+ {
+ byteIdx = 0;
+ searchSpc->monitoringSymbolsWithinSlot->buf[byteIdx++] = PDCCH_SYMBOL_WITHIN_SLOT /* setting MSB to 128 i.e. 0x80 */;
+ searchSpc->monitoringSymbolsWithinSlot->buf[byteIdx++] = 0;
+ }
+ else
+ memcpy(searchSpc->monitoringSymbolsWithinSlot->buf, pdcchCfg->searchSpcToAddModList[idx].mSymbolsWithinSlot, numBytes);
+ searchSpc->monitoringSymbolsWithinSlot->bits_unused = bitsUnused;
- searchSpc->searchSpaceType = NULLP;
- DU_ALLOC(searchSpc->searchSpaceType, sizeof(struct SearchSpace__searchSpaceType));
- if(!searchSpc->searchSpaceType)
- {
- DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildSearchSpcToAddModList");
- return RFAILED;
- }
+ searchSpc->nrofCandidates = NULLP;
+ DU_ALLOC(searchSpc->nrofCandidates, sizeof(struct SearchSpace__nrofCandidates));
+ if(!searchSpc->nrofCandidates)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildSearchSpcToAddModList");
+ return RFAILED;
+ }
- searchSpc->searchSpaceType->present = SearchSpace__searchSpaceType_PR_ue_Specific;
+ if(pdcchCfg == NULLP)
+ {
+ searchSpc->nrofCandidates->aggregationLevel1 = PDCCH_SRCH_SPC_TWO_AGG_LVL1_CANDIDATE;
+ searchSpc->nrofCandidates->aggregationLevel2 = PDCCH_SRCH_SPC_TWO_AGG_LVL2_CANDIDATE;
+ searchSpc->nrofCandidates->aggregationLevel4 = PDCCH_SRCH_SPC_TWO_AGG_LVL4_CANDIDATE;
+ searchSpc->nrofCandidates->aggregationLevel8 = PDCCH_SRCH_SPC_TWO_AGG_LVL8_CANDIDATE;
+ searchSpc->nrofCandidates->aggregationLevel16 = PDCCH_SRCH_SPC_TWO_AGG_LVL16_CANDIDATE;
+ }
+ else
+ {
+ searchSpc->nrofCandidates->aggregationLevel1 = pdcchCfg->searchSpcToAddModList[idx].numCandidatesAggLevel1;
+ searchSpc->nrofCandidates->aggregationLevel2 = pdcchCfg->searchSpcToAddModList[idx].numCandidatesAggLevel2;
+ searchSpc->nrofCandidates->aggregationLevel4 = pdcchCfg->searchSpcToAddModList[idx].numCandidatesAggLevel4;
+ searchSpc->nrofCandidates->aggregationLevel8 = pdcchCfg->searchSpcToAddModList[idx].numCandidatesAggLevel8;
+ searchSpc->nrofCandidates->aggregationLevel16 = pdcchCfg->searchSpcToAddModList[idx].numCandidatesAggLevel16;
+ }
- searchSpc->searchSpaceType->choice.ue_Specific = NULLP;
- DU_ALLOC(searchSpc->searchSpaceType->choice.ue_Specific, \
- sizeof(struct SearchSpace__searchSpaceType__ue_Specific));
- if(!searchSpc->searchSpaceType->choice.ue_Specific)
- {
- DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildSearchSpcToAddModList");
- return RFAILED;
- }
- searchSpc->searchSpaceType->choice.ue_Specific->dci_Formats = \
- PDCCH_SRCH_SPC_TWO_UE_SPEC_DCI_FORMAT;
+ searchSpc->searchSpaceType = NULLP;
+ DU_ALLOC(searchSpc->searchSpaceType, sizeof(struct SearchSpace__searchSpaceType));
+ if(!searchSpc->searchSpaceType)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildSearchSpcToAddModList");
+ return RFAILED;
+ }
+ if(pdcchCfg == NULLP)
+ searchSpc->searchSpaceType->present = SearchSpace__searchSpaceType_PR_ue_Specific;
+ else
+ searchSpc->searchSpaceType->present = pdcchCfg->searchSpcToAddModList[idx].searchSpaceType;
+ searchSpc->searchSpaceType->choice.ue_Specific = NULLP;
+ DU_ALLOC(searchSpc->searchSpaceType->choice.ue_Specific, sizeof(struct SearchSpace__searchSpaceType__ue_Specific));
+ if(!searchSpc->searchSpaceType->choice.ue_Specific)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildSearchSpcToAddModList");
+ return RFAILED;
+ }
+ if(pdcchCfg == NULLP)
+ searchSpc->searchSpaceType->choice.ue_Specific->dci_Formats = PDCCH_SRCH_SPC_TWO_UE_SPEC_DCI_FORMAT;
+ else
+ searchSpc->searchSpaceType->choice.ue_Specific->dci_Formats = pdcchCfg->searchSpcToAddModList[idx].ueSpecificDciFormat;
+ }
return ROK;
}/* End BuildSearchSpcToAddModList */
* RFAILED - failure
*
* ****************************************************************/
-uint8_t BuildBWPDlDedPdcchCfg(struct PDCCH_Config *pdcchCfg)
+uint8_t BuildBWPDlDedPdcchCfg(PdcchConfig *pdcchCfgDb, struct PDCCH_Config *pdcchCfg)
{
pdcchCfg->controlResourceSetToAddModList = NULLP;
- DU_ALLOC(pdcchCfg->controlResourceSetToAddModList, \
- sizeof(struct PDCCH_Config__controlResourceSetToAddModList));
+ DU_ALLOC(pdcchCfg->controlResourceSetToAddModList, sizeof(struct PDCCH_Config__controlResourceSetToAddModList));
if(!pdcchCfg->controlResourceSetToAddModList)
{
DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildBWPDlDedPdcchCfg");
return RFAILED;
}
- if(BuildControlRSetToAddModList(pdcchCfg->controlResourceSetToAddModList) != ROK)
+ if(BuildControlRSetToAddModList(pdcchCfgDb, pdcchCfg->controlResourceSetToAddModList) != ROK)
{
+ DU_LOG("\nERROR --> F1AP : Failed in BuildControlRSetToAddModList()");
return RFAILED;
}
pdcchCfg->controlResourceSetToReleaseList = NULLP;
pdcchCfg->searchSpacesToAddModList = NULLP;
- DU_ALLOC(pdcchCfg->searchSpacesToAddModList, \
- sizeof(struct PDCCH_Config__searchSpacesToAddModList));
+ DU_ALLOC(pdcchCfg->searchSpacesToAddModList, sizeof(struct PDCCH_Config__searchSpacesToAddModList));
if(!pdcchCfg->searchSpacesToAddModList)
{
DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildBWPDlDedPdcchCfg");
return RFAILED;
}
- if(BuildSearchSpcToAddModList(pdcchCfg->searchSpacesToAddModList) != ROK)
+ if(BuildSearchSpcToAddModList(pdcchCfgDb, pdcchCfg->searchSpacesToAddModList) != ROK)
{
+ DU_LOG("\nERROR --> F1AP : Failed in BuildSearchSpcToAddModList()");
return RFAILED;
}
* RFAILED - failure
*
* ****************************************************************/
- uint8_t BuildDMRSDLPdschMapTypeA
-(
- struct PDSCH_Config__dmrs_DownlinkForPDSCH_MappingTypeA *dmrsDlCfg
- )
+uint8_t BuildDMRSDLPdschMapTypeA(PdschConfig *pdschCfg, struct PDSCH_Config__dmrs_DownlinkForPDSCH_MappingTypeA *dmrsDlCfg)
{
dmrsDlCfg->present = PDSCH_Config__dmrs_DownlinkForPDSCH_MappingTypeA_PR_setup;
dmrsDlCfg->choice.setup = NULLP;
DU_ALLOC(dmrsDlCfg->choice.setup, sizeof(struct DMRS_DownlinkConfig));
if(!dmrsDlCfg->choice.setup)
{
- DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildBWPDlDedPdschCfg");
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildDMRSDLPdschMapTypeA");
return RFAILED;
}
DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildDMRSDLPdschMapTypeA");
return RFAILED;
}
- *(dmrsDlCfg->choice.setup->dmrs_AdditionalPosition) = DMRS_ADDITIONAL_POS;
+ if(pdschCfg == NULLP)
+ *(dmrsDlCfg->choice.setup->dmrs_AdditionalPosition) = DMRS_ADDITIONAL_POS;
+ else
+ *(dmrsDlCfg->choice.setup->dmrs_AdditionalPosition) = pdschCfg->dmrsDlCfgForPdschMapTypeA.addPos;
dmrsDlCfg->choice.setup->maxLength = NULLP;
dmrsDlCfg->choice.setup->scramblingID0 = NULLP;
* RFAILED - failure
*
* ****************************************************************/
- uint8_t BuildPdschTimeDomAllocList
-(
- struct PDSCH_Config__pdsch_TimeDomainAllocationList *timeDomAllocList
- )
+uint8_t BuildPdschTimeDomAllocList(PdschConfig *pdschCfg, struct PDSCH_Config__pdsch_TimeDomainAllocationList *timeDomAllocList)
{
uint8_t idx;
uint8_t elementCnt;
struct PDSCH_TimeDomainResourceAllocation *timeDomAlloc;
- timeDomAllocList->present = \
- PDSCH_Config__pdsch_TimeDomainAllocationList_PR_setup;
+ timeDomAllocList->present = PDSCH_Config__pdsch_TimeDomainAllocationList_PR_setup;
timeDomAllocList->choice.setup = NULLP;
- DU_ALLOC(timeDomAllocList->choice.setup, \
- sizeof(struct PDSCH_TimeDomainResourceAllocationList));
+ DU_ALLOC(timeDomAllocList->choice.setup, sizeof(struct PDSCH_TimeDomainResourceAllocationList));
if(!timeDomAllocList->choice.setup)
{
DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildPdschTimeDomAllocList");
return RFAILED;
}
- elementCnt = 1;
+if(pdschCfg == NULLP)
+ elementCnt = 2;
+else
+elementCnt = pdschCfg->numTimeDomRsrcAlloc;
timeDomAllocList->choice.setup->list.count = elementCnt;
- timeDomAllocList->choice.setup->list.size = \
- elementCnt * sizeof(struct PDSCH_TimeDomainResourceAllocation *);
+ timeDomAllocList->choice.setup->list.size = elementCnt * sizeof(struct PDSCH_TimeDomainResourceAllocation *);
timeDomAllocList->choice.setup->list.array = NULLP;
- DU_ALLOC(timeDomAllocList->choice.setup->list.array, \
- timeDomAllocList->choice.setup->list.size);
+ DU_ALLOC(timeDomAllocList->choice.setup->list.array, timeDomAllocList->choice.setup->list.size);
if(!timeDomAllocList->choice.setup->list.array)
{
DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildPdschTimeDomAllocList");
{
timeDomAllocList->choice.setup->list.array[idx] = NULLP;
DU_ALLOC(timeDomAllocList->choice.setup->list.array[idx], \
- sizeof(struct PDSCH_TimeDomainResourceAllocation));
+ sizeof(struct PDSCH_TimeDomainResourceAllocation));
if(!timeDomAllocList->choice.setup->list.array[idx])
{
- DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildPdschTimeDomAllocList");
- return RFAILED;
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildPdschTimeDomAllocList");
+ return RFAILED;
}
}
- idx = 0;
- timeDomAlloc = timeDomAllocList->choice.setup->list.array[idx];
+ if(pdschCfg == NULLP)
+ {
+ idx = 0;
+ timeDomAlloc = timeDomAllocList->choice.setup->list.array[idx];
+ DU_ALLOC(timeDomAlloc->k0, sizeof(long));
+ if(!timeDomAlloc->k0)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildPdschTimeDomAllocList");
+ return RFAILED;
+ }
+ *(timeDomAlloc->k0) = 0;
+ timeDomAlloc->mappingType = PDSCH_MAPPING_TYPE_A;
+ timeDomAlloc->startSymbolAndLength = \
+ calcSliv(PDSCH_START_SYMBOL, PDSCH_LENGTH_SYMBOL);
- timeDomAlloc->k0 = NULLP;
- timeDomAlloc->mappingType = PDSCH_MAPPING_TYPE_A;
- timeDomAlloc->startSymbolAndLength = \
- calcSliv(PDSCH_START_SYMBOL, PDSCH_LENGTH_SYMBOL);
+ idx++;
+ timeDomAlloc = timeDomAllocList->choice.setup->list.array[idx];
+ DU_ALLOC(timeDomAlloc->k0, sizeof(long));
+ if(!timeDomAlloc->k0)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildPdschTimeDomAllocList");
+ return RFAILED;
+ }
+ *(timeDomAlloc->k0) = 1;
+ timeDomAlloc->mappingType = PDSCH_MAPPING_TYPE_A;
+ timeDomAlloc->startSymbolAndLength = calcSliv(PDSCH_START_SYMBOL, PDSCH_LENGTH_SYMBOL);
+ }
+ else
+ {
+ for(idx = 0; idx < elementCnt; idx++)
+ {
+ timeDomAlloc = timeDomAllocList->choice.setup->list.array[idx];
+ DU_ALLOC(timeDomAlloc->k0, sizeof(long));
+ if(!timeDomAlloc->k0)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildPdschTimeDomAllocList");
+ return RFAILED;
+ }
+ if(pdschCfg->timeDomRsrcAllociList[idx].k0)
+ *(timeDomAlloc->k0) = *(pdschCfg->timeDomRsrcAllociList[idx].k0);
+ timeDomAlloc->mappingType = pdschCfg->timeDomRsrcAllociList[idx].mappingType;
+ timeDomAlloc->startSymbolAndLength = pdschCfg->timeDomRsrcAllociList[idx].startSymbolAndLength;
+ }
+ }
return ROK;
}
* RFAILED - failure
*
* ****************************************************************/
- uint8_t BuildPdschPrbBundlingType
-(
- struct PDSCH_Config__prb_BundlingType *prbBndlType
- )
+uint8_t BuildPdschPrbBundlingType(PdschConfig *pdschCfg, struct PDSCH_Config__prb_BundlingType *prbBndlType)
{
- prbBndlType->present = PDSCH_Config__prb_BundlingType_PR_staticBundling;
+ if(pdschCfg == NULLP)
+ prbBndlType->present = PDSCH_Config__prb_BundlingType_PR_staticBundling;
+ else
+ prbBndlType->present = pdschCfg->bundlingType;
prbBndlType->choice.staticBundling = NULLP;
DU_ALLOC(prbBndlType->choice.staticBundling, \
* RFAILED - failure
*
* ****************************************************************/
-uint8_t BuildBWPDlDedPdschCfg(struct PDSCH_Config *pdschCfg)
+uint8_t BuildBWPDlDedPdschCfg(PdschConfig *pdschCfgDb, struct PDSCH_Config *pdschCfg)
{
pdschCfg->dataScramblingIdentityPDSCH = NULLP;
pdschCfg->dmrs_DownlinkForPDSCH_MappingTypeA = NULLP;
- DU_ALLOC(pdschCfg->dmrs_DownlinkForPDSCH_MappingTypeA, \
- sizeof(struct PDSCH_Config__dmrs_DownlinkForPDSCH_MappingTypeA));
+ DU_ALLOC(pdschCfg->dmrs_DownlinkForPDSCH_MappingTypeA, sizeof(struct PDSCH_Config__dmrs_DownlinkForPDSCH_MappingTypeA));
if(!pdschCfg->dmrs_DownlinkForPDSCH_MappingTypeA)
{
DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildBWPDlDedPdschCfg");
return RFAILED;
}
- if(BuildDMRSDLPdschMapTypeA(pdschCfg->dmrs_DownlinkForPDSCH_MappingTypeA) != ROK)
+ if(BuildDMRSDLPdschMapTypeA(pdschCfgDb, pdschCfg->dmrs_DownlinkForPDSCH_MappingTypeA) != ROK)
{
return RFAILED;
}
}
#endif
+if(pdschCfgDb == NULLP)
pdschCfg->resourceAllocation = RES_ALLOC_TYPE;
+else
+pdschCfg->resourceAllocation = pdschCfgDb->resourceAllocType;
pdschCfg->pdsch_TimeDomainAllocationList = NULLP;
- DU_ALLOC(pdschCfg->pdsch_TimeDomainAllocationList, \
- sizeof(struct PDSCH_Config__pdsch_TimeDomainAllocationList));
+ DU_ALLOC(pdschCfg->pdsch_TimeDomainAllocationList, sizeof(struct PDSCH_Config__pdsch_TimeDomainAllocationList));
if(!pdschCfg->pdsch_TimeDomainAllocationList)
{
DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildBWPDlDedPdschCfg");
return RFAILED;
}
-
- if(BuildPdschTimeDomAllocList(pdschCfg->pdsch_TimeDomainAllocationList) != ROK)
+ if(BuildPdschTimeDomAllocList(pdschCfgDb, pdschCfg->pdsch_TimeDomainAllocationList) != ROK)
{
return RFAILED;
}
pdschCfg->rateMatchPatternToReleaseList = NULLP;
pdschCfg->rateMatchPatternGroup1 = NULLP;
pdschCfg->rateMatchPatternGroup2 = NULLP;
- pdschCfg->rbg_Size = PDSCH_RBG_SIZE;
+ if(pdschCfgDb == NULLP)
+ pdschCfg->rbg_Size = PDSCH_RBG_SIZE;
+ else
+ pdschCfg->rbg_Size = pdschCfgDb->rbgSize;
pdschCfg->mcs_Table = NULLP;
pdschCfg->maxNrofCodeWordsScheduledByDCI = NULLP;
DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildBWPDlDedPdschCfg");
return RFAILED;
}
- *(pdschCfg->maxNrofCodeWordsScheduledByDCI) = PDSCH_MAX_CODEWORD_SCH_BY_DCI;
+ if(pdschCfgDb == NULLP)
+ *(pdschCfg->maxNrofCodeWordsScheduledByDCI) = PDSCH_MAX_CODEWORD_SCH_BY_DCI;
+ else
+ *(pdschCfg->maxNrofCodeWordsScheduledByDCI) = pdschCfgDb->numCodeWordsSchByDci;
- if(BuildPdschPrbBundlingType(&pdschCfg->prb_BundlingType) != ROK)
+ if(BuildPdschPrbBundlingType(pdschCfgDb, &pdschCfg->prb_BundlingType) != ROK)
{
return RFAILED;
}
* RFAILED - failure
*
* ****************************************************************/
-uint8_t BuildInitialDlBWP(BWP_DownlinkDedicated_t *dlBwp)
+uint8_t BuildInitialDlBWP(InitialDlBwp *initiDlBwp, BWP_DownlinkDedicated_t *dlBwp)
{
+ PdcchConfig *pdcchCfg = NULLP;
+ PdschConfig *pdschCfg = NULLP;
+
+ if(initiDlBwp)
+ {
+ if(initiDlBwp->pdcchPresent)
+ pdcchCfg = &initiDlBwp->pdcchCfg;
+ if(initiDlBwp->pdschPresent)
+ pdschCfg = &initiDlBwp->pdschCfg;
+ }
+
dlBwp->pdcch_Config = NULLP;
DU_ALLOC(dlBwp->pdcch_Config, sizeof(struct BWP_DownlinkDedicated__pdcch_Config));
if(!dlBwp->pdcch_Config)
DU_LOG("\nERROR --> F1AP : Memory Allocation failure in BuildInitialDlBWP");
return RFAILED;
}
- if(BuildBWPDlDedPdcchCfg(dlBwp->pdcch_Config->choice.setup) != ROK)
+ if(BuildBWPDlDedPdcchCfg(pdcchCfg, dlBwp->pdcch_Config->choice.setup) != ROK)
{
return RFAILED;
}
return RFAILED;
}
- if(BuildBWPDlDedPdschCfg(dlBwp->pdsch_Config->choice.setup) != ROK)
+ if(BuildBWPDlDedPdschCfg(pdschCfg, dlBwp->pdsch_Config->choice.setup) != ROK)
{
return RFAILED;
}
* RFAILED - failure
*
* ****************************************************************/
- uint8_t BuildDMRSULPuschMapTypeA
-(
- struct PUSCH_Config__dmrs_UplinkForPUSCH_MappingTypeA *dmrsUlCfg
- )
+uint8_t BuildDMRSULPuschMapTypeA(DmrsUlCfg *ulDmrsCfgDb, struct PUSCH_Config__dmrs_UplinkForPUSCH_MappingTypeA *dmrsUlCfg)
{
dmrsUlCfg->present = PUSCH_Config__dmrs_UplinkForPUSCH_MappingTypeA_PR_setup;
dmrsUlCfg->choice.setup= NULLP;
DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildDMRSULPuschMapTypeA");
return RFAILED;
}
- *(dmrsUlCfg->choice.setup->dmrs_AdditionalPosition) = DMRS_ADDITIONAL_POS;
+ if(ulDmrsCfgDb == NULLP)
+ *(dmrsUlCfg->choice.setup->dmrs_AdditionalPosition) = DMRS_ADDITIONAL_POS;
+ else
+ *(dmrsUlCfg->choice.setup->dmrs_AdditionalPosition) = ulDmrsCfgDb->addPos;
dmrsUlCfg->choice.setup->phaseTrackingRS = NULLP;
dmrsUlCfg->choice.setup->maxLength = NULLP;
dmrsUlCfg->choice.setup->transformPrecodingDisabled = NULLP;
- DU_ALLOC(dmrsUlCfg->choice.setup->transformPrecodingDisabled, \
- sizeof(struct DMRS_UplinkConfig__transformPrecodingDisabled));
+ DU_ALLOC(dmrsUlCfg->choice.setup->transformPrecodingDisabled, sizeof(struct DMRS_UplinkConfig__transformPrecodingDisabled));
if(!dmrsUlCfg->choice.setup->transformPrecodingDisabled)
{
DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildDMRSULPuschMapTypeA");
DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildDMRSULPuschMapTypeA");
return RFAILED;
}
- *(dmrsUlCfg->choice.setup->transformPrecodingDisabled->scramblingID0) = SCRAMBLING_ID;
+ if(ulDmrsCfgDb == NULLP)
+ *(dmrsUlCfg->choice.setup->transformPrecodingDisabled->scramblingID0) = SCRAMBLING_ID;
+ else
+ *(dmrsUlCfg->choice.setup->transformPrecodingDisabled->scramblingID0) = ulDmrsCfgDb->transPrecodDisabled.scramblingId0;
dmrsUlCfg->choice.setup->transformPrecodingDisabled->scramblingID1 = NULLP;
dmrsUlCfg->choice.setup->transformPrecodingEnabled = NULLP;
* RFAILED - failure
*
* ****************************************************************/
- uint8_t BuildPuschTimeDomAllocList
-(
- struct PUSCH_Config__pusch_TimeDomainAllocationList *timeDomAllocList
- )
+uint8_t BuildPuschTimeDomAllocList(PuschCfg *puschCfgDb, struct PUSCH_Config__pusch_TimeDomainAllocationList *timeDomAllocList)
{
uint8_t idx;
uint8_t elementCnt;
timeDomAllocList->present = PUSCH_Config__pusch_TimeDomainAllocationList_PR_setup;
timeDomAllocList->choice.setup = NULLP;
- DU_ALLOC(timeDomAllocList->choice.setup, \
- sizeof(struct PUSCH_TimeDomainResourceAllocationList));
+ DU_ALLOC(timeDomAllocList->choice.setup, sizeof(struct PUSCH_TimeDomainResourceAllocationList));
if(!timeDomAllocList->choice.setup)
{
DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildPuschTimeDomAllocList");
return RFAILED;
}
- elementCnt = 1;
+ if(puschCfgDb == NULLP)
+ elementCnt = 2;
+ else
+ elementCnt = puschCfgDb->numTimeDomRsrcAlloc;
+
timeDomAllocList->choice.setup->list.count = elementCnt;
- timeDomAllocList->choice.setup->list.size = \
- elementCnt * sizeof(PUSCH_TimeDomainResourceAllocation_t *);
+ timeDomAllocList->choice.setup->list.size = elementCnt * sizeof(PUSCH_TimeDomainResourceAllocation_t *);
timeDomAllocList->choice.setup->list.array = NULLP;
- DU_ALLOC(timeDomAllocList->choice.setup->list.array, \
- timeDomAllocList->choice.setup->list.size);
+ DU_ALLOC(timeDomAllocList->choice.setup->list.array, timeDomAllocList->choice.setup->list.size);
if(!timeDomAllocList->choice.setup->list.array)
{
DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildPuschTimeDomAllocList");
for(idx = 0; idx < elementCnt; idx++)
{
timeDomAllocList->choice.setup->list.array[idx] = NULLP;
- DU_ALLOC(timeDomAllocList->choice.setup->list.array[idx],\
- sizeof(PUSCH_TimeDomainResourceAllocation_t));
+ DU_ALLOC(timeDomAllocList->choice.setup->list.array[idx], sizeof(PUSCH_TimeDomainResourceAllocation_t));
if(!timeDomAllocList->choice.setup->list.array[idx])
{
- DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildPuschTimeDomAllocList");
- return RFAILED;
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildPuschTimeDomAllocList");
+ return RFAILED;
}
}
- idx = 0;
- timeDomAlloc = timeDomAllocList->choice.setup->list.array[idx];
- DU_ALLOC(timeDomAlloc->k2, sizeof(long));
- if(!timeDomAlloc->k2)
+ for(idx = 0; idx < elementCnt; idx++)
{
- DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildPuschTimeDomAllocList");
- return RFAILED;
+ timeDomAlloc = timeDomAllocList->choice.setup->list.array[idx];
+ DU_ALLOC(timeDomAlloc->k2, sizeof(long));
+ if(!timeDomAlloc->k2)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildPuschTimeDomAllocList");
+ return RFAILED;
+ }
+ if(puschCfgDb == NULLP)
+ {
+ if(idx == 0)
+ *(timeDomAlloc->k2) = PUSCH_K2_CFG1;
+ else if(idx == 1)
+ *(timeDomAlloc->k2) = PUSCH_K2_CFG2;
+
+ timeDomAlloc->mappingType = PUSCH_MAPPING_TYPE_A;
+ timeDomAlloc->startSymbolAndLength = calcSliv(PUSCH_START_SYMBOL, PUSCH_LENGTH_SYMBOL);
+ }
+ else
+ {
+ *(timeDomAlloc->k2) = puschCfgDb->timeDomRsrcAllocList[idx].k2;
+ timeDomAlloc->mappingType = puschCfgDb->timeDomRsrcAllocList[idx].mappingType;
+ timeDomAlloc->startSymbolAndLength = puschCfgDb->timeDomRsrcAllocList[idx].startSymbolAndLength;
+ }
}
- *(timeDomAlloc->k2) = PUSCH_K2;
- timeDomAlloc->mappingType = PUSCH_MAPPING_TYPE_A;
- timeDomAlloc->startSymbolAndLength = calcSliv(PUSCH_START_SYMBOL, PUSCH_LENGTH_SYMBOL);
+
return ROK;
}
* Functionality:
* Builds BWP UL dedicated PUSCH Config
*
- * @params[in] : PUSCH_Config_t *puschCfg
- *
+ * @params[in] : PUSCH_Config_t *puschCfg
+ *
+ * @return ROK - success
+ * RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t BuildBWPUlDedPuschCfg(PuschCfg *puschCfgDb, PUSCH_Config_t *puschCfg)
+{
+ DmrsUlCfg *ulDmrsCfg = NULLP;
+
+ if(puschCfgDb)
+ ulDmrsCfg = &puschCfgDb->dmrsUlCfgForPuschMapTypeA;
+
+ puschCfg->dataScramblingIdentityPUSCH = NULLP;
+ DU_ALLOC(puschCfg->dataScramblingIdentityPUSCH, sizeof(long));
+ if(!puschCfg->dataScramblingIdentityPUSCH)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildBWPUlDedPuschCfg");
+ return RFAILED;
+ }
+ if(puschCfgDb == NULLP)
+ *(puschCfg->dataScramblingIdentityPUSCH) = SCRAMBLING_ID;
+ else
+ *(puschCfg->dataScramblingIdentityPUSCH) = puschCfgDb->dataScramblingId;
+
+ puschCfg->txConfig = NULLP;
+ puschCfg->dmrs_UplinkForPUSCH_MappingTypeA = NULLP;
+ DU_ALLOC(puschCfg->dmrs_UplinkForPUSCH_MappingTypeA, sizeof(struct PUSCH_Config__dmrs_UplinkForPUSCH_MappingTypeA));
+ if(!puschCfg->dmrs_UplinkForPUSCH_MappingTypeA)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildBWPUlDedPuschCfg");
+ return RFAILED;
+ }
+
+ if(BuildDMRSULPuschMapTypeA(ulDmrsCfg, puschCfg->dmrs_UplinkForPUSCH_MappingTypeA) != ROK)
+ {
+ return RFAILED;
+ }
+
+ puschCfg->dmrs_UplinkForPUSCH_MappingTypeB = NULLP;
+ puschCfg->pusch_PowerControl = NULLP;
+ puschCfg->frequencyHopping = NULLP;
+ puschCfg->frequencyHoppingOffsetLists = NULLP;
+
+ if(puschCfgDb == NULLP)
+ puschCfg->resourceAllocation = RES_ALLOC_TYPE;
+ else
+ puschCfg->resourceAllocation = puschCfgDb->resourceAllocType;
+
+ puschCfg->pusch_TimeDomainAllocationList = NULLP;
+ DU_ALLOC(puschCfg->pusch_TimeDomainAllocationList, sizeof(struct PUSCH_Config__pusch_TimeDomainAllocationList));
+ if(!puschCfg->pusch_TimeDomainAllocationList)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildBWPUlDedPuschCfg");
+ return RFAILED;
+ }
+
+ if(BuildPuschTimeDomAllocList(puschCfgDb, puschCfg->pusch_TimeDomainAllocationList) != ROK)
+ {
+ return RFAILED;
+ }
+
+ puschCfg->pusch_AggregationFactor = NULLP;
+ puschCfg->mcs_Table = NULLP;
+ puschCfg->mcs_TableTransformPrecoder = NULLP;
+ puschCfg->transformPrecoder = NULLP;
+ DU_ALLOC(puschCfg->transformPrecoder, sizeof(long));
+ if(!puschCfg->transformPrecoder)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildBWPUlDedPuschCfg");
+ return RFAILED;
+ }
+ if(puschCfgDb == NULLP)
+ *(puschCfg->transformPrecoder) = PUSCH_TRANSFORM_PRECODER;
+ else
+ *(puschCfg->transformPrecoder) = puschCfgDb->transformPrecoder;
+
+ puschCfg->codebookSubset = NULLP;
+ puschCfg->maxRank = NULLP;
+ puschCfg->rbg_Size = NULLP;
+ puschCfg->uci_OnPUSCH = NULLP;
+ puschCfg->tp_pi2BPSK = NULLP;
+
+ return ROK;
+}
+
+/*******************************************************************
+ *
+ * @brief Builds PUCCH resource set add/modify list
+ *
+ * @details
+ *
+ * Function : BuildPucchRsrcSetAddModList
+ *
+ * Functionality:
+ * Builds PUCCH resource set add/modify list
+ *
+ * @params[in] : PucchResrcSetCfg *rsrcSetCfgDb
+ * struct PUCCH_Config__resourceSetToAddModList *rsrcSetAddModList
+ *
+ * @return ROK - success
+ * RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t BuildPucchRsrcSetAddModList(PucchResrcSetCfg *rsrcSetCfgDb, \
+ struct PUCCH_Config__resourceSetToAddModList *resourceSetToAddModList)
+{
+ uint8_t elementCnt = 0, rsrcSetIdx = 0, rsrcIdx = 0;
+ PUCCH_ResourceSet_t *rsrcSet = NULLP;
+
+ if(rsrcSetCfgDb == NULLP)
+ elementCnt = 1;
+ else
+ elementCnt = rsrcSetCfgDb->resrcSetToAddModListCount;
+
+ resourceSetToAddModList->list.count = elementCnt;
+ resourceSetToAddModList->list.size = elementCnt * sizeof(PUCCH_ResourceSet_t *);
+ DU_ALLOC(resourceSetToAddModList->list.array, resourceSetToAddModList->list.size);
+ if(resourceSetToAddModList->list.array == NULLP)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildPucchRsrcSetAddModList");
+ return RFAILED;
+ }
+ for(rsrcSetIdx=0; rsrcSetIdx < resourceSetToAddModList->list.count; rsrcSetIdx++)
+ {
+ DU_ALLOC(resourceSetToAddModList->list.array[rsrcSetIdx], sizeof(PUCCH_ResourceSet_t));
+ if(resourceSetToAddModList->list.array[rsrcSetIdx] == NULLP)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildPucchRsrcSetAddModList");
+ return RFAILED;
+ }
+ }
+
+ for(rsrcSetIdx=0; rsrcSetIdx < resourceSetToAddModList->list.count; rsrcSetIdx++)
+ {
+ rsrcSet = resourceSetToAddModList->list.array[rsrcSetIdx];
+
+ /* Resource set Id */
+ if(rsrcSetCfgDb == NULLP)
+ rsrcSet->pucch_ResourceSetId = 1;
+ else
+ rsrcSet->pucch_ResourceSetId = rsrcSetCfgDb->resrcSetToAddModList[rsrcSetIdx].resrcSetId;
+
+ /* Resource list of a resource set */
+ if(rsrcSetCfgDb == NULLP)
+ elementCnt = 1;
+ else
+ elementCnt = rsrcSetCfgDb->resrcSetToAddModList[rsrcSetIdx].resrcListCount;
+ rsrcSet->resourceList.list.count = elementCnt;
+ rsrcSet->resourceList.list.size = elementCnt * sizeof(PUCCH_ResourceId_t *);
+ DU_ALLOC(rsrcSet->resourceList.list.array, rsrcSet->resourceList.list.size);
+ if(rsrcSet->resourceList.list.array == NULLP)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildPucchRsrcSetAddModList");
+ return RFAILED;
+ }
+
+ for(rsrcIdx=0; rsrcIdx < rsrcSet->resourceList.list.count; rsrcIdx++)
+ {
+ DU_ALLOC(rsrcSet->resourceList.list.array[rsrcIdx], sizeof(PUCCH_ResourceId_t));
+ if(rsrcSet->resourceList.list.array[rsrcIdx] == NULLP)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildPucchRsrcSetAddModList");
+ return RFAILED;
+ }
+ }
+ for(rsrcIdx=0; rsrcIdx < rsrcSet->resourceList.list.count; rsrcIdx++)
+ {
+ if(rsrcSetCfgDb == NULLP)
+ *(rsrcSet->resourceList.list.array[rsrcIdx]) = 1;
+ else
+ *(rsrcSet->resourceList.list.array[rsrcIdx]) = rsrcSetCfgDb->resrcSetToAddModList[rsrcSetIdx].resrcList[rsrcIdx];
+ }
+
+ /* Max payload size (minus 1) in a Resource set */
+ rsrcSet->maxPayloadMinus1 = NULLP;
+ if(rsrcSetCfgDb && rsrcSetCfgDb->resrcSetToAddModList[rsrcSetIdx].maxPayLoadSize)
+ {
+ DU_ALLOC(rsrcSet->maxPayloadMinus1, sizeof(long));
+ if(rsrcSet->maxPayloadMinus1 == NULLP)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildPucchRsrcSetAddModList");
+ return RFAILED;
+ }
+ *(rsrcSet->maxPayloadMinus1) = rsrcSetCfgDb->resrcSetToAddModList[rsrcSetIdx].maxPayLoadSize;
+ }
+ }
+ return ROK;
+}
+
+/*******************************************************************
+ *
+ * @brief Builds PUCCH resource add/modify list
+ *
+ * @details
+ *
+ * Function : BuildPucchRsrcAdddModList
+ *
+ * Functionality:
+ * Builds PUCCH resource add/modify list
+ *
+ * @params[in] : PucchResrcCfg *rsrcSetCfgDb
+ * struct PUCCH_Config__resourceSetToAddModList *rsrcSetAddModList
+ *
+ * @return ROK - success
+ * RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t BuildPucchRsrcAddModList(PucchResrcCfg *rsrcCfgDb, struct PUCCH_Config__resourceToAddModList *resourceToAddModList)
+{
+ uint8_t elementCnt = 0, rsrcIdx = 0;
+ PUCCH_Resource_t *rsrc = NULLP;
+
+ if(rsrcCfgDb == NULLP)
+ elementCnt = 1;
+ else
+ elementCnt = rsrcCfgDb->resrcToAddModListCount;
+ resourceToAddModList->list.count = elementCnt;
+ resourceToAddModList->list.size = elementCnt * sizeof(PUCCH_Resource_t *);
+ DU_ALLOC(resourceToAddModList->list.array, resourceToAddModList->list.size);
+ if(resourceToAddModList->list.array == NULLP)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildPucchRsrcAddModList");
+ return RFAILED;
+ }
+ for(rsrcIdx=0; rsrcIdx < resourceToAddModList->list.count; rsrcIdx++)
+ {
+ DU_ALLOC(resourceToAddModList->list.array[rsrcIdx], sizeof(PUCCH_Resource_t));
+ if(resourceToAddModList->list.array[rsrcIdx] == NULLP)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildPucchRsrcAddModList");
+ return RFAILED;
+ }
+ }
+
+ for(rsrcIdx=0; rsrcIdx < resourceToAddModList->list.count; rsrcIdx++)
+ {
+ rsrc = resourceToAddModList->list.array[rsrcIdx];
+
+ if(rsrcCfgDb == NULLP)
+ {
+ rsrc->pucch_ResourceId = 1;
+ rsrc->startingPRB = 0;
+ rsrc->format.present = PUCCH_Resource__format_PR_format1;
+ DU_ALLOC(rsrc->format.choice.format1, sizeof(PUCCH_format1_t));
+ if(rsrc->format.choice.format1 == NULLP)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildPucchRsrcAddModList");
+ return RFAILED;
+ }
+ rsrc->format.choice.format1->initialCyclicShift = 0;
+ rsrc->format.choice.format1->nrofSymbols = 4;
+ rsrc->format.choice.format1->startingSymbolIndex = 0;
+ rsrc->format.choice.format1->timeDomainOCC = 0;
+ }
+ else
+ {
+ rsrc->pucch_ResourceId = rsrcCfgDb->resrcToAddModList[rsrcIdx].resrcId;
+ rsrc->startingPRB = rsrcCfgDb->resrcToAddModList[rsrcIdx].startPrb;
+ if(rsrcCfgDb->resrcToAddModList[rsrcIdx].intraFreqHop)
+ {
+ DU_ALLOC(rsrc->intraSlotFrequencyHopping, sizeof(long));
+ if(rsrc->intraSlotFrequencyHopping == NULLP)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildPucchRsrcAddModList");
+ return RFAILED;
+ }
+ *(rsrc->intraSlotFrequencyHopping) = rsrcCfgDb->resrcToAddModList[rsrcIdx].intraFreqHop;
+ }
+ else
+ rsrc->intraSlotFrequencyHopping = NULLP;
+
+ if(rsrcCfgDb->resrcToAddModList[rsrcIdx].secondPrbHop)
+ {
+ DU_ALLOC(rsrc->secondHopPRB, sizeof(PRB_Id_t));
+ if(rsrc->secondHopPRB == NULLP)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildPucchRsrcAddModList");
+ return RFAILED;
+ }
+ *(rsrc->secondHopPRB) = rsrcCfgDb->resrcToAddModList[rsrcIdx].secondPrbHop;
+ }
+ else
+ rsrc->secondHopPRB = NULLP;
+ rsrc->format.present = covertPucchFormatIntEnumToRrcEnum(rsrcCfgDb->resrcToAddModList[rsrcIdx].pucchFormat);
+
+ switch(rsrc->format.present)
+ {
+ case PUCCH_Resource__format_PR_NOTHING:
+ break;
+ case PUCCH_Resource__format_PR_format0:
+ {
+ DU_ALLOC(rsrc->format.choice.format0, sizeof(PUCCH_format0_t));
+ if(rsrc->format.choice.format0 == NULLP)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildPucchRsrcAddModList");
+ return RFAILED;
+ }
+ rsrc->format.choice.format0->initialCyclicShift = rsrcCfgDb->resrcToAddModList[rsrcIdx].PucchFormat.format0->initialCyclicShift;
+ rsrc->format.choice.format0->nrofSymbols = rsrcCfgDb->resrcToAddModList[rsrcIdx].PucchFormat.format0->numSymbols;
+ rsrc->format.choice.format0->startingSymbolIndex = rsrcCfgDb->resrcToAddModList[rsrcIdx].PucchFormat.format0->startSymbolIdx;
+ break;
+ }
+
+ case PUCCH_Resource__format_PR_format1:
+ {
+ DU_ALLOC(rsrc->format.choice.format1, sizeof(PUCCH_format1_t));
+ if(rsrc->format.choice.format1 == NULLP)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildPucchRsrcAddModList");
+ return RFAILED;
+ }
+ rsrc->format.choice.format1->initialCyclicShift = rsrcCfgDb->resrcToAddModList[rsrcIdx].PucchFormat.format1->initialCyclicShift;
+ rsrc->format.choice.format1->nrofSymbols = rsrcCfgDb->resrcToAddModList[rsrcIdx].PucchFormat.format1->numSymbols;
+ rsrc->format.choice.format1->startingSymbolIndex = rsrcCfgDb->resrcToAddModList[rsrcIdx].PucchFormat.format1->startSymbolIdx;
+ rsrc->format.choice.format1->timeDomainOCC = rsrcCfgDb->resrcToAddModList[rsrcIdx].PucchFormat.format1->timeDomOCC;
+ break;
+ }
+
+ case PUCCH_Resource__format_PR_format2:
+ {
+ DU_ALLOC(rsrc->format.choice.format2, sizeof(PUCCH_format2_t));
+ if(rsrc->format.choice.format2 == NULLP)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildPucchRsrcAddModList");
+ return RFAILED;
+ }
+ rsrc->format.choice.format2->nrofPRBs = rsrcCfgDb->resrcToAddModList[rsrcIdx].PucchFormat.format2->numPrbs;
+ rsrc->format.choice.format2->nrofSymbols = rsrcCfgDb->resrcToAddModList[rsrcIdx].PucchFormat.format2->numSymbols;
+ rsrc->format.choice.format2->startingSymbolIndex = rsrcCfgDb->resrcToAddModList[rsrcIdx].PucchFormat.format2->startSymbolIdx;
+ break;
+ }
+
+ case PUCCH_Resource__format_PR_format3:
+ {
+ DU_ALLOC(rsrc->format.choice.format3, sizeof(PUCCH_format3_t));
+ if(rsrc->format.choice.format3 == NULLP)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildPucchRsrcAddModList");
+ return RFAILED;
+ }
+ rsrc->format.choice.format3->nrofPRBs = rsrcCfgDb->resrcToAddModList[rsrcIdx].PucchFormat.format3->numPrbs;
+ rsrc->format.choice.format3->nrofSymbols = rsrcCfgDb->resrcToAddModList[rsrcIdx].PucchFormat.format3->numSymbols;
+ rsrc->format.choice.format3->startingSymbolIndex = rsrcCfgDb->resrcToAddModList[rsrcIdx].PucchFormat.format3->startSymbolIdx;
+ break;
+ }
+
+ case PUCCH_Resource__format_PR_format4:
+ {
+ DU_ALLOC(rsrc->format.choice.format4, sizeof(PUCCH_format4_t));
+ if(rsrc->format.choice.format4 == NULLP)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildPucchRsrcAddModList");
+ return RFAILED;
+ }
+ rsrc->format.choice.format4->nrofSymbols = rsrcCfgDb->resrcToAddModList[rsrcIdx].PucchFormat.format4->numSymbols;
+ rsrc->format.choice.format4->occ_Length = rsrcCfgDb->resrcToAddModList[rsrcIdx].PucchFormat.format4->occLen;
+ rsrc->format.choice.format4->occ_Index = rsrcCfgDb->resrcToAddModList[rsrcIdx].PucchFormat.format4->occIdx;
+ rsrc->format.choice.format4->startingSymbolIndex = rsrcCfgDb->resrcToAddModList[rsrcIdx].PucchFormat.format4->startSymbolIdx;
+ break;
+ }
+ }
+ }
+ }
+ return ROK;
+}
+
+/*******************************************************************
+ *
+ * @brief Builds PUCCH format config
+ *
+ * @details
+ *
+ * Function : BuildPucchFormat
+ *
+ * Functionality: Builds PUCCH format config
+ *
+ * @params[in] : PucchFormatCfg *formatDb
+ * PUCCH_FormatConfig_t *format
+ *
+ * @return ROK - success
+ * RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t BuildPucchFormat(PucchFormatCfg *formatDb, PUCCH_FormatConfig_t *format)
+{
+ /* Inter Slot Fequency hopping */
+ format->interslotFrequencyHopping = NULLP;
+ if((formatDb != NULLP) && (formatDb->interSlotFreqHop == true))
+ {
+ DU_ALLOC(format->interslotFrequencyHopping, sizeof(long));
+ if(format->interslotFrequencyHopping)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildPucchFormat");
+ return RFAILED;
+ }
+ *(format->interslotFrequencyHopping) = PUCCH_FormatConfig__interslotFrequencyHopping_enabled;
+ }
+
+ /* Additional DMRS */
+ format->additionalDMRS = NULLP;
+ if((formatDb != NULLP) && (formatDb->addDmrs == true))
+ {
+ DU_ALLOC(format->additionalDMRS, sizeof(long));
+ if(format->additionalDMRS)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildPucchFormat");
+ return RFAILED;
+ }
+ *(format->additionalDMRS) = PUCCH_FormatConfig__additionalDMRS_true;
+ }
+
+ /* Maximum code rate */
+ format->maxCodeRate = NULLP;
+ if((formatDb != NULLP) && (formatDb->maxCodeRate != 0))
+ {
+ DU_ALLOC(format->maxCodeRate, sizeof(long));
+ if(format->maxCodeRate)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildPucchFormat");
+ return RFAILED;
+ }
+ *(format->maxCodeRate) = formatDb->maxCodeRate;
+ }
+
+ /* Number of slots */
+ format->nrofSlots = NULLP;
+ if((formatDb == NULLP) || ((formatDb != NULLP) && (formatDb->numSlots != 0)))
+ {
+ DU_ALLOC(format->nrofSlots, sizeof(long));
+ if(format->nrofSlots == NULLP)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildPucchFormat");
+ return RFAILED;
+ }
+ if(formatDb == NULLP)
+ *(format->nrofSlots) = PUCCH_FormatConfig__nrofSlots_n4;
+ else
+ *(format->nrofSlots) = formatDb->numSlots;
+ }
+
+ /* Pi2BPSK*/
+ format->pi2BPSK = NULLP;
+ if((formatDb != NULLP) && (formatDb->pi2BPSK == true))
+ {
+ DU_ALLOC(format->pi2BPSK, sizeof(long));
+ if(format->pi2BPSK)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildPucchFormat");
+ return RFAILED;
+ }
+ *(format->pi2BPSK) = PUCCH_FormatConfig__pi2BPSK_enabled;
+ }
+
+ /* Simultaneous HARQ ACK and CSI */
+ format->simultaneousHARQ_ACK_CSI = NULLP;
+ if((formatDb != NULLP) && (formatDb->harqAckCSI == true))
+ {
+ DU_ALLOC(format->simultaneousHARQ_ACK_CSI, sizeof(long));
+ if(format->simultaneousHARQ_ACK_CSI)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildPucchFormat");
+ return RFAILED;
+ }
+ *(format->simultaneousHARQ_ACK_CSI) = PUCCH_FormatConfig__simultaneousHARQ_ACK_CSI_true;
+ }
+
+ return ROK;
+}
+
+
+/*******************************************************************
+ *
+ * @brief Builds PUCCH scheduling request list
+ *
+ * @details
+ *
+ * Function : BuildPucchSchReqAddModList
+ *
+ * Functionality:
+ * Builds PUCCH scheduling request list
+ *
+ * @params[in] : PucchSchedReqCfg *schReqDb
+ * struct PUCCH_Config__schedulingRequestResourceToAddModList *schReqRsrcToAddModList
+ *
+ * @return ROK - success
+ * RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t BuildPucchSchReqAddModList(PucchSchedReqCfg *schReqDb, \
+ struct PUCCH_Config__schedulingRequestResourceToAddModList *schReqRsrcToAddModList)
+{
+ uint8_t elementCnt = 0, schReqIdx = 0;
+ SchedulingRequestResourceConfig_t *schReqRsrc;
+
+ elementCnt = schReqDb->schedAddModListCount;
+ schReqRsrcToAddModList->list.count = elementCnt;
+ schReqRsrcToAddModList->list.size = elementCnt *sizeof(struct SchedulingRequestResourceConfig *);
+
+ schReqRsrcToAddModList->list.array = NULLP;
+ DU_ALLOC(schReqRsrcToAddModList->list.array, schReqRsrcToAddModList->list.size);
+ if(schReqRsrcToAddModList->list.array == NULLP)
+ {
+ DU_LOG("\nERROR --> DU APP: Memory allocation failed in BuildPucchSchReqAddModList");
+ return RFAILED;
+ }
+
+ for(schReqIdx = 0; schReqIdx < schReqRsrcToAddModList->list.count; schReqIdx++)
+ {
+ DU_ALLOC(schReqRsrcToAddModList->list.array[schReqIdx], schReqRsrcToAddModList->list.size);
+ if(schReqRsrcToAddModList->list.array[schReqIdx] == NULLP)
+ {
+ DU_LOG("\nERROR --> DU APP: Memory allocation failed in BuildPucchSchReqAddModList");
+ return RFAILED;
+ }
+ }
+
+ for(schReqIdx = 0; schReqIdx < schReqRsrcToAddModList->list.count; schReqIdx++)
+ {
+ schReqRsrc = schReqRsrcToAddModList->list.array[schReqIdx];
+ schReqRsrc->schedulingRequestResourceId = schReqDb->schedAddModList[schReqIdx].resrcId;
+ schReqRsrc->schedulingRequestID = schReqDb->schedAddModList[schReqIdx].requestId;
+
+ if(schReqDb->schedAddModList[schReqIdx].periodicity)
+ {
+ schReqRsrc->periodicityAndOffset = NULLP;
+ DU_ALLOC(schReqRsrc->periodicityAndOffset, sizeof(struct SchedulingRequestResourceConfig__periodicityAndOffset));
+ if(schReqRsrc->periodicityAndOffset == NULLP)
+ {
+ DU_LOG("\nERROR --> DU APP: Memory allocation failed in BuildPucchSchReqAddModList");
+ return RFAILED;
+ }
+
+ schReqRsrc->periodicityAndOffset->present = schReqDb->schedAddModList[schReqIdx].periodicity;
+ switch(schReqRsrc->periodicityAndOffset->present)
+ {
+ case SchedulingRequestResourceConfig__periodicityAndOffset_PR_NOTHING:
+ break;
+ case SchedulingRequestResourceConfig__periodicityAndOffset_PR_sym2:
+ schReqRsrc->periodicityAndOffset->choice.sym2 = schReqDb->schedAddModList[schReqIdx].offset;
+ break;
+ case SchedulingRequestResourceConfig__periodicityAndOffset_PR_sym6or7:
+ schReqRsrc->periodicityAndOffset->choice.sym6or7 = schReqDb->schedAddModList[schReqIdx].offset;
+ break;
+ case SchedulingRequestResourceConfig__periodicityAndOffset_PR_sl1:
+ schReqRsrc->periodicityAndOffset->choice.sl1 = schReqDb->schedAddModList[schReqIdx].offset;
+ break;
+ case SchedulingRequestResourceConfig__periodicityAndOffset_PR_sl2:
+ schReqRsrc->periodicityAndOffset->choice.sl2 = schReqDb->schedAddModList[schReqIdx].offset;
+ break;
+ case SchedulingRequestResourceConfig__periodicityAndOffset_PR_sl4:
+ schReqRsrc->periodicityAndOffset->choice.sl4 = schReqDb->schedAddModList[schReqIdx].offset;
+ break;
+ case SchedulingRequestResourceConfig__periodicityAndOffset_PR_sl5:
+ schReqRsrc->periodicityAndOffset->choice.sl5 = schReqDb->schedAddModList[schReqIdx].offset;
+ break;
+ case SchedulingRequestResourceConfig__periodicityAndOffset_PR_sl8:
+ schReqRsrc->periodicityAndOffset->choice.sl8 = schReqDb->schedAddModList[schReqIdx].offset;
+ break;
+ case SchedulingRequestResourceConfig__periodicityAndOffset_PR_sl10:
+ schReqRsrc->periodicityAndOffset->choice.sl10 = schReqDb->schedAddModList[schReqIdx].offset;
+ break;
+ case SchedulingRequestResourceConfig__periodicityAndOffset_PR_sl16:
+ schReqRsrc->periodicityAndOffset->choice.sl16 = schReqDb->schedAddModList[schReqIdx].offset;
+ break;
+ case SchedulingRequestResourceConfig__periodicityAndOffset_PR_sl20:
+ schReqRsrc->periodicityAndOffset->choice.sl20 = schReqDb->schedAddModList[schReqIdx].offset;
+ break;
+ case SchedulingRequestResourceConfig__periodicityAndOffset_PR_sl40:
+ schReqRsrc->periodicityAndOffset->choice.sl40 = schReqDb->schedAddModList[schReqIdx].offset;
+ break;
+ case SchedulingRequestResourceConfig__periodicityAndOffset_PR_sl80:
+ schReqRsrc->periodicityAndOffset->choice.sl80 = schReqDb->schedAddModList[schReqIdx].offset;
+ break;
+ case SchedulingRequestResourceConfig__periodicityAndOffset_PR_sl160:
+ schReqRsrc->periodicityAndOffset->choice.sl160 = schReqDb->schedAddModList[schReqIdx].offset;
+ break;
+ case SchedulingRequestResourceConfig__periodicityAndOffset_PR_sl320:
+ schReqRsrc->periodicityAndOffset->choice.sl320 = schReqDb->schedAddModList[schReqIdx].offset;
+ break;
+ case SchedulingRequestResourceConfig__periodicityAndOffset_PR_sl640:
+ schReqRsrc->periodicityAndOffset->choice.sl640 = schReqDb->schedAddModList[schReqIdx].offset;
+ break;
+ }
+ }
+
+ if(schReqDb->schedAddModList[schReqIdx].resrc)
+ {
+ schReqRsrc->resource = NULLP;
+ DU_ALLOC(schReqRsrc->resource, sizeof(PUCCH_ResourceId_t));
+ if(schReqRsrc->resource == NULLP)
+ {
+ DU_LOG("\nERROR --> DU APP: Memory allocation failed in BuildPucchSchReqAddModList");
+ return RFAILED;
+ }
+ *(schReqRsrc->resource) = schReqDb->schedAddModList[schReqIdx].resrc;
+
+ }
+ }
+ return ROK;
+}
+
+/*******************************************************************
+ *
+ * @brief Builds PUCCH multi csi resource list
+ *
+ * @details
+ *
+ * Function : BuildPucchMultiCsiRsrcList
+ *
+ * Functionality:
+ * Builds PUCCH multi csi resource list
+ *
+ * @params[in] : PucchMultiCsiCfg *multiCsiDb
+ * struct PUCCH_Config__multi_CSI_PUCCH_ResourceList *multiCsiRsrcList
+ *
+ * @return ROK - success
+ * RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t BuildPucchMultiCsiRsrcList(PucchMultiCsiCfg *multiCsiDb, struct PUCCH_Config__multi_CSI_PUCCH_ResourceList *multiCsiRsrcList)
+{
+ uint8_t elementCnt = 0, rsrcIdx = 0;
+
+ elementCnt = multiCsiDb->multiCsiResrcListCount;
+ multiCsiRsrcList->list.count = elementCnt;
+ multiCsiRsrcList->list.size = elementCnt * sizeof(PUCCH_ResourceId_t *);
+ multiCsiRsrcList->list.array = NULLP;
+ DU_ALLOC(multiCsiRsrcList->list.array, multiCsiRsrcList->list.size);
+ if(multiCsiRsrcList->list.array == NULLP)
+ {
+ DU_LOG("\nERROR --> DU APP: Memory allocation failed in BuildPucchMultiCsiRsrcList");
+ return RFAILED;
+ }
+
+ for(rsrcIdx = 0; rsrcIdx<multiCsiRsrcList->list.count; rsrcIdx++)
+ {
+ DU_ALLOC(multiCsiRsrcList->list.array[rsrcIdx], sizeof(PUCCH_ResourceId_t));
+ if(multiCsiRsrcList->list.array[rsrcIdx] == NULLP)
+ {
+ DU_LOG("\nERROR --> DU APP: Memory allocation failed in BuildPucchMultiCsiRsrcList");
+ return RFAILED;
+ }
+ }
+
+ for(rsrcIdx = 0; rsrcIdx<multiCsiRsrcList->list.count; rsrcIdx++)
+ {
+ *(multiCsiRsrcList->list.array[rsrcIdx]) = multiCsiDb->multiCsiResrcList[rsrcIdx];
+ }
+ return ROK;
+}
+
+/*******************************************************************
+ *
+ * @brief Builds DL data -to- Ul Ack list
+ *
+ * @details
+ *
+ * Function : BuildDlDataToUlAckList
+ *
+ * Functionality: Builds DL data -to- Ul Ack list
+ *
+ * @params[in] : PucchDlDataToUlAck *dlDataToUlAckDb
+ * struct PUCCH_Config__dl_DataToUL_ACK * dlDataToUlACKList
+ *
+ * @return ROK - success
+ * RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t BuildDlDataToUlAckList(PucchDlDataToUlAck *dlDataToUlAckDb, struct PUCCH_Config__dl_DataToUL_ACK * dlDataToUlACKList)
+{
+ uint8_t elementCnt = 0, arrIdx = 0;
+
+ if(dlDataToUlAckDb == NULLP)
+ elementCnt = 2;
+ else
+ elementCnt = dlDataToUlAckDb->dlDataToUlAckListCount;
+
+ dlDataToUlACKList->list.count = elementCnt;
+ dlDataToUlACKList->list.size = elementCnt * sizeof(long *);
+ DU_ALLOC(dlDataToUlACKList->list.array, dlDataToUlACKList->list.size);
+ if(dlDataToUlACKList->list.array == NULLP)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildDlDataToUlAckList");
+ return RFAILED;
+ }
+
+ for(arrIdx = 0; arrIdx < dlDataToUlACKList->list.count; arrIdx++)
+ {
+ DU_ALLOC(dlDataToUlACKList->list.array[arrIdx], sizeof(long));
+ if(dlDataToUlACKList->list.array[arrIdx] == NULLP)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildDlDataToUlAckList");
+ return RFAILED;
+ }
+ }
+
+ if(dlDataToUlAckDb == NULLP)
+ {
+ arrIdx = 0;
+ *(dlDataToUlACKList->list.array[arrIdx++]) = 1;
+ *(dlDataToUlACKList->list.array[arrIdx]) = 2;
+ }
+ else
+ {
+ for(arrIdx = 0; arrIdx < dlDataToUlACKList->list.count; arrIdx++)
+ {
+ *(dlDataToUlACKList->list.array[arrIdx]) = dlDataToUlAckDb->dlDataToUlAckList[arrIdx];
+ }
+ }
+ return ROK;
+}
+
+/*******************************************************************
+ *
+ * @brief Builds BWP UL dedicated PUCCH Config
+ *
+ * @details
+ *
+ * Function : BuildBWPUlDedPucchCfg
+ *
+ * Functionality:
+ * Builds BWP UL dedicated PUCCH Config
+ *
+ * @params[in] : PUCCH_Config_t *pucchCfg
+ *
* @return ROK - success
* RFAILED - failure
*
* ****************************************************************/
-uint8_t BuildBWPUlDedPuschCfg(PUSCH_Config_t *puschCfg)
+uint8_t BuildBWPUlDedPucchCfg(PucchCfg *pucchCfgDb, PUCCH_Config_t *pucchCfg)
{
- puschCfg->dataScramblingIdentityPUSCH = NULLP;
- DU_ALLOC(puschCfg->dataScramblingIdentityPUSCH, sizeof(long));
- if(!puschCfg->dataScramblingIdentityPUSCH)
+ PucchResrcSetCfg *rsrcSetCfgDb = NULLP;
+ PucchResrcCfg *rsrcCfgDb = NULLP;
+ PucchFormatCfg *format1Db = NULLP;
+ PucchFormatCfg *format2Db = NULLP;
+ PucchFormatCfg *format3Db = NULLP;
+ PucchFormatCfg *format4Db = NULLP;
+ PucchSchedReqCfg *schReqDb = NULLP;
+ PucchMultiCsiCfg *multiCsiDb = NULLP;
+ PucchDlDataToUlAck *dlDataToUlAckDb = NULLP;
+
+ if(pucchCfgDb)
{
- DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildBWPUlDedPuschCfg");
+ rsrcSetCfgDb = pucchCfgDb->resrcSet;
+ rsrcCfgDb = pucchCfgDb->resrc;
+ format1Db = pucchCfgDb->format1;
+ format2Db = pucchCfgDb->format2;
+ format3Db = pucchCfgDb->format3;
+ format4Db = pucchCfgDb->format4;
+ schReqDb = pucchCfgDb->schedReq;
+ multiCsiDb = pucchCfgDb->multiCsiCfg;
+ dlDataToUlAckDb = pucchCfgDb->dlDataToUlAck;
+ }
+
+ /* RESOURCE SET */
+ DU_ALLOC(pucchCfg->resourceSetToAddModList, sizeof(struct PUCCH_Config__resourceSetToAddModList));
+ if(pucchCfg->resourceSetToAddModList == NULL)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildBWPUlDedPucchCfg");
return RFAILED;
}
- *(puschCfg->dataScramblingIdentityPUSCH) = SCRAMBLING_ID;
- puschCfg->txConfig = NULLP;
- puschCfg->dmrs_UplinkForPUSCH_MappingTypeA = NULLP;
- DU_ALLOC(puschCfg->dmrs_UplinkForPUSCH_MappingTypeA, \
- sizeof(struct PUSCH_Config__dmrs_UplinkForPUSCH_MappingTypeA));
- if(!puschCfg->dmrs_UplinkForPUSCH_MappingTypeA)
+ if(BuildPucchRsrcSetAddModList(rsrcSetCfgDb, pucchCfg->resourceSetToAddModList) != ROK)
{
- DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildBWPUlDedPuschCfg");
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildBWPUlDedPucchCfg");
return RFAILED;
}
- if(BuildDMRSULPuschMapTypeA(puschCfg->dmrs_UplinkForPUSCH_MappingTypeA) != ROK)
+ /* PUCCH RESOURCE */
+ DU_ALLOC(pucchCfg->resourceToAddModList, sizeof(struct PUCCH_Config__resourceToAddModList));
+ if(pucchCfg->resourceToAddModList == NULLP)
{
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildBWPUlDedPucchCfg");
return RFAILED;
}
- puschCfg->dmrs_UplinkForPUSCH_MappingTypeB = NULLP;
- puschCfg->pusch_PowerControl = NULLP;
- puschCfg->frequencyHopping = NULLP;
- puschCfg->frequencyHoppingOffsetLists = NULLP;
- puschCfg->resourceAllocation = RES_ALLOC_TYPE;
+ if(BuildPucchRsrcAddModList(rsrcCfgDb, pucchCfg->resourceToAddModList) != ROK)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildBWPUlDedPucchCfg");
+ return RFAILED;
+ }
- puschCfg->pusch_TimeDomainAllocationList = NULLP;
- DU_ALLOC(puschCfg->pusch_TimeDomainAllocationList, \
- sizeof(struct PUSCH_Config__pusch_TimeDomainAllocationList));
- if(!puschCfg->pusch_TimeDomainAllocationList)
+ /* PUCCH Format 1 */
+ DU_ALLOC(pucchCfg->format1, sizeof(struct PUCCH_Config__format1));
+ if(pucchCfg->format1 == NULLP)
{
- DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildBWPUlDedPuschCfg");
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildBWPUlDedPucchCfg");
+ return RFAILED;
+ }
+
+ pucchCfg->format1->present = PUCCH_Config__format1_PR_setup;
+ DU_ALLOC(pucchCfg->format1->choice.setup, sizeof(PUCCH_FormatConfig_t));
+ if(pucchCfg->format1->choice.setup == NULLP)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildBWPUlDedPucchCfg");
return RFAILED;
}
- if(BuildPuschTimeDomAllocList(puschCfg->pusch_TimeDomainAllocationList) != ROK)
+ if(BuildPucchFormat(format1Db, pucchCfg->format1->choice.setup) != ROK)
{
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildBWPUlDedPucchCfg");
return RFAILED;
}
- puschCfg->pusch_AggregationFactor = NULLP;
- puschCfg->mcs_Table = NULLP;
- puschCfg->mcs_TableTransformPrecoder = NULLP;
- puschCfg->transformPrecoder = NULLP;
- DU_ALLOC(puschCfg->transformPrecoder, sizeof(long));
- if(!puschCfg->transformPrecoder)
+ /* PUCCH Format 2 */
+ if(format2Db)
{
- DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildBWPUlDedPuschCfg");
+ DU_ALLOC(pucchCfg->format2, sizeof(struct PUCCH_Config__format2));
+ if(pucchCfg->format2 == NULLP)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildBWPUlDedPucchCfg");
+ return RFAILED;
+ }
+
+ pucchCfg->format2->present = PUCCH_Config__format2_PR_setup;
+ DU_ALLOC(pucchCfg->format2->choice.setup, sizeof(PUCCH_FormatConfig_t));
+ if(pucchCfg->format2->choice.setup == NULLP)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildBWPUlDedPucchCfg");
+ return RFAILED;
+ }
+
+ if(BuildPucchFormat(format2Db, pucchCfg->format2->choice.setup) != ROK)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildBWPUlDedPucchCfg");
+ return RFAILED;
+ }
+ }
+
+ /* PUCCH Format 3 */
+ if(format3Db)
+ {
+ DU_ALLOC(pucchCfg->format3, sizeof(struct PUCCH_Config__format3));
+ if(pucchCfg->format3 == NULLP)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildBWPUlDedPucchCfg");
+ return RFAILED;
+ }
+
+ pucchCfg->format3->present = PUCCH_Config__format3_PR_setup;
+ DU_ALLOC(pucchCfg->format3->choice.setup, sizeof(PUCCH_FormatConfig_t));
+ if(pucchCfg->format3->choice.setup == NULLP)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildBWPUlDedPucchCfg");
+ return RFAILED;
+ }
+
+ if(BuildPucchFormat(format3Db, pucchCfg->format3->choice.setup) != ROK)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildBWPUlDedPucchCfg");
+ return RFAILED;
+ }
+ }
+
+ /* PUCCH Format 4 */
+ if(format4Db)
+ {
+ DU_ALLOC(pucchCfg->format4, sizeof(struct PUCCH_Config__format4));
+ if(pucchCfg->format4 == NULLP)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildBWPUlDedPucchCfg");
+ return RFAILED;
+ }
+
+ pucchCfg->format4->present = PUCCH_Config__format4_PR_setup;
+ DU_ALLOC(pucchCfg->format4->choice.setup, sizeof(PUCCH_FormatConfig_t));
+ if(pucchCfg->format4->choice.setup == NULLP)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildBWPUlDedPucchCfg");
+ return RFAILED;
+ }
+
+ if(BuildPucchFormat(format4Db, pucchCfg->format4->choice.setup) != ROK)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildBWPUlDedPucchCfg");
+ return RFAILED;
+ }
+ }
+
+ /* Scheduling Request */
+ if(schReqDb && (schReqDb->schedAddModListCount != 0))
+ {
+ pucchCfg->schedulingRequestResourceToAddModList = NULLP;
+ DU_ALLOC(pucchCfg->schedulingRequestResourceToAddModList, sizeof(struct PUCCH_Config__schedulingRequestResourceToAddModList));
+ if(pucchCfg->schedulingRequestResourceToAddModList == NULLP)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildBWPUlDedPucchCfg");
+ return RFAILED;
+ }
+
+ if(BuildPucchSchReqAddModList(schReqDb, pucchCfg->schedulingRequestResourceToAddModList) != ROK)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildBWPUlDedPucchCfg");
+ return RFAILED;
+ }
+ }
+
+ /* Multi CSI */
+ if(multiCsiDb && (multiCsiDb->multiCsiResrcListCount != 0))
+ {
+ pucchCfg->multi_CSI_PUCCH_ResourceList == NULLP;
+ DU_ALLOC(pucchCfg->multi_CSI_PUCCH_ResourceList, sizeof(struct PUCCH_Config__multi_CSI_PUCCH_ResourceList));
+ if(pucchCfg->multi_CSI_PUCCH_ResourceList == NULLP)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildBWPUlDedPucchCfg");
+ return RFAILED;
+ }
+
+ if(BuildPucchMultiCsiRsrcList(multiCsiDb, pucchCfg->multi_CSI_PUCCH_ResourceList) != ROK)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildBWPUlDedPucchCfg");
+ return RFAILED;
+ }
+ }
+
+ /* DL DATA TO UL ACK */
+ DU_ALLOC(pucchCfg->dl_DataToUL_ACK, sizeof(struct PUCCH_Config__dl_DataToUL_ACK));
+ if(pucchCfg->dl_DataToUL_ACK == NULLP)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildBWPUlDedPucchCfg");
return RFAILED;
}
- *(puschCfg->transformPrecoder) = PUSCH_TRANSFORM_PRECODER;
- puschCfg->codebookSubset = NULLP;
- puschCfg->maxRank = NULLP;
- puschCfg->rbg_Size = NULLP;
- puschCfg->uci_OnPUSCH = NULLP;
- puschCfg->tp_pi2BPSK = NULLP;
+ if(BuildDlDataToUlAckList(dlDataToUlAckDb, pucchCfg->dl_DataToUL_ACK) != ROK)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildBWPUlDedPucchCfg");
+ return RFAILED;
+ }
+
+ /* TODO : spatial relation info add/mod list and power control*/
return ROK;
}
* RFAILED - failure
*
* ****************************************************************/
-uint8_t BuildInitialUlBWP(BWP_UplinkDedicated_t *ulBwp)
+uint8_t BuildInitialUlBWP(InitialUlBwp *initUlBwp, BWP_UplinkDedicated_t *ulBwp)
{
+ PucchCfg *pucchCfg = NULLP;
+ PuschCfg *puschCfg = NULLP;
+
+ if(initUlBwp)
+ {
+ if(initUlBwp->pucchPresent)
+ pucchCfg = &initUlBwp->pucchCfg;
+ if(initUlBwp->puschPresent)
+ puschCfg = &initUlBwp->puschCfg;
+ }
+
ulBwp->pucch_Config = NULLP;
+ DU_ALLOC(ulBwp->pucch_Config, sizeof(struct BWP_UplinkDedicated__pucch_Config));
+ if(!ulBwp->pucch_Config)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildInitialUlBWP");
+ return RFAILED;
+ }
+
+ ulBwp->pucch_Config->present = BWP_UplinkDedicated__pucch_Config_PR_setup;
+ ulBwp->pucch_Config->choice.setup = NULLP;
+ DU_ALLOC(ulBwp->pucch_Config->choice.setup, sizeof(PUCCH_Config_t));
+ if(!ulBwp->pucch_Config->choice.setup)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildInitialUlBWP");
+ return RFAILED;
+ }
+
+ if(BuildBWPUlDedPucchCfg(pucchCfg, ulBwp->pucch_Config->choice.setup) != ROK)
+ {
+ return RFAILED;
+ }
/* Fill BWP UL dedicated PUSCH config */
ulBwp->pusch_Config = NULLP;
return RFAILED;
}
- if(BuildBWPUlDedPuschCfg(ulBwp->pusch_Config->choice.setup) != ROK)
+ if(BuildBWPUlDedPuschCfg(puschCfg, ulBwp->pusch_Config->choice.setup) != ROK)
{
return RFAILED;
}
* RFAILED - failure
*
* ****************************************************************/
-uint8_t BuildUlCfg(UplinkConfig_t *ulCfg)
+uint8_t BuildUlCfg(ServCellCfgInfo *servCellCfg, UplinkConfig_t *ulCfg)
{
+ InitialUlBwp *initUlBwp = NULLP;
+
+ if(servCellCfg)
+ {
+ initUlBwp = &servCellCfg->initUlBwp;
+ }
+
ulCfg->initialUplinkBWP = NULLP;
DU_ALLOC(ulCfg->initialUplinkBWP, sizeof(BWP_UplinkDedicated_t));
if(!ulCfg->initialUplinkBWP)
return RFAILED;
}
- if(BuildInitialUlBWP(ulCfg->initialUplinkBWP) != ROK)
+ if(BuildInitialUlBWP(initUlBwp, ulCfg->initialUplinkBWP) != ROK)
{
return RFAILED;
}
DU_LOG("\nERROR --> F1AP : Memory Allocation failed in BuildUlCfg");
return RFAILED;
}
- *(ulCfg->firstActiveUplinkBWP_Id) = ACTIVE_UL_BWP_ID;
+ if(servCellCfg == NULLP)
+ *(ulCfg->firstActiveUplinkBWP_Id) = ACTIVE_UL_BWP_ID;
+ else
+ *(ulCfg->firstActiveUplinkBWP_Id) = servCellCfg->firstActvUlBwpId;
ulCfg->pusch_ServingCellConfig = NULLP;
- DU_ALLOC(ulCfg->pusch_ServingCellConfig, \
- sizeof(struct UplinkConfig__pusch_ServingCellConfig));
+ DU_ALLOC(ulCfg->pusch_ServingCellConfig, sizeof(struct UplinkConfig__pusch_ServingCellConfig));
if(!ulCfg->pusch_ServingCellConfig)
{
DU_LOG("\nERROR --> F1AP : Memory Allocation failed in BuildUlCfg");
* RFAILED - failure
*
* ****************************************************************/
-uint8_t BuildPdschSrvCellCfg(struct ServingCellConfig__pdsch_ServingCellConfig *pdschCfg)
+uint8_t BuildPdschSrvCellCfg(PdschServCellCfg *pdschServCellDb, struct ServingCellConfig__pdsch_ServingCellConfig *pdschCfg)
{
pdschCfg->present = ServingCellConfig__pdsch_ServingCellConfig_PR_setup;
pdschCfg->choice.setup = NULLP;
return RFAILED;
}
+ /* Code Block Group Transmission */
pdschCfg->choice.setup->codeBlockGroupTransmission = NULLP;
+ if(pdschServCellDb && (pdschServCellDb->maxCodeBlkGrpPerTb || pdschServCellDb->codeBlkGrpFlushInd))
+ {
+ DU_ALLOC(pdschCfg->choice.setup->codeBlockGroupTransmission, sizeof(struct PDSCH_ServingCellConfig__codeBlockGroupTransmission));
+ if(pdschCfg->choice.setup->codeBlockGroupTransmission == NULLP)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildPdschSrvCellCfg");
+ return RFAILED;
+ }
+
+ pdschCfg->choice.setup->codeBlockGroupTransmission->present = PDSCH_ServingCellConfig__codeBlockGroupTransmission_PR_setup;
+ pdschCfg->choice.setup->codeBlockGroupTransmission->choice.setup = NULLP;
+ DU_ALLOC(pdschCfg->choice.setup->codeBlockGroupTransmission->choice.setup, sizeof(struct PDSCH_CodeBlockGroupTransmission ));
+ if(pdschCfg->choice.setup->codeBlockGroupTransmission->choice.setup == NULLP)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildPdschSrvCellCfg");
+ return RFAILED;
+ }
+
+ pdschCfg->choice.setup->codeBlockGroupTransmission->choice.setup->maxCodeBlockGroupsPerTransportBlock = \
+ *(pdschServCellDb->maxCodeBlkGrpPerTb);
+ pdschCfg->choice.setup->codeBlockGroupTransmission->choice.setup->codeBlockGroupFlushIndicator = \
+ *(pdschServCellDb->codeBlkGrpFlushInd);
+ }
+
+ /* xOverhead */
pdschCfg->choice.setup->xOverhead = NULLP;
+ if(pdschServCellDb && pdschServCellDb->xOverhead)
+ {
+ DU_ALLOC(pdschCfg->choice.setup->xOverhead, sizeof(long));
+ if(pdschCfg->choice.setup->xOverhead == NULLP)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildPdschSrvCellCfg");
+ return RFAILED;
+ }
+ *(pdschCfg->choice.setup->xOverhead) = *(pdschServCellDb->xOverhead);
+ }
+
+ /* Number of HARQ processes */
pdschCfg->choice.setup->nrofHARQ_ProcessesForPDSCH = NULLP;
DU_ALLOC(pdschCfg->choice.setup->nrofHARQ_ProcessesForPDSCH, sizeof(long));
if(!pdschCfg->choice.setup->nrofHARQ_ProcessesForPDSCH)
DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildPdschSrvCellCfg");
return RFAILED;
}
- *(pdschCfg->choice.setup->nrofHARQ_ProcessesForPDSCH)= PDSCH_NUM_HARQ_PROC;
+
+ if(pdschServCellDb == NULLP)
+ *(pdschCfg->choice.setup->nrofHARQ_ProcessesForPDSCH) = PDSCH_NUM_HARQ_PROC;
+ else
+ *(pdschCfg->choice.setup->nrofHARQ_ProcessesForPDSCH) = pdschServCellDb->numHarqProcForPdsch;
+
pdschCfg->choice.setup->pucch_Cell = NULLP;
+
+ /* Extension */
pdschCfg->choice.setup->ext1 = NULLP;
+ if(pdschServCellDb && pdschServCellDb->maxMimoLayers)
+ {
+ DU_ALLOC(pdschCfg->choice.setup->ext1, sizeof(struct PDSCH_ServingCellConfig__ext1));
+ if(pdschCfg->choice.setup->ext1 == NULLP)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildPdschSrvCellCfg");
+ return RFAILED;
+ }
+
+ DU_ALLOC(pdschCfg->choice.setup->ext1->maxMIMO_Layers, sizeof(long));
+ if(pdschCfg->choice.setup->ext1->maxMIMO_Layers == NULLP)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildPdschSrvCellCfg");
+ return RFAILED;
+ }
+ *(pdschCfg->choice.setup->ext1->maxMIMO_Layers) = *(pdschServCellDb->maxMimoLayers);
+ }
return ROK;
}
return ROK;
}
+/*******************************************************************
+ *
+ * @brief Builds DL BWP to add/modify list
+ * @details
+ *
+ * Function : BuildDlBwpToAddModList
+ *
+ * Functionality: Builds DL BWP to add/modify list
+ *
+ * @params[in] ServCellCfgInfo *servCellCfg,
+ * struct ServingCellConfig__downlinkBWP_ToAddModList *dlBwpAddModList
+ *
+ * @return ROK - success
+ * RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t BuildDlBwpToAddModList(ServCellCfgInfo *servCellCfg, struct ServingCellConfig__downlinkBWP_ToAddModList *dlBwpAddModList)
+{
+ uint8_t elementCnt, idx;
+
+ elementCnt = servCellCfg->numDlBwpToAdd;
+ dlBwpAddModList->list.count = elementCnt;
+ dlBwpAddModList->list.size = elementCnt * sizeof(struct BWP_Downlink *);
+ dlBwpAddModList->list.array = NULLP;
+ DU_ALLOC(dlBwpAddModList->list.array, dlBwpAddModList->list.size);
+ if(dlBwpAddModList->list.array == NULLP)
+ {
+ DU_LOG("\nERROR --> DU APP: Memory allocation failure in BuildDlBwpToAddModList");
+ return RFAILED;
+ }
+
+ for(idx=0; idx<dlBwpAddModList->list.count; idx++)
+ {
+ DU_ALLOC(dlBwpAddModList->list.array[idx], sizeof(BWP_Downlink_t));
+ if(dlBwpAddModList->list.array[idx] == NULLP)
+ {
+ DU_LOG("\nERROR --> DU APP: Memory allocation failure in BuildDlBwpToAddModList");
+ return RFAILED;
+ }
+ }
+
+ for(idx=0; idx<dlBwpAddModList->list.count; idx++)
+ {
+ dlBwpAddModList->list.array[idx]->bwp_Id = servCellCfg->DlBwpToAddList[idx].bwpId;
+ dlBwpAddModList->list.array[idx]->bwp_Common = NULLP;
+ dlBwpAddModList->list.array[idx]->bwp_Dedicated = NULLP;
+ }
+ return ROK;
+}
+
/*******************************************************************
*
* @brief Builds Spcell config dedicated
* RFAILED - failure
*
* ****************************************************************/
-uint8_t BuildSpCellCfgDed(ServingCellConfig_t *srvCellCfg)
+uint8_t BuildSpCellCfgDed(DuUeCb *ueCb, ServingCellConfig_t *srvCellCfg)
{
+ ServCellCfgInfo *servCellCfg = NULLP;
+ InitialDlBwp *initDlBwp = NULLP;
+ PdschServCellCfg *pdschServCellDb = NULLP;
+
+ if(ueCb)
+ {
+ servCellCfg = &ueCb->macUeCfg.spCellCfg.servCellCfg;
+ initDlBwp = &servCellCfg->initDlBwp;
+ pdschServCellDb = &servCellCfg->pdschServCellCfg;
+ }
+
srvCellCfg->tdd_UL_DL_ConfigurationDedicated = NULLP;
DU_ALLOC(srvCellCfg->tdd_UL_DL_ConfigurationDedicated, sizeof(TDD_UL_DL_ConfigDedicated_t));
if(!srvCellCfg->tdd_UL_DL_ConfigurationDedicated)
return RFAILED;
}
- if(BuildInitialDlBWP(srvCellCfg->initialDownlinkBWP) != ROK)
+ if(BuildInitialDlBWP(initDlBwp, srvCellCfg->initialDownlinkBWP) != ROK)
{
DU_LOG("\nERROR --> F1AP : BuildInitialDlBWP failed");
return RFAILED;
}
+
srvCellCfg->downlinkBWP_ToReleaseList = NULLP;
+
srvCellCfg->downlinkBWP_ToAddModList = NULLP;
+ if(ueCb && ueCb->macUeCfg.spCellCfg.servCellCfg.numDlBwpToAdd)
+ {
+ DU_ALLOC(srvCellCfg->downlinkBWP_ToAddModList, sizeof(struct ServingCellConfig__downlinkBWP_ToAddModList));
+ if(srvCellCfg->downlinkBWP_ToAddModList == NULLP)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failure in BuildSpCellCfgDed");
+ return RFAILED;
+ }
+
+ if(BuildDlBwpToAddModList(&ueCb->macUeCfg.spCellCfg.servCellCfg, srvCellCfg->downlinkBWP_ToAddModList) != ROK)
+ {
+ DU_LOG("\nERROR --> F1AP : BuildInitialDlBWP failed");
+ return RFAILED;
+ }
+ }
srvCellCfg->firstActiveDownlinkBWP_Id = NULLP;
DU_ALLOC(srvCellCfg->firstActiveDownlinkBWP_Id, sizeof(long));
DU_LOG("\nERROR --> F1AP : Memory allocation failure in BuildSpCellCfgDed");
return RFAILED;
}
- *(srvCellCfg->firstActiveDownlinkBWP_Id) = ACTIVE_DL_BWP_ID;
+ if(ueCb == NULLP)
+ *(srvCellCfg->firstActiveDownlinkBWP_Id) = ACTIVE_DL_BWP_ID;
+ else
+ *(srvCellCfg->firstActiveDownlinkBWP_Id) = ueCb->macUeCfg.spCellCfg.servCellCfg.firstActvDlBwpId;
srvCellCfg->bwp_InactivityTimer = NULLP;
DU_LOG("\nERROR --> F1AP : Memory allocation failure in BuildSpCellCfgDed");
return RFAILED;
}
- *(srvCellCfg->defaultDownlinkBWP_Id) = ACTIVE_DL_BWP_ID;
+ if(ueCb == NULLP)
+ *(srvCellCfg->defaultDownlinkBWP_Id) = ACTIVE_DL_BWP_ID;
+ else
+ *(srvCellCfg->defaultDownlinkBWP_Id) = ueCb->macUeCfg.spCellCfg.servCellCfg.defaultDlBwpId;
srvCellCfg->uplinkConfig = NULLP;
DU_ALLOC(srvCellCfg->uplinkConfig, sizeof(UplinkConfig_t));
return RFAILED;
}
- if(BuildUlCfg(srvCellCfg->uplinkConfig) != ROK)
+ if(BuildUlCfg(servCellCfg, srvCellCfg->uplinkConfig) != ROK)
{
DU_LOG("\nERROR --> F1AP : BuildUlCfg failed");
return RFAILED;
return RFAILED;
}
- if(BuildPdschSrvCellCfg(srvCellCfg->pdsch_ServingCellConfig) != ROK)
+ if(BuildPdschSrvCellCfg(pdschServCellDb, srvCellCfg->pdsch_ServingCellConfig) != ROK)
{
DU_LOG("\nERROR --> F1AP : BuildPdschSrvCellCfg failed");
return RFAILED;
* RFAILED - failure
*
* ****************************************************************/
-uint8_t BuildSpCellCfg(SpCellConfig_t *spCellCfg)
+uint8_t BuildSpCellCfg(DuUeCb *ueCb, SpCellConfig_t *spCellCfg)
{
-
spCellCfg->servCellIndex = NULLP;
DU_ALLOC(spCellCfg->servCellIndex, sizeof(long));
if(!spCellCfg->servCellIndex)
DU_LOG("\nERROR --> F1AP : Memory allocation failure in BuildSpCellCfg");
return RFAILED;
}
- *(spCellCfg->servCellIndex) = SERV_CELL_IDX;
+
+ if(ueCb == NULLP)
+ *(spCellCfg->servCellIndex) = SERV_CELL_IDX;
+ else
+ *(spCellCfg->servCellIndex) = ueCb->macUeCfg.spCellCfg.servCellIdx;
spCellCfg->reconfigurationWithSync = NULLP;
spCellCfg->rlf_TimersAndConstants = NULLP;
spCellCfg->rlmInSyncOutOfSyncThreshold = NULLP;
+
DU_ALLOC(spCellCfg->rlmInSyncOutOfSyncThreshold, sizeof(long));
if(!spCellCfg->rlmInSyncOutOfSyncThreshold)
{
DU_LOG("\nERROR --> F1AP : Memory allocation failure in BuildSpCellCfg");
return RFAILED;
}
- if(BuildSpCellCfgDed(spCellCfg->spCellConfigDedicated) != ROK)
+ if(BuildSpCellCfgDed(ueCb, spCellCfg->spCellConfigDedicated) != ROK)
{
DU_LOG("\nERROR --> F1AP : BuildSpCellCfgDed failed");
return RFAILED;
}
+
return ROK;
}
+
/*******************************************************************
*
* @brief Builds Phy cell group config
* RFAILED - failure
*
* ****************************************************************/
-uint8_t BuildPhyCellGrpCfg(PhysicalCellGroupConfig_t *phyCellGrpCfg)
+uint8_t BuildPhyCellGrpCfg(DuUeCb *ueCb, PhysicalCellGroupConfig_t *phyCellGrpCfg)
{
phyCellGrpCfg->harq_ACK_SpatialBundlingPUCCH = NULLP;
phyCellGrpCfg->harq_ACK_SpatialBundlingPUSCH = NULLP;
DU_LOG("\nERROR --> F1AP : Memory allocation failure in BuildPhyCellGrpCfg");
return RFAILED;
}
- *(phyCellGrpCfg->p_NR_FR1) = P_NR_FR1;
- phyCellGrpCfg->pdsch_HARQ_ACK_Codebook = PDSCH_HARQ_ACK_CODEBOOK;
+
+ if(ueCb == NULLP)
+ {
+ *(phyCellGrpCfg->p_NR_FR1) = P_NR_FR1;
+ phyCellGrpCfg->pdsch_HARQ_ACK_Codebook = PDSCH_HARQ_ACK_CODEBOOK;
+ }
+ else
+ {
+ *(phyCellGrpCfg->p_NR_FR1) = ueCb->macUeCfg.phyCellGrpCfg.pNrFr1;
+ phyCellGrpCfg->pdsch_HARQ_ACK_Codebook = ueCb->macUeCfg.phyCellGrpCfg.pdschHarqAckCodebook;
+ }
+
phyCellGrpCfg->tpc_SRS_RNTI = NULLP;
phyCellGrpCfg->tpc_PUCCH_RNTI = NULLP;
phyCellGrpCfg->tpc_PUSCH_RNTI = NULLP;
return ROK;
}
+
/*******************************************************************
*
* @brief Builds Mac cell group config
* RFAILED - failure
*
* ****************************************************************/
-uint8_t BuildMacCellGrpCfg(MAC_CellGroupConfig_t *macCellGrpCfg)
+uint8_t BuildMacCellGrpCfg(DuUeCb *ueCb, MAC_CellGroupConfig_t *macCellGrpCfg)
{
macCellGrpCfg->drx_Config = NULLP;
macCellGrpCfg->schedulingRequestConfig = NULLP;
return RFAILED;
}
- if(BuildSchedulingReqConfig(macCellGrpCfg->schedulingRequestConfig) != ROK)
+ if(BuildSchedulingReqConfig(ueCb, macCellGrpCfg->schedulingRequestConfig) != ROK)
{
DU_LOG("\nERROR --> F1AP : BuildSchedulingReqConfig failed");
return RFAILED;
return RFAILED;
}
- if(BuildBsrConfig(macCellGrpCfg->bsr_Config) != ROK)
+ if(BuildBsrConfig(ueCb, macCellGrpCfg->bsr_Config) != ROK)
{
DU_LOG("\nERROR --> F1AP : BuildBsrConfig failed");
return RFAILED;
return RFAILED;
}
- if(BuildTagConfig(macCellGrpCfg->tag_Config) != ROK)
+ if(BuildTagConfig(ueCb, macCellGrpCfg->tag_Config) != ROK)
{
DU_LOG("\nERROR --> F1AP : BuildTagConfig failed");
return RFAILED;
return RFAILED;
}
- if(BuildPhrConfig(macCellGrpCfg->phr_Config) != ROK)
+ if(BuildPhrConfig(ueCb, macCellGrpCfg->phr_Config) != ROK)
{
DU_LOG("\nERROR --> F1AP : BuildPhrConfig failed");
return RFAILED;
*
* @return void
*
- 4221 * ****************************************************************/
+ * ****************************************************************/
void FreePdschTimeDomAllocList( struct PDSCH_Config__pdsch_TimeDomainAllocationList *timeDomAllocList)
{
uint8_t idx1=0;
{
if(timeDomAllocList->choice.setup->list.array)
{
- for(idx1 = 0; idx1 <timeDomAllocList->choice.setup->list.count ; idx1++)
- {
- DU_FREE(timeDomAllocList->choice.setup->list.array[idx1],
- sizeof(struct PDSCH_TimeDomainResourceAllocation));
- }
- DU_FREE(timeDomAllocList->choice.setup->list.array, \
- timeDomAllocList->choice.setup->list.size);
+ for(idx1 = 0; idx1 <timeDomAllocList->choice.setup->list.count ; idx1++)
+ {
+ DU_FREE(timeDomAllocList->choice.setup->list.array[idx1]->k0, sizeof(long));
+ DU_FREE(timeDomAllocList->choice.setup->list.array[idx1],
+ sizeof(struct PDSCH_TimeDomainResourceAllocation));
+ }
+ DU_FREE(timeDomAllocList->choice.setup->list.array, \
+ timeDomAllocList->choice.setup->list.size);
}
DU_FREE(timeDomAllocList->choice.setup,\
- sizeof(struct PDSCH_TimeDomainResourceAllocationList));
+ sizeof(struct PDSCH_TimeDomainResourceAllocationList));
}
}
/*******************************************************************
*
*@details
*
- * Function : FreePuschTimeDomAllocList
+ * Function : FreePuschTimeDomAllocList
+ *
+ * Functionality: Deallocating memory of PuschTimeDomAllocList
+ *
+ * @params[in] PUSCH_Config_t *puschCfg
+ *
+ * @return void
+ *
+ * ****************************************************************/
+void FreePuschTimeDomAllocList(PUSCH_Config_t *puschCfg)
+{
+ uint8_t rsrcListIdx=0;
+ struct PUSCH_Config__pusch_TimeDomainAllocationList *timeDomAllocList_t=NULLP;
+
+ if(puschCfg->pusch_TimeDomainAllocationList)
+ {
+ timeDomAllocList_t=puschCfg->pusch_TimeDomainAllocationList;
+ if(timeDomAllocList_t->choice.setup)
+ {
+ if(timeDomAllocList_t->choice.setup->list.array)
+ {
+ for(rsrcListIdx = 0; rsrcListIdx<timeDomAllocList_t->choice.setup->list.count; rsrcListIdx++)
+ {
+ DU_FREE(timeDomAllocList_t->choice.setup->list.array[rsrcListIdx]->k2, sizeof(long));
+ DU_FREE(timeDomAllocList_t->choice.setup->list.array[rsrcListIdx],\
+ sizeof(PUSCH_TimeDomainResourceAllocation_t));
+ }
+ DU_FREE(timeDomAllocList_t->choice.setup->list.array, \
+ timeDomAllocList_t->choice.setup->list.size);
+ }
+ DU_FREE(timeDomAllocList_t->choice.setup, \
+ sizeof(struct PUSCH_TimeDomainResourceAllocationList));
+ }
+ DU_FREE(puschCfg->transformPrecoder, sizeof(long));
+ DU_FREE(puschCfg->pusch_TimeDomainAllocationList, \
+ sizeof(struct PUSCH_Config__pusch_TimeDomainAllocationList));
+ }
+
+}
+
+/*******************************************************************
+ *
+ * @brief Frees memory allocated for Dedicated PUCCH config
+ *
+ * @details
+ *
+ * Function : FreeBWPUlDedPucchCfg
*
- * Functionality: Deallocating memory of PuschTimeDomAllocList
+ * Functionality: Deallocating memory of Dedicated PUCCH cfg
*
- * @params[in] PUSCH_Config_t *puschCfg
+ * @params[in] BWP_UplinkDedicated__pucch_Config *ulBwpPucchCfg
*
* @return void
*
* ****************************************************************/
-void FreePuschTimeDomAllocList(PUSCH_Config_t *puschCfg)
+void FreeBWPUlDedPucchCfg(struct BWP_UplinkDedicated__pucch_Config *ulBwpPucchCfg)
{
- uint8_t idx1=0;
- uint8_t idx2=0;
- struct PUSCH_Config__pusch_TimeDomainAllocationList *timeDomAllocList_t=NULLP;
+ uint8_t k1Idx, rsrcIdx, rsrcSetIdx;
+ PUCCH_Config_t *pucchCfg = NULLP;
+ PUCCH_ResourceSet_t *rsrcSet = NULLP;
+ PUCCH_Resource_t *rsrc = NULLP;
- if(puschCfg->pusch_TimeDomainAllocationList)
+ if(ulBwpPucchCfg)
{
- timeDomAllocList_t=puschCfg->pusch_TimeDomainAllocationList;
- if(timeDomAllocList_t->choice.setup)
+ if(ulBwpPucchCfg->choice.setup)
{
- if(timeDomAllocList_t->choice.setup->list.array)
- {
- DU_FREE(timeDomAllocList_t->choice.setup->list.array[idx2]->k2, sizeof(long));
- for(idx1 = 0; idx1<timeDomAllocList_t->choice.setup->list.count; idx1++)
- {
- DU_FREE(timeDomAllocList_t->choice.setup->list.array[idx1],\
- sizeof(PUSCH_TimeDomainResourceAllocation_t));
- }
- DU_FREE(timeDomAllocList_t->choice.setup->list.array, \
- timeDomAllocList_t->choice.setup->list.size);
- }
- DU_FREE(timeDomAllocList_t->choice.setup, \
- sizeof(struct PUSCH_TimeDomainResourceAllocationList));
+ pucchCfg = ulBwpPucchCfg->choice.setup;
+
+ //Free resource set list
+ if(pucchCfg->resourceSetToAddModList)
+ {
+ if(pucchCfg->resourceSetToAddModList->list.array)
+ {
+ for(rsrcSetIdx=0; rsrcSetIdx < pucchCfg->resourceSetToAddModList->list.count; rsrcSetIdx++)
+ {
+ rsrcSet = pucchCfg->resourceSetToAddModList->list.array[rsrcSetIdx];
+ if(rsrcSet->resourceList.list.array)
+ {
+ for(rsrcIdx=0; rsrcIdx < rsrcSet->resourceList.list.count; rsrcIdx++)
+ {
+ DU_FREE(rsrcSet->resourceList.list.array[rsrcIdx], sizeof(PUCCH_ResourceId_t));
+ }
+ DU_FREE(rsrcSet->resourceList.list.array, rsrcSet->resourceList.list.size);
+ }
+ DU_FREE(pucchCfg->resourceSetToAddModList->list.array[rsrcSetIdx], sizeof(PUCCH_ResourceSet_t));
+ }
+ DU_FREE(pucchCfg->resourceSetToAddModList->list.array, pucchCfg->resourceSetToAddModList->list.size);
+ }
+ DU_FREE(pucchCfg->resourceSetToAddModList, sizeof(struct PUCCH_Config__resourceSetToAddModList));
+ }
+
+ //Free resource list
+ if(pucchCfg->resourceToAddModList)
+ {
+ if(pucchCfg->resourceToAddModList->list.array)
+ {
+ for(rsrcIdx=0; rsrcIdx < pucchCfg->resourceToAddModList->list.count; rsrcIdx++)
+ {
+ rsrc = pucchCfg->resourceToAddModList->list.array[rsrcIdx];
+ DU_FREE(rsrc->format.choice.format1, sizeof(PUCCH_format1_t));
+ DU_FREE(pucchCfg->resourceToAddModList->list.array[rsrcIdx], sizeof(PUCCH_Resource_t));
+ }
+ DU_FREE(pucchCfg->resourceToAddModList->list.array, pucchCfg->resourceToAddModList->list.size);
+ }
+ DU_FREE(pucchCfg->resourceToAddModList, sizeof(struct PUCCH_Config__resourceToAddModList));
+ }
+
+ //PUCCH Format 1
+ if(pucchCfg->format1)
+ {
+ if(pucchCfg->format1->choice.setup)
+ {
+ DU_FREE(pucchCfg->format1->choice.setup->nrofSlots, sizeof(long));
+ DU_FREE(pucchCfg->format1->choice.setup, sizeof(PUCCH_FormatConfig_t));
+ }
+ DU_FREE(pucchCfg->format1, sizeof(struct PUCCH_Config__format1));
+ }
+
+ //DL DATA TO UL ACK
+ if(pucchCfg->dl_DataToUL_ACK)
+ {
+ if(pucchCfg->dl_DataToUL_ACK->list.array)
+ {
+ for(k1Idx = 0; k1Idx < pucchCfg->dl_DataToUL_ACK->list.count; k1Idx++)
+ {
+ DU_FREE(pucchCfg->dl_DataToUL_ACK->list.array[k1Idx], sizeof(long));
+ }
+ DU_FREE(pucchCfg->dl_DataToUL_ACK->list.array, pucchCfg->dl_DataToUL_ACK->list.size);
+ }
+ DU_FREE(pucchCfg->dl_DataToUL_ACK, sizeof(struct PUCCH_Config__dl_DataToUL_ACK));
+ }
+
+ DU_FREE(ulBwpPucchCfg->choice.setup, sizeof(PUCCH_Config_t));
}
- DU_FREE(puschCfg->transformPrecoder, sizeof(long));
- DU_FREE(puschCfg->pusch_TimeDomainAllocationList, \
- sizeof(struct PUSCH_Config__pusch_TimeDomainAllocationList));
+ DU_FREE(ulBwpPucchCfg, sizeof(struct BWP_UplinkDedicated__pucch_Config));
}
-
}
+
/*******************************************************************
*
* @brief Frees memory allocated for InitialUlBWP
struct SRS_ResourceSet__srs_ResourceIdList *rsrcIdList = NULLP;
struct SRS_Config__srs_ResourceToAddModList *resourceList = NULLP;
+ FreeBWPUlDedPucchCfg(ulBwp->pucch_Config);
+
if(ulBwp->pusch_Config)
{
if(ulBwp->pusch_Config->choice.setup)
{
- puschCfg=ulBwp->pusch_Config->choice.setup;
- if(puschCfg->dataScramblingIdentityPUSCH)
- {
- if(puschCfg->dmrs_UplinkForPUSCH_MappingTypeA)
- {
- FreePuschTimeDomAllocList(puschCfg);
- dmrsUlCfg=puschCfg->dmrs_UplinkForPUSCH_MappingTypeA;
- if(dmrsUlCfg->choice.setup)
- {
- if(dmrsUlCfg->choice.setup->dmrs_AdditionalPosition)
- {
- if(dmrsUlCfg->choice.setup->transformPrecodingDisabled)
- {
- DU_FREE(dmrsUlCfg->choice.setup->transformPrecodingDisabled->scramblingID0,\
- sizeof(long));
- DU_FREE(dmrsUlCfg->choice.setup->transformPrecodingDisabled,
- sizeof(struct DMRS_UplinkConfig__transformPrecodingDisabled));
- }
- DU_FREE(dmrsUlCfg->choice.setup->dmrs_AdditionalPosition,
- sizeof(long));
- }
- DU_FREE(dmrsUlCfg->choice.setup,sizeof(DMRS_UplinkConfig_t));
- }
- DU_FREE(puschCfg->dmrs_UplinkForPUSCH_MappingTypeA, \
- sizeof(struct PUSCH_Config__dmrs_UplinkForPUSCH_MappingTypeA));
- }
- DU_FREE(puschCfg->dataScramblingIdentityPUSCH, sizeof(long));
- }
- DU_FREE(ulBwp->pusch_Config->choice.setup, sizeof(PUSCH_Config_t));
+ puschCfg=ulBwp->pusch_Config->choice.setup;
+ if(puschCfg->dataScramblingIdentityPUSCH)
+ {
+ if(puschCfg->dmrs_UplinkForPUSCH_MappingTypeA)
+ {
+ FreePuschTimeDomAllocList(puschCfg);
+ dmrsUlCfg=puschCfg->dmrs_UplinkForPUSCH_MappingTypeA;
+ if(dmrsUlCfg->choice.setup)
+ {
+ if(dmrsUlCfg->choice.setup->dmrs_AdditionalPosition)
+ {
+ if(dmrsUlCfg->choice.setup->transformPrecodingDisabled)
+ {
+ DU_FREE(dmrsUlCfg->choice.setup->transformPrecodingDisabled->scramblingID0,\
+ sizeof(long));
+ DU_FREE(dmrsUlCfg->choice.setup->transformPrecodingDisabled,
+ sizeof(struct DMRS_UplinkConfig__transformPrecodingDisabled));
+ }
+ DU_FREE(dmrsUlCfg->choice.setup->dmrs_AdditionalPosition,
+ sizeof(long));
+ }
+ DU_FREE(dmrsUlCfg->choice.setup,sizeof(DMRS_UplinkConfig_t));
+ }
+ DU_FREE(puschCfg->dmrs_UplinkForPUSCH_MappingTypeA, \
+ sizeof(struct PUSCH_Config__dmrs_UplinkForPUSCH_MappingTypeA));
+ }
+ DU_FREE(puschCfg->dataScramblingIdentityPUSCH, sizeof(long));
+ }
+ DU_FREE(ulBwp->pusch_Config->choice.setup, sizeof(PUSCH_Config_t));
}
DU_FREE(ulBwp->pusch_Config, sizeof(struct BWP_UplinkDedicated__pusch_Config));
/* Free SRS-Config */
if(ulBwp->srs_Config)
{
- if(ulBwp->srs_Config->choice.setup)
- {
- srsCfg = ulBwp->srs_Config->choice.setup;
+ if(ulBwp->srs_Config->choice.setup)
+ {
+ srsCfg = ulBwp->srs_Config->choice.setup;
- /* Free Resource Set to add/mod list */
- if(srsCfg->srs_ResourceSetToAddModList)
- {
- rsrcSetList = srsCfg->srs_ResourceSetToAddModList;
- if(rsrcSetList->list.array)
- {
- rSetIdx = 0;
+ /* Free Resource Set to add/mod list */
+ if(srsCfg->srs_ResourceSetToAddModList)
+ {
+ rsrcSetList = srsCfg->srs_ResourceSetToAddModList;
+ if(rsrcSetList->list.array)
+ {
+ rSetIdx = 0;
- /* Free SRS resource Id list in this SRS resource set */
- if(rsrcSetList->list.array[rSetIdx]->srs_ResourceIdList)
- {
- rsrcIdList = rsrcSetList->list.array[rSetIdx]->srs_ResourceIdList;
+ /* Free SRS resource Id list in this SRS resource set */
+ if(rsrcSetList->list.array[rSetIdx]->srs_ResourceIdList)
+ {
+ rsrcIdList = rsrcSetList->list.array[rSetIdx]->srs_ResourceIdList;
- if(rsrcIdList->list.array)
- {
- for(rsrcIdx = 0; rsrcIdx < rsrcIdList->list.count; rsrcIdx++)
- {
- DU_FREE(rsrcIdList->list.array[rsrcIdx], sizeof(SRS_ResourceId_t));
- }
- DU_FREE(rsrcIdList->list.array, rsrcIdList->list.size);
- }
- DU_FREE(rsrcSetList->list.array[rSetIdx]->srs_ResourceIdList,\
- sizeof(struct SRS_ResourceSet__srs_ResourceIdList));
- }
+ if(rsrcIdList->list.array)
+ {
+ for(rsrcIdx = 0; rsrcIdx < rsrcIdList->list.count; rsrcIdx++)
+ {
+ DU_FREE(rsrcIdList->list.array[rsrcIdx], sizeof(SRS_ResourceId_t));
+ }
+ DU_FREE(rsrcIdList->list.array, rsrcIdList->list.size);
+ }
+ DU_FREE(rsrcSetList->list.array[rSetIdx]->srs_ResourceIdList,\
+ sizeof(struct SRS_ResourceSet__srs_ResourceIdList));
+ }
- /* Free resource type info for this SRS resource set */
- DU_FREE(rsrcSetList->list.array[rSetIdx]->resourceType.choice.aperiodic, \
- sizeof(struct SRS_ResourceSet__resourceType__aperiodic));
+ /* Free resource type info for this SRS resource set */
+ DU_FREE(rsrcSetList->list.array[rSetIdx]->resourceType.choice.aperiodic, \
+ sizeof(struct SRS_ResourceSet__resourceType__aperiodic));
- /* Free memory for each resource set */
- for(rSetIdx = 0; rSetIdx < rsrcSetList->list.count; rSetIdx++)
- {
- DU_FREE(rsrcSetList->list.array[rSetIdx], sizeof(SRS_ResourceSet_t));
- }
- DU_FREE(rsrcSetList->list.array, rsrcSetList->list.size);
- }
- DU_FREE(srsCfg->srs_ResourceSetToAddModList, \
- sizeof(struct SRS_Config__srs_ResourceSetToAddModList));
- }
+ /* Free memory for each resource set */
+ for(rSetIdx = 0; rSetIdx < rsrcSetList->list.count; rSetIdx++)
+ {
+ DU_FREE(rsrcSetList->list.array[rSetIdx], sizeof(SRS_ResourceSet_t));
+ }
+ DU_FREE(rsrcSetList->list.array, rsrcSetList->list.size);
+ }
+ DU_FREE(srsCfg->srs_ResourceSetToAddModList, \
+ sizeof(struct SRS_Config__srs_ResourceSetToAddModList));
+ }
- /* Free resource to add/modd list */
- if(srsCfg->srs_ResourceToAddModList)
- {
- resourceList = srsCfg->srs_ResourceToAddModList;
- if(resourceList->list.array)
- {
- rsrcIdx = 0;
- DU_FREE(resourceList->list.array[rsrcIdx]->transmissionComb.choice.n2,\
- sizeof(struct SRS_Resource__transmissionComb__n2));
- DU_FREE(resourceList->list.array[rsrcIdx]->resourceType.choice.aperiodic,\
- sizeof(struct SRS_Resource__resourceType__aperiodic));
+ /* Free resource to add/modd list */
+ if(srsCfg->srs_ResourceToAddModList)
+ {
+ resourceList = srsCfg->srs_ResourceToAddModList;
+ if(resourceList->list.array)
+ {
+ rsrcIdx = 0;
+ DU_FREE(resourceList->list.array[rsrcIdx]->transmissionComb.choice.n2,\
+ sizeof(struct SRS_Resource__transmissionComb__n2));
+ DU_FREE(resourceList->list.array[rsrcIdx]->resourceType.choice.aperiodic,\
+ sizeof(struct SRS_Resource__resourceType__aperiodic));
- for(rsrcIdx = 0; rsrcIdx < resourceList->list.count; rsrcIdx++)
- {
- DU_FREE(resourceList->list.array[rsrcIdx], sizeof(SRS_Resource_t));
- }
- DU_FREE(resourceList->list.array, resourceList->list.size);
- }
- DU_FREE(srsCfg->srs_ResourceToAddModList, \
- sizeof(struct SRS_Config__srs_ResourceToAddModList));
- }
+ for(rsrcIdx = 0; rsrcIdx < resourceList->list.count; rsrcIdx++)
+ {
+ DU_FREE(resourceList->list.array[rsrcIdx], sizeof(SRS_Resource_t));
+ }
+ DU_FREE(resourceList->list.array, resourceList->list.size);
+ }
+ DU_FREE(srsCfg->srs_ResourceToAddModList, \
+ sizeof(struct SRS_Config__srs_ResourceToAddModList));
+ }
- DU_FREE(ulBwp->srs_Config->choice.setup, sizeof(SRS_Config_t));
- }
- DU_FREE(ulBwp->srs_Config, sizeof(struct BWP_UplinkDedicated__srs_Config));
+ DU_FREE(ulBwp->srs_Config->choice.setup, sizeof(SRS_Config_t));
+ }
+ DU_FREE(ulBwp->srs_Config, sizeof(struct BWP_UplinkDedicated__srs_Config));
}
}
}
{
if(rlcBearerList->list.array)
{
- for(idx=0; idx<rlcBearerList->list.count; idx++)
- {
- if(rlcBearerList->list.array[idx])
- {
- rlcConfig = rlcBearerList->list.array[idx]->rlc_Config;
- macLcConfig = rlcBearerList->list.array[idx]->mac_LogicalChannelConfig;
- if(rlcConfig)
- {
- if(rlcConfig->choice.am)
- {
- DU_FREE(rlcConfig->choice.am->ul_AM_RLC.sn_FieldLength, sizeof(SN_FieldLengthAM_t));
- DU_FREE(rlcConfig->choice.am->dl_AM_RLC.sn_FieldLength, sizeof(SN_FieldLengthAM_t));
- DU_FREE(rlcConfig->choice.am, sizeof(struct RLC_Config__am));
- }
- DU_FREE(rlcConfig, sizeof(struct RLC_Config));
- }
- DU_FREE(rlcBearerList->list.array[idx]->servedRadioBearer, sizeof(struct RLC_BearerConfig__servedRadioBearer));
- if(macLcConfig)
- {
- if(macLcConfig->ul_SpecificParameters)
- {
- DU_FREE(macLcConfig->ul_SpecificParameters->schedulingRequestID, sizeof(SchedulingRequestId_t));
- DU_FREE(macLcConfig->ul_SpecificParameters->logicalChannelGroup, sizeof(long));
- DU_FREE(macLcConfig->ul_SpecificParameters, sizeof(struct LogicalChannelConfig__ul_SpecificParameters));
- }
- DU_FREE(rlcBearerList->list.array[idx]->mac_LogicalChannelConfig, sizeof(struct LogicalChannelConfig));
- }
- DU_FREE(rlcBearerList->list.array[idx], sizeof(struct RLC_BearerConfig));
- }
- }
- DU_FREE(rlcBearerList->list.array, rlcBearerList->list.size);
+ for(idx=0; idx<rlcBearerList->list.count; idx++)
+ {
+ if(rlcBearerList->list.array[idx])
+ {
+ rlcConfig = rlcBearerList->list.array[idx]->rlc_Config;
+ macLcConfig = rlcBearerList->list.array[idx]->mac_LogicalChannelConfig;
+ if(rlcConfig)
+ {
+ if(rlcConfig->choice.am)
+ {
+ DU_FREE(rlcConfig->choice.am->ul_AM_RLC.sn_FieldLength, sizeof(SN_FieldLengthAM_t));
+ DU_FREE(rlcConfig->choice.am->dl_AM_RLC.sn_FieldLength, sizeof(SN_FieldLengthAM_t));
+ DU_FREE(rlcConfig->choice.am, sizeof(struct RLC_Config__am));
+ }
+ DU_FREE(rlcConfig, sizeof(struct RLC_Config));
+ }
+ DU_FREE(rlcBearerList->list.array[idx]->servedRadioBearer, sizeof(struct RLC_BearerConfig__servedRadioBearer));
+ if(macLcConfig)
+ {
+ if(macLcConfig->ul_SpecificParameters)
+ {
+ DU_FREE(macLcConfig->ul_SpecificParameters->schedulingRequestID, sizeof(SchedulingRequestId_t));
+ DU_FREE(macLcConfig->ul_SpecificParameters->logicalChannelGroup, sizeof(long));
+ DU_FREE(macLcConfig->ul_SpecificParameters, sizeof(struct LogicalChannelConfig__ul_SpecificParameters));
+ }
+ DU_FREE(rlcBearerList->list.array[idx]->mac_LogicalChannelConfig, sizeof(struct LogicalChannelConfig));
+ }
+ DU_FREE(rlcBearerList->list.array[idx], sizeof(struct RLC_BearerConfig));
+ }
+ }
+ DU_FREE(rlcBearerList->list.array, rlcBearerList->list.size);
}
DU_FREE(cellGrpCfg->rlc_BearerToAddModList, sizeof(struct CellGroupConfigRrc__rlc_BearerToAddModList));
}
schedulingRequestConfig = macCellGrpCfg->schedulingRequestConfig;
if(schedulingRequestConfig)
{
- schReqList = schedulingRequestConfig->schedulingRequestToAddModList;
- if(schReqList)
- {
- if(schReqList->list.array)
- {
- for(idx=0;idx<schReqList->list.count; idx++)
- {
- if(schReqList->list.array[idx])
- {
- DU_FREE(schReqList->list.array[idx]->sr_ProhibitTimer, sizeof(long));
- DU_FREE(schReqList->list.array[idx], sizeof(struct SchedulingRequestToAddMod));
- }
- }
- DU_FREE(schReqList->list.array, schReqList->list.size);
- }
- DU_FREE(schedulingRequestConfig->schedulingRequestToAddModList,\
- sizeof(struct SchedulingRequestConfig__schedulingRequestToAddModList)); }
- DU_FREE(macCellGrpCfg->schedulingRequestConfig, sizeof(struct SchedulingRequestConfig));
+ schReqList = schedulingRequestConfig->schedulingRequestToAddModList;
+ if(schReqList)
+ {
+ if(schReqList->list.array)
+ {
+ for(idx=0;idx<schReqList->list.count; idx++)
+ {
+ if(schReqList->list.array[idx])
+ {
+ DU_FREE(schReqList->list.array[idx]->sr_ProhibitTimer, sizeof(long));
+ DU_FREE(schReqList->list.array[idx], sizeof(struct SchedulingRequestToAddMod));
+ }
+ }
+ DU_FREE(schReqList->list.array, schReqList->list.size);
+ }
+ DU_FREE(schedulingRequestConfig->schedulingRequestToAddModList,\
+ sizeof(struct SchedulingRequestConfig__schedulingRequestToAddModList)); }
+ DU_FREE(macCellGrpCfg->schedulingRequestConfig, sizeof(struct SchedulingRequestConfig));
}
if(macCellGrpCfg->bsr_Config)
{
- DU_FREE(macCellGrpCfg->bsr_Config, sizeof(struct BSR_Config));
+ DU_FREE(macCellGrpCfg->bsr_Config, sizeof(struct BSR_Config));
}
tagConfig = macCellGrpCfg->tag_Config;
if(tagConfig)
{
- tagList = tagConfig->tag_ToAddModList;
- if(tagList)
- {
- if(tagList->list.array)
- {
- for(idx=0; idx<tagList->list.count; idx++)
- {
- DU_FREE(tagList->list.array[idx], sizeof(struct TAG));
- }
- DU_FREE(tagList->list.array, tagList->list.size);
- }
- DU_FREE(tagConfig->tag_ToAddModList, sizeof(struct TAG_Config__tag_ToAddModList));
- }
- DU_FREE(tagConfig, sizeof(struct TAG_Config));
+ tagList = tagConfig->tag_ToAddModList;
+ if(tagList)
+ {
+ if(tagList->list.array)
+ {
+ for(idx=0; idx<tagList->list.count; idx++)
+ {
+ DU_FREE(tagList->list.array[idx], sizeof(struct TAG));
+ }
+ DU_FREE(tagList->list.array, tagList->list.size);
+ }
+ DU_FREE(tagConfig->tag_ToAddModList, sizeof(struct TAG_Config__tag_ToAddModList));
+ }
+ DU_FREE(tagConfig, sizeof(struct TAG_Config));
}
phrConfig = macCellGrpCfg->phr_Config;
if(phrConfig)
{
- DU_FREE(phrConfig->choice.setup, sizeof(struct PHR_Config));
- DU_FREE(phrConfig, sizeof(struct MAC_CellGroupConfig__phr_Config));
+ DU_FREE(phrConfig->choice.setup, sizeof(struct PHR_Config));
+ DU_FREE(phrConfig, sizeof(struct MAC_CellGroupConfig__phr_Config));
}
DU_FREE(macCellGrpCfg, sizeof(MAC_CellGroupConfig_t));
{
if(spCellCfg->servCellIndex)
{
- if(spCellCfg->rlmInSyncOutOfSyncThreshold)
- {
- if(spCellCfg->spCellConfigDedicated)
- {
- srvCellCfg = spCellCfg->spCellConfigDedicated;
- if(srvCellCfg->tdd_UL_DL_ConfigurationDedicated)
- {
- if(srvCellCfg->initialDownlinkBWP)
- {
- dlBwp = srvCellCfg->initialDownlinkBWP;
- if(srvCellCfg->firstActiveDownlinkBWP_Id)
- {
- if(srvCellCfg->defaultDownlinkBWP_Id)
- {
- if(srvCellCfg->uplinkConfig)
- {
- if(srvCellCfg->pdsch_ServingCellConfig)
- {
- pdschCfg= srvCellCfg->pdsch_ServingCellConfig;
- if(pdschCfg->choice.setup)
- {
- DU_FREE(pdschCfg->choice.setup->nrofHARQ_ProcessesForPDSCH,sizeof(long));
- DU_FREE(pdschCfg->choice.setup, sizeof( struct PDSCH_ServingCellConfig));
- }
- DU_FREE(srvCellCfg->pdsch_ServingCellConfig, sizeof(struct
- ServingCellConfig__pdsch_ServingCellConfig));
- }
- FreeinitialUplinkBWP(srvCellCfg->uplinkConfig);
- DU_FREE(srvCellCfg->uplinkConfig, sizeof(UplinkConfig_t));
- }
- DU_FREE(srvCellCfg->defaultDownlinkBWP_Id, sizeof(long));
- }
- DU_FREE(srvCellCfg->firstActiveDownlinkBWP_Id, sizeof(long));
- }
- if(dlBwp->pdcch_Config)
- {
- if(dlBwp->pdsch_Config)
- {
- FreeBWPDlDedPdschCfg(dlBwp);
- DU_FREE(dlBwp->pdsch_Config, sizeof(struct BWP_DownlinkDedicated__pdsch_Config));
- }
- FreeBWPDlDedPdcchCfg(dlBwp);
- DU_FREE(dlBwp->pdcch_Config, sizeof(struct BWP_DownlinkDedicated__pdcch_Config));
- }
- DU_FREE(srvCellCfg->initialDownlinkBWP, sizeof(BWP_DownlinkDedicated_t));
- }
- DU_FREE(srvCellCfg->tdd_UL_DL_ConfigurationDedicated, sizeof(TDD_UL_DL_ConfigDedicated_t));
- }
- DU_FREE(spCellCfg->spCellConfigDedicated, sizeof(ServingCellConfig_t));
- }
- DU_FREE(spCellCfg->rlmInSyncOutOfSyncThreshold, sizeof(long));
- }
- DU_FREE(spCellCfg->servCellIndex, sizeof(long));
+ if(spCellCfg->rlmInSyncOutOfSyncThreshold)
+ {
+ if(spCellCfg->spCellConfigDedicated)
+ {
+ srvCellCfg = spCellCfg->spCellConfigDedicated;
+ if(srvCellCfg->tdd_UL_DL_ConfigurationDedicated)
+ {
+ if(srvCellCfg->initialDownlinkBWP)
+ {
+ dlBwp = srvCellCfg->initialDownlinkBWP;
+ if(srvCellCfg->firstActiveDownlinkBWP_Id)
+ {
+ if(srvCellCfg->defaultDownlinkBWP_Id)
+ {
+ if(srvCellCfg->uplinkConfig)
+ {
+ if(srvCellCfg->pdsch_ServingCellConfig)
+ {
+ pdschCfg= srvCellCfg->pdsch_ServingCellConfig;
+ if(pdschCfg->choice.setup)
+ {
+ DU_FREE(pdschCfg->choice.setup->nrofHARQ_ProcessesForPDSCH,sizeof(long));
+ DU_FREE(pdschCfg->choice.setup, sizeof( struct PDSCH_ServingCellConfig));
+ }
+ DU_FREE(srvCellCfg->pdsch_ServingCellConfig, sizeof(struct
+ ServingCellConfig__pdsch_ServingCellConfig));
+ }
+ FreeinitialUplinkBWP(srvCellCfg->uplinkConfig);
+ DU_FREE(srvCellCfg->uplinkConfig, sizeof(UplinkConfig_t));
+ }
+ DU_FREE(srvCellCfg->defaultDownlinkBWP_Id, sizeof(long));
+ }
+ DU_FREE(srvCellCfg->firstActiveDownlinkBWP_Id, sizeof(long));
+ }
+ if(dlBwp->pdcch_Config)
+ {
+ if(dlBwp->pdsch_Config)
+ {
+ FreeBWPDlDedPdschCfg(dlBwp);
+ DU_FREE(dlBwp->pdsch_Config, sizeof(struct BWP_DownlinkDedicated__pdsch_Config));
+ }
+ FreeBWPDlDedPdcchCfg(dlBwp);
+ DU_FREE(dlBwp->pdcch_Config, sizeof(struct BWP_DownlinkDedicated__pdcch_Config));
+ }
+ DU_FREE(srvCellCfg->initialDownlinkBWP, sizeof(BWP_DownlinkDedicated_t));
+ }
+ DU_FREE(srvCellCfg->tdd_UL_DL_ConfigurationDedicated, sizeof(TDD_UL_DL_ConfigDedicated_t));
+ }
+ DU_FREE(spCellCfg->spCellConfigDedicated, sizeof(ServingCellConfig_t));
+ }
+ DU_FREE(spCellCfg->rlmInSyncOutOfSyncThreshold, sizeof(long));
+ }
+ DU_FREE(spCellCfg->servCellIndex, sizeof(long));
}
DU_FREE(spCellCfg,sizeof(SpCellConfig_t));
}
return ROK;
}
+
/*******************************************************************
*
- * @brief Builds DU To CU RRC Container
+ * @brief Builds CellGroupConfigRrc for DU To CU RRC Container
*
* @details
*
- * Function : BuildDuToCuRrcContainer
+ * Function : BuildCellGroupConfigRrc
*
- * Functionality: Builds DuToCuRrcContainer
+ * Functionality: Builds and copied Cell group config buffer into
+ * DuToCuRrcContainer
*
* @params[in] idx, index in F1AP msg
* DuToCuRRCContainer, DuToCuRRCContainer
* RFAILED - failure
*
* ****************************************************************/
-uint8_t BuildDuToCuRrcContainer(DUtoCURRCContainer_t *duToCuRrcContainer)
+uint8_t BuildCellGroupConfigRrc(DuUeCb *ueCb, OCTET_STRING_t *duToCuRrcContainer)
{
uint8_t ret = ROK;
CellGroupConfigRrc_t cellGrpCfg;
DU_ALLOC(cellGrpCfg.rlc_BearerToAddModList, sizeof(struct CellGroupConfigRrc__rlc_BearerToAddModList));
if(!cellGrpCfg.rlc_BearerToAddModList)
{
- DU_LOG("\nERROR --> F1AP : Memory allocation failure in BuildDuToCuRrcContainer");
- ret = RFAILED;
- break;
+ DU_LOG("\nERROR --> F1AP : Memory allocation failure in BuildDuToCuRrcContainer");
+ ret = RFAILED;
+ break;
}
- if(BuildRlcBearerToAddModList(cellGrpCfg.rlc_BearerToAddModList) != ROK)
+ if(BuildRlcBearerToAddModList(ueCb, cellGrpCfg.rlc_BearerToAddModList) != ROK)
{
- DU_LOG("\nERROR --> F1AP : BuildRlcBearerToAddModList failed");
- ret = RFAILED;
- break;
+ DU_LOG("\nERROR --> F1AP : BuildRlcBearerToAddModList failed");
+ ret = RFAILED;
+ break;
}
cellGrpCfg.rlc_BearerToReleaseList = NULLP;
DU_ALLOC(cellGrpCfg.mac_CellGroupConfig, sizeof(MAC_CellGroupConfig_t));
if(!cellGrpCfg.mac_CellGroupConfig)
{
- DU_LOG("\nERROR --> F1AP : Memory allocation failure in BuildDuToCuRrcContainer");
- ret = RFAILED;
- break;
+ DU_LOG("\nERROR --> F1AP : Memory allocation failure in BuildDuToCuRrcContainer");
+ ret = RFAILED;
+ break;
}
- if(BuildMacCellGrpCfg(cellGrpCfg.mac_CellGroupConfig) != ROK)
+ if(BuildMacCellGrpCfg(ueCb, cellGrpCfg.mac_CellGroupConfig) != ROK)
{
- DU_LOG("\nERROR --> F1AP : BuildMacCellGrpCfg failed");
- ret = RFAILED;
- break;
+ DU_LOG("\nERROR --> F1AP : BuildMacCellGrpCfg failed");
+ ret = RFAILED;
+ break;
}
cellGrpCfg.physicalCellGroupConfig = NULLP;
DU_ALLOC(cellGrpCfg.physicalCellGroupConfig, sizeof(PhysicalCellGroupConfig_t));
if(!cellGrpCfg.physicalCellGroupConfig)
{
- DU_LOG("\nERROR --> F1AP : Memory allocation failure in BuildDuToCuRrcContainer");
- ret = RFAILED;
- break;
+ DU_LOG("\nERROR --> F1AP : Memory allocation failure in BuildDuToCuRrcContainer");
+ ret = RFAILED;
+ break;
}
- if(BuildPhyCellGrpCfg(cellGrpCfg.physicalCellGroupConfig) != ROK)
+ if(BuildPhyCellGrpCfg(ueCb, cellGrpCfg.physicalCellGroupConfig) != ROK)
{
- DU_LOG("\nERROR --> F1AP : BuildPhyCellGrpCfg failed");
- ret = RFAILED;
- break;
+ DU_LOG("\nERROR --> F1AP : BuildPhyCellGrpCfg failed");
+ ret = RFAILED;
+ break;
}
cellGrpCfg.spCellConfig = NULLP;
DU_ALLOC(cellGrpCfg.spCellConfig, sizeof(SpCellConfig_t));
if(!cellGrpCfg.spCellConfig)
{
- DU_LOG("\nERROR --> F1AP : Memory allocation failure in BuildDuToCuRrcContainer");
- ret = RFAILED;
- break;
+ DU_LOG("\nERROR --> F1AP : Memory allocation failure in BuildDuToCuRrcContainer");
+ ret = RFAILED;
+ break;
}
- if(BuildSpCellCfg(cellGrpCfg.spCellConfig) != ROK)
+ if(BuildSpCellCfg(ueCb, cellGrpCfg.spCellConfig) != ROK)
{
- DU_LOG("\nERROR --> F1AP : BuildSpCellCfg failed");
- ret = RFAILED;
- break;
+ DU_LOG("\nERROR --> F1AP : BuildSpCellCfg failed");
+ ret = RFAILED;
+ break;
}
cellGrpCfg.sCellToAddModList = NULLP;
/* Encode results */
if(encRetVal.encoded == ENCODE_FAIL)
{
- DU_LOG( "\nERROR --> F1AP : Could not encode DuToCuRrcContainer (at %s)\n",\
- encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
- ret = RFAILED;
- break;
+ DU_LOG( "\nERROR --> F1AP : Could not encode DuToCuRrcContainer (at %s)\n",\
+ encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
+ ret = RFAILED;
+ break;
}
else
{
- DU_LOG("\nDEBUG --> F1AP : Created APER encoded buffer for DuToCuRrcContainer\n");
- for(int i=0; i< encBufSize; i++)
- {
- printf("%x",encBuf[i]);
- }
+ DU_LOG("\nDEBUG --> F1AP : Created APER encoded buffer for DuToCuRrcContainer\n");
+ for(int i=0; i< encBufSize; i++)
+ {
+ printf("%x",encBuf[i]);
+ }
}
duToCuRrcContainer->size = encBufSize;
DU_ALLOC(duToCuRrcContainer->buf, duToCuRrcContainer->size);
if(!duToCuRrcContainer->buf)
{
- DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildDuToCuRrcContainer");
- ret = RFAILED;
- break;
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed in BuildDuToCuRrcContainer");
+ ret = RFAILED;
+ break;
}
if(ret == ROK)
{
{
uint8_t ret;
uint8_t elementCnt;
- uint8_t ieIdx;
+ uint8_t ieIdx, cellIdx, ueIdx;
+ DuUeCb *duUeCb = NULLP;
asn_enc_rval_t encRetVal;
F1AP_PDU_t *f1apMsg = NULLP;
InitialULRRCMessageTransfer_t *initULRRCMsg = NULLP;
initULRRCMsg->protocolIEs.list.array[ieIdx]->value.present =\
InitialULRRCMessageTransferIEs__value_PR_DUtoCURRCContainer;
- ret = BuildDuToCuRrcContainer(&initULRRCMsg->protocolIEs.list.array[ieIdx]->value.choice.DUtoCURRCContainer);
+ for(cellIdx = 0; cellIdx < MAX_NUM_CELL; cellIdx++)
+ {
+ for(ueIdx = 0; ueIdx < MAX_NUM_UE; ueIdx++)
+ {
+ if(duCb.actvCellLst[cellIdx] && (duCb.actvCellLst[cellIdx]->ueCb[ueIdx].gnbDuUeF1apId == gnbDuUeF1apId)&&\
+ (duCb.actvCellLst[cellIdx]->ueCb[ueIdx].crnti == crnti))
+ {
+ duUeCb = &duCb.actvCellLst[cellIdx]->ueCb[ueIdx];
+ }
+ }
+ }
+
+ ret = BuildCellGroupConfigRrc(duUeCb, &initULRRCMsg->protocolIEs.list.array[ieIdx]->value.choice.DUtoCURRCContainer);
if(ret != ROK)
{
break;
xer_fprint(stdout, &asn_DEF_F1AP_PDU, f1apMsg);
- /* Encode the F1SetupRequest type as APER */
+ /* Encode the Intial UL RRC Message transfer as APER */
memset(encBuf, 0, ENC_BUF_MAX_LEN);
encBufSize = 0;
encRetVal = aper_encode(&asn_DEF_F1AP_PDU, 0, f1apMsg, PrepFinalEncBuf, encBuf);
DU_LOG("\nERROR --> DU_APP: Invalid Rlc Mode %d at freeRlcLcCfg()", lcCfg->rlcMode);
break;
}
+ DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, lcCfg->snssai, sizeof(Snssai));
}
/*******************************************************************
/* UL AM */
if(rlcAmCfg->dl_AM_RLC.sn_FieldLength)
{
- amCfgToSet->ulAmCfg.snLenUl = *(rlcAmCfg->dl_AM_RLC.sn_FieldLength);
+ amCfgToSet->ulAmCfg.snLenUl = covertAmSnLenFromRrcEnumToIntEnum(*(rlcAmCfg->dl_AM_RLC.sn_FieldLength));
/*TODO: Check the timer value when sent by real CU */
- amCfgToSet->ulAmCfg.reAssemTmr = rlcAmCfg->dl_AM_RLC.t_Reassembly;
- amCfgToSet->ulAmCfg.statProhTmr = rlcAmCfg->dl_AM_RLC.t_StatusProhibit;
+ amCfgToSet->ulAmCfg.reAssemTmr = convertReasmblTmrEnumToValue(rlcAmCfg->dl_AM_RLC.t_Reassembly);
+ amCfgToSet->ulAmCfg.statProhTmr = convertProhibitTmrEnumToValue(rlcAmCfg->dl_AM_RLC.t_StatusProhibit);
}
/* DL AM */
if(rlcAmCfg->ul_AM_RLC.sn_FieldLength)
{
- amCfgToSet->dlAmCfg.snLenDl = *(rlcAmCfg->ul_AM_RLC.sn_FieldLength);
- amCfgToSet->dlAmCfg.pollRetxTmr = rlcAmCfg->ul_AM_RLC.t_PollRetransmit;
- amCfgToSet->dlAmCfg.pollPdu = rlcAmCfg->ul_AM_RLC.pollPDU;
- amCfgToSet->dlAmCfg.pollByte = rlcAmCfg->ul_AM_RLC.pollByte;
- amCfgToSet->dlAmCfg.maxRetxTh = rlcAmCfg->ul_AM_RLC.maxRetxThreshold;
+ amCfgToSet->dlAmCfg.snLenDl = covertAmSnLenFromRrcEnumToIntEnum(*(rlcAmCfg->ul_AM_RLC.sn_FieldLength));
+ amCfgToSet->dlAmCfg.pollRetxTmr = covertPollRetxTmrEnumToValue(rlcAmCfg->ul_AM_RLC.t_PollRetransmit);
+ amCfgToSet->dlAmCfg.pollPdu = covertPollPduEnumToValue(rlcAmCfg->ul_AM_RLC.pollPDU);
+ amCfgToSet->dlAmCfg.pollByte = covertPollByteEnumToValue(rlcAmCfg->ul_AM_RLC.pollByte);
+ amCfgToSet->dlAmCfg.maxRetxTh = covertMaxRetxEnumToValue(rlcAmCfg->ul_AM_RLC.maxRetxThreshold);
}
}
}
/* UL UM BI DIR Cfg */
if(rlcBiCfg->dl_UM_RLC.sn_FieldLength)
{
- umBiCfgToSet->ulUmCfg.snLenUlUm = *(rlcBiCfg->dl_UM_RLC.sn_FieldLength);
- umBiCfgToSet->ulUmCfg.reAssemTmr = rlcBiCfg->dl_UM_RLC.t_Reassembly;
+ umBiCfgToSet->ulUmCfg.snLenUlUm = covertUmSnLenFromRrcEnumToIntEnum(*(rlcBiCfg->dl_UM_RLC.sn_FieldLength));
+ umBiCfgToSet->ulUmCfg.reAssemTmr = convertReasmblTmrEnumToValue(rlcBiCfg->dl_UM_RLC.t_Reassembly);
}
/* DL UM BI DIR Cfg */
if(rlcBiCfg->ul_UM_RLC.sn_FieldLength)
- umBiCfgToSet->dlUmCfg.snLenDlUm = *(rlcBiCfg->ul_UM_RLC.sn_FieldLength);
+ umBiCfgToSet->dlUmCfg.snLenDlUm = covertUmSnLenFromRrcEnumToIntEnum(*(rlcBiCfg->ul_UM_RLC.sn_FieldLength));
}
}
{
if(umUlCfg->dl_UM_RLC.sn_FieldLength)
{
- umUlCfgToSet->ulUmCfg.snLenUlUm = *(umUlCfg->dl_UM_RLC.sn_FieldLength);
- umUlCfgToSet->ulUmCfg.reAssemTmr = umUlCfg->dl_UM_RLC.t_Reassembly;
+ umUlCfgToSet->ulUmCfg.snLenUlUm = covertUmSnLenFromRrcEnumToIntEnum(*(umUlCfg->dl_UM_RLC.sn_FieldLength));
+ umUlCfgToSet->ulUmCfg.reAssemTmr = convertReasmblTmrEnumToValue(umUlCfg->dl_UM_RLC.t_Reassembly);
}
}
}
if(umDlCfg)
{
if(umDlCfg->ul_UM_RLC.sn_FieldLength)
- umDlCfgToSet->dlUmCfg.snLenDlUm = *(umDlCfg->ul_UM_RLC.sn_FieldLength);
+ umDlCfgToSet->dlUmCfg.snLenDlUm = covertUmSnLenFromRrcEnumToIntEnum(*(umDlCfg->ul_UM_RLC.sn_FieldLength));
}
}
}
}
+/*******************************************************************
+*
+* @brief Function to extract Snssai Cfg Info from CU
+*
+* @details
+*
+* Function : extractDrbSnssaiCfg
+*
+* Functionality: Function to extract Drb Snssai Cfg Info from CU
+*
+* @params[in] DRB_Information_t *drbInfo, Snssai *snssai
+* @return ROK/RFAILED
+*
+* ****************************************************************/
+
+uint8_t extractDrbSnssaiCfg(SNSSAI_t *RecvSnssai, Snssai **snssaiToBeShared)
+{
+ if(!(*snssaiToBeShared))
+ {
+ DU_ALLOC_SHRABL_BUF((*snssaiToBeShared), sizeof(Snssai));
+ if(snssaiToBeShared == NULLP)
+ {
+ DU_LOG("\nERROR --> DUAPP : extractDrbSnssaiCfg(): Memory failed at allocating for SNSSAI ");
+ return RFAILED;
+ }
+ }
+ if(RecvSnssai)
+ {
+ memcpy(&(*snssaiToBeShared)->sst, RecvSnssai->sST.buf, RecvSnssai->sST.size);
+ if(RecvSnssai->sD)
+ {
+ memcpy((*snssaiToBeShared)->sd, RecvSnssai->sD->buf, RecvSnssai->sD->size);
+ }
+ else
+ {
+ DU_LOG("\nERROR --> DUAPP : extractDrbSnssaiCfg(): Received Null pointer of Snssai->SD");
+ return RFAILED;
+ }
+ }
+ return ROK;
+}
+
/*******************************************************************
*
* @brief Function to procRlcLcCfg
* ****************************************************************/
void procRlcLcCfg(uint8_t rbId, uint8_t lcId, uint8_t rbType, uint8_t rlcMode,\
- uint8_t configType, RLC_Config_t *f1RlcCfg, RlcBearerCfg *lcCfg)
+ uint8_t configType, RLC_Config_t *f1RlcCfg, RlcBearerCfg *lcCfg, QoSInformation_t *qoSInformation)
{
+ DRB_Information_t *drbInfo;
lcCfg->rbId = rbId;
lcCfg->configType = configType;
{
extractRlcModeCfg(lcCfg->rlcMode, lcCfg, f1RlcCfg);
}
+ if(qoSInformation != NULLP)
+ {
+ if(qoSInformation->present == QoSInformation_PR_choice_extension)
+ {
+ if(qoSInformation->choice.choice_extension->value.present ==\
+ QoSInformation_ExtIEs__value_PR_DRB_Information)
+ {
+ drbInfo = &qoSInformation->choice.choice_extension->value.choice.DRB_Information;
+ if(extractDrbSnssaiCfg(&drbInfo->sNSSAI, &lcCfg->snssai) != ROK)
+ {
+ DU_LOG("\nERROR --> DUAPP: Unable to extract Snssai information at procRlcLcCfg()");
+ return;
+ }
+ }
+ }
+ }
}
-
-
/*******************************************************************
*
* @brief Fills DrbQos Info received by CU
void extractQosInfo(DrbQosInfo *qosToAdd, QoSFlowLevelQoSParameters_t *qosFlowCfg)
{
+ uint8_t qosCntIdx = 0;
+ ProtocolExtensionContainer_4624P74_t *qosIeExt = NULLP;
+
qosToAdd->fiveQiType = qosFlowCfg->qoS_Characteristics.present;
qosToAdd->u.nonDyn5Qi.fiveQi =\
- qosFlowCfg->qoS_Characteristics.choice.non_Dynamic_5QI->fiveQI;
+ qosFlowCfg->qoS_Characteristics.choice.non_Dynamic_5QI->fiveQI;
if(qosFlowCfg->qoS_Characteristics.choice.non_Dynamic_5QI->averagingWindow)
{
qosToAdd->u.nonDyn5Qi.avgWindow = \
- *(qosFlowCfg->qoS_Characteristics.choice.non_Dynamic_5QI->averagingWindow);
+ *(qosFlowCfg->qoS_Characteristics.choice.non_Dynamic_5QI->averagingWindow);
+ }
+
+ if(qosFlowCfg->qoS_Characteristics.choice.non_Dynamic_5QI->maxDataBurstVolume)
+ {
+ qosToAdd->u.nonDyn5Qi.maxDataBurstVol = \
+ *(qosFlowCfg->qoS_Characteristics.choice.non_Dynamic_5QI->maxDataBurstVolume);
}
- qosToAdd->u.nonDyn5Qi.maxDataBurstVol = \
- *(qosFlowCfg->qoS_Characteristics.choice.non_Dynamic_5QI->maxDataBurstVolume);
+
if(qosFlowCfg->qoS_Characteristics.choice.non_Dynamic_5QI->qoSPriorityLevel)
{
qosToAdd->u.nonDyn5Qi.priorLevel = \
- *(qosFlowCfg->qoS_Characteristics.choice.non_Dynamic_5QI->qoSPriorityLevel);
+ *(qosFlowCfg->qoS_Characteristics.choice.non_Dynamic_5QI->qoSPriorityLevel);
}
qosToAdd->ngRanRetPri.priorityLevel = \
- qosFlowCfg->nGRANallocationRetentionPriority.priorityLevel;
+ qosFlowCfg->nGRANallocationRetentionPriority.priorityLevel;
qosToAdd->ngRanRetPri.preEmptionCap = \
- qosFlowCfg->nGRANallocationRetentionPriority.pre_emptionCapability;
+ qosFlowCfg->nGRANallocationRetentionPriority.pre_emptionCapability;
qosToAdd->ngRanRetPri.preEmptionVul = \
- qosFlowCfg->nGRANallocationRetentionPriority.pre_emptionVulnerability;
+ qosFlowCfg->nGRANallocationRetentionPriority.pre_emptionVulnerability;
if(qosFlowCfg->gBR_QoS_Flow_Information)
{
memcpy(&qosToAdd->grbQosInfo.maxFlowBitRateDl, \
- qosFlowCfg->gBR_QoS_Flow_Information->maxFlowBitRateDownlink.buf, \
- qosFlowCfg->gBR_QoS_Flow_Information->maxFlowBitRateDownlink.size);
+ qosFlowCfg->gBR_QoS_Flow_Information->maxFlowBitRateDownlink.buf, \
+ qosFlowCfg->gBR_QoS_Flow_Information->maxFlowBitRateDownlink.size);
memcpy(&qosToAdd->grbQosInfo.maxFlowBitRateUl, \
- qosFlowCfg->gBR_QoS_Flow_Information->maxFlowBitRateUplink.buf, \
- qosFlowCfg->gBR_QoS_Flow_Information->maxFlowBitRateUplink.size);
+ qosFlowCfg->gBR_QoS_Flow_Information->maxFlowBitRateUplink.buf, \
+ qosFlowCfg->gBR_QoS_Flow_Information->maxFlowBitRateUplink.size);
memcpy(&qosToAdd->grbQosInfo.guarFlowBitRateDl,\
- qosFlowCfg->gBR_QoS_Flow_Information->guaranteedFlowBitRateDownlink.buf, \
- qosFlowCfg->gBR_QoS_Flow_Information->guaranteedFlowBitRateDownlink.size);
+ qosFlowCfg->gBR_QoS_Flow_Information->guaranteedFlowBitRateDownlink.buf, \
+ qosFlowCfg->gBR_QoS_Flow_Information->guaranteedFlowBitRateDownlink.size);
memcpy(&qosToAdd->grbQosInfo.guarFlowBitRateUl,\
- qosFlowCfg->gBR_QoS_Flow_Information->guaranteedFlowBitRateUplink.buf, \
- qosFlowCfg->gBR_QoS_Flow_Information->guaranteedFlowBitRateUplink.size);
+ qosFlowCfg->gBR_QoS_Flow_Information->guaranteedFlowBitRateUplink.buf, \
+ qosFlowCfg->gBR_QoS_Flow_Information->guaranteedFlowBitRateUplink.size);
+ }
+ /*Extracting PDU_SESSION_ID*/
+ qosIeExt = (ProtocolExtensionContainer_4624P74_t *)qosFlowCfg->iE_Extensions;
+ if(qosIeExt)
+ {
+ for(qosCntIdx = 0; qosCntIdx < qosIeExt->list.count; qosCntIdx++)
+ {
+ if(qosIeExt->list.array[qosCntIdx]->extensionValue.present == \
+ QoSFlowLevelQoSParameters_ExtIEs__extensionValue_PR_PDUSessionID)
+ {
+ qosToAdd->pduSessionId = qosIeExt->list.array[qosCntIdx]->extensionValue.choice.PDUSessionID;
+ DU_LOG("\nDEBUG --> DU_F1AP : extractQosInfo: PDU SessionID:%d",qosToAdd->pduSessionId);
+ }
+ }
}
- qosToAdd->pduSessionId = 0;
qosToAdd->ulPduSessAggMaxBitRate = 0;
}
}
return ROK;
}
+
/*******************************************************************
*
* @brief Function to extract Drb Qos Cfg Info from CU
DU_ALLOC_SHRABL_BUF(macLcToAdd->drbQos, sizeof(DrbQosInfo));
if(macLcToAdd->drbQos == NULLP)
{
- DU_LOG("\nERROR --> DUAPP:Memory failed at allocating DrbQos at extractDrbCfg()");
+ DU_LOG("\nERROR --> DUAPP:Memory failed at allocating DrbQos at extractDrbQosCfg()");
return RFAILED;
}
extractQosInfo(macLcToAdd->drbQos, &drbInfo->dRB_QoS);
macLcToAdd->dlLcCfg.lcp = macLcToAdd->drbQos->ngRanRetPri.priorityLevel;
}
- if(!macLcToAdd->snssai)
- {
- DU_ALLOC_SHRABL_BUF(macLcToAdd->snssai, sizeof(Snssai));
- if(macLcToAdd->snssai == NULLP)
- {
- DU_LOG("\nERROR --> DUAPP : Memory failed at allocating SNSSAI at extractDrbCfg()");
- return RFAILED;
- }
- }
- memcpy(&macLcToAdd->snssai->sst, drbInfo->sNSSAI.sST.buf, \
- drbInfo->sNSSAI.sST.size);
- if(drbInfo->sNSSAI.sD)
+ if(extractDrbSnssaiCfg(&drbInfo->sNSSAI, &macLcToAdd->snssai) != ROK)
{
- memcpy(macLcToAdd->snssai->sd, drbInfo->sNSSAI.sD->buf, \
- drbInfo->sNSSAI.sD->size);
+ DU_LOG("\nERROR --> DUAPP: Unable to extract Snssai information at extractDrbQosCfg()");
+ return RFAILED;
}
return ROK;
}
* @return void
*
* ****************************************************************/
-uint8_t extractDrbCfg(DRBs_ToBeSetup_Item_t *drbItem,DRBs_ToBeSetupMod_Item_t *drbSetupModItem,\
-LcCfg *macLcToAdd, UpTnlCfg *upTnlInfo)
+uint8_t extractDrbCfg(DRBs_ToBeSetup_Item_t *drbItem, DRBs_ToBeSetupMod_Item_t *drbSetupModItem,\
+DRBs_ToBeModified_Item_t *drbModItem, LcCfg *macLcToAdd, UpTnlCfg *upTnlInfo)
{
DRB_Information_t *drbInfo = NULLP;
}
}
}
+ else if(drbModItem != NULLP)
+ {
+ if(extractUpTnlInfo(drbModItem->dRBID, CONFIG_MOD, &drbModItem->uLUPTNLInformation_ToBeSetup_List,\
+ upTnlInfo) != ROK)
+ {
+ DU_LOG("\nERROR --> DUAPP : Failed to extract tunnel Cfg at extractDrbCfg()");
+ return RFAILED;
+ }
+ if(drbModItem->qoSInformation != NULLP)
+ {
+ if(drbModItem->qoSInformation->present == QoSInformation_PR_choice_extension)
+ {
+ if(drbModItem->qoSInformation->choice.choice_extension->value.present ==\
+ QoSInformation_ExtIEs__value_PR_DRB_Information)
+ {
+ drbInfo = &drbModItem->qoSInformation->choice.choice_extension->value.choice.DRB_Information;
+ if(extractDrbQosCfg(drbInfo , macLcToAdd) != ROK)
+ {
+ DU_LOG("\nERROR --> DUAPP : Failed to extract qos Cfg at extractDrbCfg()");
+ return RFAILED;
+ }
+ }
+ }
+ }
+ }
return ROK;
}
* ****************************************************************/
uint8_t extractMacRbCfg(uint8_t lcId, DRBs_ToBeSetup_Item_t *drbCfg,\
-DRBs_ToBeSetupMod_Item_t *drbSetupModCfg, LogicalChannelConfig_t *ulLcCfg, LcCfg *lcCfg, UpTnlCfg *upTnlInfo)
+DRBs_ToBeSetupMod_Item_t *drbSetupModCfg, DRBs_ToBeModified_Item_t *drbModCfg, LogicalChannelConfig_t *ulLcCfg, LcCfg *lcCfg, UpTnlCfg *upTnlInfo)
{
if(drbCfg != NULLP)
{
- if(extractDrbCfg(drbCfg, NULL, lcCfg, upTnlInfo) != ROK)
+ if(extractDrbCfg(drbCfg, NULL, NULL, lcCfg, upTnlInfo) != ROK)
{
DU_LOG("ERROR --> F1AP : Failed to build Drb Qos at extractMacRbCfg()");
return RFAILED;
}
else if(drbSetupModCfg != NULLP)
{
- if(extractDrbCfg(NULL, drbSetupModCfg, lcCfg, upTnlInfo) != ROK)
+ if(extractDrbCfg(NULL, drbSetupModCfg, NULL, lcCfg, upTnlInfo) != ROK)
+ {
+ DU_LOG("ERROR --> F1AP : Failed to build Drb Qos at extractMacRbCfg()");
+ return RFAILED;
+ }
+ }
+ else if(drbModCfg != NULLP)
+ {
+ if(extractDrbCfg(NULL, NULL, drbModCfg, lcCfg, upTnlInfo) != ROK)
{
DU_LOG("ERROR --> F1AP : Failed to build Drb Qos at extractMacRbCfg()");
return RFAILED;
*
* ****************************************************************/
-uint8_t procMacLcCfg(uint8_t lcId, uint8_t rbType, uint8_t configType,\
-DRBs_ToBeSetup_Item_t *drbItem, DRBs_ToBeSetupMod_Item_t *drbSetupModItem, LogicalChannelConfig_t *ulLcCfg,\
+uint8_t procMacLcCfg(uint8_t lcId, uint8_t rbType, uint8_t configType, DRBs_ToBeSetup_Item_t *drbItem,\
+DRBs_ToBeSetupMod_Item_t *drbSetupModItem, DRBs_ToBeModified_Item_t *drbModItem, LogicalChannelConfig_t *ulLcCfg,\
LcCfg *lcCfg, UpTnlCfg *upTnlInfo)
{
uint8_t ret = ROK;
lcCfg->configType = configType;
if(rbType == RB_TYPE_SRB)
{
- ret = extractMacRbCfg(lcId, NULL,NULL, ulLcCfg, lcCfg, NULL);
+ ret = extractMacRbCfg(lcId, NULL, NULL, NULL, ulLcCfg, lcCfg, NULL);
}
else if(rbType == RB_TYPE_DRB)
{
if(drbItem != NULL)
- ret = extractMacRbCfg(lcId, drbItem, NULL, ulLcCfg, lcCfg, upTnlInfo);
+ ret = extractMacRbCfg(lcId, drbItem, NULL, NULL, ulLcCfg, lcCfg, upTnlInfo);
else if(drbSetupModItem != NULL)
- ret = extractMacRbCfg(lcId, NULL, drbSetupModItem, ulLcCfg, lcCfg, upTnlInfo);
+ ret = extractMacRbCfg(lcId, NULL, drbSetupModItem, NULL, ulLcCfg, lcCfg, upTnlInfo);
+ else if(drbModItem != NULL)
+ ret = extractMacRbCfg(lcId, NULL, NULL, drbModItem, ulLcCfg, lcCfg, upTnlInfo);
}
return ret;
}
/* Filling RLC/MAC Config*/
memset(&ueCfgDb->macLcCfg[idx], 0, sizeof(LcCfg));
memset(&ueCfgDb->rlcLcCfg[idx], 0, sizeof(RlcBearerCfg));
- procRlcLcCfg(rbId, lcId, rbType, rlcMode, CONFIG_UNKNOWN, f1RlcCfg, &(ueCfgDb->rlcLcCfg[idx]));
- if(procMacLcCfg(lcId, rbType, CONFIG_UNKNOWN, NULL, NULL, macUlLcCfg, &ueCfgDb->macLcCfg[idx], NULL) != ROK)
+ procRlcLcCfg(rbId, lcId, rbType, rlcMode, CONFIG_UNKNOWN, f1RlcCfg, &(ueCfgDb->rlcLcCfg[idx]), NULLP);
+ if(procMacLcCfg(lcId, rbType, CONFIG_UNKNOWN, NULL, NULL, NULL, macUlLcCfg, &ueCfgDb->macLcCfg[idx], NULL) != ROK)
{
DU_LOG("\nERROR --> DU APP : Failed while filling MAC LC config at extractRlcCfgToAddMod()");
return RFAILED;
}
(ueCfgDb->numRlcLcs)++;
(ueCfgDb->numMacLcs)++;
+ DU_LOG("\nDEBUG -> DUAPP: extractRlcCfgToAddMod:RBType:%d, DrbID: %d,lcId:%d, [RLC,MAC,NumDrb]:[%x,%x,%x]",\
+ rbType, rbId, lcId, ueCfgDb->numRlcLcs, ueCfgDb->numMacLcs, ueCfgDb->numDrb);
}
//TODO: To send the failure cause in UeContextSetupRsp
return ROK;
* ****************************************************************/
void freeMacServingCellInfo(ServCellCfgInfo *srvCellCfg)
{
+ uint8_t timeDomRsrcIdx;
+
+ if(srvCellCfg->initDlBwp.pdschPresent)
+ {
+ for(timeDomRsrcIdx = 0; timeDomRsrcIdx < srvCellCfg->initDlBwp.pdschCfg.numTimeDomRsrcAlloc; timeDomRsrcIdx++)
+ {
+ DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, \
+ srvCellCfg->initDlBwp.pdschCfg.timeDomRsrcAllociList[timeDomRsrcIdx].k0, sizeof(uint8_t));
+ }
+ }
+
freeMacPdschServCellInfo(&srvCellCfg->pdschServCellCfg);
if(srvCellCfg->bwpInactivityTmr)
{
DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, srvCellCfg->bwpInactivityTmr, sizeof(uint8_t));
}
+
+ if(srvCellCfg->initUlBwp.pucchPresent)
+ {
+ DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, srvCellCfg->initUlBwp.pucchCfg.dlDataToUlAck, sizeof(PucchDlDataToUlAck));
+ }
}
/*******************************************************************
if(cRsetToAddModList->list.count)
{
macPdcchCfg->numCRsetToAddMod = cRsetToAddModList->list.count;
- for(cRsetIdx = 0; cRsetIdx < cRsetToAddModList->list.count; cRsetIdx++)
- {
- macPdcchCfg->cRSetToAddModList[cRsetIdx].cRSetId = \
- cRsetToAddModList->list.array[cRsetIdx]->controlResourceSetId;
- bitStringToInt(&cRsetToAddModList->list.array[cRsetIdx]->frequencyDomainResources,\
- macPdcchCfg->cRSetToAddModList[cRsetIdx].freqDomainRsrc);
+ for(cRsetIdx = 0; cRsetIdx < cRsetToAddModList->list.count; cRsetIdx++)
+ {
+ macPdcchCfg->cRSetToAddModList[cRsetIdx].cRSetId = \
+ cRsetToAddModList->list.array[cRsetIdx]->controlResourceSetId;
+ //freqDomRsrcBitStringToInt(&cRsetToAddModList->list.array[cRsetIdx]->frequencyDomainResources,\
+ macPdcchCfg->cRSetToAddModList[cRsetIdx].freqDomainRsrc);
+ memcpy(macPdcchCfg->cRSetToAddModList[cRsetIdx].freqDomainRsrc, \
+ cRsetToAddModList->list.array[cRsetIdx]->frequencyDomainResources.buf,
+ cRsetToAddModList->list.array[cRsetIdx]->frequencyDomainResources.size);
+
macPdcchCfg->cRSetToAddModList[cRsetIdx].duration = \
- cRsetToAddModList->list.array[cRsetIdx]->duration;
+ cRsetToAddModList->list.array[cRsetIdx]->duration;
- macPdcchCfg->cRSetToAddModList[cRsetIdx].cceRegMappingType = \
- cRsetToAddModList->list.array[cRsetIdx]->cce_REG_MappingType.present;
+ macPdcchCfg->cRSetToAddModList[cRsetIdx].cceRegMappingType = \
+ cRsetToAddModList->list.array[cRsetIdx]->cce_REG_MappingType.present;
if(macPdcchCfg->cRSetToAddModList[cRsetIdx].cceRegMappingType == CCE_REG_MAPPINGTYPE_PR_INTERLEAVED)
- {
- //TODO: handle the case for Interleaved
+ {
+ //TODO: handle the case for Interleaved
}
macPdcchCfg->cRSetToAddModList[cRsetIdx].precoderGranularity = \
- cRsetToAddModList->list.array[cRsetIdx]->precoderGranularity;
- if(cRsetToAddModList->list.array[cRsetIdx]->pdcch_DMRS_ScramblingID)
- {
- macPdcchCfg->cRSetToAddModList[cRsetIdx].dmrsScramblingId= \
- *(cRsetToAddModList->list.array[cRsetIdx]->pdcch_DMRS_ScramblingID);
- }
+ cRsetToAddModList->list.array[cRsetIdx]->precoderGranularity;
+ if(cRsetToAddModList->list.array[cRsetIdx]->pdcch_DMRS_ScramblingID)
+ {
+ macPdcchCfg->cRSetToAddModList[cRsetIdx].dmrsScramblingId= \
+ *(cRsetToAddModList->list.array[cRsetIdx]->pdcch_DMRS_ScramblingID);
+ }
}
}
-
}
/* Control Resource Set To Release List */
if(cuPdcchCfg->controlResourceSetToReleaseList)
if(cRsetToRelList->list.count)
{
macPdcchCfg->numCRsetToRel = cRsetToRelList->list.count;
- for(cRsetIdx = 0; cRsetIdx < cRsetToRelList->list.count; cRsetIdx++)
- {
+ for(cRsetIdx = 0; cRsetIdx < cRsetToRelList->list.count; cRsetIdx++)
+ {
macPdcchCfg->cRSetToRelList[cRsetIdx] = *(cRsetToRelList->list.array[cRsetIdx]);
- }
+ }
}
}
if(srchSpcToAddModList->list.count)
{
macPdcchCfg->numSearchSpcToAddMod = srchSpcToAddModList->list.count;
- for(srchSpcIdx = 0; srchSpcIdx < srchSpcToAddModList->list.count; srchSpcIdx++)
- {
+ for(srchSpcIdx = 0; srchSpcIdx < srchSpcToAddModList->list.count; srchSpcIdx++)
+ {
macPdcchCfg->searchSpcToAddModList[srchSpcIdx].searchSpaceId =\
- srchSpcToAddModList->list.array[srchSpcIdx]->searchSpaceId;
+ srchSpcToAddModList->list.array[srchSpcIdx]->searchSpaceId;
macPdcchCfg->searchSpcToAddModList[srchSpcIdx].cRSetId =\
- *(srchSpcToAddModList->list.array[srchSpcIdx]->controlResourceSetId);
- if(srchSpcToAddModList->list.array[srchSpcIdx]->monitoringSlotPeriodicityAndOffset)
- {
+ *(srchSpcToAddModList->list.array[srchSpcIdx]->controlResourceSetId);
+ if(srchSpcToAddModList->list.array[srchSpcIdx]->monitoringSlotPeriodicityAndOffset)
+ {
macPdcchCfg->searchSpcToAddModList[srchSpcIdx].mSlotPeriodicityAndOffset =\
- srchSpcToAddModList->list.array[srchSpcIdx]->monitoringSlotPeriodicityAndOffset->present;
+ srchSpcToAddModList->list.array[srchSpcIdx]->monitoringSlotPeriodicityAndOffset->present;
}
if(srchSpcToAddModList->list.array[srchSpcIdx]->monitoringSymbolsWithinSlot)
{
- bitStringToInt(srchSpcToAddModList->list.array[srchSpcIdx]->monitoringSymbolsWithinSlot,\
- macPdcchCfg->searchSpcToAddModList[srchSpcIdx].mSymbolsWithinSlot);
+ bitStringToInt(srchSpcToAddModList->list.array[srchSpcIdx]->monitoringSymbolsWithinSlot,\
+ macPdcchCfg->searchSpcToAddModList[srchSpcIdx].mSymbolsWithinSlot);
}
- if(srchSpcToAddModList->list.array[srchSpcIdx]->nrofCandidates)
+ if(srchSpcToAddModList->list.array[srchSpcIdx]->nrofCandidates)
{
- macPdcchCfg->searchSpcToAddModList[srchSpcIdx].numCandidatesAggLevel1 = \
- srchSpcToAddModList->list.array[srchSpcIdx]->nrofCandidates->aggregationLevel1;
- macPdcchCfg->searchSpcToAddModList[srchSpcIdx].numCandidatesAggLevel2 = \
- srchSpcToAddModList->list.array[srchSpcIdx]->nrofCandidates->aggregationLevel2;
- macPdcchCfg->searchSpcToAddModList[srchSpcIdx].numCandidatesAggLevel4 = \
- srchSpcToAddModList->list.array[srchSpcIdx]->nrofCandidates->aggregationLevel4;
-
- macPdcchCfg->searchSpcToAddModList[srchSpcIdx].numCandidatesAggLevel8 = \
- srchSpcToAddModList->list.array[srchSpcIdx]->nrofCandidates->aggregationLevel8;
-
- macPdcchCfg->searchSpcToAddModList[srchSpcIdx].numCandidatesAggLevel16 = \
- srchSpcToAddModList->list.array[srchSpcIdx]->nrofCandidates->aggregationLevel16;
- }
+ macPdcchCfg->searchSpcToAddModList[srchSpcIdx].numCandidatesAggLevel1 = \
+ srchSpcToAddModList->list.array[srchSpcIdx]->nrofCandidates->aggregationLevel1;
+ macPdcchCfg->searchSpcToAddModList[srchSpcIdx].numCandidatesAggLevel2 = \
+ srchSpcToAddModList->list.array[srchSpcIdx]->nrofCandidates->aggregationLevel2;
+ macPdcchCfg->searchSpcToAddModList[srchSpcIdx].numCandidatesAggLevel4 = \
+ srchSpcToAddModList->list.array[srchSpcIdx]->nrofCandidates->aggregationLevel4;
+
+ macPdcchCfg->searchSpcToAddModList[srchSpcIdx].numCandidatesAggLevel8 = \
+ srchSpcToAddModList->list.array[srchSpcIdx]->nrofCandidates->aggregationLevel8;
+
+ macPdcchCfg->searchSpcToAddModList[srchSpcIdx].numCandidatesAggLevel16 = \
+ srchSpcToAddModList->list.array[srchSpcIdx]->nrofCandidates->aggregationLevel16;
+ }
if(srchSpcToAddModList->list.array[srchSpcIdx]->searchSpaceType)
- {
- macPdcchCfg->searchSpcToAddModList[srchSpcIdx].searchSpaceType =\
- srchSpcToAddModList->list.array[srchSpcIdx]->searchSpaceType->present;
- if(macPdcchCfg->searchSpcToAddModList[srchSpcIdx].searchSpaceType == SEARCHSPACETYPE_PR_UE_SPECIFIC)
- {
- macPdcchCfg->searchSpcToAddModList[srchSpcIdx].ueSpecificDciFormat =\
- srchSpcToAddModList->list.array[srchSpcIdx]->searchSpaceType->choice.ue_Specific->dci_Formats;
- }
-
- }
- }
+ {
+ macPdcchCfg->searchSpcToAddModList[srchSpcIdx].searchSpaceType =\
+ srchSpcToAddModList->list.array[srchSpcIdx]->searchSpaceType->present;
+ if(macPdcchCfg->searchSpcToAddModList[srchSpcIdx].searchSpaceType == SEARCHSPACETYPE_PR_UE_SPECIFIC)
+ {
+ macPdcchCfg->searchSpcToAddModList[srchSpcIdx].ueSpecificDciFormat =\
+ srchSpcToAddModList->list.array[srchSpcIdx]->searchSpaceType->choice.ue_Specific->dci_Formats;
+ }
+
+ }
+ }
}
}
/* Search space To Rel List */
if(srchSpcToRelList->list.count)
{
macPdcchCfg->numSearchSpcToRel = srchSpcToRelList->list.count;
- for(srchSpcIdx = 0; srchSpcIdx < srchSpcToRelList->list.count; srchSpcIdx++)
- {
+ for(srchSpcIdx = 0; srchSpcIdx < srchSpcToRelList->list.count; srchSpcIdx++)
+ {
macPdcchCfg->searchSpcToRelList[srchSpcIdx] =\
- *(srchSpcToRelList->list.array[srchSpcIdx]);
- }
+ *(srchSpcToRelList->list.array[srchSpcIdx]);
+ }
}
}
}
*
* Functionality: Fills PdschCfg received by CU
*
- * @params[in] PDSCH_Config_t *cuPdschCfg,
- * PdschConfig *macPdschCfg
+ * @params[in] PDSCH_Config_t *cuPdschCfg = Information which is send by CU,
+ * which we have stored in F1UeContextSetupDb,
+ * PdschConfig *macPdschCfg = Used to Store the information which
+ * needs to send in other layer, as well as this can be the variable
+ * which stores the information in DuCb,
+ * PdschConfig *storedPdschCfg = Null in case of sending the
+ * information to other layer else it will have stored pdsch
+ * configuration in copyOfmacUeCfg.
* @return void
*
* ****************************************************************/
-void extractPdschCfg(PDSCH_Config_t *cuPdschCfg, PdschConfig *macPdschCfg)
+void extractPdschCfg(PDSCH_Config_t *cuPdschCfg, PdschConfig *macPdschCfg, PdschConfig *storedPdschCfg)
{
uint8_t timeDomIdx;
struct PDSCH_Config__pdsch_TimeDomainAllocationList *timeDomAlloc = NULLP;
if(cuPdschCfg->dmrs_DownlinkForPDSCH_MappingTypeA)
{
if(cuPdschCfg->dmrs_DownlinkForPDSCH_MappingTypeA->present == \
- PDSCH_Config__dmrs_DownlinkForPDSCH_MappingTypeA_PR_setup)
+ PDSCH_Config__dmrs_DownlinkForPDSCH_MappingTypeA_PR_setup)
{
if(cuPdschCfg->dmrs_DownlinkForPDSCH_MappingTypeA->choice.setup)
- {
+ {
macPdschCfg->dmrsDlCfgForPdschMapTypeA.addPos = \
- *(cuPdschCfg->dmrs_DownlinkForPDSCH_MappingTypeA->choice.setup->dmrs_AdditionalPosition);
- }
+ *(cuPdschCfg->dmrs_DownlinkForPDSCH_MappingTypeA->choice.setup->dmrs_AdditionalPosition);
+ }
}
}
macPdschCfg->resourceAllocType = cuPdschCfg->resourceAllocation;
{
timeDomAlloc = cuPdschCfg->pdsch_TimeDomainAllocationList;
if(timeDomAlloc->present ==\
- PDSCH_Config__pdsch_TimeDomainAllocationList_PR_setup)
+ PDSCH_Config__pdsch_TimeDomainAllocationList_PR_setup)
{
if(timeDomAlloc->choice.setup)
- {
- macPdschCfg->numTimeDomRsrcAlloc = timeDomAlloc->choice.setup->list.count;
+ {
+ macPdschCfg->numTimeDomRsrcAlloc = timeDomAlloc->choice.setup->list.count;
for(timeDomIdx = 0; timeDomIdx < timeDomAlloc->choice.setup->list.count; timeDomIdx++)
{
- macPdschCfg->timeDomRsrcAllociList[timeDomIdx].mappingType = \
- timeDomAlloc->choice.setup->list.array[timeDomIdx]->mappingType;
- macPdschCfg->timeDomRsrcAllociList[timeDomIdx].startSymbolAndLength = \
- timeDomAlloc->choice.setup->list.array[timeDomIdx]->startSymbolAndLength;
- }
- }
+ macPdschCfg->timeDomRsrcAllociList[timeDomIdx].k0 = NULLP;
+ if(timeDomAlloc->choice.setup->list.array[timeDomIdx]->k0)
+ {
+ if(macPdschCfg->timeDomRsrcAllociList[timeDomIdx].k0 == NULL)
+ {
+ if(storedPdschCfg)
+ {
+ if(storedPdschCfg->timeDomRsrcAllociList[timeDomIdx].k0)
+ {
+ macPdschCfg->timeDomRsrcAllociList[timeDomIdx].k0 =\
+ storedPdschCfg->timeDomRsrcAllociList[timeDomIdx].k0;
+ }
+ else
+ {
+ DU_ALLOC_SHRABL_BUF(macPdschCfg->timeDomRsrcAllociList[timeDomIdx].k0, sizeof(uint8_t));
+ }
+ }
+ else
+ {
+ DU_ALLOC_SHRABL_BUF(macPdschCfg->timeDomRsrcAllociList[timeDomIdx].k0, sizeof(uint8_t));
+ }
+ if(!macPdschCfg->timeDomRsrcAllociList[timeDomIdx].k0)
+ {
+ DU_LOG("\nERROR --> DU APP : Memory allocation failed for k0 at extractPdschCfg()");
+ return;
+ }
+ }
+ *(macPdschCfg->timeDomRsrcAllociList[timeDomIdx].k0) = \
+ *(timeDomAlloc->choice.setup->list.array[timeDomIdx]->k0);
+ }
+ macPdschCfg->timeDomRsrcAllociList[timeDomIdx].mappingType = \
+ timeDomAlloc->choice.setup->list.array[timeDomIdx]->mappingType;
+ macPdschCfg->timeDomRsrcAllociList[timeDomIdx].startSymbolAndLength = \
+ timeDomAlloc->choice.setup->list.array[timeDomIdx]->startSymbolAndLength;
+ }
+ }
}
}
macPdschCfg->rbgSize = cuPdschCfg->rbg_Size;
if(cuPdschCfg->prb_BundlingType.choice.staticBundling)
{
if(cuPdschCfg->prb_BundlingType.choice.staticBundling->bundleSize)
- {
+ {
macPdschCfg->bundlingInfo.StaticBundling.size = \
- *(cuPdschCfg->prb_BundlingType.choice.staticBundling->bundleSize);
- }
+ *(cuPdschCfg->prb_BundlingType.choice.staticBundling->bundleSize);
+ }
}
}
else if(cuPdschCfg->prb_BundlingType.present == PDSCH_Config__prb_BundlingType_PR_dynamicBundling)
macRsrcSetList->resrcSetToAddModList[arrIdx].resrcList[rsrcListIdx] =\
*cuRsrcSetList->list.array[arrIdx]->resourceList.list.array[rsrcListIdx];
}
- macRsrcSetList->resrcSetToAddModList[arrIdx].maxPayLoadSize =\
- *cuRsrcSetList->list.array[arrIdx]->maxPayloadMinus1;
+
+ if(cuRsrcSetList->list.array[arrIdx]->maxPayloadMinus1)
+ {
+ macRsrcSetList->resrcSetToAddModList[arrIdx].maxPayLoadSize =\
+ *cuRsrcSetList->list.array[arrIdx]->maxPayloadMinus1;
+ }
+ else
+ {
+ macRsrcSetList->resrcSetToAddModList[arrIdx].maxPayLoadSize = 0;
+ }
}
}/* End of extractResrcSetToAddModList */
*
* Functionality: Fills PucchCfg received by CU
*
- * @params[in] BWP_UplinkDedicated__pucch_Config *cuPucchCfg,
- * PucchCfg *macPucchCfg
+ * @params[in] BWP_UplinkDedicated__pucch_Config *cuPucchCfg = Information which
+ * is send by CU, which we have stored in F1UeContextSetupDb,
+ * PucchCfg *macPucchCfg = Used to Store the information which
+ * needs to send in other layer, as well as this can be the variable
+ * which stores the information in DuCb,
+ * PucchCfg *storedPucchCfg = Null in case of sending the
+ * information to other layer else it will have Pucch Cfg which
+ * we have stored in copyOfmacUeCfg.
* @return ROK/RFAILED
*
* ****************************************************************/
-uint8_t extractPucchCfg(struct BWP_UplinkDedicated__pucch_Config *cuPucchCfg, PucchCfg *macPucchCfg)
+uint8_t extractPucchCfg(struct BWP_UplinkDedicated__pucch_Config *cuPucchCfg, PucchCfg *macPucchCfg,\
+PucchCfg *storedPucchCfg)
{
uint8_t arrIdx;
/* Dl_DataToUL_ACK */
if(cuPucchCfg->choice.setup->dl_DataToUL_ACK)
- {
+ {
+ if(storedPucchCfg)
+ {
+ if(storedPucchCfg->dlDataToUlAck)
+ {
+ macPucchCfg->dlDataToUlAck = storedPucchCfg->dlDataToUlAck;
+ }
+ else
+ {
DU_ALLOC_SHRABL_BUF(macPucchCfg->dlDataToUlAck, sizeof(PucchDlDataToUlAck));
- if(macPucchCfg->dlDataToUlAck == NULLP)
- {
- DU_LOG("\nERROR --> F1AP : Failed to extract Dl_DataToUL_ACK in extractPucchCfg()");
- return RFAILED;
- }
- memset(macPucchCfg->dlDataToUlAck, 0, sizeof(PucchDlDataToUlAck));
- macPucchCfg->dlDataToUlAck->dlDataToUlAckListCount = cuPucchCfg->choice.setup->dl_DataToUL_ACK->list.count;
- for(arrIdx = 0; arrIdx < macPucchCfg->dlDataToUlAck->dlDataToUlAckListCount; arrIdx++)
- {
- macPucchCfg->dlDataToUlAck->dlDataToUlAckList[arrIdx] =\
- *cuPucchCfg->choice.setup->dl_DataToUL_ACK->list.array[arrIdx];
- }
+ }
+ }
+ else
+ {
+ DU_ALLOC_SHRABL_BUF(macPucchCfg->dlDataToUlAck, sizeof(PucchDlDataToUlAck));
+ }
+ if(macPucchCfg->dlDataToUlAck == NULLP)
+ {
+ DU_LOG("\nERROR --> F1AP : Failed to extract Dl_DataToUL_ACK in extractPucchCfg()");
+ return RFAILED;
+ }
+ memset(macPucchCfg->dlDataToUlAck, 0, sizeof(PucchDlDataToUlAck));
+ macPucchCfg->dlDataToUlAck->dlDataToUlAckListCount = cuPucchCfg->choice.setup->dl_DataToUL_ACK->list.count;
+ for(arrIdx = 0; arrIdx < macPucchCfg->dlDataToUlAck->dlDataToUlAckListCount; arrIdx++)
+ {
+ macPucchCfg->dlDataToUlAck->dlDataToUlAckList[arrIdx] =\
+ *cuPucchCfg->choice.setup->dl_DataToUL_ACK->list.array[arrIdx];
+ }
}
/* Power Control */
*
* Functionality: Fills ServingCellReconfig received by CU
*
- * @params[in] ServingCellConfig_t *cuSrvCellCfg
- * ServCellCfgInfo *macSrvCellCfg
+ * @params[in] ServingCellConfig_t *cuSrvCellCfg = Information which is send by
+ * CU, which we have stored in F1UeContextSetupDb,
+ * ServCellCfgInfo *macSrvCellCfg = Used to Store the information
+ * which needs to send in other layer, as well as this can be the
+ * variable which stores the information in DuCb,
+ * ServCellCfgInfo *storedSrvCellCfg = Null in case of sending the
+ * information to other layer else it will have ServCellCfgInfo which
+ * we have stored in copyOfmacUeCfg.
* @return ROK/RFAILD
*
* ****************************************************************/
-uint8_t extractSpCellDedicatedCfg(ServingCellConfig_t *cuSrvCellCfg, ServCellCfgInfo *macSrvCellCfg)
+uint8_t extractSpCellDedicatedCfg(ServingCellConfig_t *cuSrvCellCfg, ServCellCfgInfo *macSrvCellCfg,\
+ServCellCfgInfo *storedSrvCellCfg)
{
uint8_t ret = ROK;
BWP_DownlinkDedicated_t *dlBwp = NULLP;
if(dlBwp->pdcch_Config)
{
if(dlBwp->pdcch_Config->choice.setup)
- {
- macSrvCellCfg->initDlBwp.pdcchPresent = true;
- extractPdcchCfg(dlBwp->pdcch_Config->choice.setup, &macSrvCellCfg->initDlBwp.pdcchCfg);
- }
+ {
+ macSrvCellCfg->initDlBwp.pdcchPresent = true;
+ if(storedSrvCellCfg)
+ {
+ if(!storedSrvCellCfg->initDlBwp.pdcchPresent)
+ {
+ extractPdcchCfg(dlBwp->pdcch_Config->choice.setup, &macSrvCellCfg->initDlBwp.pdcchCfg);
+ }
+ else
+ {
+ extractPdcchCfg(dlBwp->pdcch_Config->choice.setup, &macSrvCellCfg->initDlBwp.pdcchCfg);
+ }
+ }
+ else
+ {
+ extractPdcchCfg(dlBwp->pdcch_Config->choice.setup, &macSrvCellCfg->initDlBwp.pdcchCfg);
+ }
+ }
}
if(dlBwp->pdsch_Config)
{
if(dlBwp->pdsch_Config->choice.setup)
- {
- macSrvCellCfg->initDlBwp.pdschPresent = true;
- extractPdschCfg(dlBwp->pdsch_Config->choice.setup, &macSrvCellCfg->initDlBwp.pdschCfg);
- }
+ {
+ macSrvCellCfg->initDlBwp.pdschPresent = true;
+
+ if(storedSrvCellCfg)
+ {
+ if(!storedSrvCellCfg->initDlBwp.pdschPresent)
+ {
+ extractPdschCfg(dlBwp->pdsch_Config->choice.setup, &macSrvCellCfg->initDlBwp.pdschCfg, NULL);
+ }
+ else
+ {
+ extractPdschCfg(dlBwp->pdsch_Config->choice.setup, &macSrvCellCfg->initDlBwp.pdschCfg,\
+ &storedSrvCellCfg->initDlBwp.pdschCfg);
+ }
+ }
+ else
+ {
+ extractPdschCfg(dlBwp->pdsch_Config->choice.setup, &macSrvCellCfg->initDlBwp.pdschCfg, NULL);
+ }
+ }
}
}
if(cuSrvCellCfg->firstActiveDownlinkBWP_Id)
{
macSrvCellCfg->bwpInactivityTmr = NULLP;
DU_ALLOC_SHRABL_BUF(macSrvCellCfg->bwpInactivityTmr, sizeof(uint8_t));
- if(macSrvCellCfg->bwpInactivityTmr)
- {
+ if(macSrvCellCfg->bwpInactivityTmr)
+ {
memcpy(macSrvCellCfg->bwpInactivityTmr, cuSrvCellCfg->bwp_InactivityTimer, sizeof(uint8_t));
- }
- else
- {
- DU_LOG("\nERROR --> F1AP : Memory Alloc failed for bwpInactivityTmr at extractSpCellDedicatedCfg()");
- return RFAILED;
- }
+ }
+ else
+ {
+ DU_LOG("\nERROR --> F1AP : Memory Alloc failed for bwpInactivityTmr at extractSpCellDedicatedCfg()");
+ return RFAILED;
+ }
}
}
if(cuSrvCellCfg->pdsch_ServingCellConfig)
{
ret = extractPdschServingCellCfg(cuSrvCellCfg->pdsch_ServingCellConfig->choice.setup, &macSrvCellCfg->pdschServCellCfg);
if(ret == RFAILED)
- {
- DU_LOG("\nERROR --> F1AP : Failed at extractPdschServingCellCfg()");
- return RFAILED;
- }
+ {
+ DU_LOG("\nERROR --> F1AP : Failed at extractPdschServingCellCfg()");
+ return RFAILED;
+ }
+ }
+ }
+ if(cuSrvCellCfg->uplinkConfig)
+ {
+ if(cuSrvCellCfg->uplinkConfig->initialUplinkBWP)
+ {
+ ulBwp = ((BWP_UplinkDedicated_t *)(cuSrvCellCfg->uplinkConfig->initialUplinkBWP));
+ if(ulBwp->pusch_Config)
+ {
+ macSrvCellCfg->initUlBwp.puschPresent = true;
+ extractPuschCfg(ulBwp->pusch_Config, &macSrvCellCfg->initUlBwp.puschCfg);
+ }
+ if(ulBwp->pucch_Config)
+ {
+ macSrvCellCfg->initUlBwp.pucchPresent = true;
+ memset(&macSrvCellCfg->initUlBwp.pucchCfg, 0, sizeof(PucchCfg));
+ if(storedSrvCellCfg)
+ {
+ if(!storedSrvCellCfg->initUlBwp.pucchPresent)
+ extractPucchCfg(ulBwp->pucch_Config, &macSrvCellCfg->initUlBwp.pucchCfg, NULL);
+ else
+ extractPucchCfg(ulBwp->pucch_Config, &macSrvCellCfg->initUlBwp.pucchCfg,\
+ &storedSrvCellCfg->initUlBwp.pucchCfg);
+ }
+ else
+ {
+ extractPucchCfg(ulBwp->pucch_Config, &macSrvCellCfg->initUlBwp.pucchCfg, NULL);
+ }
+ }
}
- }
- if(cuSrvCellCfg->uplinkConfig)
- {
- if(cuSrvCellCfg->uplinkConfig->initialUplinkBWP)
- {
- ulBwp = ((BWP_UplinkDedicated_t *)(cuSrvCellCfg->uplinkConfig->initialUplinkBWP));
- if(ulBwp->pusch_Config)
- {
- macSrvCellCfg->initUlBwp.puschPresent = true;
- extractPuschCfg(ulBwp->pusch_Config, &macSrvCellCfg->initUlBwp.puschCfg);
- }
- if(ulBwp->pucch_Config)
- {
- macSrvCellCfg->initUlBwp.pucchPresent = true;
- memset(&macSrvCellCfg->initUlBwp.pucchCfg, 0, sizeof(PucchCfg));
- extractPucchCfg(ulBwp->pucch_Config, &macSrvCellCfg->initUlBwp.pucchCfg);
- }
- }
- if(cuSrvCellCfg->uplinkConfig->firstActiveUplinkBWP_Id)
- macSrvCellCfg->firstActvUlBwpId = *(cuSrvCellCfg->uplinkConfig->firstActiveUplinkBWP_Id);
+ if(cuSrvCellCfg->uplinkConfig->firstActiveUplinkBWP_Id)
+ macSrvCellCfg->firstActvUlBwpId = *(cuSrvCellCfg->uplinkConfig->firstActiveUplinkBWP_Id);
}
return ret;
}
* Function : extractUeReCfgCellInfo
*
* Functionality: Fills Reconfig Cell group Info received by CU
+ *
+ * @params[in] CellGroupConfigRrc_t *cellGrp = CellGroupConfigRrc_t information which
+ * is send by CU, which we have stored in F1UeContextSetupDb
+ * MacUeCfg *MacUeCfg = Used to Store the information,
+ * which needs to send in other layer, as well as this can be
+ * the variable which stores the information in DuCb,
+ * MacUeCfg *storedMacUeCfg = Null in case of sending the
+ * information to other layer else it will have copyOfmacUeCfg
+ * which we have stored in F1UeContextSetupDb.
*
- * @params[in] CellGroupConfigRrc_t *macCellGrpCfg
- * MacUeCfg* macUeCfg
* @return ROK/RFAILED
*
* ****************************************************************/
-uint8_t extractUeReCfgCellInfo(CellGroupConfigRrc_t *cellGrp, MacUeCfg *macUeCfg)
+uint8_t extractUeReCfgCellInfo(CellGroupConfigRrc_t *cellGrp, MacUeCfg *macUeCfg, MacUeCfg *storedMacUeCfg)
{
uint8_t ret = ROK;
MAC_CellGroupConfig_t *macCellGroup = NULLP;
if(cellGrp->spCellConfig->spCellConfigDedicated)
{
servCellCfg = ((ServingCellConfig_t *)(cellGrp->spCellConfig->spCellConfigDedicated));
- ret = extractSpCellDedicatedCfg(servCellCfg, &macUeCfg->spCellCfg.servCellCfg);
+ if(storedMacUeCfg)
+ {
+ if(!storedMacUeCfg->spCellCfgPres)
+ ret = extractSpCellDedicatedCfg(servCellCfg, &macUeCfg->spCellCfg.servCellCfg, NULL);
+ else
+ ret = extractSpCellDedicatedCfg(servCellCfg, &macUeCfg->spCellCfg.servCellCfg,\
+ &storedMacUeCfg->spCellCfg.servCellCfg);
+ }
+ else
+ {
+ ret = extractSpCellDedicatedCfg(servCellCfg, &macUeCfg->spCellCfg.servCellCfg, NULL);
+ }
if(ret == RFAILED)
{
DU_LOG("\nERROR --> F1AP : Failed at extractSpCellDedicatedCfg()");
*
* Functionality: builds Mac Cell Cfg
*
- * @params[in] MacUeCfg pointer
- * void pointer
+ * @params[in] MacUeCfg *macUeCfgToSend = Used to Store the information which
+ * needs to send in other layer, as well as this can be
+ * the variable which stores the information in DuCb.
+ * MacUeCfg *storedMacUeCfg = Null in case of sending the
+ * information to other layer else it will have copyOfmacUeCfg
+ * which we have stored in F1UeContextSetupDb
+ * void *cellInfo = CellGroupConfigRrc_t information which is send
+ * by CU, which we have stored in F1UeContextSetupDb
*
* @return void
*
* ****************************************************************/
-uint8_t procUeReCfgCellInfo(MacUeCfg *macUeCfg, void *cellInfo)
+uint8_t procUeReCfgCellInfo(MacUeCfg *macUeCfgToSend, MacUeCfg *storedMacUeCfg, void *cellInfo)
{
uint8_t ret = ROK;
CellGroupConfigRrc_t *cellGrp = NULLP;
if(cellInfo)
{
cellGrp = (CellGroupConfigRrc_t *)cellInfo;
- ret = extractUeReCfgCellInfo(cellGrp, macUeCfg);
+ ret = extractUeReCfgCellInfo(cellGrp, macUeCfgToSend, storedMacUeCfg);
if(ret == RFAILED)
DU_LOG("\nERROR --> F1AP : Failed at procUeReCfgCellInfo()");
}
if(ret == RFAILED)
{
- freeUeReCfgCellGrpInfo(macUeCfg);
+ freeUeReCfgCellGrpInfo(macUeCfgToSend);
}
return ret;
}
{
UE_NR_Capability_t *ueNrCap=NULLP;
- if(!ueCap)
+ if(!ueCap && oldUeCfg)
{
memcpy(&ueCfg->dlModInfo, &oldUeCfg->dlModInfo, sizeof(ModulationInfo));
memcpy(&ueCfg->ulModInfo, &oldUeCfg->ulModInfo, sizeof(ModulationInfo));
default:
{
DU_LOG("\nERROR --> DU APP: Incorrect downlink modulation order received. Reatining old modulation configuration");
- memcpy(&ueCfg->dlModInfo, &oldUeCfg->dlModInfo, sizeof(ModulationInfo));
+ if(oldUeCfg)
+ memcpy(&ueCfg->dlModInfo, &oldUeCfg->dlModInfo, sizeof(ModulationInfo));
break;
}
}
}
else
{
- memcpy(&ueCfg->dlModInfo, &oldUeCfg->dlModInfo, sizeof(ModulationInfo));
+ if(oldUeCfg)
+ memcpy(&ueCfg->dlModInfo, &oldUeCfg->dlModInfo, sizeof(ModulationInfo));
}
/* Filling UL modulation info */
default:
{
DU_LOG("\nERROR --> DU APP: Incorrect uplink modulation order received. Reatining old modulation configuration");
- memcpy(&ueCfg->ulModInfo, &oldUeCfg->ulModInfo, sizeof(ModulationInfo));
+ if(oldUeCfg)
+ memcpy(&ueCfg->ulModInfo, &oldUeCfg->ulModInfo, sizeof(ModulationInfo));
break;
}
}
}
else
{
- memcpy(&ueCfg->ulModInfo, &oldUeCfg->ulModInfo, sizeof(ModulationInfo));
+ if(oldUeCfg)
+ memcpy(&ueCfg->ulModInfo, &oldUeCfg->ulModInfo, sizeof(ModulationInfo));
}
}
}
/*******************************************************************
*
- * @brief Function to extract cellGrp Info present in cutoDu cont
+ * @brief Function to extract info from CU to DU RRC container extension
*
* @details
*
- * Function : extractCellGrpInfo
+ * Function : extractCuToDuRrcInfoExt
*
- * Functionality: Function to extract cellGrp Info present
- * in cutoDu cont
+ * Functionality: Function to extract info from CU to DU RRC container
+ * extension
*
* @params[in] ProtocolExtensionContainer_4624P16_t pointer
*
- * @return CellGroupConfigRrc_t *
+ * @return ROK
+ * RFAILED
*
* ****************************************************************/
-
-CellGroupConfigRrc_t *extractCellGrpInfo(ProtocolExtensionContainer_4624P16_t *protocolIeExtn,\
- DuUeCfg *ueCfgDb)
+uint8_t extractCuToDuRrcInfoExt(ProtocolExtensionContainer_4624P16_t *protocolIeExtn, DuUeCfg *ueCfgDb)
{
- uint8_t idx2 =0;
- uint16_t id =0;
+ uint8_t ieIdx =0;
uint16_t recvBufLen =0;
CellGroupConfigRrc_t *cellGrpCfg = NULLP;
CUtoDURRCInformation_ExtIEs_t *extIeInfo = NULLP;
if(protocolIeExtn)
{
- for(idx2 = 0; idx2 < protocolIeExtn->list.count; idx2++)
+ for(ieIdx = 0; ieIdx < protocolIeExtn->list.count; ieIdx++)
{
- extIeInfo = ((CUtoDURRCInformation_ExtIEs_t *)(protocolIeExtn->list.array[idx2]));
- id = extIeInfo->id;
- switch(id)
+ extIeInfo = ((CUtoDURRCInformation_ExtIEs_t *)(protocolIeExtn->list.array[ieIdx]));
+ switch(extIeInfo->id)
{
case ProtocolIE_ID_id_CellGroupConfig:
- {
- recvBufLen = extIeInfo->extensionValue.choice.CellGroupConfig.size;
- /* decoding the CellGroup Buf received */
- DU_ALLOC(cellGrpCfg, sizeof(CellGroupConfigRrc_t));
- if(cellGrpCfg)
- {
- memset(cellGrpCfg, 0, sizeof(CellGroupConfigRrc_t));
- rval = aper_decode(0, &asn_DEF_CellGroupConfigRrc, (void **)&cellGrpCfg,
- extIeInfo->extensionValue.choice.CellGroupConfig.buf, recvBufLen, 0, 0);
- if(rval.code == RC_FAIL || rval.code == RC_WMORE)
+ {
+ /* decoding the CellGroup Buf received */
+ recvBufLen = extIeInfo->extensionValue.choice.CellGroupConfig.size;
+ DU_ALLOC(cellGrpCfg, sizeof(CellGroupConfigRrc_t));
+ if(cellGrpCfg)
{
- DU_LOG("\nERROR --> F1AP : ASN decode failed at decodeCellGrpCfg()");
- return NULLP;
+ memset(cellGrpCfg, 0, sizeof(CellGroupConfigRrc_t));
+ rval = aper_decode(0, &asn_DEF_CellGroupConfigRrc, (void **)&cellGrpCfg,
+ extIeInfo->extensionValue.choice.CellGroupConfig.buf, recvBufLen, 0, 0);
+ if(rval.code == RC_FAIL || rval.code == RC_WMORE)
+ {
+ DU_LOG("\nERROR --> F1AP : ASN decode failed at decodeCellGrpCfg()");
+ return RFAILED;
+ }
+ xer_fprint(stdout, &asn_DEF_CellGroupConfigRrc, cellGrpCfg);
+
+ if(extractRlcCfgToAddMod(cellGrpCfg->rlc_BearerToAddModList, ueCfgDb))
+ return NULLP;
+ ueCfgDb->cellGrpCfg = cellGrpCfg;
}
- xer_fprint(stdout, &asn_DEF_CellGroupConfigRrc, cellGrpCfg);
- if(extractRlcCfgToAddMod(cellGrpCfg->rlc_BearerToAddModList, ueCfgDb))
- return NULLP;
- }
- break;
- }
+ break;
+ }
+
+ case ProtocolIE_ID_id_HandoverPreparationInformation:
+ {
+ DU_LOG("\nINFO --> F1AP : Received HANDOVER PREPARATION INFO in UE CONTEXT SETUP REQUEST");
+ break;
+ }
+
default:
- DU_LOG("\nERROR --> F1AP : Invalid IE received CUtoDURRCInformation:%d at decodeCellGrpCfg()", id);
- break;
+ DU_LOG("\nERROR --> F1AP : Invalid IE received CUtoDURRCInformation: %ld at decodeCellGrpCfg()", extIeInfo->id);
+ break;
}
}
}
- return cellGrpCfg;
+ return ROK;
}
/*******************************************************************
* ****************************************************************/
uint8_t procSrbListToSetup(SRBs_ToBeSetup_Item_t * srbItem, LcCfg *macLcToAdd, RlcBearerCfg *rlcLcToAdd)
{
- uint8_t ret = ROK;
/* Filling RLC INFO */
- procRlcLcCfg(srbItem->sRBID, srbItem->sRBID, RB_TYPE_SRB, RLC_AM, CONFIG_ADD, NULL, rlcLcToAdd);
+ procRlcLcCfg(srbItem->sRBID, srbItem->sRBID, RB_TYPE_SRB, RLC_AM, CONFIG_ADD, NULL, rlcLcToAdd, NULL);
/* Filling MAC INFO */
- ret = procMacLcCfg(srbItem->sRBID, RB_TYPE_SRB, CONFIG_ADD, NULL,NULL, NULL, macLcToAdd, NULL);
- if(ret == RFAILED)
+ if(procMacLcCfg(srbItem->sRBID, RB_TYPE_SRB, CONFIG_ADD, NULL,NULL, NULL, NULL, macLcToAdd, NULL) != ROK)
{
DU_LOG("\nERROR --> F1AP : Failed at MAC LC Cfg in procSrbListToSetup()");
- return ret;
+ return RFAILED;
}
- return ret;
+
+ return ROK;
}
uint8_t extractSrbListToSetup(SRBs_ToBeSetup_List_t *srbCfg, DuUeCfg *ueCfgDb)
{
- uint8_t ret, srbIdx;
+ uint8_t ret = ROK, srbIdx = 0, rlcLcIdx = 0;
SRBs_ToBeSetup_Item_t *srbItem = NULLP;
+ LcCfg *macLcCtxt = NULLP;
+ RlcBearerCfg *rlcLcCtxt = NULLP;
if(srbCfg)
{
for(srbIdx = 0; srbIdx < srbCfg->list.count; srbIdx++)
{
+ macLcCtxt = NULL;
+ rlcLcCtxt = NULL;
+
srbItem = &srbCfg->list.array[srbIdx]->value.choice.SRBs_ToBeSetup_Item;
if(ueCfgDb->numMacLcs > MAX_NUM_LC)
- {
+ {
DU_LOG("\nERROR --> F1AP: MAX LC Reached in MAC");
- ret = RFAILED;
- break;
- }
+ ret = RFAILED;
+ break;
+ }
if(ueCfgDb->numRlcLcs > MAX_NUM_LC)
- {
+ {
DU_LOG("\nERROR --> F1AP: MAX LC Reached in RLC");
- ret = RFAILED;
- break;
- }
- memset(&ueCfgDb->macLcCfg[ueCfgDb->numMacLcs], 0, sizeof(LcCfg));
- memset(&ueCfgDb->rlcLcCfg[ueCfgDb->numRlcLcs], 0, sizeof(RlcBearerCfg));
- ret = procSrbListToSetup(srbItem, &ueCfgDb->macLcCfg[ueCfgDb->numMacLcs],\
- &ueCfgDb->rlcLcCfg[ueCfgDb->numRlcLcs]);
- ueCfgDb->numRlcLcs++;
- ueCfgDb->numMacLcs++;
- if(ret == RFAILED)
- {
+ ret = RFAILED;
+ break;
+ }
+
+ for(rlcLcIdx = 0; rlcLcIdx < ueCfgDb->numMacLcs; rlcLcIdx++)
+ {
+ if(ueCfgDb->rlcLcCfg[rlcLcIdx].rbId == srbItem->sRBID && ueCfgDb->rlcLcCfg[rlcLcIdx].rbType == RB_TYPE_SRB)
+ {
+ macLcCtxt = &ueCfgDb->macLcCfg[rlcLcIdx];
+ rlcLcCtxt = &ueCfgDb->rlcLcCfg[rlcLcIdx];
+ break;
+ }
+ }
+ if(!macLcCtxt)
+ {
+ memset(&ueCfgDb->macLcCfg[ueCfgDb->numMacLcs], 0, sizeof(LcCfg));
+ macLcCtxt = &ueCfgDb->macLcCfg[ueCfgDb->numMacLcs];
+ ueCfgDb->numMacLcs++;
+ }
+ if(!rlcLcCtxt)
+ {
+ memset(&ueCfgDb->rlcLcCfg[ueCfgDb->numRlcLcs], 0, sizeof(RlcBearerCfg));
+ rlcLcCtxt = &ueCfgDb->rlcLcCfg[ueCfgDb->numRlcLcs];
+ ueCfgDb->numRlcLcs++;
+ }
+
+ ret = procSrbListToSetup(srbItem, macLcCtxt, rlcLcCtxt);
+
+ DU_LOG("\nDEBUG --> DUAPP: extractSrbListToSetup: SRBID: %ld [RLC,MAC,NumDrb]:[%x,%x,%x]",\
+ srbItem->sRBID, ueCfgDb->numRlcLcs, ueCfgDb->numMacLcs, ueCfgDb->numDrb);
+ if(ret == RFAILED)
+ {
DU_LOG("\nERROR --> F1AP: Failed at extractSrbListToSetup()");
- break;
- }
+ break;
+ }
}
}
else
*
* @details
*
- * Function : procDrbListToSetup
+ * Function : procDrbListToSetupMod
*
* Functionality: Fills Drb List received by CU
* for both MAC and RLC
*
- * @params[in] SRBs_ToBeSetup_Item_t pointer
- * LcCfg pointer,
- * RlcBearerCfg pointer
+ * @params[in] DRBs_ToBeSetup_Item_t , DRBs_ToBeSetupMod_Item_t,
+ * DRBs_ToBeModified_Item_t , lcId, LcCfg pointer,
+ * RlcBearerCfg , UpTnlCfg, RlcUeCfg
* @return void
*
* ****************************************************************/
-uint8_t procDrbListToSetup(uint8_t lcId, DRBs_ToBeSetup_Item_t *drbItem,\
-DRBs_ToBeSetupMod_Item_t *drbSetupModItem, LcCfg *macLcToAdd, RlcBearerCfg *rlcLcToAdd, UpTnlCfg *upTnlInfo)
+uint8_t procDrbListToSetupMod(uint8_t lcId, DRBs_ToBeSetup_Item_t *drbItem,\
+DRBs_ToBeSetupMod_Item_t *drbSetupModItem, DRBs_ToBeModified_Item_t *drbModItem, LcCfg *macLcToAdd, RlcBearerCfg *rlcLcToAdd, UpTnlCfg *upTnlInfo, RlcUeCfg *storedRlcUeCfg)
{
+ uint8_t cfgIdx = 0;
+ RlcMode rlcModeInfo;
if(drbItem != NULLP)
{
/* Filling RLC INFO */
- procRlcLcCfg(drbItem->dRBID, lcId, RB_TYPE_DRB, drbItem->rLCMode, CONFIG_ADD, NULL, rlcLcToAdd);
+ procRlcLcCfg(drbItem->dRBID, lcId, RB_TYPE_DRB, drbItem->rLCMode, CONFIG_ADD, NULL, rlcLcToAdd, &drbItem->\
+ qoSInformation);
/* Filling MAC INFO */
- if(procMacLcCfg(lcId, RB_TYPE_DRB, CONFIG_ADD, drbItem, NULL, NULL, macLcToAdd, upTnlInfo) != ROK)
+ if(procMacLcCfg(lcId, RB_TYPE_DRB, CONFIG_ADD, drbItem, NULL, NULL, NULL, macLcToAdd, upTnlInfo) != ROK)
{
- DU_LOG("\nERROR --> F1AP : Failed at RLC LC Cfg in procDrbListToSetup()");
+ DU_LOG("\nERROR --> F1AP : Failed at RLC LC Cfg in procDrbListToSetupMod()");
return RFAILED;
}
}
else if(drbSetupModItem != NULLP)
{
- procRlcLcCfg(drbSetupModItem->dRBID, lcId, RB_TYPE_DRB, drbSetupModItem->rLCMode, CONFIG_ADD, NULL, rlcLcToAdd);
+ procRlcLcCfg(drbSetupModItem->dRBID, lcId, RB_TYPE_DRB, drbSetupModItem->rLCMode, CONFIG_ADD, NULL, rlcLcToAdd,
+ &drbSetupModItem->qoSInformation);
+
+ if(procMacLcCfg(lcId, RB_TYPE_DRB, CONFIG_ADD, NULL, drbSetupModItem, NULL, NULL, macLcToAdd, upTnlInfo) != ROK)
+ {
+ DU_LOG("\nERROR --> F1AP : Failed at RLC LC Cfg in procDrbListToSetupMod()");
+ return RFAILED;
+ }
+ }
+ else if(drbModItem != NULLP)
+ {
+ /* Drb to Mod IEs doesnot have rlcMode to be modified
+ * in ASN. Hence no change in RLC configurations */
+ if(storedRlcUeCfg != NULLP)
+ {
+ for(cfgIdx = 0; cfgIdx < storedRlcUeCfg->numLcs; cfgIdx++)
+ {
+ if(storedRlcUeCfg->rlcLcCfg[cfgIdx].lcId == lcId)
+ {
+ rlcModeInfo = storedRlcUeCfg->rlcLcCfg[cfgIdx].rlcMode;
+ break;
+ }
+ }
+ }
- if(procMacLcCfg(lcId, RB_TYPE_DRB, CONFIG_ADD, NULL, drbSetupModItem, NULL, macLcToAdd, upTnlInfo) != ROK)
+ procRlcLcCfg(drbModItem->dRBID, lcId, RB_TYPE_DRB, rlcModeInfo, CONFIG_MOD, NULL, rlcLcToAdd, drbModItem->qoSInformation);
+ if(procMacLcCfg(lcId, RB_TYPE_DRB, CONFIG_MOD, NULL, NULL, drbModItem, NULL, macLcToAdd, upTnlInfo) != ROK)
{
- DU_LOG("\nERROR --> F1AP : Failed at RLC LC Cfg in procDrbListToSetup()");
+ DU_LOG("\nERROR --> F1AP : Failed at RLC LC Cfg in procDrbListToSetupMod()");
return RFAILED;
}
}
*
* @details
*
- * Function : extractDrbListToSetup
+ * Function : extractDrbListToSetupMod
*
* Functionality: extract Drb List received by CU
* for both MAC and RLC
*
* ****************************************************************/
-uint8_t extractDrbListToSetup(uint8_t lcId, DRBs_ToBeSetup_List_t *drbCfg,DRBs_ToBeSetupMod_List_t *drbSetupModCfg,\
-uint8_t drbCount, DuUeCfg *ueCfgDb)
+uint8_t extractDrbListToSetupMod(DRBs_ToBeSetup_List_t *drbCfg, DRBs_ToBeSetupMod_List_t *drbSetupModCfg,\
+ DRBs_ToBeModified_List_t *drbModCfg, uint8_t drbCount, DuUeCfg *ueCfgDb, uint32_t *drbBitMap, RlcUeCfg *rlcUeCfg)
{
- uint8_t ret, drbIdx;
+ uint8_t ret = ROK;
+ uint8_t drbIdx = 0, rlcLcIdx = 0;
+ uint8_t drbId = 0, lcId = 0;
DRBs_ToBeSetup_Item_t *drbItem = NULLP;
DRBs_ToBeSetupMod_ItemIEs_t *drbSetupModItem = NULLP;
+ DRBs_ToBeModified_ItemIEs_t *drbModItem = NULLP;
+ LcCfg *macLcCtxt = NULLP;
+ RlcBearerCfg *rlcLcCtxt = NULLP;
ret = ROK;
if(drbCount > 0)
{
for(drbIdx = 0; drbIdx < drbCount; drbIdx++)
{
+ macLcCtxt = NULL;
+ rlcLcCtxt = NULL;
+
if(ueCfgDb->numMacLcs > MAX_NUM_LC)
{
- DU_LOG("\nERROR --> F1AP : MAX LC Reached in MAC at extractDrbListToSetup()");
+ DU_LOG("\nERROR --> F1AP : MAX LC Reached in MAC at extractDrbListToSetupMod()");
ret = RFAILED;
break;
}
if(ueCfgDb->numRlcLcs > MAX_NUM_LC)
{
- DU_LOG("\nERROR --> F1AP : MAX LC Reached in RLC at extractDrbListToSetup()");
+ DU_LOG("\nERROR --> F1AP : MAX LC Reached in RLC at extractDrbListToSetupMod()");
ret = RFAILED;
break;
}
- memset(&ueCfgDb->macLcCfg[ueCfgDb->numMacLcs], 0, sizeof(LcCfg));
- memset(&ueCfgDb->rlcLcCfg[ueCfgDb->numRlcLcs], 0, sizeof(RlcBearerCfg));
-
- if(drbCfg != NULL)
+
+ if(drbModCfg != NULLP)
{
- drbItem = &drbCfg->list.array[drbIdx]->value.choice.DRBs_ToBeSetup_Item;
- ret = procDrbListToSetup(lcId, drbItem, NULL, &ueCfgDb->macLcCfg[ueCfgDb->numMacLcs],\
- &ueCfgDb->rlcLcCfg[ueCfgDb->numRlcLcs], &ueCfgDb->upTnlInfo[ueCfgDb->numDrb]);
- if(ret == RFAILED)
+ drbModItem = (DRBs_ToBeModified_ItemIEs_t *) drbModCfg->list.array[drbIdx];
+ drbId = drbModItem->value.choice.DRBs_ToBeModified_Item.dRBID;
+ }
+ else if(drbCfg != NULLP)
+ drbId = drbCfg->list.array[drbIdx]->value.choice.DRBs_ToBeSetup_Item.dRBID;
+ else if(drbSetupModCfg != NULL)
+ {
+ drbSetupModItem = (DRBs_ToBeSetupMod_ItemIEs_t *) drbSetupModCfg->list.array[drbIdx];
+ drbId = drbSetupModItem->value.choice.DRBs_ToBeSetupMod_Item.dRBID;
+ }
+
+ for(rlcLcIdx = 0; rlcLcIdx < ueCfgDb->numRlcLcs; rlcLcIdx++)
+ {
+ if(ueCfgDb->rlcLcCfg[rlcLcIdx].rbId == drbId && ueCfgDb->rlcLcCfg[rlcLcIdx].rbType == RB_TYPE_DRB)
{
- DU_LOG("\nERROR --> F1AP : Failed at extractDrbListToSetup()");
+ macLcCtxt = &ueCfgDb->macLcCfg[rlcLcIdx];
+ rlcLcCtxt = &ueCfgDb->rlcLcCfg[rlcLcIdx];
break;
}
}
- else if(drbSetupModCfg != NULL)
+ if(!macLcCtxt)
{
- drbSetupModItem = (DRBs_ToBeSetupMod_ItemIEs_t *) drbSetupModCfg->list.array[drbIdx];
- ret = procDrbListToSetup(lcId, NULL, &(drbSetupModItem->value.choice.DRBs_ToBeSetupMod_Item) ,\
- &ueCfgDb->macLcCfg[ueCfgDb->numMacLcs], &ueCfgDb->rlcLcCfg[ueCfgDb->numRlcLcs],\
- &ueCfgDb->upTnlInfo[ueCfgDb->numDrb]);
+ memset(&ueCfgDb->macLcCfg[ueCfgDb->numMacLcs], 0, sizeof(LcCfg));
+ macLcCtxt = &ueCfgDb->macLcCfg[ueCfgDb->numMacLcs];
+ ueCfgDb->numMacLcs++;
+ }
+ if(!rlcLcCtxt)
+ {
+ memset(&ueCfgDb->rlcLcCfg[ueCfgDb->numRlcLcs], 0, sizeof(RlcBearerCfg));
+ rlcLcCtxt = &ueCfgDb->rlcLcCfg[ueCfgDb->numRlcLcs];
+ ueCfgDb->numRlcLcs++;
+ }
+
+ if(drbModCfg != NULLP)
+ {
+ lcId = fetchLcId(drbId);
+ if(lcId < MIN_DRB_LCID)
+ {
+ DU_LOG("\nERROR --> F1AP : Failed fetching LCID %d in extractDrbListToSetupMod() for Modified List", lcId);
+ break;
+ }
+ ret = procDrbListToSetupMod(lcId, NULL, NULL, &(drbModItem->value.choice.DRBs_ToBeModified_Item),\
+ macLcCtxt, rlcLcCtxt, &ueCfgDb->upTnlInfo[ueCfgDb->numDrb], rlcUeCfg);
if(ret == RFAILED)
{
- DU_LOG("\nERROR --> F1AP : Failed at extractDrbListToSetup()");
+ DU_LOG("\nERROR --> F1AP : Failed at extractDrbListToSetupMod() for Modified List");
+ break;
+ }
+ }
+ else
+ {
+ lcId = getDrbLcId(drbBitMap);
+ if(lcId == RFAILED)
+ {
+ DU_LOG("\nERROR --> F1AP : InCorrect LCID extractDrbListToSetupMod()");
+ ret = RFAILED;
break;
}
+ if(drbCfg != NULL)
+ {
+ drbItem = &drbCfg->list.array[drbIdx]->value.choice.DRBs_ToBeSetup_Item;
+ ret = procDrbListToSetupMod(lcId, drbItem, NULL, NULL, macLcCtxt, rlcLcCtxt, &ueCfgDb->upTnlInfo[ueCfgDb->numDrb], rlcUeCfg);
+ if(ret == RFAILED)
+ {
+ DU_LOG("\nERROR --> F1AP : Failed at extractDrbListToSetupMod() for DrbSetup List");
+ break;
+ }
+ }
+ else if(drbSetupModCfg != NULL)
+ {
+ ret = procDrbListToSetupMod(lcId, NULL, &(drbSetupModItem->value.choice.DRBs_ToBeSetupMod_Item), NULL,\
+ macLcCtxt, rlcLcCtxt, &ueCfgDb->upTnlInfo[ueCfgDb->numDrb], rlcUeCfg);
+ if(ret == RFAILED)
+ {
+ DU_LOG("\nERROR --> F1AP : Failed at extractDrbListToSetupMod() for DrbSetupMod List");
+ break;
+ }
+ ueCfgDb->numDrbSetupMod++;
+ }
}
- ueCfgDb->numRlcLcs++;
- ueCfgDb->numMacLcs++;
ueCfgDb->numDrb++;
+
+ DU_LOG("\nDEBUG --> DUAPP: extractDrbListToSetupMod:lcId:%x ,BitMap:%x, [RLC,MAC,NumDrb]:[%x,%x,%x]",\
+ lcId,*drbBitMap, ueCfgDb->numRlcLcs, ueCfgDb->numMacLcs, ueCfgDb->numDrb);
if(ret == RFAILED)
{
- DU_LOG("\nERROR --> F1AP : Failed at extractDrbListToSetup()");
+ DU_LOG("\nERROR --> F1AP : Failed at extractDrbListToSetupMod()");
break;
}
}
* ****************************************************************/
uint8_t procF1UeContextSetupReq(F1AP_PDU_t *f1apMsg)
{
- uint8_t ret=0, ieIdx=0, ueIdx=0, lcId=0, cellIdx=0;
- bool ueCbFound = false;
+ int8_t ueIdx = -1;
+ uint8_t ret=0, ieIdx=0, ieExtIdx = 0, servCellIdx = 0;
+ bool ueCbFound = false, hoInProgress = false;
+ uint16_t nrCellId = 0, cellIdx=0;
uint32_t gnbCuUeF1apId=0, gnbDuUeF1apId=0, bitRateSize=0;
DuUeCb *duUeCb = NULL;
UEContextSetupRequest_t *ueSetReq = NULL;
DRBs_ToBeSetup_List_t *drbCfg = NULL;
+ CUtoDURRCInformation_t *rrcInfo = NULL;
ret = ROK;
gnbCuUeF1apId = ueSetReq->protocolIEs.list.array[ieIdx]->value.choice.GNB_CU_UE_F1AP_ID;
break;
}
+
case ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID:
{
gnbDuUeF1apId = ueSetReq->protocolIEs.list.array[ieIdx]->value.choice.GNB_DU_UE_F1AP_ID;
break;
}
+
+ case ProtocolIE_ID_id_SpCell_ID:
+ {
+ bitStringToInt(&ueSetReq->protocolIEs.list.array[ieIdx]->value.choice.NRCGI.nRCellIdentity, &nrCellId);
+
+ GET_CELL_IDX(nrCellId, cellIdx);
+ if(!duCb.actvCellLst[cellIdx])
+ {
+ DU_LOG("\nERROR --> F1AP : Cell Id [%d] not found", nrCellId);
+ ret = RFAILED;
+ }
+ break;
+ }
+
case ProtocolIE_ID_id_ServCellIndex:
{
- cellIdx = ueSetReq->protocolIEs.list.array[ieIdx]->value.choice.ServCellIndex;
+ servCellIdx = ueSetReq->protocolIEs.list.array[ieIdx]->value.choice.ServCellIndex;
+ break;
+ }
+
+ case ProtocolIE_ID_id_SpCellULConfigured:
+ {
+ /* Indicates whether the gNB-CU requests the gNB-DU to configure the uplink as no UL,
+ UL, SUL or UL+SUL for the indicated cell for the UE */
+ break;
+ }
+
+ case ProtocolIE_ID_id_CUtoDURRCInformation:
+ {
+ rrcInfo = &ueSetReq->protocolIEs.list.array[ieIdx]->value.choice.CUtoDURRCInformation;
+
+ /* Search if UE context is present */
for(ueIdx = 0; ueIdx < MAX_NUM_UE; ueIdx++)
{
- if((duCb.actvCellLst[cellIdx]->ueCb[ueIdx].gnbDuUeF1apId == gnbDuUeF1apId)&&\
- (duCb.actvCellLst[cellIdx]->ueCb[ueIdx].gnbCuUeF1apId == gnbCuUeF1apId))
+ if(duCb.actvCellLst[cellIdx]->ueCb[ueIdx].gnbCuUeF1apId == gnbCuUeF1apId)
{
ueCbFound = true;
duUeCb = &duCb.actvCellLst[cellIdx]->ueCb[ueIdx];
- DU_ALLOC(duUeCb->f1UeDb, sizeof(F1UeContextSetupDb));
- if(duUeCb->f1UeDb)
- {
- memset(duUeCb->f1UeDb, 0, sizeof(F1UeContextSetupDb));
- duUeCb->f1UeDb->actionType = UE_CTXT_SETUP;
- duUeCb->f1UeDb->cellIdx = cellIdx;
- }
- else
+ break;
+ }
+ }
+
+ /* Check if UE Handover scenario */
+ if(rrcInfo->iE_Extensions)
+ {
+ for(ieExtIdx = 0; ieExtIdx < rrcInfo->iE_Extensions->list.count; ieExtIdx++)
+ {
+ if(rrcInfo->iE_Extensions->list.array[ieExtIdx]->id == ProtocolIE_ID_id_HandoverPreparationInformation)
{
- DU_LOG("\nERROR --> F1AP: Memory Alloc Failed at procF1UeContextSetupReq()");
- ret = RFAILED;
+ hoInProgress = true;
+ break;
}
- break;
}
+ }
+
+ /* If UE context is not present, but UE is in handover */
+ if(!ueCbFound && hoInProgress)
+ {
+ ueIdx = getFreeBitFromUeBitMap(nrCellId);
+ if(ueIdx != -1)
+ gnbDuUeF1apId = ueIdx +1;
else
- ueCbFound = false;
+ {
+ DU_LOG("\nERROR --> F1AP : No free UE IDX found in UE bit map of cell Id [%d]", nrCellId);
+ ret = RFAILED;
+ break;
+ }
+ duUeCb = &duCb.actvCellLst[cellIdx]->ueCb[ueIdx];
+ duUeCb->f1UeDb = NULL;
+ duUeCb->gnbCuUeF1apId = gnbCuUeF1apId;
+ duUeCb->gnbDuUeF1apId = gnbDuUeF1apId;
+ duUeCb->ueState = UE_HANDIN_IN_PROGRESS;
+ }
+ if(duUeCb)
+ {
+ DU_ALLOC(duUeCb->f1UeDb, sizeof(F1UeContextSetupDb));
+ if(duUeCb->f1UeDb)
+ {
+ memset(duUeCb->f1UeDb, 0, sizeof(F1UeContextSetupDb));
+ duUeCb->f1UeDb->actionType = UE_CTXT_SETUP;
+ duUeCb->f1UeDb->cellIdx = cellIdx;
+ }
+ else
+ {
+ DU_LOG("\nERROR --> F1AP: Memory Alloc Failed at procF1UeContextSetupReq()");
+ ret = RFAILED;
+ break;
+ }
}
- if(!ueCbFound)
+ else
{
DU_LOG("\nERROR --> F1AP: DuUeCb is not found at procF1UeContextSetupReq()");
ret = RFAILED;
+ break;
}
- break;
- }
- case ProtocolIE_ID_id_SpCellULConfigured:
- /* Indicates whether the gNB-CU requests the gNB-DU to configure the uplink as no UL,
- UL, SUL or UL+SUL for the indicated cell for the UE */
- break;
- case ProtocolIE_ID_id_CUtoDURRCInformation:
- {
- if(ueSetReq->protocolIEs.list.array[ieIdx]->value.choice.CUtoDURRCInformation.uE_CapabilityRAT_ContainerList)
+
+ /* Extract UE capability info */
+ if(rrcInfo->uE_CapabilityRAT_ContainerList)
{
- duUeCb->f1UeDb->duUeCfg.ueNrCapability = \
- extractUeCapability(ueSetReq->protocolIEs.list.array[ieIdx]->value.choice.CUtoDURRCInformation.\
- uE_CapabilityRAT_ContainerList, duUeCb);
+ duUeCb->f1UeDb->duUeCfg.ueNrCapability = extractUeCapability(rrcInfo->uE_CapabilityRAT_ContainerList, duUeCb);
}
- if(ueSetReq->protocolIEs.list.array[ieIdx]->value.choice.CUtoDURRCInformation.iE_Extensions)
+
+ /* Extract IE extension */
+ if(rrcInfo->iE_Extensions)
{
- duUeCb->f1UeDb->duUeCfg.cellGrpCfg = extractCellGrpInfo(ueSetReq->protocolIEs.list.array[ieIdx]->\
- value.choice.CUtoDURRCInformation.iE_Extensions, &duUeCb->f1UeDb->duUeCfg);
- if(!duUeCb->f1UeDb->duUeCfg.cellGrpCfg)
+ if(extractCuToDuRrcInfoExt(rrcInfo->iE_Extensions, &duUeCb->f1UeDb->duUeCfg) != ROK)
{
- DU_LOG("\nERROR --> F1AP: Failed to extract cell Grp Info");
+ DU_LOG("\nERROR --> F1AP: Failed to extract CU to DU RRC information extension IE");
//TODO: Update the failure cause in ue context Setup Response
ret = RFAILED;
}
}
break;
}
+
case ProtocolIE_ID_id_SCell_ToBeSetup_List:
{
DU_LOG("\nINFO --> DU_APP: Received SCell_ToBeSetup_List but Not processing the list");
break;
}
+
case ProtocolIE_ID_id_SRBs_ToBeSetup_List:
{
if(extractSrbListToSetup(&ueSetReq->protocolIEs.list.array[ieIdx]->value.choice.SRBs_ToBeSetup_List,\
- &duUeCb->f1UeDb->duUeCfg))
+ &duUeCb->f1UeDb->duUeCfg))
{
DU_LOG("\nERROR --> DU APP : Failed at extractSrbListToSetup()");
//TODO: Update the failure cause in ue context Setup Response
}
break;
}
+
case ProtocolIE_ID_id_DRBs_ToBeSetup_List:
{
- lcId = getDrbLcId(&duUeCb->drbBitMap);
- if(lcId != RFAILED)
+ drbCfg = &ueSetReq->protocolIEs.list.array[ieIdx]->value.choice.DRBs_ToBeSetup_List;
+
+ if(extractDrbListToSetupMod(drbCfg, NULL, NULL, drbCfg->list.count, &duUeCb->f1UeDb->duUeCfg, &duUeCb->drbBitMap, NULLP))
{
- drbCfg = &ueSetReq->protocolIEs.list.array[ieIdx]->value.choice.DRBs_ToBeSetup_List;
- if(extractDrbListToSetup(lcId, drbCfg, NULL, drbCfg->list.count, &duUeCb->f1UeDb->duUeCfg))
- {
- DU_LOG("\nERROR --> DU APP : Failed at extractDrbListToSetup()");
- //TODO: Update the failure cause in ue context Setup Response
- ret = RFAILED;
- }
- }
- else
+ DU_LOG("\nERROR --> DU APP : Failed at extractDrbListToSetupMod()");
+ //TODO: Update the failure cause in ue context Setup Response
ret = RFAILED;
+ }
break;
}
+
case ProtocolIE_ID_id_RRCContainer:
{
/* Filling Dl RRC Msg Info */
}
break;
}
+
case ProtocolIE_ID_id_RRCDeliveryStatusRequest:
{
if(duUeCb->f1UeDb->dlRrcMsg->rrcMsgPdu)
}
break;
}
+
case ProtocolIE_ID_id_GNB_DU_UE_AMBR_UL:
{
/* MaximumBitRate Uplink */
ret = RFAILED;
break;
}
+
default:
{
break;
}
+ } /* End of switch */
+
+ /* In case of any failure in any IE */
+ if(ret == RFAILED)
+ {
+ // BuildAndSendUeContextSetupRsp(cellId,ueId);
+ DU_LOG("\nERROR --> F1AP: Failed to process UE CNTXT SETUP REQ at procF1UeContextSetupReq()");
+ break;
}
- }
- if(ret == RFAILED)
- {
- /*TODO : Negative case*/
- // BuildAndSendUeContextSetupRsp(cellId,ueIdx);
- DU_LOG("\nERROR --> F1AP: Failed to process UE CNTXT SETUP REQ at procF1UeContextSetupReq()");
- }
- else
+ } /* End of for loop of IEs */
+
+ if(ret == ROK)
ret = duProcUeContextSetupRequest(duUeCb);
freeAperDecodeF1UeContextSetupReq(ueSetReq);
* Functionality: Constructs the UE Setup Response and sends
* it to the DU through SCTP.
*
- * @params[in] uint8_t cellId,uint8_t ueIdx
+ * @params[in] uint8_t cellId,uint8_t ueId
*
* @return ROK - success
* RFAILED - failure
*
* ****************************************************************/
-uint8_t BuildAndSendUeContextSetupRsp(uint8_t cellId,uint8_t ueIdx)
+uint8_t BuildAndSendUeContextSetupRsp(uint8_t cellId,uint8_t ueId)
{
uint8_t idx, ret, cellIdx, elementCnt;
uint32_t gnbCuUeF1apId; /* gNB-CU UE F1AP Id */
asn_enc_rval_t encRetVal; /* Encoder return value */
F1AP_PDU_t *f1apMsg = NULLP;
UEContextSetupResponse_t *ueSetRsp = NULLP;
- CellGroupConfigRrc_t *cellGrpCfg = NULLP;
DuUeCb *ueCb = NULLP;
- DU_LOG("\n INFO --> F1AP : Building UE Context Setup Response for cellId %d, ueIdx %d\n", cellId, ueIdx);
+ DU_LOG("\n INFO --> F1AP : Building UE Context Setup Response for cellId %d, ueId %d\n", cellId, ueId);
while(true)
{
DU_ALLOC(f1apMsg, sizeof(F1AP_PDU_t));
if(f1apMsg == NULLP)
{
- DU_LOG(" ERROR --> F1AP : Memory allocation for F1AP-PDU failed");
- ret = RFAILED;
- break;
+ DU_LOG(" ERROR --> F1AP : Memory allocation for F1AP-PDU failed");
+ ret = RFAILED;
+ break;
}
f1apMsg->present = F1AP_PDU_PR_successfulOutcome;
DU_ALLOC(f1apMsg->choice.successfulOutcome,
- sizeof(SuccessfulOutcome_t));
+ sizeof(SuccessfulOutcome_t));
if(f1apMsg->choice.successfulOutcome == NULLP)
{
- DU_LOG(" ERROR --> F1AP : Memory allocation for F1AP-PDU failed");
- ret = RFAILED;
- break;
+ DU_LOG(" ERROR --> F1AP : Memory allocation for F1AP-PDU failed");
+ ret = RFAILED;
+ break;
}
f1apMsg->choice.successfulOutcome->procedureCode = \
- ProcedureCode_id_UEContextSetup;
+ ProcedureCode_id_UEContextSetup;
f1apMsg->choice.successfulOutcome->criticality = Criticality_reject;
f1apMsg->choice.successfulOutcome->value.present = \
- SuccessfulOutcome__value_PR_UEContextSetupResponse;
+ SuccessfulOutcome__value_PR_UEContextSetupResponse;
ueSetRsp =
- &f1apMsg->choice.successfulOutcome->value.choice.UEContextSetupResponse;
+ &f1apMsg->choice.successfulOutcome->value.choice.UEContextSetupResponse;
elementCnt = 4;
ueSetRsp->protocolIEs.list.count = elementCnt;
ueSetRsp->protocolIEs.list.size = \
- elementCnt * sizeof(UEContextSetupResponse_t *);
+ elementCnt * sizeof(UEContextSetupResponse_t *);
/* Initialize the UESetup members */
DU_ALLOC(ueSetRsp->protocolIEs.list.array, \
- ueSetRsp->protocolIEs.list.size);
+ ueSetRsp->protocolIEs.list.size);
if(ueSetRsp->protocolIEs.list.array == NULLP)
{
- DU_LOG(" ERROR --> F1AP : Memory allocation for UE Setup Response failed");
- ret = RFAILED;
- break;
+ DU_LOG(" ERROR --> F1AP : Memory allocation for UE Setup Response failed");
+ ret = RFAILED;
+ break;
}
for(idx=0; idx<elementCnt; idx++)
{
- DU_ALLOC(ueSetRsp->protocolIEs.list.array[idx],\
- sizeof(UEContextSetupResponseIEs_t));
- if(ueSetRsp->protocolIEs.list.array[idx] == NULLP)
- {
- DU_LOG(" ERROR --> F1AP : Memory allocation for UE Setup Response failed");
- ret = RFAILED;
- break;
- }
+ DU_ALLOC(ueSetRsp->protocolIEs.list.array[idx],\
+ sizeof(UEContextSetupResponseIEs_t));
+ if(ueSetRsp->protocolIEs.list.array[idx] == NULLP)
+ {
+ DU_LOG(" ERROR --> F1AP : Memory allocation for UE Setup Response failed");
+ ret = RFAILED;
+ break;
+ }
}
/* Fetching Ue Cb Info*/
GET_CELL_IDX(cellId, cellIdx);
- gnbDuUeF1apId = duCb.actvCellLst[cellIdx]->ueCb[ueIdx-1].gnbDuUeF1apId;
- gnbCuUeF1apId = duCb.actvCellLst[cellIdx]->ueCb[ueIdx-1].gnbCuUeF1apId;
- ueCb = &duCb.actvCellLst[cellIdx]->ueCb[ueIdx-1];
+ gnbDuUeF1apId = duCb.actvCellLst[cellIdx]->ueCb[ueId-1].gnbDuUeF1apId;
+ gnbCuUeF1apId = duCb.actvCellLst[cellIdx]->ueCb[ueId-1].gnbCuUeF1apId;
+ ueCb = &duCb.actvCellLst[cellIdx]->ueCb[ueId-1];
idx = 0;
/*GNB CU UE F1AP ID*/
ueSetRsp->protocolIEs.list.array[idx]->id = \
- ProtocolIE_ID_id_gNB_CU_UE_F1AP_ID;
+ ProtocolIE_ID_id_gNB_CU_UE_F1AP_ID;
ueSetRsp->protocolIEs.list.array[idx]->criticality = Criticality_reject;
ueSetRsp->protocolIEs.list.array[idx]->value.present = \
- UEContextSetupResponseIEs__value_PR_GNB_CU_UE_F1AP_ID;
+ UEContextSetupResponseIEs__value_PR_GNB_CU_UE_F1AP_ID;
ueSetRsp->protocolIEs.list.array[idx]->value.choice.GNB_CU_UE_F1AP_ID = gnbCuUeF1apId;
/*GNB DU UE F1AP ID*/
idx++;
ueSetRsp->protocolIEs.list.array[idx]->id = \
- ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID;
+ ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID;
ueSetRsp->protocolIEs.list.array[idx]->criticality = Criticality_reject;
ueSetRsp->protocolIEs.list.array[idx]->value.present = \
- UEContextSetupResponseIEs__value_PR_GNB_DU_UE_F1AP_ID;
+ UEContextSetupResponseIEs__value_PR_GNB_DU_UE_F1AP_ID;
ueSetRsp->protocolIEs.list.array[idx]->value.choice.GNB_DU_UE_F1AP_ID = gnbDuUeF1apId;
/*DUtoCURRC Information */
idx++;
ueSetRsp->protocolIEs.list.array[idx]->id = \
- ProtocolIE_ID_id_DUtoCURRCInformation;
+ ProtocolIE_ID_id_DUtoCURRCInformation;
ueSetRsp->protocolIEs.list.array[idx]->criticality = Criticality_reject;
ueSetRsp->protocolIEs.list.array[idx]->value.present =\
- UEContextSetupResponseIEs__value_PR_DUtoCURRCInformation;
- if(ueCb->f1UeDb)
- {
- if(ueCb->f1UeDb->duUeCfg.cellGrpCfg)
- {
- cellGrpCfg = (CellGroupConfigRrc_t*)ueCb->f1UeDb->duUeCfg.cellGrpCfg;
- ret = EncodeUeCntxtDuToCuInfo(&ueSetRsp->protocolIEs.list.array[idx]->value.\
- choice.DUtoCURRCInformation.cellGroupConfig, cellGrpCfg);
- if(ret == RFAILED)
- {
- DU_LOG("\nERROR --> F1AP : Failed to EncodeUeCntxtDuToCuInfo in BuildAndSendUeContextSetupRsp()");
- freeF1UeDb(ueCb->f1UeDb);
- ueCb->f1UeDb = NULLP;
- break;
- }
- }
- }
- else
- {
- DU_LOG("\nERROR --> F1AP : Failed to form DUtoCU RRCInfo at BuildAndSendUeContextSetupRsp()");
- ret = RFAILED;
- break;
- }
+ UEContextSetupResponseIEs__value_PR_DUtoCURRCInformation;
+ BuildCellGroupConfigRrc(ueCb, &ueSetRsp->protocolIEs.list.array[idx]->value.choice.DUtoCURRCInformation.cellGroupConfig);
/* Drb Setup List */
idx++;
ueSetRsp->protocolIEs.list.array[idx]->id = \
- ProtocolIE_ID_id_DRBs_Setup_List;
+ ProtocolIE_ID_id_DRBs_Setup_List;
ueSetRsp->protocolIEs.list.array[idx]->criticality = Criticality_reject;
ueSetRsp->protocolIEs.list.array[idx]->value.present =\
- UEContextSetupResponseIEs__value_PR_DRBs_Setup_List;
+ UEContextSetupResponseIEs__value_PR_DRBs_Setup_List;
ret = fillDrbSetupList(&ueSetRsp->protocolIEs.list.array[idx]->value.choice.DRBs_Setup_List,\
- &ueCb->f1UeDb->duUeCfg);
+ &ueCb->f1UeDb->duUeCfg);
if(ret == RFAILED)
{
DU_LOG("\nERROR --> F1AP : Failed to fillDrbSetupList in BuildAndSendUeContextSetupRsp()");
break;
}
- /* Free UeContext Db created during Ue context Req */
- freeF1UeDb(ueCb->f1UeDb);
- ueCb->f1UeDb = NULLP;
+ /* Free UeContext Db created during Ue context Req */
+ freeF1UeDb(ueCb->f1UeDb);
+ ueCb->f1UeDb = NULLP;
/* TODO: To send Drb list */
xer_fprint(stdout, &asn_DEF_F1AP_PDU, f1apMsg);
memset((uint8_t *)encBuf, 0, ENC_BUF_MAX_LEN);
encBufSize = 0;
encRetVal = aper_encode(&asn_DEF_F1AP_PDU, 0, f1apMsg, PrepFinalEncBuf,\
- encBuf);
+ encBuf);
/* Encode results */
if(encRetVal.encoded == ENCODE_FAIL)
{
- DU_LOG( "\nERROR --> F1AP : Could not encode UE Context Setup Response structure (at %s)\n",\
- encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
- ret = RFAILED;
- break;
+ DU_LOG( "\nERROR --> F1AP : Could not encode UE Context Setup Response structure (at %s)\n",\
+ encRetVal.failed_type ? encRetVal.failed_type->name : "unknown");
+ ret = RFAILED;
+ break;
}
else
{
- DU_LOG("\nDEBUG --> F1AP : Created APER encoded buffer for UE Context Setup Response\n");
- for(int i=0; i< encBufSize; i++)
- {
- printf("%x",encBuf[i]);
- }
+ DU_LOG("\nDEBUG --> F1AP : Created APER encoded buffer for UE Context Setup Response\n");
+ for(int i=0; i< encBufSize; i++)
+ {
+ printf("%x",encBuf[i]);
+ }
}
/* Sending msg */
if(sendF1APMsg() != ROK)
{
- DU_LOG("\nERROR --> F1AP : Sending UE Context Setup Response failed");
- ret = RFAILED;
- break;
+ DU_LOG("\nERROR --> F1AP : Sending UE Context Setup Response failed");
+ ret = RFAILED;
+ break;
}
break;
}
* failure = RFAILED
*
* ****************************************************************/
-uint8_t BuildAndSendUeCtxtRsp(uint8_t cellId, uint8_t ueIdx)
+uint8_t BuildAndSendUeCtxtRsp(uint8_t cellId, uint8_t ueId)
{
uint8_t cellIdx = 0, actionType = 0;
GET_CELL_IDX(cellId, cellIdx);
- actionType = duCb.actvCellLst[cellIdx]->ueCb[ueIdx-1].f1UeDb->actionType;
+ actionType = duCb.actvCellLst[cellIdx]->ueCb[ueId-1].f1UeDb->actionType;
switch(actionType)
{
case UE_CTXT_SETUP:
{
- BuildAndSendUeContextSetupRsp(cellId,ueIdx);
+ BuildAndSendUeContextSetupRsp(cellId,ueId);
break;
}
case UE_CTXT_MOD:
{
- BuildAndSendUeContextModRsp(cellId, ueIdx);
+ BuildAndSendUeContextModRsp(&duCb.actvCellLst[cellIdx]->ueCb[ueId-1]);
break;
}
default:
* RFAILED - failure
*
* ****************************************************************/
-uint8_t procF1SetupRsp(F1AP_PDU_t *f1apMsg)
+uint8_t procF1SetupRsp(F1AP_PDU_t *f1apMsg, MsgLen recvBufLen, char *recvBuf)
{
uint8_t ret = ROK;
uint16_t idx =0;
}
freeAperDecodeF1SetupRsp(f1SetRspMsg);
+
+ duCb.f1SetupReqAndRspMsg.f1MsgRspBufSize = recvBufLen;
+ DU_ALLOC(duCb.f1SetupReqAndRspMsg.f1MsgRspBuf, duCb.f1SetupReqAndRspMsg.f1MsgRspBufSize);
+ if(duCb.f1SetupReqAndRspMsg.f1MsgReqBuf == NULLP)
+ {
+ DU_LOG("\nERROR --> F1AP : Memory allocation failed to store the buf of F1setup response");
+ return RFAILED;
+ }
+ memcpy(duCb.f1SetupReqAndRspMsg.f1MsgRspBuf, recvBuf, recvBufLen);
+
+ if(BuildAndSendE2SetupReq() != ROK)
+ {
+ DU_LOG("\nERROR --> F1AP : Failed to build and send E2 setup request ");
+ return RFAILED;
+ }
return ret;
}
/*******************************************************************
uint8_t duProcGnbDuCfgUpdAckMsg(uint8_t transId)
{
uint8_t ieIdx=0, arrIdx=0,ret=ROK;
- uint8_t ueId =0 , ueIdx =0;
+ uint8_t ueId =0 , ueIdx =0, totalActiveUe = 0;
uint16_t cellId =0, cellIdx =0, crnti=0;
CmLList *f1apPduNode = NULLP;
ReservedF1apPduInfo *f1apPduInfo =NULLP;
{
cellIdentity = &deleteItem->oldNRCGI.nRCellIdentity;
bitStringToInt(cellIdentity, &cellId);
+
+ GET_CELL_IDX(cellId, cellIdx);
+ if(duCb.actvCellLst[cellIdx] != NULLP)
+ {
+ duCb.actvCellLst[cellId-1]->cellStatus = DELETION_IN_PROGRESS;
+ }
}
}
}
- GET_CELL_IDX(cellId, cellIdx);
if(duCb.actvCellLst[cellIdx] != NULLP)
{
if(duCb.actvCellLst[cellIdx]->numActvUes == 0)
{
- duCb.actvCellLst[cellId-1]->cellStatus = DELETION_IN_PROGRESS;
ret = duSendCellDeletReq(cellId);
if(ret == RFAILED)
{
- DU_LOG("ERROR --> DU_APP : duProcGnbDuCfgUpdAckMsg(): Failed to send cell delete\
+ DU_LOG("\nERROR --> DU_APP : duProcGnbDuCfgUpdAckMsg(): Failed to send cell delete\
request for cellId[%d]", cellId);
}
}
else
{
- for(ueIdx = 0; ueIdx < duCb.actvCellLst[cellIdx]->numActvUes; ueIdx++)
+ totalActiveUe = duCb.actvCellLst[cellIdx]->numActvUes;
+ while(totalActiveUe)
{
+ if(duCb.actvCellLst[cellIdx]->ueCb[ueIdx].ueState != UE_ACTIVE)
+ {
+ ueIdx++;
+ continue;
+ }
+
crnti = duCb.actvCellLst[cellIdx]->ueCb[ueIdx].crnti;
- GET_UE_IDX(crnti,ueId);
+ GET_UE_ID(crnti,ueId);
+ /* Sending Ue Context release request only for maximum supporting UEs */
ret = BuildAndSendUeContextReleaseReq(cellId, ueId);
if(ret == RFAILED)
{
- DU_LOG("ERROR --> DU_APP : duProcGnbDuCfgUpdAckMsg(): Failed to build and send UE delete\
+ DU_LOG("\nERROR --> DU_APP : duProcGnbDuCfgUpdAckMsg(): Failed to build and send UE delete\
request for cellId[%d]", cellId);
}
+ ueIdx++;
+ totalActiveUe--;
}
}
}
else
{
- DU_LOG("ERROR --> DU_APP : duProcGnbDuCfgUpdAckMsg(): CellId [%d] not found", cellId);
+ DU_LOG("\nERROR --> DU_APP : duProcGnbDuCfgUpdAckMsg(): CellId [%d] not found", cellId);
ret = RFAILED;
}
break;
freeAperDecodef1DlRrcMsg(f1DlRrcMsg);
return ret;
}
+/*******************************************************************
+ *
+* @brief Builds the DRB to be Setup Mod list
+*
+* @details
+*
+* Function :
+*
+* Functionality: Constructs the DRB to be Setup Mod list
+*
+* @params[in] DRBs_SetupMod_List_t *drbSet
+*
+* @return ROK - success
+* RFAILED - failure
+*
+* ****************************************************************/
+uint8_t BuildSrbSetupModList(SRBs_SetupMod_List_t *srbList, DuUeCfg *ueCfg)
+{
+ uint8_t srbIdx = 0;
+ struct SRBs_SetupMod_ItemIEs *srbItemIe;
+
+ srbList->list.count = ueCfg->numRlcLcs;
+ srbList->list.size = srbList->list.count * sizeof(SRBs_SetupMod_ItemIEs_t *);
+
+ DU_ALLOC(srbList->list.array, srbList->list.size);
+ if(srbList->list.array == NULLP)
+ {
+ DU_LOG("\nERROR --> DU APP : Memory allocation failed in BuildSrbSetupModList");
+ return RFAILED;
+ }
+
+ for(srbIdx = 0; srbIdx < srbList->list.count; srbIdx++)
+ {
+ DU_ALLOC(srbList->list.array[srbIdx], sizeof(SRBs_SetupMod_ItemIEs_t));
+ if(srbList->list.array[srbIdx] == NULLP)
+ {
+ DU_LOG("\nERROR --> DU APP : Memory allocation failed in BuildSrbSetupModList");
+ return RFAILED;
+ }
+ }
+
+ for(srbIdx=0; srbIdx < srbList->list.count; srbIdx++)
+ {
+ srbItemIe = (struct SRBs_SetupMod_ItemIEs *)srbList->list.array[srbIdx];
+ srbItemIe->id = ProtocolIE_ID_id_SRBs_SetupMod_Item;
+ srbItemIe->criticality = Criticality_reject;
+ srbItemIe->value.present = SRBs_SetupMod_ItemIEs__value_PR_SRBs_SetupMod_Item;
+ srbItemIe->value.choice.SRBs_SetupMod_Item.sRBID = ueCfg->rlcLcCfg[srbIdx].rbId;
+ srbItemIe->value.choice.SRBs_SetupMod_Item.lCID = ueCfg->rlcLcCfg[srbIdx].lcId;
+ }
+ return ROK;
+}
+
/*******************************************************************
*
* @brief Builds the DRB to be Setup Mod list
uint8_t drbCnt =0;
struct DRBs_SetupMod_ItemIEs *drbItemIe;
- drbCnt = 1;
+ drbCnt = ueCfg->numDrbSetupMod;
+
+ if(!drbCnt)
+ {
+ DU_LOG("\nINFO --> F1AP : BuildDrbToBeSetupModList(): No DRB information to avaialble to add");
+ return ROK;
+ }
+
drbSet->list.count = drbCnt;
drbSet->list.size = drbCnt * sizeof(DRBs_SetupMod_ItemIEs_t *);
DU_ALLOC(drbSet->list.array, drbSet->list.size);
}
DU_FREE(drbSetupList->list.array, drbSetupList->list.size);
}
+
+/*******************************************************************
+* @brief Free the memory allocated for SRB setup List
+*
+* @details
+*
+* Function : FreeSrbSetupModList
+*
+* Functionality:
+* Free the memory allocated for SRB setup list
+*
+* @params[in] SRBs_Setup_List_t *
+* @return void
+*
+* ****************************************************************/
+void FreeSrbSetupModList(SRBs_SetupMod_List_t *srbSetupList)
+{
+ uint8_t srbIdx = 0;
+
+ for(srbIdx = 0; srbIdx < srbSetupList->list.count; srbIdx++)
+ DU_FREE(srbSetupList->list.array[srbIdx], sizeof(SRBs_SetupMod_ItemIEs_t));
+ DU_FREE(srbSetupList->list.array, srbSetupList->list.size);
+}
+
/*******************************************************************
* @brief Free the memory allocated for UE Context Mod Response
*
{
FreeDrbSetupModList(&(ueContextModifyRes->protocolIEs.list.array[ieIdx]->\
value.choice.DRBs_SetupMod_List));
- break;
+ break;
+ }
+ case ProtocolIE_ID_id_SRBs_SetupMod_List:
+ {
+ FreeSrbSetupModList(&(ueContextModifyRes->protocolIEs.list.array[ieIdx]->value.choice.\
+ SRBs_SetupMod_List));
+ break;
}
}
DU_FREE(ueContextModifyRes->protocolIEs.list.array[ieIdx], sizeof(UEContextModificationResponse_t));
* Functionality:
* - Creating the ue context modifcation response
*
-* @params[in] uint8_t cellId,uint8_t ueIdx
+* @params[in] uint8_t cellId,uint8_t ueId
* @return ROK - success
* RFAILED - failure
*
* ****************************************************************/
-uint8_t BuildAndSendUeContextModRsp(uint8_t cellId,uint8_t ueIdx)
+uint8_t BuildAndSendUeContextModRsp(DuUeCb *ueCb)
{
- uint8_t ieIdx = 0;
- uint8_t cellIdx =0;
+ uint8_t ieIdx = 0, tnlIdx = 0, rbIdx = 0;
uint8_t elementCnt = 0;
uint8_t ret = RFAILED;
- uint32_t gnbCuUeF1apId; /* gNB-CU UE F1AP Id */
- uint32_t gnbDuUeF1apId; /* gNB-DU UE F1AP Id */
F1AP_PDU_t *f1apMsg = NULLP;
- asn_enc_rval_t encRetVal;
+ asn_enc_rval_t encRetVal;
UEContextModificationResponse_t *ueContextModifyRes = NULLP;
- DuUeCb *ueCb = NULLP;
- DU_LOG("\nINFO --> F1AP : Building Ue context modification response\n");
+ DU_LOG("\nINFO --> F1AP : Building UE context modification response\n");
while(1)
{
f1apMsg->choice.successfulOutcome->value.present = SuccessfulOutcome__value_PR_UEContextModificationResponse;
ueContextModifyRes =&f1apMsg->choice.successfulOutcome->value.choice.UEContextModificationResponse;
-
- elementCnt = 3;
+
+ if(ueCb->f1UeDb->actionType == UE_CTXT_MOD)
+ {
+ if(ueCb->f1UeDb->duUeCfg.numDrbSetupMod)
+ elementCnt =3;
+ else
+ elementCnt =2;
+ }
+ if(ueCb->f1UeDb->actionType == UE_CTXT_CFG_QUERY)
+ elementCnt = 5;
+ if(ueCb->f1UeDb->actionType == UE_CTXT_RRC_RECFG_COMPLETE)
+ elementCnt = 2;
ueContextModifyRes->protocolIEs.list.count = elementCnt;
ueContextModifyRes->protocolIEs.list.size = elementCnt*sizeof(UEContextModificationResponse_t*);
}
}
- /* Fetching Ue Cb Info*/
- GET_CELL_IDX(cellId, cellIdx);
- gnbDuUeF1apId = duCb.actvCellLst[cellIdx]->ueCb[ueIdx-1].gnbDuUeF1apId;
- gnbCuUeF1apId = duCb.actvCellLst[cellIdx]->ueCb[ueIdx-1].gnbCuUeF1apId;
- ueCb = &duCb.actvCellLst[cellIdx]->ueCb[ueIdx-1];
-
ieIdx=0;
ueContextModifyRes->protocolIEs.list.array[ieIdx]->id = ProtocolIE_ID_id_gNB_CU_UE_F1AP_ID;
ueContextModifyRes->protocolIEs.list.array[ieIdx]->criticality = Criticality_reject;
ueContextModifyRes->protocolIEs.list.array[ieIdx]->value.present =\
UEContextModificationResponseIEs__value_PR_GNB_CU_UE_F1AP_ID;
- ueContextModifyRes->protocolIEs.list.array[ieIdx]->value.choice.GNB_CU_UE_F1AP_ID = gnbCuUeF1apId;
+ ueContextModifyRes->protocolIEs.list.array[ieIdx]->value.choice.GNB_CU_UE_F1AP_ID = ueCb->gnbCuUeF1apId;
ieIdx++;
ueContextModifyRes->protocolIEs.list.array[ieIdx]->id = ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID;
ueContextModifyRes->protocolIEs.list.array[ieIdx]->criticality = Criticality_reject;
ueContextModifyRes->protocolIEs.list.array[ieIdx]->value.present=\
UEContextModificationResponseIEs__value_PR_GNB_DU_UE_F1AP_ID;
- ueContextModifyRes->protocolIEs.list.array[ieIdx]->value.choice.GNB_DU_UE_F1AP_ID = gnbDuUeF1apId;
+ ueContextModifyRes->protocolIEs.list.array[ieIdx]->value.choice.GNB_DU_UE_F1AP_ID = ueCb->gnbDuUeF1apId;
- ieIdx++;
- ueContextModifyRes->protocolIEs.list.array[ieIdx]->id = ProtocolIE_ID_id_DRBs_SetupMod_List;
- ueContextModifyRes->protocolIEs.list.array[ieIdx]->criticality = Criticality_reject;
- ueContextModifyRes->protocolIEs.list.array[ieIdx]->value.present =\
- UEContextModificationResponseIEs__value_PR_DRBs_SetupMod_List;
- if(ueCb->f1UeDb)
+ if(ueCb->f1UeDb->actionType == UE_CTXT_CFG_QUERY)
+ {
+ ieIdx++;
+ ueContextModifyRes->protocolIEs.list.array[ieIdx]->id = ProtocolIE_ID_id_DUtoCURRCInformation;
+ ueContextModifyRes->protocolIEs.list.array[ieIdx]->criticality = Criticality_reject;
+ ueContextModifyRes->protocolIEs.list.array[ieIdx]->value.present = \
+ UEContextModificationResponseIEs__value_PR_DUtoCURRCInformation;
+ BuildCellGroupConfigRrc(ueCb, &ueContextModifyRes->protocolIEs.list.array[ieIdx]->value.choice.DUtoCURRCInformation.cellGroupConfig);
+ }
+
+ if((ueCb->f1UeDb->actionType == UE_CTXT_CFG_QUERY) || (ueCb->f1UeDb->actionType == UE_CTXT_MOD))
+ {
+ if(ueCb->f1UeDb->duUeCfg.numDrbSetupMod)
+ {
+ ieIdx++;
+ ueContextModifyRes->protocolIEs.list.array[ieIdx]->id = ProtocolIE_ID_id_DRBs_SetupMod_List;
+ ueContextModifyRes->protocolIEs.list.array[ieIdx]->criticality = Criticality_reject;
+ ueContextModifyRes->protocolIEs.list.array[ieIdx]->value.present =\
+ UEContextModificationResponseIEs__value_PR_DRBs_SetupMod_List;
+ if(ueCb->f1UeDb->actionType == UE_CTXT_CFG_QUERY)
+ {
+ for(tnlIdx = 0; tnlIdx < duCb.numTeId; tnlIdx++)
+ {
+ if(duCb.upTnlCfg[tnlIdx]->ueId == ueCb->gnbDuUeF1apId)
+ {
+ memcpy(&ueCb->f1UeDb->duUeCfg.upTnlInfo[ueCb->f1UeDb->duUeCfg.numDrbSetupMod++], duCb.upTnlCfg[tnlIdx], sizeof(UpTnlCfg));
+ }
+ }
+ }
+ ret = BuildDrbSetupModList(&(ueContextModifyRes->protocolIEs.list.array[ieIdx]->\
+ value.choice.DRBs_SetupMod_List) , &ueCb->f1UeDb->duUeCfg);
+ if(ret != ROK)
+ {
+ DU_LOG( "\nERROR --> F1AP : Failed to build DRB setupmod List ");
+ break;
+ }
+ }
+ }
+
+ if(ueCb->f1UeDb->actionType == UE_CTXT_CFG_QUERY)
{
- ret = BuildDrbSetupModList(&(ueContextModifyRes->protocolIEs.list.array[ieIdx]->\
- value.choice.DRBs_SetupMod_List) , &ueCb->f1UeDb->duUeCfg);
+ ieIdx++;
+ ueContextModifyRes->protocolIEs.list.array[ieIdx]->id = ProtocolIE_ID_id_SRBs_SetupMod_List;
+ ueContextModifyRes->protocolIEs.list.array[ieIdx]->criticality = Criticality_reject;
+ ueContextModifyRes->protocolIEs.list.array[ieIdx]->value.present = \
+ UEContextModificationResponseIEs__value_PR_SRBs_SetupMod_List;
+ for(rbIdx = 0; rbIdx < ueCb->rlcUeCfg.numLcs; rbIdx++)
+ {
+ if(ueCb->rlcUeCfg.rlcLcCfg[rbIdx].rbType == RB_TYPE_SRB)
+ {
+ memcpy(&ueCb->f1UeDb->duUeCfg.rlcLcCfg[ueCb->f1UeDb->duUeCfg.numRlcLcs++], &ueCb->rlcUeCfg.rlcLcCfg[rbIdx],\
+ sizeof(RlcBearerCfg));
+ }
+ }
+ ret = BuildSrbSetupModList(&ueContextModifyRes->protocolIEs.list.array[ieIdx]->value.choice.SRBs_SetupMod_List, \
+ &ueCb->f1UeDb->duUeCfg);
if(ret != ROK)
{
- DU_LOG( "\nERROR --> F1AP : Failed to build drb setupmod List ");
+ DU_LOG( "\nERROR --> F1AP : Failed to build SRB setupmod List ");
break;
}
- freeF1UeDb(ueCb->f1UeDb);
- ueCb->f1UeDb = NULLP;
}
+
+ freeF1UeDb(ueCb->f1UeDb);
+ ueCb->f1UeDb = NULLP;
+
xer_fprint(stdout, &asn_DEF_F1AP_PDU, f1apMsg);
/* Encode the F1SetupRequest type as APER */
ret = RFAILED;
break;
}
+
+ ret = ROK;
break;
}
FreeUeContextModResp(f1apMsg);
* @return void
*
* ****************************************************************/
-void freeAperDecodeUeContextModificationReqMsg(UEContextModificationRequest_t *UeContextModifyReq )
+void freeAperDecodeUeContextModificationReqMsg(UEContextModificationRequest_t *ueContextModifyReq )
{
uint8_t arrIdx, ieId;
- if(UeContextModifyReq->protocolIEs.list.array)
+ if(ueContextModifyReq->protocolIEs.list.array)
{
- for( arrIdx = 0 ; arrIdx<UeContextModifyReq->protocolIEs.list.count ; arrIdx++)
+ for( arrIdx = 0 ; arrIdx<ueContextModifyReq->protocolIEs.list.count ; arrIdx++)
{
- if(UeContextModifyReq->protocolIEs.list.array[arrIdx])
+ if(ueContextModifyReq->protocolIEs.list.array[arrIdx])
{
- ieId = UeContextModifyReq->protocolIEs.list.array[arrIdx]->id;
+ ieId = ueContextModifyReq->protocolIEs.list.array[arrIdx]->id;
switch(ieId)
{
case ProtocolIE_ID_id_gNB_CU_UE_F1AP_ID:
break;
case ProtocolIE_ID_id_DRBs_ToBeSetupMod_List:
{
- freeAperDecodeDrbToBeSetupModList(&UeContextModifyReq->protocolIEs.list.array[arrIdx]->\
+ freeAperDecodeDrbToBeSetupModList(&ueContextModifyReq->protocolIEs.list.array[arrIdx]->\
value.choice.DRBs_ToBeSetupMod_List);
break;
}
+ case ProtocolIE_ID_id_TransmissionActionIndicator:
+ break;
+ case ProtocolIE_ID_id_RRCContainer:
+ {
+ free(ueContextModifyReq->protocolIEs.list.array[arrIdx]->value.choice.RRCContainer.buf);
+ }
}
- free(UeContextModifyReq->protocolIEs.list.array[arrIdx]);
+ free(ueContextModifyReq->protocolIEs.list.array[arrIdx]);
}
}
- free(UeContextModifyReq->protocolIEs.list.array);
+ free(ueContextModifyReq->protocolIEs.list.array);
}
}
/*******************************************************************
uint8_t procF1UeContextModificationReq(F1AP_PDU_t *f1apMsg)
{
UEContextModificationRequest_t *ueContextModifyReq = NULLP;
- uint8_t ret = ROK, ieIdx = 0, lcId =0,cellIdx=0, ueIdx=0;
+ uint8_t ret = ROK, ieIdx = 0, cellIdx=0;
DuUeCb *duUeCb = NULLP;
DRBs_ToBeSetupMod_List_t *drbSetupModCfg;
+ DRBs_ToBeModified_List_t *drbModifiedCfg;
uint32_t gnbCuUeF1apId, gnbDuUeF1apId;
ueContextModifyReq = &f1apMsg->choice.initiatingMessage->value.choice.UEContextModificationRequest;
case ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID:
{
gnbDuUeF1apId = ueContextModifyReq->protocolIEs.list.array[ieIdx]->value.choice.GNB_DU_UE_F1AP_ID;
+ for(cellIdx = 0; cellIdx < MAX_NUM_CELL; cellIdx++)
+ {
+ if(duCb.actvCellLst[cellIdx])
+ {
+ if((duCb.actvCellLst[cellIdx]->ueCb[gnbDuUeF1apId-1].gnbDuUeF1apId == gnbDuUeF1apId)&&\
+ (duCb.actvCellLst[cellIdx]->ueCb[gnbDuUeF1apId-1].gnbCuUeF1apId == gnbCuUeF1apId))
+ {
+ duUeCb = &duCb.actvCellLst[cellIdx]->ueCb[gnbDuUeF1apId-1];
+ if(duUeCb->f1UeDb == NULLP)
+ {
+ DU_ALLOC(duUeCb->f1UeDb, sizeof(F1UeContextSetupDb));
+ duUeCb->f1UeDb->cellIdx = cellIdx;
+ duUeCb->f1UeDb->actionType = UE_CTXT_MOD;
+ }
+ break;
+ }
+ }
+ }
+ if(duUeCb == NULLP)
+ {
+ DU_LOG("\nERROR --> DU APP : wrong values of gnbCuUeF1apId and gnbDuUeF1apId ");
+ ret = RFAILED;
+ }
+ break;
+ }
+
+ case ProtocolIE_ID_id_RRCContainer:
+ {
+ /* Filling Dl RRC Msg Info */
+ DU_ALLOC_SHRABL_BUF(duUeCb->f1UeDb->dlRrcMsg, sizeof(F1DlRrcMsg));
+ if(!duUeCb->f1UeDb->dlRrcMsg)
+ {
+ DU_LOG("\nERROR --> DU APP : procF1UeContextReleaseCommand(): \
+ Memory allocation failed ");
+ ret = RFAILED;
+ }
+ else
+ {
+ duUeCb->f1UeDb->dlRrcMsgPres = true;
+ memset(duUeCb->f1UeDb->dlRrcMsg, 0, sizeof(F1DlRrcMsg));
+ ret = extractDlRrcMsg(gnbDuUeF1apId, gnbCuUeF1apId, duUeCb->f1UeDb->dlRrcMsg,\
+ &ueContextModifyReq->protocolIEs.list.array[ieIdx]->\
+ value.choice.RRCContainer);
+ }
+
break;
}
+
case ProtocolIE_ID_id_DRBs_ToBeSetupMod_List:
+ case ProtocolIE_ID_id_DRBs_ToBeModified_List:
{
- for(cellIdx = 0; cellIdx < duCb.numActvCells; cellIdx++)
+ if(duUeCb->f1UeDb)
{
- for(ueIdx = 0; ueIdx < duCb.actvCellLst[cellIdx]->numActvUes; ueIdx++)
+ if(ueContextModifyReq->protocolIEs.list.array[ieIdx]->value.present ==\
+ UEContextModificationRequestIEs__value_PR_DRBs_ToBeSetupMod_List)
{
- if((duCb.actvCellLst[cellIdx]->ueCb[ueIdx].gnbDuUeF1apId == gnbDuUeF1apId)&&\
- (duCb.actvCellLst[cellIdx]->ueCb[ueIdx].gnbCuUeF1apId == gnbCuUeF1apId))
+ drbSetupModCfg = &ueContextModifyReq->protocolIEs.list.array[ieIdx]->value.\
+ choice.DRBs_ToBeSetupMod_List;
+
+ if(extractDrbListToSetupMod(NULL, drbSetupModCfg, NULL, drbSetupModCfg->list.count,\
+ &duUeCb->f1UeDb->duUeCfg, &duUeCb->drbBitMap, NULL))
{
+ DU_LOG("\nERROR --> DU APP : Failed at extractDrbListToSetupMod() for DrbSetupModList");
+ ret = RFAILED;
+ }
+ }
- duUeCb = &duCb.actvCellLst[cellIdx]->ueCb[ueIdx];
- lcId = getDrbLcId(&duUeCb->drbBitMap);
- if(lcId != RFAILED)
- {
- DU_ALLOC(duUeCb->f1UeDb, sizeof(F1UeContextSetupDb));
- if(duUeCb->f1UeDb)
- {
- duUeCb->f1UeDb->actionType = UE_CTXT_MOD;
- drbSetupModCfg = &ueContextModifyReq->protocolIEs.list.array[ieIdx]->value.\
- choice.DRBs_ToBeSetupMod_List;
- if(extractDrbListToSetup(lcId, NULL, drbSetupModCfg ,drbSetupModCfg->list.count, \
- &duUeCb->f1UeDb->duUeCfg))
- {
- DU_LOG("\nERROR --> DU APP : Failed at extractDrbListToSetup()");
- ret = RFAILED;
- }
- }
- }
- break;
+ if(ueContextModifyReq->protocolIEs.list.array[ieIdx]->value.present == \
+ UEContextModificationRequestIEs__value_PR_DRBs_ToBeModified_List)
+
+ {
+ drbModifiedCfg = &ueContextModifyReq->protocolIEs.list.array[ieIdx]->value.\
+ choice.DRBs_ToBeModified_List;
+ if(extractDrbListToSetupMod(NULL, NULL, drbModifiedCfg, drbModifiedCfg->list.count,\
+ &duUeCb->f1UeDb->duUeCfg, &duUeCb->drbBitMap, &duUeCb->rlcUeCfg))
+ {
+ DU_LOG("\nERROR --> DU APP : Failed at extractDrbListToSetupMod() for DrbModifiedList");
+ ret = RFAILED;
}
}
- if(ueIdx >= duCb.actvCellLst[cellIdx]->numActvUes)
+ }
+ break;
+ }
+
+ case ProtocolIE_ID_id_GNB_DUConfigurationQuery:
+ {
+ DU_LOG("\nINFO --> DU APP : Received GNB DU Configuration Query in UE Context Modification Request from CU");
+ if(duUeCb->f1UeDb)
+ {
+ duUeCb->f1UeDb->actionType = UE_CTXT_CFG_QUERY;
+ }
+ break;
+ }
+
+ case ProtocolIE_ID_id_RRCReconfigurationCompleteIndicator:
+ {
+ if(ueContextModifyReq->protocolIEs.list.array[ieIdx]->value.choice.RRCReconfigurationCompleteIndicator == \
+ RRCReconfigurationCompleteIndicator_true)
+ {
+ duUeCb->f1UeDb->actionType = UE_CTXT_RRC_RECFG_COMPLETE;
+ }
+ break;
+ }
+ case ProtocolIE_ID_id_TransmissionActionIndicator:
+ {
+ if(duUeCb->f1UeDb)
+ {
+ if(ueContextModifyReq->protocolIEs.list.array[ieIdx]->value.choice.TransmissionActionIndicator == TransmissionActionIndicator_stop)
+ {
+ duUeCb->f1UeDb->duUeCfg.dataTransmissionAction = STOP_TRANSMISSION;
+ }
+ else
{
- DU_LOG("\nERROR --> DU APP : wrong values of gnbCuUeF1apId and gnbDuUeF1apId ");
- ret = RFAILED;
+ duUeCb->f1UeDb->duUeCfg.dataTransmissionAction = RESTART_TRANSMISSION;
}
}
break;
}
+
+ case ProtocolIE_ID_id_RRCDeliveryStatusRequest:
+ {
+ if(duUeCb->f1UeDb->dlRrcMsg->rrcMsgPdu)
+ {
+ duUeCb->f1UeDb->dlRrcMsg->deliveryStatRpt = true;
+ }
+ break;
+ }
+
}
}
- if(ret != RFAILED)
+
+ if(ret != RFAILED)
{
ret = duProcUeContextModReq(duUeCb);
}
freeAperDecodeUeContextModificationReqMsg(ueContextModifyReq);
return ret;
}
+
/*****************************************************************i
*
* @brief Free memory allocated for UE Context Release Request
* RFAILED - failure
*
* *************************************************************/
-uint8_t BuildAndSendUeContextReleaseReq(uint16_t cellId, uint8_t ueIdx)
+uint8_t BuildAndSendUeContextReleaseReq(uint16_t cellId, uint8_t ueId)
{
bool memAllocFail = false;
uint8_t ieIdx =0;
}
else
{
- GET_CRNTI(crnti, ueIdx);
- if(duCb.actvCellLst[cellIdx]->ueCb[ueIdx-1].crnti != crnti)
+ GET_CRNTI(crnti, ueId);
+ if(duCb.actvCellLst[cellIdx]->ueCb[ueId-1].crnti != crnti)
{
DU_LOG("\nERROR --> F1AP : BuildAndSendUeContextReleaseReq(): crnti[%d] does not exist", crnti);
break;
}
- gnbDuUeF1apId = duCb.actvCellLst[cellIdx]->ueCb[ueIdx-1].gnbDuUeF1apId;
- gnbCuUeF1apId = duCb.actvCellLst[cellIdx]->ueCb[ueIdx-1].gnbCuUeF1apId;
+ gnbDuUeF1apId = duCb.actvCellLst[cellIdx]->ueCb[ueId-1].gnbDuUeF1apId;
+ gnbCuUeF1apId = duCb.actvCellLst[cellIdx]->ueCb[ueId-1].gnbCuUeF1apId;
}
ieIdx=0;
break;
}while(true);
- if(ret == ROK)
+ if((ret == ROK) && (duCb.actvCellLst[cellId-1]) && (duCb.actvCellLst[cellId-1]->cellStatus == DELETION_IN_PROGRESS)
+ && (duCb.actvCellLst[cellId-1]->numActvUes == 0))
{
- duCb.actvCellLst[cellId-1]->cellStatus = DELETION_IN_PROGRESS;
ret = duSendCellDeletReq(cellId);
if(ret != ROK)
{
uint8_t procF1UeContextReleaseCommand(F1AP_PDU_t *f1apMsg)
{
uint8_t ieIdx=0, ret=ROK, ueIdx=0;
- uint16_t cellIdx =0;
- bool ueIdxFound;
+ uint16_t cellIdx =0, cellId = 0;
+ bool ueIdxFound = false;
uint32_t gnbCuUeF1apId=0, gnbDuUeF1apId=0;
DuUeCb *duUeCb = NULLP;
UEContextReleaseCommand_t *ueContextReleaseCommand = NULLP;
case ProtocolIE_ID_id_Cause:
{
- break;
- }
-
- case ProtocolIE_ID_id_RRCContainer:
- {
- for(cellIdx = 0; cellIdx < duCb.numActvCells; cellIdx++)
+ for(cellIdx = 0; cellIdx < MAX_NUM_CELL; cellIdx++)
{
- for(ueIdx = 0; ueIdx < duCb.actvCellLst[cellIdx]->numActvUes; ueIdx++)
+ for(ueIdx = 0; ueIdx < MAX_NUM_UE; ueIdx++)
{
- if((duCb.actvCellLst[cellIdx]->ueCb[ueIdx].gnbDuUeF1apId == gnbDuUeF1apId)&&\
+ if(duCb.actvCellLst[cellIdx] && (duCb.actvCellLst[cellIdx]->ueCb[ueIdx].gnbDuUeF1apId == gnbDuUeF1apId)&&\
(duCb.actvCellLst[cellIdx]->ueCb[ueIdx].gnbCuUeF1apId == gnbCuUeF1apId))
{
+ cellId = duCb.actvCellLst[cellIdx]->cellId;
duUeCb = &duCb.actvCellLst[cellIdx]->ueCb[ueIdx];
- DU_ALLOC(duUeCb->f1UeDb, sizeof(F1UeContextSetupDb));
- if(duUeCb->f1UeDb)
- {
- memset(duUeCb->f1UeDb, 0, sizeof(F1UeContextSetupDb));
- duUeCb->f1UeDb->actionType = UE_CTXT_RELEASE;
- duUeCb->f1UeDb->cellIdx = cellIdx;
- /* Filling Dl RRC Msg Info */
- DU_ALLOC_SHRABL_BUF(duUeCb->f1UeDb->dlRrcMsg, sizeof(F1DlRrcMsg));
- if(!duUeCb->f1UeDb->dlRrcMsg)
- {
- DU_LOG("\nERROR --> DU APP : procF1UeContextReleaseCommand(): \
- Memory allocation failed ");
- ret = RFAILED;
- }
- else
- {
- duUeCb->f1UeDb->dlRrcMsgPres = true;
- memset(duUeCb->f1UeDb->dlRrcMsg, 0, sizeof(F1DlRrcMsg));
- ret = extractDlRrcMsg(gnbDuUeF1apId, gnbCuUeF1apId, duUeCb->f1UeDb->dlRrcMsg,\
- &ueContextReleaseCommand->protocolIEs.list.array[ieIdx]->\
- value.choice.RRCContainer);
- }
-
- }
- else
- {
- DU_LOG("\nERROR --> DU APP : procF1UeContextReleaseCommand(): \
- Memory allocation failed ");
- ret = RFAILED;
-
- }
-
ueIdxFound = true;
break;
}
break;
}
}
+
if(!ueIdxFound)
{
- DU_LOG("\nERROR --> F1AP: DuUeCb is not found at procF1UeContextSetupReq()");
+ DU_LOG("\nERROR --> F1AP: procF1UeContextReleaseCommand(): Ue Information is not available");
ret = RFAILED;
}
+ break;
+ }
+
+ case ProtocolIE_ID_id_RRCContainer:
+ {
+ if(ueIdxFound == true)
+ {
+ DU_ALLOC(duUeCb->f1UeDb, sizeof(F1UeContextSetupDb));
+ if(duUeCb->f1UeDb)
+ {
+ memset(duUeCb->f1UeDb, 0, sizeof(F1UeContextSetupDb));
+ duUeCb->f1UeDb->actionType = UE_CTXT_RELEASE;
+ duUeCb->f1UeDb->cellIdx = cellIdx;
+ /* Filling Dl RRC Msg Info */
+ DU_ALLOC_SHRABL_BUF(duUeCb->f1UeDb->dlRrcMsg, sizeof(F1DlRrcMsg));
+ if(!duUeCb->f1UeDb->dlRrcMsg)
+ {
+ DU_LOG("\nERROR --> DU APP : procF1UeContextReleaseCommand(): \
+ Memory allocation failed ");
+ ret = RFAILED;
+ }
+ else
+ {
+ duUeCb->f1UeDb->dlRrcMsgPres = true;
+ memset(duUeCb->f1UeDb->dlRrcMsg, 0, sizeof(F1DlRrcMsg));
+ ret = extractDlRrcMsg(gnbDuUeF1apId, gnbCuUeF1apId, duUeCb->f1UeDb->dlRrcMsg,\
+ &ueContextReleaseCommand->protocolIEs.list.array[ieIdx]->\
+ value.choice.RRCContainer);
+ }
+ }
+ else
+ {
+ DU_LOG("\nERROR --> DU APP : procF1UeContextReleaseCommand(): \
+ Memory allocation failed ");
+ ret = RFAILED;
+ }
+ }
break;
}
default :
}
if(ret != RFAILED)
{
- duProcUeContextReleaseCommand(duUeCb);
+ duProcUeContextReleaseCommand(cellId, duUeCb);
}
freeAperDecodeUeContextReleaseCommand(f1apMsg);
return ret;
memset(f1apMsg, 0, sizeof(F1AP_PDU_t));
rval = aper_decode(0, &asn_DEF_F1AP_PDU, (void **)&f1apMsg, recvBuf, recvBufLen, 0, 0);
- DU_FREE(recvBuf, (Size)recvBufLen);
if(rval.code == RC_FAIL || rval.code == RC_WMORE)
{
case SuccessfulOutcome__value_PR_F1SetupResponse:
{
#ifndef ODU_TEST_STUB
- procF1SetupRsp(f1apMsg);
+ procF1SetupRsp(f1apMsg, recvBufLen, recvBuf);
#endif
break;
}
free(f1apMsg);
}/* End of switch(f1apMsg->present) */
-
+
+ DU_FREE(recvBuf, (Size)recvBufLen);
} /* End of F1APMsgHdlr */
/**********************************************************************