From 23cc049157f68f1c0a5101a5bc6eaca5266ce8dc Mon Sep 17 00:00:00 2001 From: Bartosz Podrygajlo Date: Thu, 26 Sep 2024 14:55:37 +0200 Subject: [PATCH 1/2] Remove unnecessary includes in rfsimulator --- openair1/PHY/TOOLS/signal_energy.c | 1 - openair1/SIMULATION/RF/dac.c | 1 - openair1/SIMULATION/TOOLS/channel_sim.c | 9 --------- openair1/SIMULATION/TOOLS/multipath_channel.c | 5 ----- openair1/SIMULATION/TOOLS/multipath_tv_channel.c | 5 +---- openair1/SIMULATION/TOOLS/phase_noise.c | 5 +---- openair1/SIMULATION/TOOLS/random_channel.c | 2 -- openair1/SIMULATION/TOOLS/rangen_double.c | 1 - openair1/SIMULATION/TOOLS/taus.c | 3 --- radio/rfsimulator/apply_channelmod.c | 11 ----------- radio/rfsimulator/simulator.c | 5 ----- 11 files changed, 2 insertions(+), 46 deletions(-) diff --git a/openair1/PHY/TOOLS/signal_energy.c b/openair1/PHY/TOOLS/signal_energy.c index affee5dac4..b3289935b6 100644 --- a/openair1/PHY/TOOLS/signal_energy.c +++ b/openair1/PHY/TOOLS/signal_energy.c @@ -21,7 +21,6 @@ #include "tools_defs.h" #include "PHY/impl_defs_top.h" -#include "PHY/sse_intrin.h" // Compute Energy of a complex signal vector, removing the DC component! // input : points to vector diff --git a/openair1/SIMULATION/RF/dac.c b/openair1/SIMULATION/RF/dac.c index dc4c09827b..edde6e3baf 100644 --- a/openair1/SIMULATION/RF/dac.c +++ b/openair1/SIMULATION/RF/dac.c @@ -24,7 +24,6 @@ #include #include "PHY/TOOLS/tools_defs.h" #include "rf.h" -#include "common/utils/LOG/log.h" void dac(double *s_re[2], diff --git a/openair1/SIMULATION/TOOLS/channel_sim.c b/openair1/SIMULATION/TOOLS/channel_sim.c index 9d020a8c4d..9f196b02ec 100644 --- a/openair1/SIMULATION/TOOLS/channel_sim.c +++ b/openair1/SIMULATION/TOOLS/channel_sim.c @@ -21,21 +21,12 @@ #include #include -#include #include #include -#include #include "SIMULATION/TOOLS/sim.h" #include "SIMULATION/RF/rf.h" -#include "PHY/types.h" -#include "PHY/defs_eNB.h" -#include "PHY/phy_extern.h" #include "PHY/phy_extern_ue.h" - -#include "common/utils/LOG/log.h" -#include "PHY_INTERFACE/phy_interface_extern.h" -#include "UTIL/OPT/opt.h" // to test OPT #include "common/ran_context.h" #define RF diff --git a/openair1/SIMULATION/TOOLS/multipath_channel.c b/openair1/SIMULATION/TOOLS/multipath_channel.c index 41b756b54d..de616bf86c 100644 --- a/openair1/SIMULATION/TOOLS/multipath_channel.c +++ b/openair1/SIMULATION/TOOLS/multipath_channel.c @@ -19,13 +19,8 @@ * contact@openairinterface.org */ -#include -#include #include -#include -#include "nfapi_nr_interface_scf.h" #include "PHY/TOOLS/tools_defs.h" -#include "SIMULATION/RF/rf.h" #include "sim.h" //#define DEBUG_CH diff --git a/openair1/SIMULATION/TOOLS/multipath_tv_channel.c b/openair1/SIMULATION/TOOLS/multipath_tv_channel.c index a9967a6eaf..12175ea385 100644 --- a/openair1/SIMULATION/TOOLS/multipath_tv_channel.c +++ b/openair1/SIMULATION/TOOLS/multipath_tv_channel.c @@ -19,13 +19,10 @@ * contact@openairinterface.org */ -#include #include #include -#include -#include "sim.h" -#include "SIMULATION/RF/rf.h" #include +#include "sim.h" void tv_channel(channel_desc_t *desc,double complex ***H,uint32_t length); double frand_a_b(double a, double b); diff --git a/openair1/SIMULATION/TOOLS/phase_noise.c b/openair1/SIMULATION/TOOLS/phase_noise.c index 6cc24f23db..8c2b36dfec 100644 --- a/openair1/SIMULATION/TOOLS/phase_noise.c +++ b/openair1/SIMULATION/TOOLS/phase_noise.c @@ -19,11 +19,8 @@ * contact@openairinterface.org */ -#include -#include #include -#include -#include "sim.h" +#include "sim.h" static uint16_t LUTSin[ResolSinCos+1]; diff --git a/openair1/SIMULATION/TOOLS/random_channel.c b/openair1/SIMULATION/TOOLS/random_channel.c index 268d0166b1..4c715498a8 100644 --- a/openair1/SIMULATION/TOOLS/random_channel.c +++ b/openair1/SIMULATION/TOOLS/random_channel.c @@ -25,11 +25,9 @@ #include #include - #include "PHY/TOOLS/tools_defs.h" #include "sim.h" #include "scm_corrmat.h" -#include "common/utils/LOG/log.h" #include "common/config/config_userapi.h" #include "common/utils/telnetsrv/telnetsrv.h" #include "common/utils/load_module_shlib.h" diff --git a/openair1/SIMULATION/TOOLS/rangen_double.c b/openair1/SIMULATION/TOOLS/rangen_double.c index a1207f0d4d..54871448a4 100644 --- a/openair1/SIMULATION/TOOLS/rangen_double.c +++ b/openair1/SIMULATION/TOOLS/rangen_double.c @@ -22,7 +22,6 @@ #include #include #include -#include #include "sim.h" diff --git a/openair1/SIMULATION/TOOLS/taus.c b/openair1/SIMULATION/TOOLS/taus.c index 5280cceafb..e68b8ecf93 100644 --- a/openair1/SIMULATION/TOOLS/taus.c +++ b/openair1/SIMULATION/TOOLS/taus.c @@ -19,10 +19,7 @@ * contact@openairinterface.org */ -#include #include -#include -#include #include "sim.h" diff --git a/radio/rfsimulator/apply_channelmod.c b/radio/rfsimulator/apply_channelmod.c index dc35a9bf73..91ad8b070d 100644 --- a/radio/rfsimulator/apply_channelmod.c +++ b/radio/rfsimulator/apply_channelmod.c @@ -22,20 +22,9 @@ */ -#include -#include -#include -#include -#include -#include #include - -#include #include -#include #include -#include -#include #include "rfsimulator.h" /* diff --git a/radio/rfsimulator/simulator.c b/radio/rfsimulator/simulator.c index 26feb13490..c5197eaab8 100644 --- a/radio/rfsimulator/simulator.c +++ b/radio/rfsimulator/simulator.c @@ -30,7 +30,6 @@ #include #include -#include #include #include #include @@ -39,16 +38,12 @@ #include #include #include -#include - #include #include #include #include #include #include "common_lib.h" -#include -#include "openair1/PHY/defs_UE.h" #define CHANNELMOD_DYNAMICLOAD #include #include "rfsimulator.h" From 65f14490c3678c1675e41ba2bd613de9d7c70047 Mon Sep 17 00:00:00 2001 From: Bartosz Podrygajlo Date: Thu, 26 Sep 2024 15:07:35 +0200 Subject: [PATCH 2/2] Remove additional unnecessary includes --- common/config/config_common.c | 4 ---- common/utils/threadPool/thread-pool.c | 4 ---- 2 files changed, 8 deletions(-) diff --git a/common/config/config_common.c b/common/config/config_common.c index 45edcac6df..d6e499b6a8 100644 --- a/common/config/config_common.c +++ b/common/config/config_common.c @@ -24,11 +24,7 @@ #include #include #include -#include -#include -#include #include -#include "common/platform_types.h" #include "config_common.h" #include "../utils/LOG/log.h" static int managed_ptr_sz(configmodule_interface_t *cfg, void *ptr) diff --git a/common/utils/threadPool/thread-pool.c b/common/utils/threadPool/thread-pool.c index 64341501cb..5b22f2895d 100644 --- a/common/utils/threadPool/thread-pool.c +++ b/common/utils/threadPool/thread-pool.c @@ -23,14 +23,10 @@ #define _GNU_SOURCE -#include -#include #include #include #include -#include #include -#include #include