From d91e80beba383ac047cd9e01fe8770a32e76c356 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Fri, 27 Sep 2024 16:01:03 +0200 Subject: [PATCH] Remove aerial_phy_nb_harq_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 e9a2363493..e8b4c5ddb3 100644 --- a/nfapi/oai_integration/aerial/fapi_vnf_p5.c +++ b/nfapi/oai_integration/aerial/fapi_vnf_p5.c @@ -64,7 +64,7 @@ void *aerial_vnf_nr_p7_config_init(void *ptr) p7_vnf->config->sr_indication = NULL; p7_vnf->config->cqi_indication = NULL; p7_vnf->config->lbt_dl_indication = NULL; - p7_vnf->config->nb_harq_indication = &aerial_phy_nb_harq_indication; + p7_vnf->config->nb_harq_indication = NULL; p7_vnf->config->nrach_indication = &aerial_phy_nrach_indication; p7_vnf->config->nr_slot_indication = &aerial_phy_nr_slot_indication; p7_vnf->config->nr_srs_indication = &aerial_phy_nr_srs_indication; diff --git a/nfapi/oai_integration/aerial/fapi_vnf_p7.c b/nfapi/oai_integration/aerial/fapi_vnf_p7.c index 4b4a6c797a..fb2376b71a 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_nb_harq_indication(struct nfapi_vnf_p7_config *config, nfapi_nb_harq_indication_t *ind) -{ - // vnf_p7_info* p7_vnf = (vnf_p7_info*)(config->user_data); - // mac_nb_harq_ind(p7_vnf->mac, ind); - return 1; -} - int aerial_phy_nrach_indication(struct nfapi_vnf_p7_config *config, nfapi_nrach_indication_t *ind) { // vnf_p7_info* p7_vnf = (vnf_p7_info*)(config->user_data); diff --git a/nfapi/oai_integration/aerial/fapi_vnf_p7.h b/nfapi/oai_integration/aerial/fapi_vnf_p7.h index 0af5874be2..14c504e620 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_nb_harq_indication(struct nfapi_vnf_p7_config *config, nfapi_nb_harq_indication_t *ind); int aerial_phy_nrach_indication(struct nfapi_vnf_p7_config *config, nfapi_nrach_indication_t *ind); int aerial_phy_nr_slot_indication(nfapi_nr_slot_indication_scf_t *ind); int aerial_phy_nr_srs_indication(nfapi_nr_srs_indication_t *ind);