X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fdu_app%2Fdu_cell_mgr.c;h=65dce4b307fe498989b9cbd8f9c7a21ee1bb831a;hb=aee73991f728cc127d1ed76d5a52571d916235a4;hp=41b2c581d48894a53d645446dbbedb2b2ac84f33;hpb=43f9a063a851c5318a609e9966cdc0b30f0abaf5;p=o-du%2Fl2.git diff --git a/src/du_app/du_cell_mgr.c b/src/du_app/du_cell_mgr.c index 41b2c581d..65dce4b30 100644 --- a/src/du_app/du_cell_mgr.c +++ b/src/du_app/du_cell_mgr.c @@ -16,15 +16,28 @@ ################################################################################ *******************************************************************************/ -/* This file contains message handling functionality for DU APP */ +/* This file contains message handling functionality for DU cell management */ +#include "common_def.h" +#include "lrg.h" +#include "legtp.h" +#include "lrg.x" +#include "lkw.x" +#include "rgr.h" +#include "rgr.x" +#include "E2AP-PDU.h" +#include +#include "F1AP-PDU.h" +#include "du_e2ap_msg_hdl.h" +#include "du_app_mac_inf.h" +#include "du_app_rlc_inf.h" +#include "du_cfg.h" +#include "du_mgr.h" +#include "odu_common_codec.h" #include "du_cell_mgr.h" +#include "du_f1ap_msg_hdl.h" extern DuCfgParams duCfgParam; - -extern S16 cmPkRgrCfgReq(Pst* pst, RgrCfgTransId transId, \ - RgrCfgReqInfo *cfgReqInfo); - -extern S16 duBuildAndSendMacCellCfg(); +extern uint8_t duBuildAndSendMacCellCfg(); /******************************************************************* * @@ -42,22 +55,22 @@ extern S16 duBuildAndSendMacCellCfg(); * RFAILED - failure * * ****************************************************************/ -S16 procCellsToBeActivated(Cells_to_be_Activated_List_t cellsToActivate) +uint8_t procCellsToBeActivated(Cells_to_be_Activated_List_t cellsToActivate) { - U16 idx = 0; - S16 ret = ROK; + uint16_t idx = 0; + uint8_t ret = ROK; for(idx=0; idx\ value.choice.Cells_to_be_Activated_List_Item; bitStringToInt(&cell.nRCGI.nRCellIdentity, &nci); - if(nci <= 0 || nci > DU_MAX_CELLS) + if(nci <= 0 || nci > MAX_NUM_CELL) { DU_LOG("\nDU APP : Invalid NCI %d", nci); return RFAILED; @@ -79,9 +92,9 @@ S16 procCellsToBeActivated(Cells_to_be_Activated_List_t cellsToActivate) cellCb->cellInfo.nrPci = pci; /* Now remove this cell from configured list and move to active list */ - duCb.cfgCellLst[nci-1] = NULLP; + duCb.cfgCellLst[nci-1] = NULL; duCb.actvCellLst[nci-1] = cellCb; - + duCb.numActvCells++; /* Build and send Mac Cell Cfg for the number of active cells */ ret = duBuildAndSendMacCellCfg(); if(ret != ROK) @@ -90,7 +103,6 @@ S16 procCellsToBeActivated(Cells_to_be_Activated_List_t cellsToActivate) return RFAILED; } } - return ret; } @@ -109,15 +121,15 @@ S16 procCellsToBeActivated(Cells_to_be_Activated_List_t cellsToActivate) * RFAILED - failure * * ****************************************************************/ -S16 procF1SetupRsp(F1AP_PDU_t *f1apMsg) +uint8_t procF1SetupRsp(F1AP_PDU_t *f1apMsg) { - S16 ret = ROK; + uint8_t ret = ROK; F1SetupResponse_t *f1SetRspMsg; F1SetupRsp f1SetRspDb; GNB_CU_Name_t *cuName; RRC_Version_t *rrc_Ver; - U16 idx; + uint16_t idx; DU_LOG("\nDU_APP : F1 Setup Response received"); printf("\nDU_APP : F1 Setup Response received"); @@ -165,104 +177,41 @@ S16 procF1SetupRsp(F1AP_PDU_t *f1apMsg) /* TODO :Check the deallocation */ #if 0 - SPutSBuf(DU_APP_MEM_REGION, DU_POOL,(Data *)&(f1SetupRsp->protocolIEs.list.array),\ - (Size)elementCnt * sizeof(F1SetupResponseIEs_t *)); - SPutSBuf(DU_APP_MEM_REGION, DU_POOL,(Data *)&(f1apMsg->choice.successfulOutcome),\ - (Size)sizeof(SuccessfulOutcome_t)); - SPutSBuf(DU_APP_MEM_REGION, DU_POOL,(Data *)&f1apMsg,(Size)sizeof(F1AP_PDU_t)); + DU_FREE(f1SetupRsp->protocolIEs.list.array,(Size)elementCnt * sizeof(F1SetupResponseIEs_t *)); + DU_FREE(f1apMsg->choice.successfulOutcome,(Size)sizeof(SuccessfulOutcome_t)); + DU_FREE(f1apMsg,(Size)sizeof(F1AP_PDU_t)); #endif return ret; } -/****************************************************************** -* -* @brief Send gNB cfg to scheduler via MAC -* -* @details -* -* Function : duSendSchGnbCfg -* -* Functionality: Send gNB cfg to scheduler via MAC -* -* @return ROK - success -* RFAILED - failure -* -* ****************************************************************/ -S16 duSendSchGnbCfg() +/******************************************************************* + * + * @brief Processes GNB DU config update ack + * + * @details + * + * Function : procGNBDUCfgUpdAck + * + * Functionality: Processes GNB DU config update ack + * + * @params[in] F1AP_PDU_t ASN decoded F1AP message + * @return ROK - success + * RFAILED - failure + * + * ****************************************************************/ +uint8_t procGNBDUCfgUpdAck(F1AP_PDU_t *f1apMsg) { - - RgrCfgReqInfo *cfgReq = NULLP; - MacSchedGnbCfg *cfg = NULLP; - U32 transId = 1; - - DU_ALLOC(cfgReq, sizeof(RgrCfgReqInfo)); - if( cfgReq == NULLP) - { - DU_LOG("\nDU_APP : Mem allocation failed in duSendSchGnbCfg"); - return RFAILED; - } - - cfgReq->action = SCH_CONFIG; - cfgReq->u.cfgInfo.cfgType = MAC_GNB_CFG; - cfg = &(cfgReq->u.cfgInfo.u.schedGnbCfg); - cfg->numTxAntPorts = duCfgParam.schedCfg.numTxAntPorts; - cfg->ulSchdType = duCfgParam.schedCfg.ulSchdType; - cfg->dlSchdType = duCfgParam.schedCfg.dlSchdType; - cfg->numCells = duCfgParam.schedCfg.numCells; - cfg->maxUlUePerTti = duCfgParam.schedCfg.maxUlUePerTti; - cfg->maxDlUePerTti = duCfgParam.schedCfg.maxDlUePerTti; - - if(ROK != duSendSchGnbCfgToMac(cfgReq, transId)) - { - return RFAILED; - } - - return ROK; + DU_LOG("\nF1AP : GNB-DU config update acknowledgment received"); +/* TODO :Check the deallocation */ +#if 0 + DU_FREE(gNBDuCfgAck->protocolIEs.list.array,(Size)elementCnt * sizeof(GNBDUConfigurationUpdateAcknowledgeIEs_t)); + DU_FREE(f1apMsg->choice.successfulOutcome,(Size)sizeof(SuccessfulOutcome_t)); + DU_FREE(f1apMsg,(Size)sizeof(F1AP_PDU_t)); +#endif + return ROK; } -/****************************************************************** -* -* @brief Send gNB cfg to scheduler via MAC -* -* @details -* -* Function : duSendSchGnbCfgToMac -* -* Functionality: Send gNB cfg to scheduler via MAC -* -* @return ROK - success -* RFAILED - failure -* -* ****************************************************************/ -S16 duSendSchGnbCfgToMac(RgrCfgReqInfo *cfgReq, U32 trans_id) -{ - RgrCfgTransId transId; - Pst pst; - - DU_SET_ZERO(&pst, sizeof(Pst)); - DU_SET_ZERO(&transId, sizeof(RgrCfgTransId)); - - transId.trans[0] = MAC_GNB_CFG; - transId.trans[1] = cfgReq->action; - transId.trans[7] = trans_id & 0x000000ff; trans_id >>= 8; - transId.trans[6] = trans_id & 0x000000ff; trans_id >>= 8; - transId.trans[5] = trans_id & 0x000000ff; trans_id >>= 8; - transId.trans[4] = trans_id & 0x000000ff; trans_id >>= 8; - - pst.selector = DU_SELECTOR_LC; - pst.srcEnt = ENTDUAPP; - pst.dstEnt = ENTRG; - pst.dstInst = (Inst)0; - pst.dstProcId = DU_PROC; - pst.srcProcId = DU_PROC; - pst.region = duCb.init.region; - pst.event = (Event) EVTMACSCHCFGREQ; - - cmPkRgrCfgReq(&pst, transId, cfgReq); - - return ROK; -} /********************************************************************** End of file