diff --git a/src/wifi/model/mgt-action-headers.cc b/src/wifi/model/mgt-action-headers.cc index ab8b1f846..bc1d8e062 100644 --- a/src/wifi/model/mgt-action-headers.cc +++ b/src/wifi/model/mgt-action-headers.cc @@ -1663,7 +1663,7 @@ FilsDiscHeader::FdCapability::Deserialize(Buffer::Iterator start) } void -FilsDiscHeader::FdCapability::SetOpChannelWidth(uint16_t width) +FilsDiscHeader::FdCapability::SetOpChannelWidth(ChannelWidthMhz width) { m_chWidth = (width == 20 || width == 22) ? 0 : (width == 40) ? 1 @@ -1672,7 +1672,7 @@ FilsDiscHeader::FdCapability::SetOpChannelWidth(uint16_t width) : 4; } -uint16_t +ChannelWidthMhz FilsDiscHeader::FdCapability::GetOpChannelWidth() const { switch (m_chWidth) diff --git a/src/wifi/model/mgt-action-headers.h b/src/wifi/model/mgt-action-headers.h index 53b1c5f83..3b685c40b 100644 --- a/src/wifi/model/mgt-action-headers.h +++ b/src/wifi/model/mgt-action-headers.h @@ -752,12 +752,12 @@ class FilsDiscHeader : public Header /** * \brief Set the BSS Operating Channel Width field based on the operating channel width - * \param width the operating channel width in MHz + * \param width the operating channel width */ - void SetOpChannelWidth(uint16_t width); + void SetOpChannelWidth(ChannelWidthMhz width); /// \return the operating channel width encoded in the BSS Operating Channel Width field - uint16_t GetOpChannelWidth() const; + ChannelWidthMhz GetOpChannelWidth() const; /** * \brief Set the Maximum Number of Spatial Streams field diff --git a/src/wifi/model/wifi-phy-operating-channel.h b/src/wifi/model/wifi-phy-operating-channel.h index 58843807d..baab31f2c 100644 --- a/src/wifi/model/wifi-phy-operating-channel.h +++ b/src/wifi/model/wifi-phy-operating-channel.h @@ -278,7 +278,7 @@ class WifiPhyOperatingChannel * primary channel of the given width within the operating channel (0 indicates * the 20 MHz subchannel with the lowest center frequency). Otherwise, return 0. * - * \param primaryChannelWidth the width of the primary channel in MHz + * \param primaryChannelWidth the width of the primary channel * \return the index of the requested primary channel within the operating channel */ uint8_t GetPrimaryChannelIndex(ChannelWidthMhz primaryChannelWidth) const; @@ -288,7 +288,7 @@ class WifiPhyOperatingChannel * secondary channel of the given width within the operating channel (0 indicates * the 20 MHz subchannel with the lowest center frequency). Otherwise, return 0. * - * \param secondaryChannelWidth the width of the secondary channel in MHz + * \param secondaryChannelWidth the width of the secondary channel * \return the index of the requested secondary channel within the operating channel */ uint8_t GetSecondaryChannelIndex(ChannelWidthMhz secondaryChannelWidth) const; @@ -358,7 +358,7 @@ class WifiPhyOperatingChannel * * \param number the channel number (use 0 to leave it unspecified) * \param frequency the channel center frequency in MHz (use 0 to leave it unspecified) - * \param width the channel width in MHz (use 0 to leave it unspecified) + * \param width the channel width (use 0 to leave it unspecified) * \param standard the standard (use WIFI_STANDARD_UNSPECIFIED not to check whether a * channel is suitable for a specific standard) * \param band the PHY band diff --git a/src/wifi/model/wifi-ppdu.h b/src/wifi/model/wifi-ppdu.h index 8dffd7fab..93c4f9968 100644 --- a/src/wifi/model/wifi-ppdu.h +++ b/src/wifi/model/wifi-ppdu.h @@ -225,12 +225,12 @@ class WifiPpdu : public SimpleRefCount //!< returned WifiTxVector) uint8_t m_txAntennas; //!< the number of antennas used to transmit this PPDU - uint16_t m_txChannelWidth; /**< The channel width (MHz) used for the transmission of this + ChannelWidthMhz m_txChannelWidth; /**< The channel width used for the transmission of this PPDU. This has to be stored since channel width can not always be obtained from the PHY headers, especially for non-HT PPDU, since we do not sense the spectrum to determine the occupied channel width for simplicity. */ -}; // class WifiPpdu +}; // class WifiPpdu /** * \brief Stream insertion operator. diff --git a/src/wifi/model/wifi-remote-station-manager.h b/src/wifi/model/wifi-remote-station-manager.h index 411e02af0..0af04204b 100644 --- a/src/wifi/model/wifi-remote-station-manager.h +++ b/src/wifi/model/wifi-remote-station-manager.h @@ -833,13 +833,13 @@ class WifiRemoteStationManager : public Object /** * \param header MAC header - * \param allowedWidth the allowed width in MHz to send this packet + * \param allowedWidth the allowed width to send this packet * \return the TXVECTOR to use to send this packet */ WifiTxVector GetDataTxVector(const WifiMacHeader& header, ChannelWidthMhz allowedWidth); /** * \param address remote address - * \param allowedWidth the allowed width in MHz for the data frame being protected + * \param allowedWidth the allowed width for the data frame being protected * * \return the TXVECTOR to use to send the RTS prior to the * transmission of the data packet itself. diff --git a/src/wifi/model/wifi-spectrum-value-helper.cc b/src/wifi/model/wifi-spectrum-value-helper.cc index 90b0e60f7..22e5aa3f1 100644 --- a/src/wifi/model/wifi-spectrum-value-helper.cc +++ b/src/wifi/model/wifi-spectrum-value-helper.cc @@ -62,9 +62,9 @@ NS_LOG_COMPONENT_DEFINE("WifiSpectrumValueHelper"); struct WifiSpectrumModelId { std::vector centerFrequencies; ///< center frequency per segment (in MHz) - ChannelWidthMhz channelWidth; ///< channel width (in MHz) + ChannelWidthMhz channelWidth; ///< channel width uint32_t carrierSpacing; ///< carrier spacing (in Hz) - ChannelWidthMhz guardBandwidth; ///< guard band width (in MHz) + ChannelWidthMhz guardBandwidth; ///< guard band width }; /** @@ -483,9 +483,9 @@ WifiSpectrumValueHelper::CreateHeOfdmTxPowerSpectralDensity( Ptr WifiSpectrumValueHelper::CreateHeOfdmTxPowerSpectralDensity( const std::vector& centerFrequencies, - uint16_t channelWidth, + ChannelWidthMhz channelWidth, double txPowerW, - uint16_t guardBandwidth, + ChannelWidthMhz guardBandwidth, double minInnerBandDbr, double minOuterBandDbr, double lowestPointDbr, diff --git a/src/wifi/model/wifi-spectrum-value-helper.h b/src/wifi/model/wifi-spectrum-value-helper.h index 47fbd8c08..18653bdb8 100644 --- a/src/wifi/model/wifi-spectrum-value-helper.h +++ b/src/wifi/model/wifi-spectrum-value-helper.h @@ -58,11 +58,9 @@ class WifiSpectrumValueHelper * 2 * guardBandwidth) MHz of bandwidth). * * \param centerFrequencies center frequency (MHz) per segment - * \param channelWidth total allocated channel width (MHz) over all segments + * \param channelWidth total allocated channel width over all segments * \param carrierSpacing carrier spacing (Hz) - * \param guardBandwidth total width of the guard band (MHz), which will be split over the - * segments - * + * \param guardBandwidth total width of the guard band, which will be split over the segments * \return the static SpectrumModel instance corresponding to the * given carrier frequency and channel width configuration. */ @@ -118,7 +116,7 @@ class WifiSpectrumValueHelper * MHz subchannels. Channel width may vary between 20, 40, 80, and 160 MHz. * * \param centerFrequencies center frequency (MHz) per segment - * \param channelWidth total allocated channel width (MHz) over all segments + * \param channelWidth total allocated channel width over all segments * \param txPowerW transmit power (W) to allocate * \param guardBandwidth width of the guard band * \param minInnerBandDbr the minimum relative power in the inner band (in dBr) @@ -145,7 +143,7 @@ class WifiSpectrumValueHelper * 20, 40, 80, and 160 MHz. * * \param centerFrequencies center frequency (MHz) per segment - * \param channelWidth total allocated channel width (MHz) over all segments + * \param channelWidth total allocated channel width over all segments * \param txPowerW transmit power (W) to allocate * \param guardBandwidth width of the guard band * \param minInnerBandDbr the minimum relative power in the inner band (in dBr) @@ -170,9 +168,9 @@ class WifiSpectrumValueHelper * Channel width may vary between 20, 40, 80, and 160 MHz. * * \param centerFrequency center frequency (MHz) - * \param channelWidth channel width (MHz) + * \param channelWidth channel width * \param txPowerW transmit power (W) to allocate - * \param guardBandwidth width of the guard band (MHz) + * \param guardBandwidth width of the guard band * \param minInnerBandDbr the minimum relative power in the inner band (in dBr) * \param minOuterbandDbr the minimum relative power in the outer band (in dBr) * \param lowestPointDbr maximum relative power of the outermost subcarriers of the guard band @@ -197,9 +195,9 @@ class WifiSpectrumValueHelper * Channel width may vary between 20, 40, 80, and 160 MHz. * * \param centerFrequencies center frequency (MHz) per segment - * \param channelWidth total allocated channel width (MHz) over all segments + * \param channelWidth total allocated channel width over all segments * \param txPowerW transmit power (W) to allocate - * \param guardBandwidth width of the guard band (MHz) + * \param guardBandwidth width of the guard band * \param minInnerBandDbr the minimum relative power in the inner band (in dBr) * \param minOuterbandDbr the minimum relative power in the outer band (in dBr) * \param lowestPointDbr maximum relative power of the outermost subcarriers of the guard band @@ -210,9 +208,9 @@ class WifiSpectrumValueHelper */ static Ptr CreateHeOfdmTxPowerSpectralDensity( const std::vector& centerFrequencies, - uint16_t channelWidth, + ChannelWidthMhz channelWidth, double txPowerW, - uint16_t guardBandwidth, + ChannelWidthMhz guardBandwidth, double minInnerBandDbr = -20, double minOuterbandDbr = -28, double lowestPointDbr = -40, @@ -224,9 +222,9 @@ class WifiSpectrumValueHelper * An ideal (i.e. rectangular) spectral mask is considered for the time being. * * \param centerFrequencies center frequency (MHz) per segment - * \param channelWidth total allocated channel width (MHz) over all segments + * \param channelWidth total allocated channel width over all segments * \param txPowerW transmit power (W) to allocate - * \param guardBandwidth width of the guard band (MHz) + * \param guardBandwidth width of the guard band * \param ru the RU band used by the STA * \return a pointer to a newly allocated SpectrumValue representing the HE OFDM Transmit Power * Spectral Density on the RU used by the STA in W/Hz for each Band diff --git a/src/wifi/model/wifi-tx-vector.h b/src/wifi/model/wifi-tx-vector.h index e9eccc4fd..96287f297 100644 --- a/src/wifi/model/wifi-tx-vector.h +++ b/src/wifi/model/wifi-tx-vector.h @@ -125,7 +125,7 @@ class WifiTxVector * \param nTx the number of TX antennas * \param nss the number of spatial STBC streams (NSS) * \param ness the number of extension spatial streams (NESS) - * \param channelWidth the channel width in MHz + * \param channelWidth the channel width * \param aggregation enable or disable MPDU aggregation * \param stbc enable or disable STBC * \param ldpc enable or disable LDPC (BCC is used otherwise) @@ -565,7 +565,7 @@ class WifiTxVector It is the value that will be passed to PMD_TXPWRLVL.request */ WifiPreamble m_preamble; /**< preamble */ - ChannelWidthMhz m_channelWidth; /**< channel width in MHz */ + ChannelWidthMhz m_channelWidth; /**< channel width */ uint16_t m_guardInterval; /**< guard interval duration in nanoseconds */ uint8_t m_nTx; /**< number of TX antennas */ uint8_t m_nss; /**< number of spatial streams */ diff --git a/src/wifi/model/yans-wifi-phy.cc b/src/wifi/model/yans-wifi-phy.cc index 4df035960..fcce68692 100644 --- a/src/wifi/model/yans-wifi-phy.cc +++ b/src/wifi/model/yans-wifi-phy.cc @@ -106,7 +106,7 @@ YansWifiPhy::TraceSignalArrival(Ptr ppdu, double rxPowerDbm, Tim } ChannelWidthMhz -YansWifiPhy::GetGuardBandwidth(uint16_t currentChannelWidth) const +YansWifiPhy::GetGuardBandwidth(ChannelWidthMhz currentChannelWidth) const { NS_ABORT_MSG("Guard bandwidth not relevant for Yans"); return 0; diff --git a/src/wifi/test/spectrum-wifi-phy-test.cc b/src/wifi/test/spectrum-wifi-phy-test.cc index faf90d149..9ee57c3ef 100644 --- a/src/wifi/test/spectrum-wifi-phy-test.cc +++ b/src/wifi/test/spectrum-wifi-phy-test.cc @@ -50,9 +50,9 @@ using namespace ns3; NS_LOG_COMPONENT_DEFINE("SpectrumWifiPhyTest"); static const uint8_t CHANNEL_NUMBER = 36; -static const ChannelWidthMhz CHANNEL_WIDTH = 20; // MHz +static const ChannelWidthMhz CHANNEL_WIDTH = 20; static const ChannelWidthMhz GUARD_WIDTH = - CHANNEL_WIDTH; // MHz (expanded to channel width to model spectrum mask) + CHANNEL_WIDTH; // expanded to channel width to model spectrum mask /** * Extended SpectrumWifiPhy class for the purpose of the tests. @@ -505,8 +505,8 @@ class SpectrumWifiPhyFilterTest : public TestCase Ptr m_txPhy; ///< TX PHY Ptr m_rxPhy; ///< RX PHY - ChannelWidthMhz m_txChannelWidth; ///< TX channel width (MHz) - ChannelWidthMhz m_rxChannelWidth; ///< RX channel width (MHz) + ChannelWidthMhz m_txChannelWidth; ///< TX channel width + ChannelWidthMhz m_rxChannelWidth; ///< RX channel width }; SpectrumWifiPhyFilterTest::SpectrumWifiPhyFilterTest() @@ -1256,13 +1256,13 @@ class SpectrumWifiPhy80Plus80Test : public TestCase * Run one function * \param channelNumbers the channel number for each segment of the operating channel * \param interferenceCenterFrequency the center frequency (in MHz) of the interference signal - * to generate \param interferenceBandWidth the band width (in MHz) of the interference signal - * to generate \param expectSuccess flag to indicate whether reception is expected to be - * successful + * to generate + * \param interferenceBandWidth the band width of the interference signal to generate + * \param expectSuccess flag to indicate whether reception is expected to be successful */ void RunOne(const std::vector& channelNumbers, uint16_t interferenceCenterFrequency, - uint16_t interferenceBandWidth, + ChannelWidthMhz interferenceBandWidth, bool expectSuccess); /** @@ -1485,7 +1485,7 @@ SpectrumWifiPhy80Plus80Test::DoTeardown() void SpectrumWifiPhy80Plus80Test::RunOne(const std::vector& channelNumbers, uint16_t interferenceCenterFrequency, - uint16_t interferenceBandWidth, + ChannelWidthMhz interferenceBandWidth, bool expectSuccess) { // reset counters diff --git a/src/wifi/test/wifi-emlsr-test.cc b/src/wifi/test/wifi-emlsr-test.cc index f15cb3cc7..d0d2b8d01 100644 --- a/src/wifi/test/wifi-emlsr-test.cc +++ b/src/wifi/test/wifi-emlsr-test.cc @@ -3903,7 +3903,7 @@ WifiEmlsrTestSuite::WifiEmlsrTestSuite() { for (bool resetCamState : {true, false}) { - for (uint16_t auxPhyMaxChWidth : {20, 40, 80, 160}) + for (ChannelWidthMhz auxPhyMaxChWidth : {20, 40, 80, 160}) { AddTestCase( new EmlsrLinkSwitchTest({switchAuxPhy, resetCamState, auxPhyMaxChWidth}), diff --git a/src/wifi/test/wifi-emlsr-test.h b/src/wifi/test/wifi-emlsr-test.h index 23cda9ad1..79bf6701a 100644 --- a/src/wifi/test/wifi-emlsr-test.h +++ b/src/wifi/test/wifi-emlsr-test.h @@ -540,16 +540,16 @@ class EmlsrUlTxopTest : public EmlsrOperationsTestBase struct Params { std::set - linksToEnableEmlsrOn; //!< IDs of links on which EMLSR mode should be enabled - uint16_t channelWidth; //!< width (MHz) of the channels used by MLDs - uint16_t auxPhyChannelWidth; //!< max width (MHz) supported by aux PHYs - Time mediumSyncDuration; //!< duration of the MediumSyncDelay timer - uint8_t msdMaxNTxops; //!< Max number of TXOPs that an EMLSR client is allowed - //!< to attempt to initiate while the MediumSyncDelay - //!< timer is running (zero indicates no limit) - bool genBackoffIfTxopWithoutTx; //!< whether the backoff should be invoked when the AC - //!< gains the right to start a TXOP but it does not - //!< transmit any frame + linksToEnableEmlsrOn; //!< IDs of links on which EMLSR mode should be enabled + ChannelWidthMhz channelWidth; //!< width of the channels used by MLDs + ChannelWidthMhz auxPhyChannelWidth; //!< max width supported by aux PHYs + Time mediumSyncDuration; //!< duration of the MediumSyncDelay timer + uint8_t msdMaxNTxops; //!< Max number of TXOPs that an EMLSR client is allowed + //!< to attempt to initiate while the MediumSyncDelay + //!< timer is running (zero indicates no limit) + bool genBackoffIfTxopWithoutTx; //!< whether the backoff should be invoked when the AC + //!< gains the right to start a TXOP but it does not + //!< transmit any frame }; /** @@ -642,12 +642,12 @@ class EmlsrUlTxopTest : public EmlsrOperationsTestBase void BackoffGenerated(uint32_t backoff, uint8_t linkId); std::set m_emlsrLinks; /**< IDs of the links on which EMLSR mode has to be enabled */ - uint16_t m_channelWidth; //!< width (MHz) of the channels used by MLDs - uint16_t m_auxPhyChannelWidth; //!< max width (MHz) supported by aux PHYs - Time m_mediumSyncDuration; //!< duration of the MediumSyncDelay timer - uint8_t m_msdMaxNTxops; //!< Max number of TXOPs that an EMLSR client is allowed - //!< to attempt to initiate while the MediumSyncDelay - //!< timer is running (zero indicates no limit) + ChannelWidthMhz m_channelWidth; //!< width of the channels used by MLDs + ChannelWidthMhz m_auxPhyChannelWidth; //!< max width supported by aux PHYs + Time m_mediumSyncDuration; //!< duration of the MediumSyncDelay timer + uint8_t m_msdMaxNTxops; //!< Max number of TXOPs that an EMLSR client is allowed + //!< to attempt to initiate while the MediumSyncDelay + //!< timer is running (zero indicates no limit) std::optional m_nonEmlsrLink; //!< ID of the non-EMLSR link (if any) Time m_emlsrEnabledTime; //!< when EMLSR mode has been enabled on all EMLSR clients Time m_firstUlPktsGenTime; //!< generation time of the first two UL packets @@ -697,7 +697,7 @@ class EmlsrLinkSwitchTest : public EmlsrOperationsTestBase //!< the Main PHY was operating before moving to the link of the Aux PHY bool resetCamState; //!< whether to reset the state of the ChannelAccessManager associated //!< with the link on which the main PHY has just switched to - uint16_t auxPhyMaxChWidth; //!< max channel width (MHz) supported by aux PHYs + ChannelWidthMhz auxPhyMaxChWidth; //!< max channel width supported by aux PHYs }; /** @@ -752,9 +752,9 @@ class EmlsrLinkSwitchTest : public EmlsrOperationsTestBase the Main PHY was operating before moving to the link of Aux PHY */ bool m_resetCamState; /**< whether to reset the state of the ChannelAccessManager associated with the link on which the main PHY has just switched to */ - uint16_t m_auxPhyMaxChWidth; //!< max channel width (MHz) supported by aux PHYs - std::size_t m_countQoSframes; //!< counter for QoS data frames - std::size_t m_txPsdusPos; //!< a position in the vector of TX PSDUs + ChannelWidthMhz m_auxPhyMaxChWidth; //!< max channel width supported by aux PHYs + std::size_t m_countQoSframes; //!< counter for QoS data frames + std::size_t m_txPsdusPos; //!< a position in the vector of TX PSDUs }; /** diff --git a/src/wifi/test/wifi-phy-cca-test.cc b/src/wifi/test/wifi-phy-cca-test.cc index c5b033561..eb4193446 100644 --- a/src/wifi/test/wifi-phy-cca-test.cc +++ b/src/wifi/test/wifi-phy-cca-test.cc @@ -750,7 +750,7 @@ class WifiPhyCcaIndicationTest : public TestCase Time startTime{Seconds(0)}; //!< time at which transmission will be started Time duration{Seconds(0)}; //!< the duration of the transmission uint16_t centerFreq{0}; //!< center frequency to use in MHz - ChannelWidthMhz bandwidth{0}; //!< bandwidth to use in MHz + ChannelWidthMhz bandwidth{0}; //!< bandwidth to use }; /** @@ -761,7 +761,7 @@ class WifiPhyCcaIndicationTest : public TestCase double power{0.0}; //!< transmit power to use in dBm Time startTime{Seconds(0)}; //!< time at which transmission will be started uint16_t centerFreq{0}; //!< center frequency to use in MHz - ChannelWidthMhz bandwidth{0}; //!< bandwidth to use in MHz + ChannelWidthMhz bandwidth{0}; //!< bandwidth to use }; /** @@ -820,7 +820,7 @@ class WifiPhyCcaIndicationTest : public TestCase m_rxPhyStateListener; ///< Listener for PHY state transitions uint16_t m_frequency; ///< Operating frequency in MHz - ChannelWidthMhz m_channelWidth; ///< Operating channel width in MHz + ChannelWidthMhz m_channelWidth; ///< Operating channel width }; WifiPhyCcaIndicationTest::WifiPhyCcaIndicationTest() diff --git a/src/wifi/test/wifi-phy-mu-mimo-test.cc b/src/wifi/test/wifi-phy-mu-mimo-test.cc index 2a1d92508..bf5684f29 100644 --- a/src/wifi/test/wifi-phy-mu-mimo-test.cc +++ b/src/wifi/test/wifi-phy-mu-mimo-test.cc @@ -49,8 +49,8 @@ using namespace ns3; NS_LOG_COMPONENT_DEFINE("WifiPhyMuMimoTest"); -constexpr uint32_t DEFAULT_FREQUENCY = 5180; // MHz -constexpr uint16_t DEFAULT_CHANNEL_WIDTH = 20; // MHz +constexpr uint32_t DEFAULT_FREQUENCY = 5180; // MHz +constexpr ChannelWidthMhz DEFAULT_CHANNEL_WIDTH = 20; /** * \ingroup wifi-test @@ -69,12 +69,12 @@ class TestDlMuTxVector : public TestCase /** * Build a TXVECTOR for DL MU with the given bandwidth and user information. * - * \param bw the channel width of the PPDU in MHz + * \param bw the channel width of the PPDU * \param userInfos the list of HE MU specific user transmission parameters * * \return the configured MU TXVECTOR */ - static WifiTxVector BuildTxVector(uint16_t bw, const std::list& userInfos); + static WifiTxVector BuildTxVector(ChannelWidthMhz bw, const std::list& userInfos); }; TestDlMuTxVector::TestDlMuTxVector() @@ -83,7 +83,7 @@ TestDlMuTxVector::TestDlMuTxVector() } WifiTxVector -TestDlMuTxVector::BuildTxVector(uint16_t bw, const std::list& userInfos) +TestDlMuTxVector::BuildTxVector(ChannelWidthMhz bw, const std::list& userInfos) { WifiTxVector txVector; txVector.SetPreambleType(WIFI_PREAMBLE_HE_MU); @@ -494,10 +494,10 @@ class TestDlMuMimoPhyTransmission : public TestCase Ptr m_phySta2; ///< PHY of STA 2 Ptr m_phySta3; ///< PHY of STA 3 - uint8_t m_nss; ///< number of spatial streams per STA - uint16_t m_frequency; ///< frequency in MHz - uint16_t m_channelWidth; ///< channel width in MHz - Time m_expectedPpduDuration; ///< expected duration to send MU PPDU + uint8_t m_nss; ///< number of spatial streams per STA + uint16_t m_frequency; ///< frequency in MHz + ChannelWidthMhz m_channelWidth; ///< channel width + Time m_expectedPpduDuration; ///< expected duration to send MU PPDU }; TestDlMuMimoPhyTransmission::TestDlMuMimoPhyTransmission() @@ -1265,10 +1265,10 @@ class TestUlMuMimoPhyTransmission : public TestCase std::vector m_countRxFailureFromStas; ///< count RX failure from STAs std::vector m_countRxBytesFromStas; ///< count RX bytes from STAs - Time m_delayStart; ///< delay between the start of each HE TB PPDUs - uint16_t m_frequency; ///< frequency in MHz - uint16_t m_channelWidth; ///< channel width in MHz - Time m_expectedPpduDuration; ///< expected duration to send MU PPDU + Time m_delayStart; ///< delay between the start of each HE TB PPDUs + uint16_t m_frequency; ///< frequency in MHz + ChannelWidthMhz m_channelWidth; ///< channel width + Time m_expectedPpduDuration; ///< expected duration to send MU PPDU }; TestUlMuMimoPhyTransmission::TestUlMuMimoPhyTransmission() diff --git a/src/wifi/test/wifi-phy-ofdma-test.cc b/src/wifi/test/wifi-phy-ofdma-test.cc index 8042fbcbc..a8cf2a7e2 100644 --- a/src/wifi/test/wifi-phy-ofdma-test.cc +++ b/src/wifi/test/wifi-phy-ofdma-test.cc @@ -63,9 +63,9 @@ NS_LOG_COMPONENT_DEFINE("WifiPhyOfdmaTest"); static const uint8_t DEFAULT_CHANNEL_NUMBER = 36; static const uint32_t DEFAULT_FREQUENCY = 5180; // MHz static const WifiPhyBand DEFAULT_WIFI_BAND = WIFI_PHY_BAND_5GHZ; -static const ChannelWidthMhz DEFAULT_CHANNEL_WIDTH = 20; // MHz +static const ChannelWidthMhz DEFAULT_CHANNEL_WIDTH = 20; static const ChannelWidthMhz DEFAULT_GUARD_WIDTH = - DEFAULT_CHANNEL_WIDTH; // MHz (expanded to channel width to model spectrum mask) + DEFAULT_CHANNEL_WIDTH; // expanded to channel width to model spectrum mask /** * HE PHY slightly modified so as to return a given diff --git a/src/wifi/test/wifi-phy-reception-test.cc b/src/wifi/test/wifi-phy-reception-test.cc index 2f427dfdc..51ba632b4 100644 --- a/src/wifi/test/wifi-phy-reception-test.cc +++ b/src/wifi/test/wifi-phy-reception-test.cc @@ -59,10 +59,10 @@ using namespace ns3; NS_LOG_COMPONENT_DEFINE("WifiPhyReceptionTest"); static const uint8_t CHANNEL_NUMBER = 36; -static const uint32_t FREQUENCY = 5180; // MHz -static const ChannelWidthMhz CHANNEL_WIDTH = 20; // MHz +static const uint32_t FREQUENCY = 5180; // MHz +static const ChannelWidthMhz CHANNEL_WIDTH = 20; static const ChannelWidthMhz GUARD_WIDTH = - CHANNEL_WIDTH; // MHz (expanded to channel width to model spectrum mask) + CHANNEL_WIDTH; // expanded to channel width to model spectrum mask /** * \ingroup wifi-test diff --git a/src/wifi/test/wifi-phy-thresholds-test.cc b/src/wifi/test/wifi-phy-thresholds-test.cc index 481bd1e5f..833d26625 100644 --- a/src/wifi/test/wifi-phy-thresholds-test.cc +++ b/src/wifi/test/wifi-phy-thresholds-test.cc @@ -40,8 +40,8 @@ using namespace ns3; NS_LOG_COMPONENT_DEFINE("WifiPhyThresholdsTest"); static const uint8_t CHANNEL_NUMBER = 36; -static const uint32_t FREQUENCY = 5180; // MHz -static const uint16_t CHANNEL_WIDTH = 20; // MHz +static const uint32_t FREQUENCY = 5180; // MHz +static const ChannelWidthMhz CHANNEL_WIDTH = 20; /** * \ingroup wifi-test