#include "du_app_rlc_inf.h"
#include "du_cfg.h"
#include "du_utils.h"
-#include<ProtocolIE-Field.h>
-#include "F1AP-PDU.h"
#include "du_mgr.h"
#include "du_f1ap_msg_hdl.h"
#include "du_ue_mgr.h"
-#ifdef EGTP_TEST
-U32 sduId = 0;
-#endif
-
DuMacDlCcchInd packMacDlCcchIndOpts[] =
{
- packMacDlCcchInd, /* Loose coupling */
- MacProcDlCcchInd, /* TIght coupling */
- packMacDlCcchInd /* Light weight-loose coupling */
+ packMacDlCcchInd, /* Loose coupling */
+ MacProcDlCcchInd, /* TIght coupling */
+ packMacDlCcchInd /* Light weight-loose coupling */
};
DuMacUeCreateReq packMacUeCreateReqOpts[] =
{
packDuMacUeCreateReq, /* Loose coupling */
- MacProcUeCreateReq, /* TIght coupling */
- packDuMacUeCreateReq /* Light weight-loose coupling */
+ MacProcUeCreateReq, /* TIght coupling */
+ packDuMacUeCreateReq /* Light weight-loose coupling */
};
DuRlcUeCreateReq packRlcUeCreateReqOpts[] =
{
packDuRlcUeCreateReq, /* Loose coupling */
- RlcProcUeCreateReq, /* TIght coupling */
- packDuRlcUeCreateReq /* Light weight-loose coupling */
+ RlcProcUeCreateReq, /* TIght coupling */
+ packDuRlcUeCreateReq /* Light weight-loose coupling */
};
DuDlRrcMsgToRlcFunc duSendDlRrcMsgToRlcOpts[] =
{
packDlRrcMsgToRlc, /* Loose coupling */
- RlcProcDlRrcMsgTransfer, /* Tight coupling */
+ RlcProcDlRrcMsgTransfer, /* Tight coupling */
packDlRrcMsgToRlc /* Light weight-loose coupling */
};
DuRlcUeReconfigReq packRlcUeReconfigReqOpts[] =
{
- packDuRlcUeReconfigReq, /* Loose coupling */
+ packDuRlcUeReconfigReq, /* Loose coupling */
RlcProcUeReconfigReq, /* TIght coupling */
- packDuRlcUeReconfigReq /* Light weight-loose coupling */
+ packDuRlcUeReconfigReq /* Light weight-loose coupling */
};
DuMacUeReconfigReq packMacUeReconfigReqOpts[] =
{
- packDuMacUeReconfigReq, /* Loose coupling */
+ packDuMacUeReconfigReq, /* Loose coupling */
MacProcUeReconfigReq, /* TIght coupling */
- packDuMacUeReconfigReq /* Light weight-loose coupling */
+ packDuMacUeReconfigReq /* Light weight-loose coupling */
+};
+
+DuRlcDlUserDataToRlcFunc duSendRlcDlUserDataToRlcOpts[] =
+{
+ packRlcDlUserDataToRlc, /* Loose coupling */
+ RlcProcDlUserDataTransfer, /* Tight coupling */
+ packRlcDlUserDataToRlc /* Light weight-loose coupling */
};
+
+/*******************************************************************
+ *
+ * @brief Function to fillDlUserDataInfo
+ *
+ * @details
+ *
+ * Function : fillDlUserDataInfo
+ *
+ * Functionality:
+ * Function to fillDlUserDataInfo
+ *
+ * @params[in] teId,
+ * dlDataMsgInfo
+ *
+ * @return ROK - success
+ * RFAILED - failure
+ *
+ * ****************************************************************/
+
+uint8_t fillDlUserDataInfo(uint32_t teId, RlcDlUserDataInfo *dlDataMsgInfo)
+{
+ uint8_t drbIdx;
+
+ for(drbIdx = 0; drbIdx < duCb.numDrb; drbIdx++)
+ {
+ if(duCb.upTnlCfg[drbIdx] && (duCb.upTnlCfg[drbIdx]->tnlCfg1 != NULLP))
+ {
+ if(duCb.upTnlCfg[drbIdx]->tnlCfg1->teId == teId)
+ {
+ dlDataMsgInfo->cellId = duCb.upTnlCfg[drbIdx]->cellId;
+ dlDataMsgInfo->ueIdx = duCb.upTnlCfg[drbIdx]->ueIdx;
+ dlDataMsgInfo->rbId = duCb.upTnlCfg[drbIdx]->drbId;
+ return ROK;
+ }
+ }
+ }
+ return RFAILED;
+}
+
+ /*******************************************************************
+ *
+ * @brief Build and Send DL Data Message transfer to RLC
+ *
+ * @details
+ *
+ * Function : duBuildAndSendDlUserDataToRlc
+ *
+ * Functionality:
+ * Build and Send DL Data Message transfer to RLC
+ *
+ * @params[in] Cell ID
+ * UE Index
+ * Logical Channgel ID
+ * RRC Message
+ * RRC Message Length
+ * @return ROK - success
+ * RFAILED - failure
+ *
+ * ****************************************************************/
+
+uint8_t duBuildAndSendDlUserDataToRlc(uint16_t msgLen, EgtpMsg *egtpMsg)
+{
+ uint8_t ret = RFAILED;
+ Pst pst;
+ RlcDlUserDataInfo *dlDataMsgInfo = NULLP;
+
+ DU_ALLOC_SHRABL_BUF(dlDataMsgInfo, sizeof(RlcDlUserDataInfo));
+ if(!dlDataMsgInfo)
+ {
+ DU_LOG("\nERROR --> DU_APP : Memory allocation failed for dlDataMsgInfo in duHdlEgtpDlData()");
+ return RFAILED;
+ }
+ memset(dlDataMsgInfo, 0, sizeof(RlcDlUserDataInfo));
+ if(ODU_GET_MSG_BUF(DU_APP_MEM_REGION, DU_POOL, &dlDataMsgInfo->dlMsg) != ROK)
+ {
+ DU_LOG("\nERROR --> DU_APP : Memory allocation failed for dlMsg in duHdlEgtpDlData()");
+ DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, dlDataMsgInfo, sizeof(RlcDlUserDataInfo));
+ return RFAILED;
+ }
+ dlDataMsgInfo->dlMsg = egtpMsg->msg;
+ dlDataMsgInfo->msgLen = msgLen;
+
+ /* Filling DL DATA Msg Info */
+ if(fillDlUserDataInfo(egtpMsg->msgHdr.teId, dlDataMsgInfo) == ROK)
+ {
+ /* Filling post structure and sending msg */
+ FILL_PST_DUAPP_TO_RLC(pst, RLC_DL_INST, EVENT_DL_USER_DATA_TRANS_TO_RLC);
+ DU_LOG("\nDEBUG --> DU_APP : Sending User Data Msg to RLC \n");
+ ret = (*duSendRlcDlUserDataToRlcOpts[pst.selector])(&pst, dlDataMsgInfo);
+ }
+ if(ret != ROK)
+ {
+ DU_LOG("\nERROR --> DU_APP : Failed to send User Data to RLC in duHdlEgtpDlData()");
+ DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, dlDataMsgInfo->dlMsg, msgLen);
+ DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, dlDataMsgInfo, sizeof(RlcDlUserDataInfo));
+ }
+ return ret;
+}
+
/*******************************************************************
*
* @brief Handles EGTP data from CU
* ****************************************************************/
uint8_t duHdlEgtpDlData(EgtpMsg *egtpMsg)
{
-
- /* TODO : Extract RbId/UeID/CellID/SduId from database
- using tunnel id in egtp header */
-
- DU_LOG("\nDU_APP : Processing DL data");
-#ifdef EGTP_TEST
- Pst pst;
- KwuDatReqInfo datReqInfo;
-
- datReqInfo.rlcId.rbId = RB_ID;
- datReqInfo.rlcId.rbType = CM_LTE_DRB;
- datReqInfo.rlcId.ueId = UE_ID;
- datReqInfo.rlcId.cellId = NR_CELL_ID;
-
- datReqInfo.sduId = ++sduId;
- datReqInfo.lcType = CM_LTE_LCH_DTCH;
-
- /* Filling pst and Sending to RLC DL */
- pst.selector = ODU_SELECTOR_LWLC;
- pst.srcEnt = ENTDUAPP;
- pst.dstEnt = ENTRLC;
- pst.dstInst = RLC_DL_INST;
- pst.dstProcId = DU_PROC;
- pst.srcProcId = DU_PROC;
- pst.region = duCb.init.region;
-
- cmPkKwuDatReq(&pst, &datReqInfo, egtpMsg->msg);
-#else
- //duBuildAndSendDlRrcMsgToRlc();
-#endif
+ uint16_t msgLen = 0;
+ DU_LOG("\nDEBUG --> DU_APP : Processing DL data in duHdlEgtpDlData()");
+
+ if(!egtpMsg->msg)
+ {
+ DU_LOG("\nERROR --> DU_APP : Recevied Dl Data is NULLP in duHdlEgtpDlData()");
+ return RFAILED;
+ }
+ ODU_GET_MSG_LEN(egtpMsg->msg, (MsgLen *)&msgLen);
+ if(duBuildAndSendDlUserDataToRlc(msgLen, egtpMsg) != ROK)
+ {
+ DU_LOG("\nERROR --> DU_APP : Failed to build DL USer Data in duHdlEgtpDlData()");
+ DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, egtpMsg->msg, msgLen);
+ return RFAILED;
+ }
return ROK;
}
uint8_t duBuildAndSendDlCcchInd(uint16_t *cellId, uint16_t *crnti, \
DlCcchMsgType msgType, uint16_t dlCcchMsgSize, uint8_t *dlCcchMsg)
{
- uint8_t ret = ROK;
+ uint8_t ret = ROK;
uint16_t idx2;
DlCcchIndInfo *dlCcchIndInfo = NULLP;
Pst pst;
- DU_LOG("\nDU APP : Building and Sending DL CCCH Ind to MAC");
+ DU_LOG("\nDEBUG --> DU APP : Building and Sending DL CCCH Ind to MAC");
DU_ALLOC_SHRABL_BUF(dlCcchIndInfo, sizeof(DlCcchIndInfo));
if(!dlCcchIndInfo)
{
- DU_LOG("\nDU APP : Memory alloc failed while building DL CCCH Ind");
+ DU_LOG("\nERROR --> DU APP : Memory alloc failed while building DL CCCH Ind");
return RFAILED;
}
DU_ALLOC_SHRABL_BUF(dlCcchIndInfo->dlCcchMsg, dlCcchIndInfo->dlCcchMsgLen);
if(!dlCcchIndInfo->dlCcchMsg)
{
- DU_LOG("\nDU APP : Memory alloc failed while building DL CCCH Ind");
+ DU_LOG("\nERROR --> DU APP : Memory alloc failed while building DL CCCH Ind");
DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, dlCcchIndInfo, sizeof(DlCcchIndInfo));
return RFAILED;
}
ret = (*packMacDlCcchIndOpts[pst.selector])(&pst, dlCcchIndInfo);
if(ret != ROK)
{
- DU_LOG("\nDU_APP : Failure in sending DL CCCH to MAC");
+ DU_LOG("\nERROR --> DU_APP : Failure in sending DL CCCH to MAC");
DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, dlCcchIndInfo->dlCcchMsg,\
dlCcchIndInfo->dlCcchMsgLen);
DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, dlCcchIndInfo, \
* RFAILED - failure
*
* ****************************************************************/
-uint8_t duBuildAndSendDlRrcMsgToRlc(uint16_t cellId, RlcUeCfg ueCfg, \
- uint8_t lcId, bool execDup, bool deliveryStaReq, uint16_t rrcMsgLen, uint8_t *rrcMsg)
+uint8_t duBuildAndSendDlRrcMsgToRlc(uint16_t cellId, RlcUeCfg ueCfg, F1DlRrcMsg *f1DlRrcMsg)
{
- Pst pst;
+ Pst pst;
uint8_t ret;
uint8_t lcIdx;
- RlcDlRrcMsgInfo *dlRrcMsgInfo;
+ RlcDlRrcMsgInfo *dlRrcMsgInfo = NULLP;
+
+ if(!f1DlRrcMsg)
+ {
+ DU_LOG("\nERROR --> DU APP : Received Dl RRC Msg is NULL at duBuildAndSendDlRrcMsgToRlc()");
+ return RFAILED;
+ }
DU_ALLOC_SHRABL_BUF(dlRrcMsgInfo, sizeof(RlcDlRrcMsgInfo));
if(!dlRrcMsgInfo)
{
- DU_LOG("\nDU APP : Memory allocation failed for dlRrcMsgInfo in \
+ DU_LOG("\nERROR --> DU APP : Memory allocation failed for dlRrcMsgInfo in \
duBuildAndSendDlRrcMsgToRlc");
- DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, rrcMsg, rrcMsgLen);
+ DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, f1DlRrcMsg->rrcMsgPdu, f1DlRrcMsg->rrcMsgSize);
return RFAILED;
}
-
+
/* Filling up the RRC msg info */
dlRrcMsgInfo->cellId = cellId;
dlRrcMsgInfo->ueIdx = ueCfg.ueIdx;
for(lcIdx = 0; lcIdx <= MAX_NUM_LC; lcIdx++)
{
- if(ueCfg.rlcLcCfg[lcIdx].lcId == lcId)
+ if(ueCfg.rlcLcCfg[lcIdx].lcId == f1DlRrcMsg->srbId)
{
dlRrcMsgInfo->rbType = ueCfg.rlcLcCfg[lcIdx].rbType;
- dlRrcMsgInfo->rbId = ueCfg.rlcLcCfg[lcIdx].rbId;
+ dlRrcMsgInfo->rbId = ueCfg.rlcLcCfg[lcIdx].rbId;
dlRrcMsgInfo->lcType = ueCfg.rlcLcCfg[lcIdx].lcType;
- dlRrcMsgInfo->lcId = ueCfg.rlcLcCfg[lcIdx].lcId;
+ dlRrcMsgInfo->lcId = ueCfg.rlcLcCfg[lcIdx].lcId;
break;
}
}
- dlRrcMsgInfo->execDup = execDup;
- dlRrcMsgInfo->deliveryStaRpt = deliveryStaReq;
- dlRrcMsgInfo->rrcMsg = rrcMsg;
- dlRrcMsgInfo->msgLen = rrcMsgLen;
+ dlRrcMsgInfo->execDup = f1DlRrcMsg->execDup;
+ dlRrcMsgInfo->deliveryStaRpt = f1DlRrcMsg->deliveryStatRpt;
+ dlRrcMsgInfo->msgLen = f1DlRrcMsg->rrcMsgSize;
+ dlRrcMsgInfo->rrcMsg = f1DlRrcMsg->rrcMsgPdu;
/* Filling post structure and sending msg */
FILL_PST_DUAPP_TO_RLC(pst, RLC_DL_INST, EVENT_DL_RRC_MSG_TRANS_TO_RLC);
+ DU_LOG("\nDEBUG --> DU_APP: Sending Dl RRC Msg to RLC \n");
ret = (*duSendDlRrcMsgToRlcOpts[pst.selector])(&pst, dlRrcMsgInfo);
if(ret != ROK)
{
- DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, rrcMsg, rrcMsgLen);
+ DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, f1DlRrcMsg->rrcMsgPdu, f1DlRrcMsg->rrcMsgSize);
DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, dlRrcMsgInfo, sizeof(RlcDlRrcMsgInfo));
return RFAILED;
}
/******************************************************************
*
- * @brief Processes DL RRC Message Transfer sent by CU
+ * @brief Process DL RRC Msg recevied from F1AP
*
* @details
*
- * Function : procDlRrcMsgTrans
+ * Function : duProcDlRrcMsg
*
- * Functionality: Processes DL RRC Message Transfer sent by CU
+ * Functionality: Process DL RRC Msg recevied from F1AP
*
- * @params[in] F1AP_PDU_t ASN decoded F1AP message
+ * @params[in] dlCcchMsg - uint8_t*
* @return ROK - success
* RFAILED - failure
*
* ****************************************************************/
-uint8_t procDlRrcMsgTrans(F1AP_PDU_t *f1apMsg)
-{
- DLRRCMessageTransfer_t *dlRrcMsg = NULLP;
- uint8_t *rrcMsgPdu = NULLP;
- uint8_t ieIdx, ueIdx, cellIdx;
- uint8_t ret, srbId;
- uint16_t byteIdx, crnti, cellId, rrcMsgSize;
- uint32_t gnbCuUeF1apId, gnbDuUeF1apId;
- bool execDup = false;
- bool deliveryStaRpt = false;
- bool ueFound = false;
- bool ueCcchCtxtFound = false;
- DU_LOG("\nDU_APP : DL RRC message transfer Recevied");
-
- dlRrcMsg = &f1apMsg->choice.initiatingMessage->value.choice.DLRRCMessageTransfer;
+uint8_t duProcDlRrcMsg(F1DlRrcMsg *dlRrcMsg)
+{
+ uint8_t ueIdx, ret;
+ uint16_t crnti, cellId, cellIdx;
+ bool ueCcchCtxtFound = false;
+ bool ueFound = false;
ret = ROK;
- for(ieIdx=0; ieIdx<dlRrcMsg->protocolIEs.list.count; ieIdx++)
+ if(dlRrcMsg->srbId == SRB0_LCID) //RRC connection setup
{
- switch(dlRrcMsg->protocolIEs.list.array[ieIdx]->id)
+ for(ueIdx=0; ueIdx<duCb.numUe; ueIdx++)
{
- case ProtocolIE_ID_id_gNB_CU_UE_F1AP_ID:
- {
- gnbCuUeF1apId = dlRrcMsg->protocolIEs.list.array[ieIdx]->value.choice.GNB_CU_UE_F1AP_ID;
- break;
- }
- case ProtocolIE_ID_id_gNB_DU_UE_F1AP_ID:
- {
- gnbDuUeF1apId = dlRrcMsg->protocolIEs.list.array[ieIdx]->value.choice.GNB_DU_UE_F1AP_ID;
- break;
- }
- case ProtocolIE_ID_id_SRBID:
- {
- srbId = dlRrcMsg->protocolIEs.list.array[ieIdx]->value.choice.SRBID;
- break;
- }
- case ProtocolIE_ID_id_ExecuteDuplication:
- {
- execDup = true;
- break;
- }
- case ProtocolIE_ID_id_RRCContainer:
- {
- if(dlRrcMsg->protocolIEs.list.array[ieIdx]->value.choice.RRCContainer.size > 0)
- {
- rrcMsgSize = dlRrcMsg->protocolIEs.list.array[ieIdx]->value.choice.RRCContainer.size;
- DU_ALLOC(rrcMsgPdu, rrcMsgSize);
- if(!rrcMsgPdu)
- {
- DU_LOG("\nDU_APP : Memory allocation failed in procDlRrcMsgTrans");
- return RFAILED;
- }
- for(byteIdx = 0; byteIdx < rrcMsgSize; byteIdx++)
- {
- rrcMsgPdu[byteIdx] = \
- dlRrcMsg->protocolIEs.list.array[ieIdx]->value.choice.RRCContainer.buf[byteIdx];
- }
- }
- else
- {
- DU_LOG("\nDU_APP : RRC Container Size is invalid:%ld",\
- dlRrcMsg->protocolIEs.list.array[ieIdx]->value.choice.RRCContainer.size);
- return RFAILED;
- }
- break;
- }
- case ProtocolIE_ID_id_RRCDeliveryStatusRequest:
- {
- deliveryStaRpt = true;
- break;
- }
- default:
- DU_LOG("\nDU_APP : Invalid IE received in DL RRC Msg Transfer:%ld",
- dlRrcMsg->protocolIEs.list.array[ieIdx]->id);
- }
- }
-
- if(srbId == SRB1_LCID) //RRC connection setup
- {
- for(ueIdx=0; ueIdx < duCb.numUe; ueIdx++)
- {
- if(gnbDuUeF1apId == duCb.ueCcchCtxt[ueIdx].gnbDuUeF1apId)
+ if(dlRrcMsg->gnbDuUeF1apId == duCb.ueCcchCtxt[ueIdx].gnbDuUeF1apId)
{
ueCcchCtxtFound = true;
- crnti = duCb.ueCcchCtxt[ueIdx].crnti;
- cellId = duCb.ueCcchCtxt[ueIdx].cellId;
- break;
+ crnti = duCb.ueCcchCtxt[ueIdx].crnti;
+ cellId = duCb.ueCcchCtxt[ueIdx].cellId;
+ break;
}
}
}
if(ueCcchCtxtFound)
{
- ret = duBuildAndSendDlCcchInd(&cellId, &crnti, RRC_SETUP, rrcMsgSize, rrcMsgPdu);
+ ret = duBuildAndSendDlCcchInd(&cellId, &crnti, RRC_SETUP, dlRrcMsg->rrcMsgSize, dlRrcMsg->rrcMsgPdu);
if(ret == RFAILED)
{
- DU_LOG("\nDU_APP: Falied to build DlCcch Ind at procDlRrcMsgTrans()");
+ DU_LOG("\nERROR --> DU APP : Failed to build DlCcch Ind at procDlRrcMsgTrans()");
}
else
{
if(duCb.actvCellLst[cellId-1]->numActvUes < MAX_NUM_UE)
{
- ret = duCreateUeCb(&duCb.ueCcchCtxt[ueIdx], gnbCuUeF1apId);
+ ret = duCreateUeCb(&duCb.ueCcchCtxt[ueIdx], dlRrcMsg->gnbCuUeF1apId);
if(ret == RFAILED)
{
- DU_LOG("\nDU_APP: Failed to createUeCb for cellId [%d] at procDlRrcMsgTrans()", \
+ DU_LOG("\nERROR --> DU APP : Failed to createUeCb for cellId [%d] at procDlRrcMsgTrans()", \
duCb.ueCcchCtxt[ueIdx].cellId);
- ret = RFAILED;
}
}
else
{
- DU_LOG("\nDU_APP: Max Active UEs has reached at procDlRrcMsgTrans()");
+ DU_LOG("\nERROR --> DU_APP: Max Active UEs has reached at procDlRrcMsgTrans()");
ret = RFAILED;
}
}
{
for(ueIdx = 0 ; ueIdx < MAX_NUM_UE; ueIdx++)
{
- if((gnbCuUeF1apId == duCb.actvCellLst[cellIdx]->ueCb[ueIdx].gnbCuUeF1apId)
- && (gnbDuUeF1apId == duCb.actvCellLst[cellIdx]->ueCb[ueIdx].gnbDuUeF1apId))
+ if((dlRrcMsg->gnbCuUeF1apId == duCb.actvCellLst[cellIdx]->ueCb[ueIdx].gnbCuUeF1apId)
+ && (dlRrcMsg->gnbDuUeF1apId == duCb.actvCellLst[cellIdx]->ueCb[ueIdx].gnbDuUeF1apId))
{
ueFound = true;
ret = duBuildAndSendDlRrcMsgToRlc(duCb.actvCellLst[cellIdx]->cellId, \
- duCb.actvCellLst[cellIdx]->ueCb[ueIdx].rlcUeCfg, srbId, \
- execDup, deliveryStaRpt, rrcMsgSize, rrcMsgPdu);
+ duCb.actvCellLst[cellIdx]->ueCb[ueIdx].rlcUeCfg, dlRrcMsg);
break;
}
}
ulCcchIndInfo->ulCcchMsg));
if(ret != ROK)
{
- DU_LOG("\nDU_APP : BuildAndSendInitialRrcMsgTransfer failed");
+ DU_LOG("\nERROR --> DU_APP : BuildAndSendInitialRrcMsgTransfer failed");
}
DU_FREE_SHRABL_BUF(MAC_MEM_REGION, MAC_POOL, ulCcchIndInfo->ulCcchMsg, ulCcchIndInfo->ulCcchMsgLen);
}
else
{
- DU_LOG("\n DUAPP: Memory is NULL of InitalUlBwp");
+ DU_LOG("\nERROR --> DU APP : Memory is NULL of InitalUlBwp");
}
}
}
else
{
- DU_LOG("\n DU_APP: Memory is NULL for SpCellGrp");
+ DU_LOG("\nERROR --> DU APP : Memory is NULL for SpCellGrp");
}
}
}
else
{
- DU_LOG("\nDUAPP: Memory is NULL for Physical Cell Group");
+ DU_LOG("\nERROR --> DU APP : Memory is NULL for Physical Cell Group");
}
}
}
else
{
- DU_LOG("\nDUAPP: Memory is NULL for Master Cell Group");
+ DU_LOG("\nERROR --> DU APP : Memory is NULL for Master Cell Group");
}
}
+/*******************************************************************
+ *
+ * @brief Fills default modulation info for a UE
+ *
+ * @details
+ *
+ * Function : fillDefaultModulation
+ *
+ * Functionality: Fills default modulation info for a UE
+ *
+ * @params[in] Pointer to MAC UE configuration
+ * @return ROK - success
+ * RFAILED - failure
+ *
+ * ****************************************************************/
+void fillDefaultModulation(MacUeCfg *ueCfg)
+{
+ ueCfg->dlModInfo.modOrder = MOD_ORDER_QPSK;
+ ueCfg->dlModInfo.mcsIndex = SIB1_MCS;
+ ueCfg->dlModInfo.mcsTable = MCS_TABLE_QAM64; /* Spec 38.214-Table 5.1.3.1-1 */
+
+ ueCfg->ulModInfo.modOrder = MOD_ORDER_QPSK;
+ ueCfg->ulModInfo.mcsIndex = SIB1_MCS;
+ ueCfg->ulModInfo.mcsTable = MCS_TABLE_QAM64; /* Spec 38.214-Table 5.1.3.1-1 */
+}
+
/******************************************************************
*
* @brief Function to fill Mac Lc Cfg for SRB1
DU_ALLOC_SHRABL_BUF(lcCfg->drbQos, sizeof(DrbQosInfo));
if(!lcCfg->drbQos)
{
- DU_LOG("\nDU APP: Memory Alloc failed at drQos at fillMacLcCfgToAddMod()");
+ DU_LOG("\nERROR --> DU APP : Memory Alloc failed at drQos at fillMacLcCfgToAddMod()");
return RFAILED;
}
}
DU_ALLOC_SHRABL_BUF(lcCfg->snssai, sizeof(Snssai));
if(!lcCfg->snssai)
{
- DU_LOG("\nDU APP: Memory Alloc failed at snnsai at fillMacLcCfgToAddMod()");
+ DU_LOG("\nERROR --> DU APP : Memory Alloc failed at snnsai at fillMacLcCfgToAddMod()");
ret = RFAILED;
}
}
*
* @details
*
- * Function : getMaxAggrBitRate
+ * Function : fillAmbr
*
* Functionality: Function to copy bit Rate from ueSetupReqDb
*
- * @params[in] MaxAggrBitRate *macBitRate, MaxAggrBitRate *ueDbBitRate
+ * @params[in] AmbrCfg **macAmbr, AmbrCfg *ueDbAmbr
* @return ROK/RFAILED
*
*****************************************************************/
-uint8_t getMaxAggrBitRate(MaxAggrBitRate *macBitRate, MaxAggrBitRate *ueDbBitRate)
+uint8_t fillAmbr(AmbrCfg **macAmbr, AmbrCfg *ueDbAmbr)
{
- if(ueDbBitRate)
+ if(ueDbAmbr)
{
- if(!macBitRate)
+ if(*macAmbr == NULLP)
{
- DU_ALLOC_SHRABL_BUF(macBitRate, sizeof(MaxAggrBitRate));
- if(!macBitRate)
+ DU_ALLOC_SHRABL_BUF(*macAmbr, sizeof(AmbrCfg));
+ if(*macAmbr == NULLP)
{
- DU_LOG("\nDUAPP: Memory Alloc Failed at getMaxAggrBitRate()");
+ DU_LOG("\nERROR --> DU APP : Memory Alloc Failed at fillAmbr()");
return RFAILED;
}
}
- memcpy(macBitRate, ueDbBitRate, sizeof(MaxAggrBitRate));
+ memset(*macAmbr, 0, sizeof(AmbrCfg));
+ (*macAmbr)->ulBr = ueDbAmbr->ulBr;
}
else
{
- macBitRate = NULLP;
+ *macAmbr = NULLP;
}
return ROK;
}
if(macUeCfg)
{
/* Processing one Ue at a time to MAC */
- DU_LOG("\nDU_APP: Sending Reconfig Request to MAC");
+ DU_LOG("\nDEBUG --> DU_APP: Sending Ue Reconfig Request to MAC");
ret = (*packMacUeReconfigReqOpts[pst.selector])(&pst, macUeCfg);
if(ret == RFAILED)
{
- DU_LOG("\nDU_APP: Failed to send Reconfig Request to MAC at sendUeReCfgReqToMac()");
+ DU_LOG("\nERROR --> DU APP : Failed to send Reconfig Request to MAC at sendUeReCfgReqToMac()");
DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, macUeCfg, sizeof(MacUeCfg));
}
}
else
{
- DU_LOG("\n DU_APP: Received macUeCfg is NULLP at sendUeReCfgReqToMac()");
+ DU_LOG("\nERROR --> DU_APP: Received macUeCfg is NULLP at sendUeReCfgReqToMac()");
ret = RFAILED;
}
return ret;
bitPos++;
}
}
- DU_LOG("\nDU_APP: Max LC Reached in getDrbLcId()");
+ DU_LOG("\nERROR --> DU_APP: Max LC Reached in getDrbLcId()");
return RFAILED;
}
* Functionality: Fills MacUeCfg
*
* @params[in] cellId, ueIdx, crnti,
- * UeContextSetupDb pointer,
+ * DuUeCfg pointer,
* MacUeCfg pointer
* @return ROK/RFAILED
*
*****************************************************************/
uint8_t fillMacUeCfg(uint16_t cellId, uint8_t ueIdx, uint16_t crnti, \
- UeContextSetupDb *ueCfgDb, MacUeCfg *macUeCfg)
+ DuUeCfg *ueCfgDb, MacUeCfg *macUeCfg)
{
uint8_t ret, dbIdx, lcIdx, cellIdx;
bool lcIdFound = false;
fillDefaultMacCellGrpInfo(&macUeCfg->macCellGrpCfg);
fillDefaultPhyCellGrpInfo(&macUeCfg->phyCellGrpCfg);
fillDefaultSpCellGrpInfo(&macUeCfg->spCellCfg);
- macUeCfg->maxAggrBitRate = NULLP;
+ macUeCfg->ambrCfg = NULLP;
fillMacSrb1LcCfg(&macUeCfg->lcCfgList[0]);
+ fillDefaultModulation(macUeCfg);
macUeCfg->numLcs++;
}
else
ret = procUeReCfgCellInfo(macUeCfg, ueCfgDb->cellGrpCfg);
if(ret == ROK)
{
- ret = getMaxAggrBitRate(macUeCfg->maxAggrBitRate, ueCfgDb->duUeCfg.maxAggrBitRate);
+ if(macUeCfg->spCellCfgPres == true)
+ {
+ if(macUeCfg->spCellCfg.servCellCfg.initDlBwp.pdschPresent)
+ {
+ fillStartSymbolAndLen(macUeCfg->spCellCfg.servCellCfg.initDlBwp.pdschCfg.numTimeDomRsrcAlloc,\
+ &macUeCfg->spCellCfg.servCellCfg.initDlBwp.pdschCfg, NULL);
+ }
+ if(macUeCfg->spCellCfg.servCellCfg.initUlBwp.puschPresent)
+ {
+ fillStartSymbolAndLen(macUeCfg->spCellCfg.servCellCfg.initUlBwp.puschCfg.numTimeDomRsrcAlloc,\
+ NULL, &macUeCfg->spCellCfg.servCellCfg.initUlBwp.puschCfg);
+ }
+ }
+ ret = fillAmbr(&macUeCfg->ambrCfg, ueCfgDb->ambrCfg);
+
+ duFillModulationDetails(macUeCfg, duMacDb, ueCfgDb->ueNrCapability);
}
/* Filling LC Context */
- for(dbIdx = 0; (dbIdx < ueCfgDb->duUeCfg.numMacLcs && ret == ROK); dbIdx++)
+ for(dbIdx = 0; (dbIdx < ueCfgDb->numMacLcs && ret == ROK); dbIdx++)
{
- if(!ueCfgDb->duUeCfg.macLcCfg[dbIdx].ulLcCfgPres)
- {
- /* Filling default UL LC config in MAC if not present */
- ueCfgDb->duUeCfg.macLcCfg[dbIdx].ulLcCfgPres = true;
- fillDefaultUlLcCfg(&ueCfgDb->duUeCfg.macLcCfg[dbIdx].ulLcCfg);
- }
- for(lcIdx = 0; lcIdx < duMacDb->numLcs; lcIdx++)
- {
- if(ueCfgDb->duUeCfg.macLcCfg[dbIdx].lcId == duMacDb->lcCfgList[lcIdx].lcId)
- {
- lcIdFound = true;
- if((ueCfgDb->duUeCfg.macLcCfg[dbIdx].configType == CONFIG_UNKNOWN) ||
- (ueCfgDb->duUeCfg.macLcCfg[dbIdx].configType == CONFIG_MOD))
- {
- ueCfgDb->duUeCfg.macLcCfg[dbIdx].configType = CONFIG_MOD;
- ret = fillMacLcCfgToAddMod(&macUeCfg->lcCfgList[dbIdx], &ueCfgDb->duUeCfg.macLcCfg[dbIdx]);
- }
- }
- else
- lcIdFound = false;
- }
- if(!lcIdFound)
- {
- /* ADD/DEL CONFIG */
- ret = fillMacLcCfgToAddMod(&macUeCfg->lcCfgList[dbIdx], &ueCfgDb->duUeCfg.macLcCfg[dbIdx]);
- }
- if(ret == ROK)
- {
- macUeCfg->numLcs++;
- }
- else
- {
- DU_LOG("\n DU_APP: Failed to add Lc at Idx %d in fillMacUeCfg()", dbIdx);
- break;
- }
+ if(!ueCfgDb->macLcCfg[dbIdx].ulLcCfgPres)
+ {
+ /* Filling default UL LC config in MAC if not present */
+ ueCfgDb->macLcCfg[dbIdx].ulLcCfgPres = true;
+ fillDefaultUlLcCfg(&ueCfgDb->macLcCfg[dbIdx].ulLcCfg);
+ }
+ for(lcIdx = 0; lcIdx < duMacDb->numLcs; lcIdx++)
+ {
+ if(ueCfgDb->macLcCfg[dbIdx].lcId == duMacDb->lcCfgList[lcIdx].lcId)
+ {
+ lcIdFound = true;
+ if((ueCfgDb->macLcCfg[dbIdx].configType == CONFIG_UNKNOWN) ||
+ (ueCfgDb->macLcCfg[dbIdx].configType == CONFIG_MOD))
+ {
+ ueCfgDb->macLcCfg[dbIdx].configType = CONFIG_MOD;
+ ret = fillMacLcCfgToAddMod(&macUeCfg->lcCfgList[dbIdx], &ueCfgDb->macLcCfg[dbIdx]);
+ }
+ }
+ else
+ lcIdFound = false;
+ }
+ if(!lcIdFound)
+ {
+ /* ADD/DEL CONFIG */
+ ret = fillMacLcCfgToAddMod(&macUeCfg->lcCfgList[dbIdx], &ueCfgDb->macLcCfg[dbIdx]);
+ }
+ if(ret == ROK)
+ {
+ macUeCfg->numLcs++;
+ }
+ else
+ {
+ DU_LOG("\nERROR --> DU APP : Failed to add Lc at Idx %d in fillMacUeCfg()", dbIdx);
+ break;
+ }
}/*End of Outer FOR loop */
}
return ret;
{
/* DL AM */
amCfg->dlAmCfg.snLenDl = AM_SIZE_12;
- amCfg->dlAmCfg.pollRetxTmr = POLL_RETX_TMR_45MS;
- amCfg->dlAmCfg.pollPdu = POLL_PDU_TMR_INFINITY;
- amCfg->dlAmCfg.pollByte = POLL_BYTES_INFINITY;
- amCfg->dlAmCfg.maxRetxTh = RETX_TH_8;
+ amCfg->dlAmCfg.pollRetxTmr = T_POLL_RETRANSMIT_VAL;
+ amCfg->dlAmCfg.pollPdu = POLL_PDU_VAL;
+ amCfg->dlAmCfg.pollByte = POLL_BYTE_VAL;
+ amCfg->dlAmCfg.maxRetxTh = MAX_RETX_THRESHOLD_VAL;
/* UL AM */
amCfg->ulAmCfg.snLenUl = AM_SIZE_12;
- amCfg->ulAmCfg.reAssemTmr = RE_ASM_40MS;
- amCfg->ulAmCfg.statProhTmr = PROH_35MS;
+ amCfg->ulAmCfg.reAssemTmr = T_REASSEMBLY_VAL;
+ amCfg->ulAmCfg.statProhTmr = T_STATUS_PROHIBHIT_VAL;
}
/******************************************************************
{
/* UL UM BI DIR INFO */
umBiDirCfg->ulUmCfg.snLenUlUm = UM_SIZE_12;
- umBiDirCfg->ulUmCfg.reAssemTmr = RE_ASM_40MS;
+ umBiDirCfg->ulUmCfg.reAssemTmr = T_REASSEMBLY_VAL;
/* DL UM BI DIR INFO */
umBiDirCfg->dlUmCfg.snLenDlUm = UM_SIZE_12;
void fillDefaultUmUlInfo(UmUniDirUlBearerCfg *UmUlCfg)
{
UmUlCfg->ulUmCfg.snLenUlUm = UM_SIZE_12;
- UmUlCfg->ulUmCfg.reAssemTmr = RE_ASM_40MS;
+ UmUlCfg->ulUmCfg.reAssemTmr = T_REASSEMBLY_VAL;
}
/******************************************************************
fillDefaultAmInfo(lcCfg->u.amCfg);
else
{
- DU_LOG("\n DU_APP: Memory Alloc failed at AmCfg at fillDefaultRlcModeCfg()");
+ DU_LOG("\n ERROR --> DU APP : Memory Alloc failed at AmCfg at fillDefaultRlcModeCfg()");
return RFAILED;
}
}
fillDefaultUmBiInfo(lcCfg->u.umBiDirCfg);
else
{
- DU_LOG("\n DU_APP: Memory Alloc failed at UmBiDirCfg at fillDefaultRlcModeCfg()");
+ DU_LOG("\n ERROR --> DU APP : Memory Alloc failed at UmBiDirCfg at fillDefaultRlcModeCfg()");
return RFAILED;
}
}
fillDefaultUmUlInfo(lcCfg->u.umUniDirUlCfg);
else
{
- DU_LOG("\n DU_APP: Memory Alloc failed at UmUniDirUlCfg at fillDefaultRlcModeCfg()");
+ DU_LOG("\n ERROR --> DU APP : Memory Alloc failed at UmUniDirUlCfg at fillDefaultRlcModeCfg()");
return RFAILED;
}
}
fillDefaultUmDlInfo(lcCfg->u.umUniDirDlCfg);
else
{
- DU_LOG("\n DU_APP: Memory Alloc failed at UmUniDirDlCfg at fillDefaultRlcModeCfg()");
+ DU_LOG("\n ERROR --> DU APP : Memory Alloc failed at UmUniDirDlCfg at fillDefaultRlcModeCfg()");
return RFAILED;
}
}
break;
}
default:
- DU_LOG("\nDUAPP: Invalid rlcMode %d at extractRlcCfgToAddMod()", rlcMode);
+ DU_LOG("\nERROR --> DUAPP: Invalid rlcMode %d at extractRlcCfgToAddMod()", rlcMode);
return RFAILED;
}
}
else
{
- DU_LOG("\nDUAPP: Received Lc Config is NULL");
+ DU_LOG("\nERROR --> DUAPP: Received LC Config is NULL");
return RFAILED;
}
return ROK;
if(rlcUeCfg)
{
/* Processing one Ue at a time to RLC */
- DU_LOG("\nDU_APP: Sending Reconfig Request to RLC UL");
+ DU_LOG("\nDEBUG --> DU_APP: Sending Ue Reconfig Request to RLC UL");
ret = (*packRlcUeReconfigReqOpts[pst.selector])(&pst, rlcUeCfg);
if(ret == RFAILED)
{
- DU_LOG("\nDU_APP : Failed to send Ue Reconfig Req to RLC at sendUeReCfgReqToRlc()");
+ DU_LOG("\nERROR --> DU_APP : Failed to send Ue Reconfig Req to RLC at sendUeReCfgReqToRlc()");
DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, rlcUeCfg, sizeof(RlcUeCfg));
}
}
else
{
- DU_LOG("\n DU_APP: Received RlcUeCfg is NULL at sendUeReCfgReqToRlc()");
+ DU_LOG("\nERROR --> DU_APP: Received RlcUeCfg is NULL at sendUeReCfgReqToRlc()");
ret = RFAILED;
}
return ret;
ret = fillDefaultRlcModeCfg(ueCfgDb->rlcLcCfg[dbIdx].rlcMode, &ueCfgDb->rlcLcCfg[dbIdx]);
if(ret == RFAILED)
{
- DU_LOG("\n DU_APP: Failed to fill Rlc Mode at fillRlcUeCfg()");
+ DU_LOG("\n ERROR --> DU APP : Failed to fill Rlc Mode at fillRlcUeCfg()");
memset(rlcUeCfg, 0, sizeof(RlcUeCfg));
return ret;
}
if(ueCcchCtxt->cellId == duCb.actvCellLst[cellIdx]->cellId)
{
GET_UE_IDX(ueCcchCtxt->crnti, ueIdx);
- DU_LOG("\nDU_APP: Filling UeCb for ueIdx [%d]", ueIdx);
+ DU_LOG("\nDEBUG --> DU_APP: Filling UeCb for ueIdx [%d]", ueIdx);
- duCb.actvCellLst[cellIdx]->ueCb[ueIdx-1].crnti = ueCcchCtxt->crnti;
+ duCb.actvCellLst[cellIdx]->ueCb[ueIdx-1].f1UeDb = NULLP;
+ duCb.actvCellLst[cellIdx]->ueCb[ueIdx-1].crnti = ueCcchCtxt->crnti;
duCb.actvCellLst[cellIdx]->ueCb[ueIdx-1].gnbDuUeF1apId = ueCcchCtxt->gnbDuUeF1apId;
duCb.actvCellLst[cellIdx]->ueCb[ueIdx-1].gnbCuUeF1apId = gnbCuUeF1apId;
duCb.actvCellLst[cellIdx]->ueCb[ueIdx-1].drbBitMap = NULLP;
duCb.actvCellLst[cellIdx]->ueCb[ueIdx-1].ueState = UE_ACTIVE;
- duCb.actvCellLst[cellIdx]->ueCb[ueIdx-1].f1UeDb = NULLP;
/* Filling Mac Ue Config */
memset(&duCb.actvCellLst[cellIdx]->ueCb[ueIdx-1].macUeCfg, 0, sizeof(MacUeCfg));
ret = duBuildAndSendUeCreateReqToMac(ueCcchCtxt->cellId, ueIdx, ueCcchCtxt->crnti,\
&duCb.actvCellLst[cellIdx]->ueCb[ueIdx-1].macUeCfg);
if(ret == RFAILED)
- DU_LOG("\nDU_APP: Failed to send UE create request to MAC");
+ DU_LOG("\nERROR --> DU APP : Failed to send UE create request to MAC");
/* Filling Rlc Ue Config */
memset(&duCb.actvCellLst[cellIdx]->ueCb[ueIdx-1].rlcUeCfg, 0, sizeof(RlcUeCfg));
ret = duBuildAndSendUeCreateReqToRlc(ueCcchCtxt->cellId, ueIdx, \
&duCb.actvCellLst[cellIdx]->ueCb[ueIdx-1].rlcUeCfg);
if(ret == RFAILED)
- DU_LOG("\nDU_APP: Failed to send UE create request to RLC");
+ DU_LOG("\nERROR --> DU APP : Failed to send UE create request to RLC");
duCb.actvCellLst[cellIdx]->numActvUes++;
memset(ueCcchCtxt, 0, sizeof(UeCcchCtxt));
uint8_t duBuildAndSendUeCreateReqToMac(uint16_t cellId, uint8_t ueIdx,\
uint16_t crnti, MacUeCfg *duMacUeCfg)
{
- uint8_t ret = ROK;
- Pst pst;
+ uint8_t ret = ROK;
MacUeCfg *macUeCfg = NULLP;
+ Pst pst;
+ memset(&pst, 0, sizeof(Pst));
+
ret = fillMacUeCfg(cellId, ueIdx, crnti, NULL, duMacUeCfg);
if(ret == RFAILED)
{
- DU_LOG("\nDU APP: Failed to fill MacUeCfg at duBuildAndSendUeCreateReqToMac()");
+ DU_LOG("\nERROR --> DU APP : Failed to fill MacUeCfg at duBuildAndSendUeCreateReqToMac()");
return RFAILED;
}
/* Fill Pst */
{
memset(macUeCfg, 0, sizeof(MacUeCfg));
memcpy(macUeCfg, &duCb.actvCellLst[cellId - 1]->ueCb[ueIdx -1].macUeCfg, sizeof(MacUeCfg));
- DU_LOG("\nDU_APP: Sending UE create request to MAC");
+ DU_LOG("\nDEBUG --> DU_APP: Sending UE create request to MAC");
/* Processing one Ue at a time to MAC */
ret = (*packMacUeCreateReqOpts[pst.selector])(&pst, macUeCfg);
if(ret == RFAILED)
{
- DU_LOG("\nDU_APP : Failure in sending Ue Create Req to MAC at duBuildAndSendUeCreateReqToMac()");
+ DU_LOG("\nERROR --> DU_APP : Failure in sending Ue Create Req to MAC at duBuildAndSendUeCreateReqToMac()");
DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, macUeCfg, sizeof(MacUeCfg));
}
}
else
{
- DU_LOG("\n DU_APP: Memory alloc failed at duBuildAndSendUeCreateReqToMac()");
+ DU_LOG("\n ERROR --> DU APP : Memory alloc failed at duBuildAndSendUeCreateReqToMac()");
ret = RFAILED;
}
return ret;
* Functionality: update DuUeCb MAC Cfg
*
* @params[in] DuUeCb Pointer
- * UeContextSetupDb pointer
+ * F1UeContextSetupDb pointer
* @return ROK - success
* RFAILED - failure
*
* ****************************************************************/
-uint8_t duUpdateMacCfg(MacUeCfg *macUeCfg, UeContextSetupDb *f1UeDb)
+uint8_t duUpdateMacCfg(MacUeCfg *macUeCfg, F1UeContextSetupDb *f1UeDb)
{
uint8_t ret, lcIdx, dbIdx, numLcs, lcDelIdx;
ret = ROK;
/*Filling Cell Group Cfg*/
- ret = procUeReCfgCellInfo(macUeCfg, f1UeDb->cellGrpCfg);
+ ret = procUeReCfgCellInfo(macUeCfg, f1UeDb->duUeCfg.cellGrpCfg);
if(ret == ROK)
{
- ret = getMaxAggrBitRate(macUeCfg->maxAggrBitRate, f1UeDb->duUeCfg.maxAggrBitRate);
+ if(macUeCfg->spCellCfg.servCellCfg.initDlBwp.pdschPresent)
+ {
+ fillStartSymbolAndLen(macUeCfg->spCellCfg.servCellCfg.initDlBwp.pdschCfg.numTimeDomRsrcAlloc,\
+ &macUeCfg->spCellCfg.servCellCfg.initDlBwp.pdschCfg, NULL);
+ }
+ if(macUeCfg->spCellCfg.servCellCfg.initUlBwp.puschPresent)
+ {
+ fillStartSymbolAndLen(macUeCfg->spCellCfg.servCellCfg.initUlBwp.puschCfg.numTimeDomRsrcAlloc,\
+ NULL, &macUeCfg->spCellCfg.servCellCfg.initUlBwp.puschCfg);
+ }
+ ret = fillAmbr(&macUeCfg->ambrCfg, f1UeDb->duUeCfg.ambrCfg);
}
/* Filling LC Context */
for(dbIdx = 0; (dbIdx < f1UeDb->duUeCfg.numMacLcs && ret == ROK); dbIdx++)
freeMacLcCfg(&macUeCfg->lcCfgList[lcDelIdx+1]);
if(ret == RFAILED)
{
- DU_LOG("\nDU_APP: Failed to delete LC at Idx %d in duUpdateMacCfg()", lcDelIdx);
+ DU_LOG("\nERROR --> DU APP : Failed to delete LC at Idx %d in duUpdateMacCfg()", lcDelIdx);
break;
}
}
ret = fillMacLcCfgToAddMod(&macUeCfg->lcCfgList[numLcs], &f1UeDb->duUeCfg.macLcCfg[dbIdx]);
if(ret == RFAILED)
{
- DU_LOG("\nDU_APP: Failed to add LC at Idx %d in duUpdateMacCfg()", numLcs);
+ DU_LOG("\nERROR --> DU APP : Failed to add LC at Idx %d in duUpdateMacCfg()", numLcs);
break;
}
macUeCfg->numLcs++;
break;
}
default:
- DU_LOG("\nDU_APP: Invalid Rlc Mode %d at fillRlcCfgToAddMod()", lcCfg->rlcMode);
+ DU_LOG("\nERROR --> DU_APP: Invalid Rlc Mode %d at fillRlcCfgToAddMod()", lcCfg->rlcMode);
return RFAILED;
}
return ROK;
* Functionality: update DuUeCb Rlc Lc Cfg
*
* @params[in] DuUeCb Pointer
- * UeContextSetupDb pointer
+ * F1UeContextSetupDb pointer
* @return ROK - success
* RFAILED - failure
*
* ****************************************************************/
-uint8_t duUpdateRlcLcCfg(RlcUeCfg *rlcUeCfg, UeContextSetupDb *f1UeDb)
+uint8_t duUpdateRlcLcCfg(RlcUeCfg *rlcUeCfg, F1UeContextSetupDb *f1UeDb)
{
uint8_t ret, lcIdx, dbIdx, numLcs, lcDelIdx;
freeRlcLcCfg(&rlcUeCfg->rlcLcCfg[lcDelIdx+1]);
if(ret == RFAILED)
{
- DU_LOG("\nDU_APP: Failed to delete LC at Idx %d in duUpdateRlcCfg()", lcDelIdx);
+ DU_LOG("\nERROR --> DU APP : Failed to delete LC at Idx %d in duUpdateRlcCfg()", lcDelIdx);
break;
}
}
}
+/*******************************************************************
+ *
+ * @brief Function to fill Tunnel Config to Add/Mod
+ *
+ *
+ * @details
+ *
+ * Function : fillTnlCfgToAddMod
+ *
+ * Functionality: Function to fill tunnel Config to Add/Mod
+ *
+ * @params[in] Pointer to tnlCfgDb,
+ * pointer to f1TnlCfg
+ * @return ROK - success
+ * RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t fillTnlCfgToAddMod(UpTnlCfg **ueCbTnlCfg, UpTnlCfg *f1TnlCfg)
+{
+ if(*ueCbTnlCfg == NULLP)
+ {
+ /* copying to DuCb Tnl Cfg */
+ DU_ALLOC(*ueCbTnlCfg, sizeof(UpTnlCfg));
+ if(*ueCbTnlCfg == NULLP)
+ {
+ DU_LOG("\nERROR --> DU_APP : fillTnlCfgToAddMod: Memory Alloc failed for drbId[%d]", f1TnlCfg->drbId);
+ return RFAILED;
+ }
+ }
+ memset(*ueCbTnlCfg, 0, sizeof(UpTnlCfg));
+ (*ueCbTnlCfg)->configType = f1TnlCfg->configType;
+ (*ueCbTnlCfg)->cellId = f1TnlCfg->cellId;
+ (*ueCbTnlCfg)->ueIdx = f1TnlCfg->ueIdx;
+ (*ueCbTnlCfg)->drbId = f1TnlCfg->drbId;
+ if(f1TnlCfg->tnlCfg1)
+ {
+ if((*ueCbTnlCfg)->tnlCfg1 == NULLP)
+ {
+ DU_ALLOC((*ueCbTnlCfg)->tnlCfg1, sizeof(GtpTnlCfg));
+ if((*ueCbTnlCfg)->tnlCfg1 == NULLP)
+ {
+ DU_LOG("\nERROR --> DU_APP : fillTnlCfgToAddMod: Memory Alloc failed for tnlCfg1 for drbId[%d]", f1TnlCfg->drbId);
+ return RFAILED;
+ }
+ }
+ memset((*ueCbTnlCfg)->tnlCfg1, 0, sizeof(GtpTnlCfg));
+ (*ueCbTnlCfg)->tnlCfg1->teId = f1TnlCfg->tnlCfg1->teId;
+ (*ueCbTnlCfg)->tnlCfg1->ulTnlAddress = f1TnlCfg->tnlCfg1->ulTnlAddress;
+ (*ueCbTnlCfg)->tnlCfg1->dlTnlAddress = f1TnlCfg->tnlCfg1->dlTnlAddress;
+ }
+ return ROK;
+}
+
+/*******************************************************************
+ *
+ * @brief Processing the tunnel Request to EGTP
+ *
+ * @details
+ *
+ * Function : duProcEgtpTunnelCfg
+ *
+ * Functionality: Processing the tunnel Request to EGTP
+ *
+ * @params[in] UptnlCfg *duTnlCfg, UpTnlCfg *f1TnlCfg
+ * @return ROK - success
+ * RFAILED - failure
+ *
+ * ****************************************************************/
+
+uint8_t duProcEgtpTunnelCfg(uint8_t ueCbIdx, UpTnlCfg *duTnlCfg, UpTnlCfg *f1TnlCfg)
+{
+ uint8_t ret = RFAILED, delIdx;
+
+ if(f1TnlCfg->tnlCfg1 == NULLP)
+ {
+ DU_LOG("\nERROR --> DU_APP : Tunnel config not found");
+ return ret;
+ }
+
+ if(f1TnlCfg->configType == CONFIG_ADD)
+ {
+ if(duSendEgtpTnlMgmtReq(EGTP_TNL_MGMT_ADD, NULLP, f1TnlCfg->tnlCfg1) == ROK)
+ {
+ if(fillTnlCfgToAddMod(&duCb.upTnlCfg[duCb.numDrb], f1TnlCfg) == ROK)
+ {
+ duCb.numDrb++;
+ ret = ROK;
+ }
+ }
+ }
+ else if(f1TnlCfg->configType == CONFIG_MOD)
+ {
+ if(duSendEgtpTnlMgmtReq(EGTP_TNL_MGMT_MOD, duTnlCfg->tnlCfg1->teId, f1TnlCfg->tnlCfg1) == ROK)
+ {
+ if(fillTnlCfgToAddMod(&duTnlCfg, f1TnlCfg) == ROK)
+ {
+ ret = ROK;
+ }
+ }
+ }
+ else if(f1TnlCfg->configType == CONFIG_DEL)
+ {
+ if(duSendEgtpTnlMgmtReq(EGTP_TNL_MGMT_DEL, duTnlCfg->tnlCfg1->teId, f1TnlCfg->tnlCfg1) == ROK)
+ {
+ /* Free memory at drbIdx */
+ DU_FREE(duTnlCfg->tnlCfg1, sizeof(GtpTnlCfg));
+ DU_FREE(duTnlCfg, sizeof(UpTnlCfg));
+ duCb.numDrb--;
+ for(delIdx = ueCbIdx; delIdx < duCb.numDrb; delIdx++)
+ {
+ /* moving all elements one index ahead */
+ ret = fillTnlCfgToAddMod(&duCb.upTnlCfg[delIdx], duCb.upTnlCfg[delIdx+1]);
+ if(ret != ROK)
+ {
+ return ret;
+ }
+ }
+ }
+ }
+ return ret;
+}
+
+/***********************************************************************
+ *
+ * @brief Function to fill Tunnel Config
+ * and sends tunnel Req to EGTP
+ *
+ *
+ * @details
+ *
+ * Function : duUpdateTunnelCfgDb
+ *
+ * Functionality: Function to fill tunnel Config
+ * and sends tunnel Cfg Req to EGTP
+ *
+ * @params[in] ueIdx, cellId, DuUeCfg
+ * @return ROK - success
+ * RFAILED - failure
+ *
+ * ****************************************************************/
+
+uint8_t duUpdateTunnelCfgDb(uint8_t ueIdx, uint8_t cellId, DuUeCfg *duUeCfg)
+{
+ uint8_t ret = ROK, drbIdx, duCbDrbIdx;
+ bool drbFound = false;
+
+ /*If Add/Mod tunnels request for that DRB is successful in EGTP */
+ /*then update drbId and tunnel Info in duCb */
+ for(drbIdx=0; drbIdx < duUeCfg->numDrb; drbIdx++)
+ {
+ duUeCfg->upTnlInfo[drbIdx].cellId = cellId;
+ duUeCfg->upTnlInfo[drbIdx].ueIdx = ueIdx;
+ for(duCbDrbIdx = 0; duCbDrbIdx < duCb.numDrb; duCbDrbIdx++)
+ {
+ if(duCb.upTnlCfg[duCbDrbIdx]->drbId == duUeCfg->upTnlInfo[drbIdx].drbId)
+ {
+ drbFound = true; /* existing DRB */
+ if(duProcEgtpTunnelCfg(duCbDrbIdx, duCb.upTnlCfg[duCbDrbIdx], &duUeCfg->upTnlInfo[drbIdx]) != ROK)
+ {
+ DU_LOG("\nERROR -> DU_APP : duUpdateTunnelCfgDb: Failed to modify tunnel req for Drb id[%d]",
+ duUeCfg->upTnlInfo[drbIdx].drbId);
+ ret = RFAILED;
+ }
+ break;
+ }
+ else
+ drbFound = false;
+ }
+ if(!drbFound && ret == ROK)/* new DRB to Add */
+ {
+ if(duProcEgtpTunnelCfg(NULLP, NULLP, &duUeCfg->upTnlInfo[drbIdx]) != ROK)
+ {
+ DU_LOG("\nERROR -> DU_APP : duUpdateTunnelCfgDb: Failed to add tunnel req for Drb id[%d]",
+ duUeCfg->upTnlInfo[drbIdx].drbId);
+ ret = RFAILED;
+ break;
+ }
+ }
+ else
+ break;
+ }
+ return ret;
+}
+
/*******************************************************************
*
* @brief @brief To update DuUeCb Mac and Rlc Ue Cfg
ueCb->macUeCfg.crnti = crnti;
ret = duUpdateMacCfg(&ueCb->macUeCfg, ueCb->f1UeDb);
if(ret == RFAILED)
- DU_LOG("\nDU APP: Failed while updating MAC LC Config at duUpdateDuUeCbCfg()");
+ DU_LOG("\nERROR --> DU APP : Failed while updating MAC LC Config at duUpdateDuUeCbCfg()");
+ else
+ {
+ if(duUpdateTunnelCfgDb(ueIdx, cellId, &ueCb->f1UeDb->duUeCfg) != ROK)
+ {
+ DU_LOG("\nERROR --> DU_APP : Failed to establish tunnel in duUpdateDuUeCbCfg()");
+ return RFAILED;
+ }
+ }
}
else
- DU_LOG("\nDU APP: Failed while updating RLC LC Config at duUpdateDuUeCbCfg()");
+ DU_LOG("\nERROR --> DU APP : Failed while updating RLC LC Config at duUpdateDuUeCbCfg()");
}
else
ret = RFAILED;
if(cfgRsp->result == MAC_DU_APP_RSP_OK)
{
if(pst->event == EVENT_MAC_UE_CREATE_RSP)
- {
- DU_LOG("\nDU APP : MAC UE Create Response : SUCCESS [UE IDX : %d]", cfgRsp->ueIdx);
+ {
+ DU_LOG("\nINFO --> DU APP : MAC UE Create Response : SUCCESS [UE IDX : %d]", cfgRsp->ueIdx);
duCb.actvCellLst[cfgRsp->cellId -1]->ueCb[cfgRsp->ueIdx -1].\
- macUeCfg.macUeCfgState = UE_CREATE_COMPLETE;
- }
+ macUeCfg.macUeCfgState = UE_CREATE_COMPLETE;
+ }
else if(pst->event == EVENT_MAC_UE_RECONFIG_RSP)
{
- DU_LOG("\nDU APP : MAC UE Reconfig Response : SUCCESS [UE IDX : %d]", cfgRsp->ueIdx);
+ DU_LOG("\nINFO --> DU APP : MAC UE Reconfig Response : SUCCESS [UE IDX : %d]", cfgRsp->ueIdx);
duCb.actvCellLst[cfgRsp->cellId -1]->ueCb[cfgRsp->ueIdx -1].\
- macUeCfg.macUeCfgState = UE_RECFG_COMPLETE;
+ macUeCfg.macUeCfgState = UE_RECFG_COMPLETE;
if((ret = duUpdateDuUeCbCfg(cfgRsp->ueIdx, cfgRsp->cellId)) == ROK)
+ {
BuildAndSendUeCtxtRsp(cfgRsp->ueIdx, cfgRsp->cellId);
+ duCb.actvCellLst[cfgRsp->cellId -1]->ueCb[cfgRsp->ueIdx -1].\
+ macUeCfg.macUeCfgState = 0;
+ }
}
}
else
{
- DU_LOG("\nDU APP : MAC UE CFG Response for EVENT[%d]: FAILURE [UE IDX : %d]", pst->event, cfgRsp->ueIdx);
- if(pst->event == EVENT_MAC_UE_RECONFIG_RSP)
- {
- //TODO: Send the failure case in Ue Context Setup Response
- }
+ DU_LOG("\nERROR --> DU APP : MAC UE CFG Response for EVENT[%d]: FAILURE [UE IDX : %d]", pst->event, cfgRsp->ueIdx);
+ if(pst->event == EVENT_MAC_UE_RECONFIG_RSP)
+ {
+ //TODO: Send the failure case in Ue Context Setup Response
+ }
ret = RFAILED;
}
DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, cfgRsp, sizeof(MacUeCfgRsp));
}
else
{
- DU_LOG("\nDU APP : Received MAC Ue Config Response is NULL at DuProcMacUeCfgRsp()");
+ DU_LOG("\nERROR --> DU APP : Received MAC Ue Config Response is NULL at DuProcMacUeCfgRsp()");
ret = RFAILED;
}
return ret;
uint8_t duBuildAndSendUeCreateReqToRlc(uint16_t cellId, uint8_t ueIdx,\
RlcUeCfg *duRlcUeCfg)
{
- uint8_t ret = ROK;
+ uint8_t ret = ROK;
RlcUeCfg *rlcUeCfg = NULLP;
- Pst pst;
+ Pst pst;
ret = fillRlcUeCfg(cellId, ueIdx, NULL, duRlcUeCfg);
if(ret == RFAILED)
{
- DU_LOG("\nDU_APP: Failed to fill Rlc Ue Cfg at duBuildAndSendUeCreateReqToRlc()");
+ DU_LOG("\nERROR --> DU APP : Failed to fill Rlc Ue Cfg at duBuildAndSendUeCreateReqToRlc()");
return ret;
}
memset(rlcUeCfg, 0, sizeof(RlcUeCfg));
memcpy(rlcUeCfg, duRlcUeCfg, sizeof(RlcUeCfg));
/* Processing one Ue at a time to RLC */
- DU_LOG("\nDU_APP: Sending UE create request to RLC UL");
+ DU_LOG("\nDEBUG --> DU_APP: Sending UE create request to RLC UL");
ret = (*packRlcUeCreateReqOpts[pst.selector])(&pst, rlcUeCfg);
if(ret == RFAILED)
{
- DU_LOG("\nDU_APP : Failure in sending Ue Create Req to RLC");
+ DU_LOG("\nERROR --> DU_APP : Failure in sending Ue Create Req to RLC");
DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, rlcUeCfg, sizeof(RlcUeCfg));
ret = RFAILED;
}
}
else
{
- DU_LOG("\n DU_APP: Memory alloc failed at duBuildAndSendUeCreateReqToRlc()");
+ DU_LOG("\n ERROR --> DU APP : Memory alloc failed at duBuildAndSendUeCreateReqToRlc()");
ret = RFAILED;
}
return ret;
if(cfgRsp->result == RLC_DU_APP_RSP_OK)
{
if(pst->event == EVENT_RLC_UE_CREATE_RSP)
- {
- DU_LOG("\nDU_APP: RLC UE Create Response : SUCCESS [UE IDX:%d]", cfgRsp->ueIdx);
- duCb.actvCellLst[cfgRsp->cellId -1]->ueCb[cfgRsp->ueIdx -1].\
- rlcUeCfg.rlcUeCfgState = UE_CREATE_COMPLETE;
- }
- else if(pst->event == EVENT_RLC_UE_RECONFIG_RSP)
- {
- DU_LOG("\nDU_APP: RLC UE Reconfig Response : SUCCESS [UE IDX:%d]", cfgRsp->ueIdx);
- duCb.actvCellLst[cfgRsp->cellId -1]->ueCb[cfgRsp->ueIdx -1].\
- rlcUeCfg.rlcUeCfgState = UE_RECFG_COMPLETE;
- if((ret = duUpdateDuUeCbCfg(cfgRsp->ueIdx, cfgRsp->cellId)) == ROK)
+ {
+ DU_LOG("\nINFO --> DU_APP: RLC UE Create Response : SUCCESS [UE IDX:%d]", cfgRsp->ueIdx);
+ duCb.actvCellLst[cfgRsp->cellId -1]->ueCb[cfgRsp->ueIdx -1].\
+ rlcUeCfg.rlcUeCfgState = UE_CREATE_COMPLETE;
+ }
+ else if(pst->event == EVENT_RLC_UE_RECONFIG_RSP)
+ {
+ DU_LOG("\nINFO --> DU_APP: RLC UE Reconfig Response : SUCCESS [UE IDX:%d]", cfgRsp->ueIdx);
+ duCb.actvCellLst[cfgRsp->cellId -1]->ueCb[cfgRsp->ueIdx -1].\
+ rlcUeCfg.rlcUeCfgState = UE_RECFG_COMPLETE;
+ if((ret = duUpdateDuUeCbCfg(cfgRsp->ueIdx, cfgRsp->cellId)) == ROK)
+ {
BuildAndSendUeCtxtRsp(cfgRsp->ueIdx, cfgRsp->cellId);
-
- }
+ duCb.actvCellLst[cfgRsp->cellId -1]->ueCb[cfgRsp->ueIdx -1].\
+ rlcUeCfg.rlcUeCfgState = 0;
+ }
+ }
}
else
{
- DU_LOG("\nDU_APP: RLC UE CFG Response for EVENT[%d] : FAILED [UE IDX : %d, REASON :%d]",\
- pst->event, cfgRsp->ueIdx, cfgRsp->reason);
- if((pst->event == EVENT_RLC_UE_RECONFIG_RSP))
- {
+ DU_LOG("\nERROR --> DU_APP: RLC UE CFG Response for EVENT[%d] : FAILED [UE IDX : %d, REASON :%d]",\
+ pst->event, cfgRsp->ueIdx, cfgRsp->reason);
+ if((pst->event == EVENT_RLC_UE_RECONFIG_RSP))
+ {
//TODO: update failure case in ue Context setup Response
- }
- ret = RFAILED;
+ }
+ ret = RFAILED;
}
DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, cfgRsp, sizeof(RlcUeCfgRsp));
}
else
{
- DU_LOG("\nDU_APP: Received RLC Ue Config Response is NULL at DuProcRlcUeCfgRsp()");
+ DU_LOG("\nERROR --> DU_APP: Received RLC Ue Config Response is NULL at DuProcRlcUeCfgRsp()");
ret = RFAILED;
}
return ret;
memset(rlcUeCfg, 0, sizeof(RlcUeCfg));
ret = fillRlcUeCfg(cellId, ueIdx, ueCfgDb, rlcUeCfg);
if(ret == RFAILED)
- DU_LOG("\nDU APP: Failed at duBuildAndSendUeReCfgReqToRlc()");
+ DU_LOG("\nERROR --> DU APP : Failed at duBuildAndSendUeReCfgReqToRlc()");
else
ret = sendUeReCfgReqToRlc(rlcUeCfg);
}
else
{
- DU_LOG("\nDU APP: Memory Alloc failed at duBuildAndSendUeReCfgReqToRlc()");
+ DU_LOG("\nERROR --> DU APP : Memory Alloc failed at duBuildAndSendUeReCfgReqToRlc()");
ret = RFAILED;
}
return ret;
*
* ****************************************************************/
-uint8_t duBuildAndSendUeReCfgReqToMac(uint8_t cellId, uint8_t crnti, UeContextSetupDb *ueCfgDb)
+uint8_t duBuildAndSendUeReCfgReqToMac(uint8_t cellId, uint8_t crnti, DuUeCfg *ueCfgDb)
{
uint8_t ret, ueIdx = 0;
MacUeCfg *macUeCfg = NULLP;
memset(macUeCfg, 0, sizeof(MacUeCfg));
ret = fillMacUeCfg(cellId, ueIdx, crnti, ueCfgDb, macUeCfg);
if(ret == RFAILED)
- DU_LOG("\nDU_APP: Failed to fill Mac Ue Cfg at duBuildAndSendUeReCfgReqToMac()");
+ DU_LOG("\nERROR --> DU APP : Failed to fill Mac Ue Cfg at duBuildAndSendUeReCfgReqToMac()");
else
ret = sendUeReCfgReqToMac(macUeCfg);
}
else
{
- DU_LOG("\nDU_APP: Memory alloc failed for macUeCfg at duBuildAndSendUeReCfgReqToMac()");
+ DU_LOG("\nERROR --> DU APP : Memory alloc failed for macUeCfg at duBuildAndSendUeReCfgReqToMac()");
ret = RFAILED;
}
return ret;
}
+/*******************************************************************
+ *
+ * @brief Build and Send Ue context setup request
+ *
+ * @details
+ *
+
+ * Function : duBuildAndSendUeContextSetupReq
+ *
+ * Functionality:
+ * Build and Send Ue context setup request
+ *
+ * @params[in] cellId, crnti, DuUeCfg pointer
+ * @return ROK - success
+ * RFAILED - failure
+ *
+ *****************************************************************/
+
+uint8_t duBuildAndSendUeContextSetupReq(uint16_t cellId, uint16_t crnti, DuUeCfg *duUeCfg)
+{
+ uint8_t ret = ROK;
+
+ DU_LOG("\nDEBUG --> DU_APP: Processing Ue Context Setup Request for cellId [%d]", cellId);
+ /* Filling RLC Ue Reconfig */
+ ret = duBuildAndSendUeReCfgReqToRlc(cellId, crnti, duUeCfg);
+ if(ret == RFAILED)
+ DU_LOG("\nERROR --> DU APP : Failed to build ctxt setup req for RLC at duBuildAndSendUeContextSetupReq()");
+
+ /* Filling MAC Ue Reconfig */
+ ret = duBuildAndSendUeReCfgReqToMac(cellId, crnti, duUeCfg);
+ if(ret == RFAILED)
+ DU_LOG("\nERROR --> DU APP : Failed at build ctxt setup req for MAC at duBuildAndSendUeContextSetupReq()");
+
+ return ret;
+}
+
+/*******************************************************************
+ *
+ * @brief Processes DL Rsp received from RLC DL
+ *
+ * @details
+ *
+
+ * Function : DuProcRlcDlRrcMsgRsp
+ *
+ * Functionality:
+ * Processes UE Rsp received from RLC DL
+ *
+ * @params[in] Post structure
+ * Pointer to RlcCfgCfm
+ * @return ROK - success
+ * RFAILED - failure
+ *
+ *****************************************************************/
+uint8_t DuProcRlcDlRrcMsgRsp(Pst *pst, RlcDlRrcMsgRsp *dlRrcMsg)
+{
+ uint8_t ret = ROK, ueIdx = 0;
+ DuUeCb *ueCb = NULLP;
+
+ if(dlRrcMsg->state == TRANSMISSION_COMPLETE)
+ {
+ GET_UE_IDX(dlRrcMsg->crnti, ueIdx);
+ ueCb = &duCb.actvCellLst[dlRrcMsg->cellId -1]->ueCb[ueIdx -1];
+ if(ueCb->f1UeDb && ueCb->f1UeDb->dlRrcMsgPres)
+ {
+ if(ueCb->f1UeDb->actionType == UE_CTXT_SETUP)
+ {
+ ret = duBuildAndSendUeContextSetupReq(dlRrcMsg->cellId, dlRrcMsg->crnti, &ueCb->f1UeDb->duUeCfg);
+ if(ret == RFAILED)
+ DU_LOG("\nERROR --> DU APP : Failed to process UE Context Setup Request in DuProcRlcDlRrcMsgRsp()");
+ }
+ if(ueCb->f1UeDb->actionType == UE_CTXT_MOD)
+ {
+ ret = duBuildAndSendUeContextModReq(dlRrcMsg->cellId, dlRrcMsg->crnti, &ueCb->f1UeDb->duUeCfg);
+ if(ret == RFAILED)
+ DU_LOG("\nERROR --> DU APP : Failed to process UE Context Mod Request in DuProcRlcDlRrcMsgRsp()");
+ }
+ }
+ }
+ else
+ DU_LOG("\nERROR --> DU APP : Failed to transmit DL RRC Msg");
+
+ DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, dlRrcMsg, sizeof(RlcDlRrcMsgRsp));
+ return ret;
+}
/*******************************************************************
*
* @brief Process UE context setup request from CU
uint8_t duProcUeContextSetupRequest(DuUeCb *ueCb)
{
uint8_t ret, cellId;
-
+
ret = ROK;
if(ueCb)
{
cellId = duCb.actvCellLst[ueCb->f1UeDb->cellIdx]->cellId;
-
- if(ueCb->f1UeDb->rrcMsg)
+ /* Send DL RRC msg for security Mode */
+ if(ueCb->f1UeDb->dlRrcMsg)
{
- /* Sending DL RRC Message to RLC */
- ret = duBuildAndSendDlRrcMsgToRlc(cellId, ueCb->rlcUeCfg, SRB1_LCID, false, \
- ueCb->f1UeDb->deliveryStaReq, ueCb->f1UeDb->rrcMsgLen, ueCb->f1UeDb->rrcMsg);
- if(ret == RFAILED)
+ if(ueCb->f1UeDb->dlRrcMsg->rrcMsgPdu)
{
- DU_LOG("\nDU APP : Failed to send DL RRC msg in duProcUeContextSetupRequest()");
- DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, ueCb->f1UeDb->rrcMsg, ueCb->f1UeDb->rrcMsgLen);
+ /* Sending DL RRC Message to RLC */
+ ret = duBuildAndSendDlRrcMsgToRlc(cellId, ueCb->rlcUeCfg, ueCb->f1UeDb->dlRrcMsg);
+ if(ret == RFAILED)
+ {
+ DU_LOG("\nERROR --> DU APP : Failed to send DL RRC msg in duProcUeContextSetupRequest()");
+ DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, ueCb->f1UeDb->dlRrcMsg->rrcMsgPdu,\
+ ueCb->f1UeDb->dlRrcMsg->rrcMsgSize);
+ DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, ueCb->f1UeDb->dlRrcMsg, sizeof(F1DlRrcMsg));
+ }
}
}
-
- if(ret == ROK)
+ else if(ueCb->f1UeDb->actionType == UE_CTXT_SETUP)
{
- DU_LOG("\nDU_APP: Processing Ue Context Setup Request for cellId [%d]", cellId);
- /* Filling RLC Ue Reconfig */
- ret = duBuildAndSendUeReCfgReqToRlc(cellId, ueCb->crnti, &ueCb->f1UeDb->duUeCfg);
- if(ret == RFAILED)
- DU_LOG("\nDU_APP: Failed to build ctxt setup req for RLC at duBuildAndSendUeReCfgReqToRlc()");
-
- /* Filling MAC Ue Reconfig */
- ret = duBuildAndSendUeReCfgReqToMac(cellId, ueCb->crnti, ueCb->f1UeDb);
+ ret = duBuildAndSendUeContextSetupReq(cellId, ueCb->crnti, &ueCb->f1UeDb->duUeCfg);
if(ret == RFAILED)
- DU_LOG("\nDU_APP: Failed at build ctxt setup req for MAC at duBuildAndSendUeReCfgReqToMac()");
+ {
+ DU_LOG("\nERROR --> DU APP : Failed to build ue context setup Req in duProcUeContextSetupRequest()");
+ }
}
-
}
else
{
//TODO: To send the failure cause in UeContextSetupRsp
- DU_LOG("DU_APP: Failed to process UE CNTXT SETUP REQ at duProcUeContextSetupRequest()");
+ DU_LOG("ERROR --> DU APP : Failed to process UE CNTXT SETUP REQ at duProcUeContextSetupRequest()");
}
return ret;
}
+/*******************************************************************
+ *
+ * @brief Build and Send Ue context mod request
+ *
+ * @details
+ *
+ *
+ * Function : duBuildAndSendUeContextModReq
+ *
+ * Functionality:
+ * Build and Send Ue context mod request
+ *
+ * @params[in] cellId, crnti, DuUeCfg pointer
+ * @return ROK - success
+ * RFAILED - failure
+ *
+ *****************************************************************/
+
+uint8_t duBuildAndSendUeContextModReq(uint16_t cellId, uint16_t crnti, DuUeCfg *duUeCfg)
+{
+ uint8_t ret = ROK;
+
+ DU_LOG("\nDEBUG --> DU_APP: Processing Ue Context Mod Request for cellId [%d]", cellId);
+ /* Filling RLC Ue Reconfig */
+ ret = duBuildAndSendUeReCfgReqToRlc(cellId, crnti, duUeCfg);
+ if(ret == RFAILED)
+ DU_LOG("\nERROR --> DU APP : Failed to build ctxt setup req for RLC at duBuildAndSendUeContextModReq()");
+
+ /* Filling MAC Ue Reconfig */
+ ret = duBuildAndSendUeReCfgReqToMac(cellId, crnti, duUeCfg);
+ if(ret == RFAILED)
+ DU_LOG("\nERROR --> DU APP : Failed at build ctxt setup req for MAC at duBuildAndSendUeContextModReq()");
+
+ return ret;
+}
+/*******************************************************************
+ *
+ * @brief Processing Ue context mod request
+ *
+ * @details
+ *
+ *
+ * Function : duProcUeContextModReq
+ *
+ * Functionality:
+ * Processing Ue context mod request
+ *
+ * @params[in] DuUeCb *ueCb
+ * @return ROK - success
+ * RFAILED - failure
+ *
+ *****************************************************************/
+
+uint8_t duProcUeContextModReq(DuUeCb *ueCb)
+{
+ uint8_t ret, cellId;
+
+ ret = ROK;
+ if(ueCb)
+ {
+ cellId = duCb.actvCellLst[ueCb->f1UeDb->cellIdx]->cellId;
+ /* Send DL RRC msg for security Mode */
+ if(ueCb->f1UeDb->dlRrcMsg)
+ {
+ if(ueCb->f1UeDb->dlRrcMsg->rrcMsgPdu)
+ {
+ /* Sending DL RRC Message to RLC */
+ ret = duBuildAndSendDlRrcMsgToRlc(cellId, ueCb->rlcUeCfg, ueCb->f1UeDb->dlRrcMsg);
+ if(ret == RFAILED)
+ {
+ DU_LOG("\nERROR --> DU APP : Failed to send DL RRC msg in duProcUeContextModReq()");
+ DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, ueCb->f1UeDb->dlRrcMsg->rrcMsgPdu,\
+ ueCb->f1UeDb->dlRrcMsg->rrcMsgSize);
+ DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, ueCb->f1UeDb->dlRrcMsg, sizeof(F1DlRrcMsg));
+ }
+ }
+ }
+ else
+ {
+ ret = duBuildAndSendUeContextModReq(cellId, ueCb->crnti, &ueCb->f1UeDb->duUeCfg);
+ if(ret == RFAILED)
+ {
+ DU_LOG("\nERROR --> DU APP : Failed to build ue context setup Req in duProcUeContextModReq()");
+ }
+ }
+ }
+ else
+ {
+ //TODO: To send the failure cause in UeContextModRsp
+ DU_LOG("ERROR --> DU APP : Failed to process UE CNTXT MOD REQ at duProcUeContextModReq()");
+ }
+ return ROK;
+}
/**********************************************************************
End of file
***********************************************************************/
Code Review / o-du / l2.git / blobdiff