MR2477 nfapi_nr_interface cleanup

executables/nr-softmodem.c

@@ -145,11 +145,6 @@ int rx_input_level_dBm;
 
 int otg_enabled;
 
-//int number_of_cards = 1;
-
-
-//static NR_DL_FRAME_PARMS      *frame_parms[MAX_NUM_CCs];
-//static nfapi_nr_config_request_t *config[MAX_NUM_CCs];
 uint32_t timing_advance = 0;
 uint64_t num_missed_slots=0; // counter for the number of missed slots
 

nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface_scf.h

@@ -11,7 +11,6 @@
 
 #include "stddef.h"
 #include "nfapi_interface.h"
-#include "nfapi_nr_interface.h"
 
 #define NFAPI_NR_MAX_NB_CCE_AGGREGATION_LEVELS 5
 #define NFAPI_NR_MAX_NB_TCI_STATES_PDCCH 64
@@ -26,13 +25,6 @@
 
 // Extension to the generic structures for single tlv values
 
-
-typedef enum {
-  NFAPI_NR_DMRS_TYPE1=0,
-  NFAPI_NR_DMRS_TYPE2
-} nfapi_nr_dmrs_type_e;
-
-
 typedef struct {
   /// Value: 0 -> 1, 0: Payload is carried directly in the value field, 1: Pointer to payload is in the value field 
   uint16_t tag; 

openair1/PHY/INIT/nr_init.c

@@ -38,8 +38,6 @@
 #include "PHY/NR_TRANSPORT/nr_ulsch.h"
 #include "PHY/NR_REFSIG/nr_refsig.h"
 #include "SCHED_NR/fapi_nr_l1.h"
-#include "nfapi_nr_interface.h"
-
 #include "PHY/NR_REFSIG/ul_ref_seq_nr.h"
 
 

openair1/PHY/NR_REFSIG/dmrs_nr.h

@@ -38,6 +38,7 @@
 #include "PHY/NR_REFSIG/ss_pbch_nr.h"
 #include "PHY/NR_REFSIG/pss_nr.h"
 #include "PHY/NR_REFSIG/sss_nr.h"
+#include "nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h"
 
 /************** CODE GENERATION ***********************************/
 

openair1/PHY/NR_REFSIG/nr_dmrs_rx.c

@@ -38,6 +38,7 @@
 #include "PHY/defs_nr_UE.h"
 #include "nr_refsig.h"
 #include "PHY/defs_gNB.h"
+#include "nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h"
 
 // Table 6.4.1.1.3-1/2 from TS 38.211
 static const int delta1[8] = {0, 0, 1, 1, 0, 0, 1, 1};

openair1/PHY/NR_TRANSPORT/nr_dci.h

@@ -24,6 +24,7 @@
 
 #include "PHY/defs_gNB.h"
 #include "PHY/NR_REFSIG/nr_refsig.h"
+#include "nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h"
 
 void nr_generate_dci_top(processingData_L1tx_t *msgTx,
                          int slot,

openair1/PHY/NR_TRANSPORT/nr_sch_dmrs.h

@@ -34,6 +34,7 @@
 #define NR_SCH_DMRS_H
 
 #include "PHY/defs_nr_common.h"
+#include "nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h"
 
 #define NR_PDSCH_DMRS_ANTENNA_PORT0 1000
 #define NR_PDSCH_DMRS_NB_ANTENNA_PORTS 12

openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c

@@ -19,7 +19,6 @@
  *      contact@openairinterface.org
  */
 
-
 #include <string.h>
 #include "SCHED_NR_UE/defs.h"
 #include "nr_estimation.h"
@@ -34,6 +33,8 @@
 #include "filt16a_32.h"
 #include "T.h"
 #include <openair1/PHY/TOOLS/phy_scope_interface.h>
+#include "nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h"
+
 extern openair0_config_t openair0_cfg[];
 
 //#define DEBUG_PDSCH

openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c

@@ -36,15 +36,14 @@
 #include "PHY/phy_extern_nr_ue.h"
 #include "PHY/CODING/coding_extern.h"
 #include "PHY/CODING/coding_defs.h"
-#include "PHY/NR_TRANSPORT/nr_transport_common_proto.h"
 #include "PHY/NR_UE_TRANSPORT/nr_transport_proto_ue.h"
-#include "PHY/NR_TRANSPORT/nr_dlsch.h"
 #include "SCHED_NR_UE/defs.h"
 #include "SIMULATION/TOOLS/sim.h"
 #include "executables/nr-uesoftmodem.h"
 #include "PHY/CODING/nrLDPC_extern.h"
 #include "common/utils/nr/nr_common.h"
 #include "openair1/PHY/TOOLS/phy_scope_interface.h"
+#include "nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h"
 
 //#define ENABLE_PHY_PAYLOAD_DEBUG 1
 

openair1/SCHED_NR/fapi_nr_l1.h

@@ -32,7 +32,6 @@
 
 #include "PHY/defs_gNB.h"
 #include "SCHED_NR/sched_nr.h"
-#include "nfapi_nr_interface.h"
 #include "nfapi_nr_interface_scf.h"
 
 // added

openair1/SCHED_NR/phy_procedures_nr_gNB.c

@@ -27,7 +27,6 @@
 #include "PHY/NR_TRANSPORT/nr_dci.h"
 #include "PHY/NR_ESTIMATION/nr_ul_estimation.h"
 #include "nfapi/open-nFAPI/nfapi/public_inc/nfapi_interface.h"
-#include "nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h"
 #include "fapi_nr_l1.h"
 #include "common/utils/LOG/log.h"
 #include "common/utils/LOG/vcd_signal_dumper.h"

openair2/LAYER2/NR_MAC_UE/mac_proto.h

@@ -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 */

openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c

@@ -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,

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c

@@ -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"
 

openair2/LAYER2/NR_MAC_gNB/mac_proto.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,

openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h

@@ -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"
 

openair2/NR_PHY_INTERFACE/NR_IF_Module.h

@@ -35,7 +35,6 @@
 
 #include <pthread.h>
 #include <stdint.h>
-#include "nfapi_nr_interface.h"
 #include "nfapi_nr_interface_scf.h"
 #include "common/platform_constants.h"
 #include "common/platform_types.h"