F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wifi: Extend WifiPhyOperatingChannel to retrieve the center frequency, the channel number and the width in MHz of a given segment

Browse Source
This commit is contained in:
Sébastien Deronne
2023-06-14 20:46:05 +02:00
parent 5f8abd65b2
commit 2873f8877f
2 changed files with 31 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/wifi/model/wifi-phy-operating-channel.cc
View File

@@ -409,23 +409,27 @@ WifiPhyOperatingChannel::FindFirst(uint8_t number,
}
uint8_t
WifiPhyOperatingChannel::GetNumber() const
WifiPhyOperatingChannel::GetNumber(std::size_t segment /* = 0 */) const
{
NS_ASSERT(IsSet());
return m_channelIts.front()->number;
NS_ASSERT_MSG(segment == 0, "non-contiguous operating channel is not supported yet");
return m_channelIts.at(segment)->number;
}
uint16_t
WifiPhyOperatingChannel::GetFrequency() const
WifiPhyOperatingChannel::GetFrequency(std::size_t segment /* = 0 */) const
{
NS_ASSERT(IsSet());
return m_channelIts.front()->frequency;
NS_ASSERT_MSG(segment == 0, "non-contiguous operating channel is not supported yet");
return m_channelIts.at(segment)->frequency;
}
ChannelWidthMhz
WifiPhyOperatingChannel::GetWidth() const
WifiPhyOperatingChannel::GetWidth(std::size_t segment /* = 0 */) const
{
NS_ASSERT(IsSet());
NS_ASSERT_MSG(segment == 0, "non-contiguous operating channel is not supported yet");
// Current specs only allow all segments to be the same width
return m_channelIts.front()->width;
}
@@ -433,6 +437,7 @@ WifiPhyBand
WifiPhyOperatingChannel::GetPhyBand() const
{
NS_ASSERT(IsSet());
// Current specs only allow all segments to be the same band
return m_channelIts.front()->band;
}

30
src/wifi/model/wifi-phy-operating-channel.h
View File

@@ -170,23 +170,35 @@ class WifiPhyOperatingChannel
WifiPhyBand band);
/**
* Return the channel number identifying the whole operating channel.
* Return the channel number for a given frequency segment.
* Segments are ordered by increasing frequencies, hence by default
* it returns the channel number of the segment occuping the lowest
* frequencies when a non-contiguous operating channel is used.
*
* \return the channel number identifying the whole operating channel
* \param segment the index of the frequency segment (if operating channel is non-contiguous)
* \return the channel number for a given frequency segment
*/
uint8_t GetNumber() const;
uint8_t GetNumber(std::size_t segment = 0) const;
/**
* Return the center frequency of the operating channel (in MHz).
* Return the center frequency for a given frequency segment (in MHz).
* Segments are ordered by increasing frequencies, hence by default
* it returns the center frequency of the segment occuping the lowest
* frequencies when a non-contiguous operating channel is used.
*
* \return the center frequency of the operating channel (in MHz)
* \param segment the index of the frequency segment (if operating channel is non-contiguous)
* \return the center frequency for a given frequency segment (in MHz)
*/
uint16_t GetFrequency() const;
uint16_t GetFrequency(std::size_t segment = 0) const;
/**
* Return the width of the whole operating channel (in MHz).
* Return the channel width for a given frequency segment (in MHz).
* Segments are ordered by increasing frequencies, hence by default
* it returns the channel width of the segment occuping the lowest
* frequencies when a non-contiguous operating channel is used.
*
* \return the width of the whole operating channel (in MHz)
* \param segment the index of the frequency segment (if operating channel is non-contiguous)
* \return the channel width for a given frequency segment (in MHz)
*/
ChannelWidthMhz GetWidth() const;
ChannelWidthMhz GetWidth(std::size_t segment = 0) const;
/**
* Return the width type of the operating channel.
*