From 24c8e6c5c1f52741f4d3f1c3b4b17f8a1bfeb6cf Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Fri, 27 Sep 2024 15:52:06 +0200 Subject: [PATCH] Remove aerial_phy_sync_indication(): this is a 4G callback --- nfapi/oai_integration/aerial/fapi_vnf_p5.c | 2 +- nfapi/oai_integration/aerial/fapi_vnf_p7.c | 15 --------------- nfapi/oai_integration/aerial/fapi_vnf_p7.h | 1 - 3 files changed, 1 insertion(+), 17 deletions(-) diff --git a/nfapi/oai_integration/aerial/fapi_vnf_p5.c b/nfapi/oai_integration/aerial/fapi_vnf_p5.c index be175254f8..cf04176665 100644 --- a/nfapi/oai_integration/aerial/fapi_vnf_p5.c +++ b/nfapi/oai_integration/aerial/fapi_vnf_p5.c @@ -53,7 +53,7 @@ void *aerial_vnf_nr_p7_config_init(void *ptr) init_queue(&gnb_slot_ind_queue); p7_vnf->config->port = p7_vnf->local_port; - p7_vnf->config->sync_indication = &aerial_phy_sync_indication; + p7_vnf->config->sync_indication = NULL; p7_vnf->config->slot_indication = NULL; p7_vnf->config->harq_indication = &aerial_phy_harq_indication; p7_vnf->config->nr_crc_indication = &aerial_phy_nr_crc_indication; diff --git a/nfapi/oai_integration/aerial/fapi_vnf_p7.c b/nfapi/oai_integration/aerial/fapi_vnf_p7.c index aa4f1a9493..5d446f7b00 100644 --- a/nfapi/oai_integration/aerial/fapi_vnf_p7.c +++ b/nfapi/oai_integration/aerial/fapi_vnf_p7.c @@ -136,21 +136,6 @@ extern pthread_cond_t nfapi_sync_cond; extern pthread_mutex_t nfapi_sync_mutex; extern int nfapi_sync_var; -int aerial_phy_sync_indication(struct nfapi_vnf_p7_config *config, uint8_t sync) -{ - // NFAPI_TRACE(NFAPI_TRACE_INFO, "[VNF] SYNC %s\n", sync==1 ? "ACHIEVED" : "LOST"); - - if (sync == 1 && nfapi_sync_var != 0) { - NFAPI_TRACE(NFAPI_TRACE_INFO, "[VNF] Signal to OAI main code that it can go\n"); - pthread_mutex_lock(&nfapi_sync_mutex); - nfapi_sync_var = 0; - pthread_cond_broadcast(&nfapi_sync_cond); - pthread_mutex_unlock(&nfapi_sync_mutex); - } - - return (0); -} - int aerial_phy_harq_indication(struct nfapi_vnf_p7_config *config, nfapi_harq_indication_t *ind) { struct PHY_VARS_eNB_s *eNB = RC.eNB[0][0]; diff --git a/nfapi/oai_integration/aerial/fapi_vnf_p7.h b/nfapi/oai_integration/aerial/fapi_vnf_p7.h index 942747993b..f391b22e46 100644 --- a/nfapi/oai_integration/aerial/fapi_vnf_p7.h +++ b/nfapi/oai_integration/aerial/fapi_vnf_p7.h @@ -180,7 +180,6 @@ typedef struct { } vnf_info; -int aerial_phy_sync_indication(struct nfapi_vnf_p7_config *config, uint8_t sync); int aerial_phy_harq_indication(struct nfapi_vnf_p7_config *config, nfapi_harq_indication_t *ind); int aerial_phy_nr_crc_indication(nfapi_nr_crc_indication_t *ind); int aerial_phy_nr_rx_data_indication(nfapi_nr_rx_data_indication_t *ind);