X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fdu_app%2Fdu_cell_mgr.c;h=e1f166e936216e959f1e023ec151518dbd672ba0;hb=3eceb3e5eb30b6df9f674f76b9e7b4e936e5be06;hp=522801e462dcb71caaf271f906dc22214c7986f6;hpb=e550b2091fb29289d12a5722b189acbede7862f0;p=o-du%2Fl2.git diff --git a/src/du_app/du_cell_mgr.c b/src/du_app/du_cell_mgr.c index 522801e46..e1f166e93 100644 --- a/src/du_app/du_cell_mgr.c +++ b/src/du_app/du_cell_mgr.c @@ -17,19 +17,26 @@ *******************************************************************************/ /* 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 "du_app_mac_inf.h" +#include "du_app_rlc_inf.h" +#include "du_cfg.h" +#include "du_mgr.h" #include "du_cell_mgr.h" -extern DuCfgParams duCfgParam; - -extern S16 duBuildAndSendMacCellCfg(); - /******************************************************************* * * @brief Processes cells to be activated * * @details * - * Function : procCellsToBeActivated + * Function : duProcCellsToBeActivated * * Functionality: * - Processes cells to be activated list received in F1SetupRsp @@ -39,136 +46,79 @@ extern S16 duBuildAndSendMacCellCfg(); * RFAILED - failure * * ****************************************************************/ -S16 procCellsToBeActivated(Cells_to_be_Activated_List_t cellsToActivate) +uint8_t duProcCellsToBeActivated(uint16_t nci, uint16_t nRPci) { - U16 idx = 0; - S16 ret = ROK; - - for(idx=0; idx\ - value.choice.Cells_to_be_Activated_List_Item; + uint8_t ret = ROK; + DuCellCb *cellCb = NULLP; - bitStringToInt(&cell.nRCGI.nRCellIdentity, &nci); - if(nci <= 0 || nci > DU_MAX_CELLS) - { - DU_LOG("\nDU APP : Invalid NCI %d", nci); - return RFAILED; - } + cellCb = duCb.cfgCellLst[nci-1]; - if(cell.nRPCI) - { - pci = *cell.nRPCI; - } - - cellCb = duCb.cfgCellLst[nci-1]; - - if(!cellCb) - { - DU_LOG("\nDU APP : No Cell found for NCI %d", nci); - return RFAILED; - } - cellCb->cellStatus = ACTIVATION_IN_PROGRESS; - cellCb->cellInfo.nrPci = pci; + if(!cellCb) + { + DU_LOG("\nDU APP : No Cell found for NCI %d", nci); + return RFAILED; + } - /* Now remove this cell from configured list and move to active list */ - duCb.cfgCellLst[nci-1] = NULL; - duCb.actvCellLst[nci-1] = cellCb; + cellCb->cellStatus = ACTIVATION_IN_PROGRESS; + cellCb->cellInfo.nrPci = nRPci; - /* Build and send Mac Cell Cfg for the number of active cells */ - ret = duBuildAndSendMacCellCfg(); - if(ret != ROK) - { - DU_LOG("\nDU APP : macCellCfg build and send failed"); - return RFAILED; - } + /* Now remove this cell from configured list and move to active list */ + 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) + { + DU_LOG("\nDU APP : MacCellCfg build and send failed at procCellsToBeActivated()"); + /* Move cellCb back to cfgCellList */ + duCb.cfgCellLst[nci-1] = duCb.actvCellLst[nci-1]; + duCb.actvCellLst[nci-1] = NULLP; + duCb.numActvCells--; + return RFAILED; } return ret; } -/****************************************************************** -* -* @brief Processes F1 Setup Response sent by CU -* -* @details -* -* Function : procF1SetupRsp -* -* Functionality: Processes F1 Setup Response sent by CU -* -* @params[in] F1AP_PDU_t ASN decoded F1AP message -* @return ROK - success -* RFAILED - failure -* -* ****************************************************************/ -S16 procF1SetupRsp(F1AP_PDU_t *f1apMsg) +/******************************************************************* + * + * @brief Handles DU F1Setup Rsp received in F1AP + * + * @details + * + * Function : duProcF1SetupRsp + * + * Functionality: + * - Handles DU F1Setup Rsp received in F1AP + * + * @params[in] Pointer to F1SetupRsp + * @return void + * + ******************************************************************/ +void duProcF1SetupRsp() { - S16 ret = ROK; - - F1SetupResponse_t *f1SetRspMsg; - F1SetupRsp f1SetRspDb; - GNB_CU_Name_t *cuName; - RRC_Version_t *rrc_Ver; - U16 idx; - - DU_LOG("\nDU_APP : F1 Setup Response received"); - printf("\nDU_APP : F1 Setup Response received"); + DU_LOG("\nDU_APP : F1 Setup Response received"); duCb.f1Status = TRUE; //Set F1 status as true - f1SetRspMsg = &f1apMsg->choice.successfulOutcome->value.choice.F1SetupResponse; +} - for(idx=0; idxprotocolIEs.list.count; idx++) - { -// F1SetupResponseIEs_t f1RspIe = f1SetRspMsg->protocolIEs.list.array[idx]; - switch(f1SetRspMsg->protocolIEs.list.array[idx]->id) - { - case ProtocolIE_ID_id_Cells_to_be_Activated_List: - { - procCellsToBeActivated(f1SetRspMsg->protocolIEs.list.array[idx]->\ - value.choice.Cells_to_be_Activated_List); - break; - } - //TODO: where to store and how to use below variables?can they be skipped - case ProtocolIE_ID_id_TransactionID: - { - f1SetRspDb.transId = f1SetRspMsg->protocolIEs.list.array[idx]->\ - value.choice.TransactionID; - break; - } - case ProtocolIE_ID_id_gNB_CU_Name: - { - cuName = &f1SetRspMsg->protocolIEs.list.array[idx]->\ - value.choice.GNB_CU_Name; - strcpy(f1SetRspDb.cuName, (const char*)cuName->buf); - break; - } - case ProtocolIE_ID_id_GNB_CU_RRC_Version: - { - rrc_Ver = &f1SetRspMsg->protocolIEs.list.array[idx]->\ - value.choice.RRC_Version; - strcpy(f1SetRspDb.rrcVersion.rrcVer, - (const char*)rrc_Ver->latest_RRC_Version.buf); - break; - } - default: - DU_LOG("\nDU_APP : Invalid IE received in F1SetupRsp:%ld", - f1SetRspMsg->protocolIEs.list.array[idx]->id); - } - } - - /* 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)); -#endif - - return ret; +/******************************************************************* + * + * @brief Handles GNB DU Cfg Update Ack received in F1AP + * + * @details + * + * Function : duProcGnbDuCfgUpdAckMsg + * + * Functionality: + * - Handles GNB DU Cfg Update Ack received in F1AP + * + * @params[in] Pointer to F1GnbDuCfgUpdAck + * @return void + * + ******************************************************************/ +void duProcGnbDuCfgUpdAckMsg() +{ + DU_LOG("\nDU APP: GNB-DU config update Ack received "); } /**********************************************************************