From 17ed5d345e5b3657c40b29577a061d2a2e71c5e0 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Fri, 27 Sep 2024 15:55:30 +0200 Subject: [PATCH] Remove aerial_phy_srs_indication(): this is a 4G callback --- nfapi/oai_integration/aerial/fapi_vnf_p5.c | 2 +- nfapi/oai_integration/aerial/fapi_vnf_p7.c | 7 ------- nfapi/oai_integration/aerial/fapi_vnf_p7.h | 1 - 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/nfapi/oai_integration/aerial/fapi_vnf_p5.c b/nfapi/oai_integration/aerial/fapi_vnf_p5.c index ea1a70a56f..d25c46a6ea 100644 --- a/nfapi/oai_integration/aerial/fapi_vnf_p5.c +++ b/nfapi/oai_integration/aerial/fapi_vnf_p5.c @@ -60,7 +60,7 @@ void *aerial_vnf_nr_p7_config_init(void *ptr) p7_vnf->config->nr_rx_data_indication = &aerial_phy_nr_rx_data_indication; p7_vnf->config->nr_rach_indication = &aerial_phy_nr_rach_indication; p7_vnf->config->nr_uci_indication = &aerial_phy_nr_uci_indication; - p7_vnf->config->srs_indication = &aerial_phy_srs_indication; + p7_vnf->config->srs_indication = NULL; p7_vnf->config->sr_indication = &aerial_phy_sr_indication; p7_vnf->config->cqi_indication = &aerial_phy_cqi_indication; p7_vnf->config->lbt_dl_indication = &aerial_phy_lbt_dl_indication; diff --git a/nfapi/oai_integration/aerial/fapi_vnf_p7.c b/nfapi/oai_integration/aerial/fapi_vnf_p7.c index 26f87bc1eb..031ec699b0 100644 --- a/nfapi/oai_integration/aerial/fapi_vnf_p7.c +++ b/nfapi/oai_integration/aerial/fapi_vnf_p7.c @@ -370,13 +370,6 @@ int aerial_phy_nr_uci_indication(nfapi_nr_uci_indication_t *ind) return 1; } -int aerial_phy_srs_indication(struct nfapi_vnf_p7_config *config, nfapi_srs_indication_t *ind) -{ - // vnf_p7_info* p7_vnf = (vnf_p7_info*)(config->user_data); - // mac_srs_ind(p7_vnf->mac, ind); - return 1; -} - int aerial_phy_sr_indication(struct nfapi_vnf_p7_config *config, nfapi_sr_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 c5126c2ca9..989544f839 100644 --- a/nfapi/oai_integration/aerial/fapi_vnf_p7.h +++ b/nfapi/oai_integration/aerial/fapi_vnf_p7.h @@ -184,7 +184,6 @@ 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); int aerial_phy_nr_rach_indication(nfapi_nr_rach_indication_t *ind); int aerial_phy_nr_uci_indication(nfapi_nr_uci_indication_t *ind); -int aerial_phy_srs_indication(struct nfapi_vnf_p7_config *config, nfapi_srs_indication_t *ind); int aerial_phy_sr_indication(struct nfapi_vnf_p7_config *config, nfapi_sr_indication_t *ind); int aerial_phy_cqi_indication(struct nfapi_vnf_p7_config *config, nfapi_cqi_indication_t *ind); int aerial_phy_lbt_dl_indication(struct nfapi_vnf_p7_config *config, nfapi_lbt_dl_indication_t *ind);