further compilation cleanup

executables/nr-ru.c

@@ -22,7 +22,6 @@
 
 #include "PHY/LTE_TRANSPORT/if4_tools.h"
 
-#include "PHY/types.h"
 #include "PHY/defs_nr_common.h"
 #include "PHY/phy_extern.h"
 #include "PHY/NR_TRANSPORT/nr_transport_proto.h"

executables/nr-softmodem-common.h

@@ -30,7 +30,6 @@
 #include <sys/sysinfo.h>
 #include "radio/COMMON/common_lib.h"
 #include "assertions.h"
-#include "PHY/types.h"
 
 /* help strings definition for command line options, used in CMDLINE_XXX_DESC macros and printed when -h option is used */
 #define CONFIG_HLP_DLMCS_PHYTEST  "Set the downlink MCS for PHYTEST mode\n"

executables/nr-softmodem.c

@@ -55,7 +55,6 @@ unsigned short config_frames[4] = {2,9,11,13};
 #include "gnb_paramdef.h"
 #include "intertask_interface.h"
 #include "nfapi/oai_integration/vendor_ext.h"
-#include "nfapi_interface.h"
 #include "nfapi_nr_interface_scf.h"
 #include "ngap_gNB.h"
 #include "nr-softmodem-common.h"
@@ -595,7 +594,6 @@ int main( int argc, char **argv ) {
                          : TIME_SOURCE_REALTIME);
 
   // start the main threads
-  number_of_cards = 1;
 
   wait_gNBs();
   int sl_ahead = NFAPI_MODE == NFAPI_MODE_AERIAL ? 0 : 6;

executables/nr-uesoftmodem.c

@@ -12,25 +12,18 @@
 #include "T.h"
 #include "common/oai_version.h"
 #include "assertions.h"
-#include "PHY/types.h"
 #include "PHY/defs_nr_UE.h"
 #include "SCHED_NR_UE/defs.h"
 #include "common/ran_context.h"
 #include "common/config/config_userapi.h"
 #include "common/utils/load_module_shlib.h"
-//#undef FRAME_LENGTH_COMPLEX_SAMPLES //there are two conflicting definitions, so we better make sure we don't use it at all
 #include "common/utils/nr/nr_common.h"
-
 #include "radio/COMMON/common_lib.h"
 #include "radio/ETHERNET/if_defs.h"
-
-//#undef FRAME_LENGTH_COMPLEX_SAMPLES //there are two conflicting definitions, so we better make sure we don't use it at all
 #include "openair1/PHY/MODULATION/nr_modulation.h"
 #include "PHY/CODING/nrLDPC_coding/nrLDPC_coding_interface.h"
 #include "PHY/phy_vars_nr_ue.h"
 #include "PHY/NR_UE_TRANSPORT/nr_transport_proto_ue.h"
-#include "PHY/NR_TRANSPORT/nr_dlsch.h"
-//#include "../../SIMU/USER/init_lte.h"
 
 #include "PHY_INTERFACE/phy_interface_vars.h"
 #include "NR_IF_Module.h"
@@ -69,8 +62,6 @@ unsigned short config_frames[4] = {2,9,11,13};
 #include "executables/thread-common.h"
 
 #include "nr_nas_msg.h"
-#include <openair1/PHY/MODULATION/nr_modulation.h>
-#include "openair2/GNB_APP/gnb_paramdef.h"
 #include "actor.h"
 
 THREAD_STRUCT thread_struct;

nfapi/oai_integration/nfapi_vnf.c

@@ -37,7 +37,6 @@
 #include "openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h"
 #include "executables/lte-softmodem.h"
 #include "openair1/PHY/defs_gNB.h"
-
 #include "common/ran_context.h"
 #include "openair2/PHY_INTERFACE/queue_t.h"
 #include "gnb_ind_vars.h"

openair1/PHY/CODING/nrLDPC_coding/nrLDPC_coding_interface.h

@@ -7,7 +7,7 @@
  */
 
 #include "common/utils/time_meas.h"
-#include "openair1/PHY/defs_common.h"
+#include "openair1/PHY/CODING/coding_defs.h"
 #include "common/utils/threadPool/thread-pool.h"
 
 #ifndef __NRLDPC_CODING_INTERFACE__H__

openair1/PHY/NR_ESTIMATION/nr_measurements_gNB.c

@@ -6,7 +6,6 @@
  * \brief gNB measurement routines
  */
 
-#include "PHY/types.h"
 #include "PHY/defs_gNB.h"
 #include "nr_ul_estimation.h"
 

openair1/PHY/NR_REFSIG/dmrs_nr.h

@@ -16,7 +16,6 @@
 #ifndef DMRS_NR_H
 #define DMRS_NR_H
 
-#include "PHY/types.h"
 #include "PHY/NR_REFSIG/ss_pbch_nr.h"
 #include "PHY/NR_REFSIG/pss_nr.h"
 #include "PHY/NR_REFSIG/sss_nr.h"

openair1/PHY/NR_REFSIG/pss_nr.h

@@ -16,7 +16,6 @@
 #define PSS_NR_H
 
 #include "PHY/defs_nr_common.h"
-#include "PHY/types.h"
 #include "PHY/NR_REFSIG/ss_pbch_nr.h"
 
 /************** CODE GENERATION ***********************************/

openair1/PHY/NR_REFSIG/sss_nr.h

@@ -16,7 +16,6 @@
 #define SSS_NR_H
 
 #include "limits.h"
-#include "PHY/types.h"
 #include "pss_nr.h"
 
 /************** DEFINE ********************************************/

openair1/PHY/NR_REFSIG/ul_ref_seq_nr.h

@@ -16,10 +16,8 @@
 #ifndef LOWPAPR_SEQUENCES_NR_H
 #define LOWPAPR_SEQUENCES_NR_H
 
-#include "PHY/types.h"
 #include "PHY/NR_REFSIG/ss_pbch_nr.h"
 #include "PHY/defs_nr_common.h"
-#include "PHY/defs_gNB.h"
 
 /************** DEFINE ********************************************/
 #define U_GROUP_NUMBER               (30)    /* maximum number of sequence-group */

openair1/PHY/NR_UE_ESTIMATION/nr_adjust_gain.c

@@ -2,11 +2,9 @@
  * SPDX-License-Identifier: LicenseRef-CSSL-1.0
  */
 
-#include "PHY/types.h"
 #include "PHY/defs_nr_UE.h"
 
-void
-phy_adjust_gain_nr (PHY_VARS_NR_UE *ue, uint32_t rx_power_fil_dB, uint8_t eNB_id)
+void phy_adjust_gain_nr(PHY_VARS_NR_UE *ue, uint32_t rx_power_fil_dB, uint8_t eNB_id)
 {
 
   LOG_D(PHY,"Gain control: rssi %d (%d,%d)\n",

openair1/PHY/NR_UE_ESTIMATION/nr_adjust_synch_ue.c

@@ -2,7 +2,6 @@
  * SPDX-License-Identifier: LicenseRef-CSSL-1.0
  */
 
-#include "PHY/types.h"
 #include "PHY/defs_nr_UE.h"
 #include "PHY/NR_UE_ESTIMATION/nr_estimation.h"
 #include "executables/nr-uesoftmodem.h"

openair1/PHY/NR_UE_TRANSPORT/cic_filter_nr.h

@@ -17,7 +17,6 @@
 #define CIC_FILTER_NR_H
 
 #include "PHY/defs_nr_UE.h"
-#include "PHY/types.h"
 
 /************** DEFINE ********************************************/
 

openair1/PHY/NR_UE_TRANSPORT/nr_initial_sync.c

@@ -5,7 +5,6 @@
 /*!
  * \brief Routines for initial UE synchronization procedure (PSS,SSS,PBCH and frame format detection)
  */
-#include "PHY/types.h"
 #include "PHY/defs_nr_UE.h"
 #include "PHY/MODULATION/modulation_UE.h"
 #include "nr_transport_proto_ue.h"

openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c

@@ -5,7 +5,6 @@
 /*! \file PHY/NR_UE_TRANSPORT/nr_ulsch_coding_slot.c
  */
 
-#include "PHY/defs_UE.h"
 #include "PHY/NR_UE_TRANSPORT/nr_transport_proto_ue.h"
 #include "PHY/CODING/coding_defs.h"
 #include "PHY/CODING/coding_extern.h"

openair1/PHY/defs_nr_UE.h

@@ -66,6 +66,7 @@
 #include "PHY/TOOLS/tools_defs.h"
 #include "common/platform_types.h"
 #include "NR_UE_TRANSPORT/nr_transport_ue.h"
+#include "openair1/PHY/defs_common.h"
 
 #if defined(UPGRADE_RAT_NR)
   #include "PHY/NR_REFSIG/ss_pbch_nr.h"