nfapi_nr_interface cleanup

2024-03-06 11:38:26 +01:00
parent b99e856733
commit 284d07c5ae
19 changed files with 26 additions and 538 deletions
@@ -36,6 +36,7 @@
 #include "mac_defs.h"
 #include "oai_asn1.h"
 #include "RRC/NR_UE/rrc_defs.h"
+#include "nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h"

 #define NR_DL_MAX_DAI                            (4)                      /* TS 38.213 table 9.1.3-1 Value of counter DAI for DCI format 1_0 and 1_1 */
 #define NR_DL_MAX_NB_CW                          (2)                      /* number of downlink code word */
@@ -38,7 +38,6 @@
 #include "common/utils/nr/nr_common.h"
 #include "executables/softmodem-common.h"
 #include <stdio.h>
-#include "nfapi_nr_interface.h"

 void fill_dci_search_candidates(const NR_SearchSpace_t *ss,
                                fapi_nr_dl_config_dci_dl_pdu_rel15_t *rel15,
@@ -37,8 +37,6 @@
 #include "LAYER2/NR_MAC_gNB/mac_proto.h"
 #include "LAYER2/RLC/rlc.h"

-/*NFAPI*/
-#include "nfapi_nr_interface.h"
 /*TAG*/
 #include "NR_TAG-Id.h"

@@ -317,12 +317,6 @@ void mac_remove_nr_ue(gNB_MAC_INST *nr_mac, rnti_t rnti);

 int nr_get_default_pucch_res(int pucch_ResourceCommon);

-int get_dlscs(nfapi_nr_config_request_t *cfg);
-
-int get_ulscs(nfapi_nr_config_request_t *cfg);
-
-int get_symbolsperslot(nfapi_nr_config_request_t *cfg);
-
 int nr_write_ce_dlsch_pdu(module_id_t module_idP,
                          const NR_UE_sched_ctrl_t *ue_sched_ctl,
                          unsigned char *mac_pdu,
@@ -78,6 +78,7 @@

 /* Interface */
 #include "nfapi_nr_interface_scf.h"
+#include "nfapi_nr_interface.h"
 #include "NR_PHY_INTERFACE/NR_IF_Module.h"
 #include "mac_rrc_ul.h"