X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fdu_app%2Fdu_cell_mgr.c;h=e663525813de40139920a93b4b8c13add1935dec;hb=d18338bde70b043c3dde28b7d88d128c0b138380;hp=65dce4b307fe498989b9cbd8f9c7a21ee1bb831a;hpb=4d45b914f9e94203603d3b9fdbcb1aad361301dd;p=o-du%2Fl2.git diff --git a/src/du_app/du_cell_mgr.c b/src/du_app/du_cell_mgr.c index 65dce4b30..e66352581 100644 --- a/src/du_app/du_cell_mgr.c +++ b/src/du_app/du_cell_mgr.c @@ -24,20 +24,11 @@ #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 uint8_t duBuildAndSendMacCellCfg(); /******************************************************************* * @@ -45,7 +36,7 @@ extern uint8_t duBuildAndSendMacCellCfg(); * * @details * - * Function : procCellsToBeActivated + * Function : duProcCellsToBeActivated * * Functionality: * - Processes cells to be activated list received in F1SetupRsp @@ -55,164 +46,118 @@ extern uint8_t duBuildAndSendMacCellCfg(); * RFAILED - failure * * ****************************************************************/ -uint8_t procCellsToBeActivated(Cells_to_be_Activated_List_t cellsToActivate) +uint8_t duProcCellsToBeActivated(uint8_t *plmnStr, uint16_t nci, uint16_t nRPci) { - uint16_t idx = 0; uint8_t ret = ROK; + DuCellCb *cellCb = NULLP; + uint8_t cfgIdx, tmpPlmn[4]; - for(idx=0; idx\ - value.choice.Cells_to_be_Activated_List_Item; - - bitStringToInt(&cell.nRCGI.nRCellIdentity, &nci); - if(nci <= 0 || nci > MAX_NUM_CELL) + memset(tmpPlmn, 0, 4); + buildPlmnId(duCb.cfgCellLst[cfgIdx]->cellInfo.nrEcgi.plmn, tmpPlmn); + if(duCb.cfgCellLst[cfgIdx]->cellInfo.nrEcgi.cellId == nci && + (strcmp((const char*)tmpPlmn, (const char*)plmnStr) == 0)) { - DU_LOG("\nDU APP : Invalid NCI %d", nci); - return RFAILED; + cellCb = duCb.cfgCellLst[cfgIdx]; + break; } - - if(cell.nRPCI) + else { - pci = *cell.nRPCI; + DU_LOG("\nDU APP : No Cell found for NCI %d", nci); + return RFAILED; } + } - cellCb = duCb.cfgCellLst[nci-1]; + cellCb->cellStatus = ACTIVATION_IN_PROGRESS; + cellCb->cellInfo.nrPci = nRPci; - if(!cellCb) - { - DU_LOG("\nDU APP : No Cell found for NCI %d", nci); - return RFAILED; - } - cellCb->cellStatus = ACTIVATION_IN_PROGRESS; - cellCb->cellInfo.nrPci = pci; + duCb.actvCellLst[duCb.numActvCells++] = cellCb; - /* 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"); - return RFAILED; - } + if(duBuildAndSendMacCellCfg(cellCb->cellId) != ROK) + { + DU_LOG("\nDU APP : macCellCfg build and send failed"); + /* Delete cell from actvCellList */ + duCb.actvCellLst[--(duCb.numActvCells)] = NULLP; + ret = RFAILED; } return ret; } -/****************************************************************** +/******************************************************************* + * + * @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() +{ + DU_LOG("\nDU_APP : F1 Setup Response received"); + duCb.f1Status = TRUE; //Set F1 status as true +} + +/******************************************************************* + * + * @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 "); +} +/******************************************************************* * -* @brief Processes F1 Setup Response sent by CU +* @brief Returns cellCb based on cell ID * * @details * -* Function : procF1SetupRsp +* Function : duGetCellCb * -* Functionality: Processes F1 Setup Response sent by CU +* Functionality: Returns DU APP CellCb based on cell ID * * @params[in] F1AP_PDU_t ASN decoded F1AP message * @return ROK - success * RFAILED - failure * * ****************************************************************/ -uint8_t procF1SetupRsp(F1AP_PDU_t *f1apMsg) +uint8_t duGetCellCb(uint16_t cellId, DuCellCb **cellCb) { - uint8_t ret = ROK; - - F1SetupResponse_t *f1SetRspMsg; - F1SetupRsp f1SetRspDb; - GNB_CU_Name_t *cuName; - RRC_Version_t *rrc_Ver; - uint16_t idx; - - DU_LOG("\nDU_APP : F1 Setup Response received"); - printf("\nDU_APP : F1 Setup Response received"); - duCb.f1Status = TRUE; //Set F1 status as true - f1SetRspMsg = &f1apMsg->choice.successfulOutcome->value.choice.F1SetupResponse; + uint8_t cellIdx; + for(cellIdx=0; cellIdxcellId == cellId) + *cellCb = duCb.actvCellLst[cellIdx]; + break; + } - for(idx=0; idxprotocolIEs.list.count; idx++) + if(!*cellCb) { -// 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); - } + DU_LOG("\nDU APP : Cell Id %d not found in DU APP", cellId); + return RFAILED; } - - /* TODO :Check the deallocation */ -#if 0 - 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 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) -{ - 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; + return ROK; } - /********************************************************************** End of file **********************************************************************/