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

wifi: Change returned type for GetCenterFrequencyForChannelWidth

Browse Source
This commit is contained in:
Sébastien Deronne
2018-05-08 08:32:27 +02:00
parent c20bded751
commit bf4f425ba9
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/wifi/model/spectrum-wifi-phy.cc
View File

@@ -314,17 +314,17 @@ SpectrumWifiPhy::GetTxPowerSpectralDensity (uint16_t centerFrequency, uint16_t c
return v;
}
uint32_t
uint16_t
SpectrumWifiPhy::GetCenterFrequencyForChannelWidth (WifiTxVector txVector) const
{
NS_LOG_FUNCTION (this << txVector);
uint32_t centerFrequencyForSupportedWidth = GetFrequency ();
uint16_t centerFrequencyForSupportedWidth = GetFrequency ();
uint16_t supportedWidth = GetChannelWidth ();
uint16_t currentWidth = txVector.GetChannelWidth ();
if (currentWidth != supportedWidth)
{
uint32_t startingFrequency = centerFrequencyForSupportedWidth - static_cast<uint32_t> (supportedWidth / 2);
return startingFrequency + static_cast<uint32_t> (currentWidth / 2); // primary channel is in the lower part (for the time being)
uint16_t startingFrequency = centerFrequencyForSupportedWidth - (supportedWidth / 2);
return startingFrequency + (currentWidth / 2); // primary channel is in the lower part (for the time being)
}
return centerFrequencyForSupportedWidth;
}

2
src/wifi/model/spectrum-wifi-phy.h
View File

@@ -109,7 +109,7 @@ public:
* \param txVector the TXVECTOR that has the channel width that is to be used
* \return the center frequency corresponding to the channel width to be used
*/
uint32_t GetCenterFrequencyForChannelWidth (WifiTxVector txVector) const;
uint16_t GetCenterFrequencyForChannelWidth (WifiTxVector txVector) const;
/**
* Method to encapsulate the creation of the WifiSpectrumPhyInterface