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

remove unused payloadMode argument in WifiPhy::GetPlcpHtSigHeaderDuration

Browse Source
This commit is contained in:
Ghada Badawy
2015-04-17 19:58:53 +02:00
parent c28ea66957
commit f0395aeec0
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/wifi/model/interference-helper.cc
View File

@@ -283,7 +283,7 @@ InterferenceHelper::CalculatePer (Ptr<const InterferenceHelper::Event> event, Ni
WifiMode headerMode = WifiPhy::GetPlcpHeaderMode (payloadMode, preamble);
Time plcpHeaderStart = (*j).GetTime () + WifiPhy::GetPlcpPreambleDuration (payloadMode, preamble); //packet start time+ preamble
Time plcpHsigHeaderStart = plcpHeaderStart + WifiPhy::GetPlcpHeaderDuration (payloadMode, preamble);//packet start time+ preamble+L SIG
Time plcpHtTrainingSymbolsStart = plcpHsigHeaderStart + WifiPhy::GetPlcpHtSigHeaderDuration (payloadMode, preamble);//packet start time+ preamble+L SIG+HT SIG
Time plcpHtTrainingSymbolsStart = plcpHsigHeaderStart + WifiPhy::GetPlcpHtSigHeaderDuration (preamble);//packet start time+ preamble+L SIG+HT SIG
Time plcpPayloadStart =plcpHtTrainingSymbolsStart + WifiPhy::GetPlcpHtTrainingSymbolDuration (preamble,event->GetTxVector()); //packet start time+ preamble+L SIG+HT SIG+Training
double noiseInterferenceW = (*j).GetDelta ();
double powerW = event->GetRxPowerW ();

4
src/wifi/model/wifi-phy.cc
View File

@@ -170,7 +170,7 @@ WifiPhy::GetPlcpHtTrainingSymbolDuration (WifiPreamble preamble, WifiTxVector tx
//return L-SIG
Time
WifiPhy::GetPlcpHtSigHeaderDuration (WifiMode payloadMode, WifiPreamble preamble)
WifiPhy::GetPlcpHtSigHeaderDuration (WifiPreamble preamble)
{
switch (preamble)
{
@@ -579,7 +579,7 @@ WifiPhy::CalculateTxDuration (uint32_t size, WifiTxVector txvector, WifiPreamble
WifiMode payloadMode=txvector.GetMode();
Time duration = GetPlcpPreambleDuration (payloadMode, preamble)
+ GetPlcpHeaderDuration (payloadMode, preamble)
+ GetPlcpHtSigHeaderDuration (payloadMode, preamble)
+ GetPlcpHtSigHeaderDuration (preamble)
+ GetPlcpHtTrainingSymbolDuration (preamble, txvector)
+ GetPayloadDuration (size, txvector, preamble, frequency, packetType, incFlag);
return duration;

3
src/wifi/model/wifi-phy.h
View File

@@ -311,12 +311,11 @@ public:
*/
static WifiMode GetMFPlcpHeaderMode (WifiMode payloadMode, WifiPreamble preamble);
/**
* \param payloadMode the WifiMode use for the transmission of the payload
* \param preamble the type of preamble
*
* \return the duration of the HT-SIG in Mixed Format and greenfield format PLCP header
*/
static Time GetPlcpHtSigHeaderDuration (WifiMode payloadMode, WifiPreamble preamble);
static Time GetPlcpHtSigHeaderDuration (WifiPreamble preamble);
/**