From 5e10b47d18fdab4082d9f27c5bb92b4fa238b689 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Deronne?= Date: Sat, 13 Apr 2024 09:07:34 +0200 Subject: [PATCH] spectrum, wifi: Move wifi spectrum value helper class to wifi module --- src/spectrum/CMakeLists.txt | 2 -- src/wifi/CMakeLists.txt | 2 ++ src/wifi/helper/wifi-helper.cc | 4 +--- src/wifi/model/wifi-phy-common.h | 2 +- src/{spectrum => wifi}/model/wifi-spectrum-value-helper.cc | 0 src/{spectrum => wifi}/model/wifi-spectrum-value-helper.h | 2 +- 6 files changed, 5 insertions(+), 7 deletions(-) rename src/{spectrum => wifi}/model/wifi-spectrum-value-helper.cc (100%) rename src/{spectrum => wifi}/model/wifi-spectrum-value-helper.h (99%) diff --git a/src/spectrum/CMakeLists.txt b/src/spectrum/CMakeLists.txt index 42970eb2a..dae001354 100644 --- a/src/spectrum/CMakeLists.txt +++ b/src/spectrum/CMakeLists.txt @@ -36,7 +36,6 @@ set(source_files model/trace-fading-loss-model.cc model/tv-spectrum-transmitter.cc model/waveform-generator.cc - model/wifi-spectrum-value-helper.cc ) set(header_files @@ -77,7 +76,6 @@ set(header_files model/trace-fading-loss-model.h model/tv-spectrum-transmitter.h model/waveform-generator.h - model/wifi-spectrum-value-helper.h test/spectrum-test.h ) diff --git a/src/wifi/CMakeLists.txt b/src/wifi/CMakeLists.txt index f3a2068cc..2412074bd 100644 --- a/src/wifi/CMakeLists.txt +++ b/src/wifi/CMakeLists.txt @@ -160,6 +160,7 @@ set(source_files model/yans-error-rate-model.cc model/yans-wifi-channel.cc model/yans-wifi-phy.cc + model/wifi-spectrum-value-helper.cc ) set(header_files @@ -324,6 +325,7 @@ set(header_files model/yans-error-rate-model.h model/yans-wifi-channel.h model/yans-wifi-phy.h + model/wifi-spectrum-value-helper.h ) build_lib( diff --git a/src/wifi/helper/wifi-helper.cc b/src/wifi/helper/wifi-helper.cc index 90f8f191e..9db6317fc 100644 --- a/src/wifi/helper/wifi-helper.cc +++ b/src/wifi/helper/wifi-helper.cc @@ -968,6 +968,7 @@ WifiHelper::EnableLogComponents(LogLevel logLevel) LogComponentEnable("WifiRemoteStationManager", logLevel); LogComponentEnable("WifiSpectrumPhyInterface", logLevel); LogComponentEnable("WifiSpectrumSignalParameters", logLevel); + LogComponentEnable("WifiSpectrumValueHelper", logLevel); LogComponentEnable("WifiTxCurrentModel", logLevel); LogComponentEnable("WifiTxParameters", logLevel); LogComponentEnable("WifiTxTimer", logLevel); @@ -979,9 +980,6 @@ WifiHelper::EnableLogComponents(LogLevel logLevel) LogComponentEnable("WifiHelper", logLevel); LogComponentEnable("SpectrumWifiHelper", logLevel); LogComponentEnable("YansWifiHelper", logLevel); - - // From Spectrum - LogComponentEnable("WifiSpectrumValueHelper", logLevel); } int64_t diff --git a/src/wifi/model/wifi-phy-common.h b/src/wifi/model/wifi-phy-common.h index 976baf5be..554997dd4 100644 --- a/src/wifi/model/wifi-phy-common.h +++ b/src/wifi/model/wifi-phy-common.h @@ -22,11 +22,11 @@ #ifndef WIFI_PHY_COMMON_H #define WIFI_PHY_COMMON_H +#include "wifi-spectrum-value-helper.h" #include "wifi-standards.h" #include "ns3/fatal-error.h" #include "ns3/ptr.h" -#include "ns3/wifi-spectrum-value-helper.h" #include diff --git a/src/spectrum/model/wifi-spectrum-value-helper.cc b/src/wifi/model/wifi-spectrum-value-helper.cc similarity index 100% rename from src/spectrum/model/wifi-spectrum-value-helper.cc rename to src/wifi/model/wifi-spectrum-value-helper.cc diff --git a/src/spectrum/model/wifi-spectrum-value-helper.h b/src/wifi/model/wifi-spectrum-value-helper.h similarity index 99% rename from src/spectrum/model/wifi-spectrum-value-helper.h rename to src/wifi/model/wifi-spectrum-value-helper.h index c991af1e3..341ebe890 100644 --- a/src/spectrum/model/wifi-spectrum-value-helper.h +++ b/src/wifi/model/wifi-spectrum-value-helper.h @@ -22,7 +22,7 @@ #ifndef WIFI_SPECTRUM_VALUE_HELPER_H #define WIFI_SPECTRUM_VALUE_HELPER_H -#include "spectrum-value.h" +#include namespace ns3 {