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

spectrum: Cleanup unused functions

Browse Source
This commit is contained in:
Sébastien Deronne
2023-02-25 12:06:23 +01:00
committed by Sébastien Deronne
parent 2ea8b33534
commit e00523cf59
2 changed files with 0 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/spectrum/model/wifi-spectrum-value-helper.cc
View File

@@ -579,31 +579,6 @@ WifiSpectrumValueHelper::CreateNoisePowerSpectralDensity(double noiseFigureDb,
return noisePsd;
}
Ptr<SpectrumValue>
WifiSpectrumValueHelper::CreateRfFilter(uint32_t centerFrequency,
uint16_t totalChannelWidth,
uint32_t bandBandwidth,
uint16_t guardBandwidth,
WifiSpectrumBand band)
{
uint32_t startIndex = band.first;
uint32_t stopIndex = band.second;
NS_LOG_FUNCTION(centerFrequency << totalChannelWidth << bandBandwidth << guardBandwidth
<< startIndex << stopIndex);
Ptr<SpectrumValue> c = Create<SpectrumValue>(
GetSpectrumModel(centerFrequency, totalChannelWidth, bandBandwidth, guardBandwidth));
Bands::const_iterator bit = c->ConstBandsBegin();
Values::iterator vit = c->ValuesBegin();
vit += startIndex;
bit += startIndex;
for (size_t i = startIndex; i <= stopIndex; i++, vit++, bit++)
{
*vit = 1;
}
NS_LOG_LOGIC("Added subbands " << startIndex << " to " << stopIndex << " to filter");
return c;
}
void
WifiSpectrumValueHelper::CreateSpectrumMaskForOfdm(
Ptr<SpectrumValue> c,
@@ -916,22 +891,6 @@ WifiSpectrumValue5MhzFactory::CreateTxPowerSpectralDensity(double txPower, uint8
return txPsd;
}
Ptr<SpectrumValue>
WifiSpectrumValue5MhzFactory::CreateRfFilter(uint8_t channel)
{
Ptr<SpectrumValue> rf = Create<SpectrumValue>(g_WifiSpectrumModel5Mhz);
NS_ASSERT(channel >= 1);
NS_ASSERT(channel <= 13);
(*rf)[channel + 3] = 1;
(*rf)[channel + 4] = 1;
(*rf)[channel + 5] = 1;
(*rf)[channel + 6] = 1;
return rf;
}
bool
operator<(const FrequencyRange& left, const FrequencyRange& right)
{

28
src/spectrum/model/wifi-spectrum-value-helper.h
View File

@@ -232,24 +232,6 @@ class WifiSpectrumValueHelper
static Ptr<SpectrumValue> CreateNoisePowerSpectralDensity(double noiseFigure,
Ptr<SpectrumModel> spectrumModel);
/**
* Create a spectral density corresponding to the RF filter
*
* \param centerFrequency the center frequency (MHz)
* \param totalChannelWidth the total channel width (MHz)
* \param bandBandwidth the width of each band (MHz)
* \param guardBandwidth the width of the guard band (MHz)
* \param band the pair of start and stop indexes that defines the band to be filtered
*
* \return a pointer to a SpectrumValue representing the RF filter applied
* to an received power spectral density
*/
static Ptr<SpectrumValue> CreateRfFilter(uint32_t centerFrequency,
uint16_t totalChannelWidth,
uint32_t bandBandwidth,
uint16_t guardBandwidth,
WifiSpectrumBand band);
/**
* Create a transmit power spectral density corresponding to OFDM
* transmit spectrum mask requirements for 11a/11g/11n/11ac/11ax
@@ -383,16 +365,6 @@ class WifiSpectrumValue5MhzFactory
* @return a Ptr to a newly created SpectrumValue
*/
virtual Ptr<SpectrumValue> CreateTxPowerSpectralDensity(double txPower, uint8_t channel);
/**
* Creates a SpectrumValue instance which
* represents the frequency response of the RF filter which is used
* by a wifi device to receive signals when tuned to a particular channel
*
* @param channel the number of the channel (1 <= channel <= 13)
*
* @return a Ptr to a newly created SpectrumValue
*/
virtual Ptr<SpectrumValue> CreateRfFilter(uint8_t channel);
};
/**