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

wifi: Make WifiPhy::Get{Ht,Vht,He}Mcs () static

Browse Source
This commit is contained in:
Stefano Avallone
2019-08-05 16:37:35 +02:00
committed by Sébastien Deronne
parent d32d864e09
commit 559241241c
3 changed files with 195 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4273,21 +4273,204 @@ WifiPhy::GetMcs (WifiModulationClass modulation, uint8_t mcs) const
}
WifiMode
WifiPhy::GetHtMcs (uint8_t mcs) const
WifiPhy::GetHtMcs (uint8_t mcs)
{
return GetMcs (WIFI_MOD_CLASS_HT, mcs);
WifiMode mode;
switch (mcs)
{
case 0:
mode = WifiPhy::GetHtMcs0 ();
break;
case 1:
mode = WifiPhy::GetHtMcs1 ();
break;
case 2:
mode = WifiPhy::GetHtMcs2 ();
break;
case 3:
mode = WifiPhy::GetHtMcs3 ();
break;
case 4:
mode = WifiPhy::GetHtMcs4 ();
break;
case 5:
mode = WifiPhy::GetHtMcs5 ();
break;
case 6:
mode = WifiPhy::GetHtMcs6 ();
break;
case 7:
mode = WifiPhy::GetHtMcs7 ();
break;
case 8:
mode = WifiPhy::GetHtMcs8 ();
break;
case 9:
mode = WifiPhy::GetHtMcs9 ();
break;
case 10:
mode = WifiPhy::GetHtMcs10 ();
break;
case 11:
mode = WifiPhy::GetHtMcs11 ();
break;
case 12:
mode = WifiPhy::GetHtMcs12 ();
break;
case 13:
mode = WifiPhy::GetHtMcs13 ();
break;
case 14:
mode = WifiPhy::GetHtMcs14 ();
break;
case 15:
mode = WifiPhy::GetHtMcs15 ();
break;
case 16:
mode = WifiPhy::GetHtMcs16 ();
break;
case 17:
mode = WifiPhy::GetHtMcs17 ();
break;
case 18:
mode = WifiPhy::GetHtMcs18 ();
break;
case 19:
mode = WifiPhy::GetHtMcs19 ();
break;
case 20:
mode = WifiPhy::GetHtMcs20 ();
break;
case 21:
mode = WifiPhy::GetHtMcs21 ();
break;
case 22:
mode = WifiPhy::GetHtMcs22 ();
break;
case 23:
mode = WifiPhy::GetHtMcs23 ();
break;
case 24:
mode = WifiPhy::GetHtMcs24 ();
break;
case 25:
mode = WifiPhy::GetHtMcs25 ();
break;
case 26:
mode = WifiPhy::GetHtMcs26 ();
break;
case 27:
mode = WifiPhy::GetHtMcs27 ();
break;
case 28:
mode = WifiPhy::GetHtMcs28 ();
break;
case 29:
mode = WifiPhy::GetHtMcs29 ();
break;
case 30:
mode = WifiPhy::GetHtMcs30 ();
break;
case 31:
mode = WifiPhy::GetHtMcs31 ();
break;
default:
NS_ABORT_MSG ("Invalid HT MCS");
break;
}
return mode;
}
WifiMode
WifiPhy::GetVhtMcs (uint8_t mcs) const
WifiPhy::GetVhtMcs (uint8_t mcs)
{
return GetMcs (WIFI_MOD_CLASS_VHT, mcs);
WifiMode mode;
switch (mcs)
{
case 0:
mode = WifiPhy::GetVhtMcs0 ();
break;
case 1:
mode = WifiPhy::GetVhtMcs1 ();
break;
case 2:
mode = WifiPhy::GetVhtMcs2 ();
break;
case 3:
mode = WifiPhy::GetVhtMcs3 ();
break;
case 4:
mode = WifiPhy::GetVhtMcs4 ();
break;
case 5:
mode = WifiPhy::GetVhtMcs5 ();
break;
case 6:
mode = WifiPhy::GetVhtMcs6 ();
break;
case 7:
mode = WifiPhy::GetVhtMcs7 ();
break;
case 8:
mode = WifiPhy::GetVhtMcs8 ();
break;
case 9:
mode = WifiPhy::GetVhtMcs9 ();
break;
default:
NS_ABORT_MSG ("Invalid VHT MCS");
break;
}
return mode;
}
WifiMode
WifiPhy::GetHeMcs (uint8_t mcs) const
WifiPhy::GetHeMcs (uint8_t mcs)
{
return GetMcs (WIFI_MOD_CLASS_HE, mcs);
WifiMode mode;
switch (mcs)
{
case 0:
mode = WifiPhy::GetHeMcs0 ();
break;
case 1:
mode = WifiPhy::GetHeMcs1 ();
break;
case 2:
mode = WifiPhy::GetHeMcs2 ();
break;
case 3:
mode = WifiPhy::GetHeMcs3 ();
break;
case 4:
mode = WifiPhy::GetHeMcs4 ();
break;
case 5:
mode = WifiPhy::GetHeMcs5 ();
break;
case 6:
mode = WifiPhy::GetHeMcs6 ();
break;
case 7:
mode = WifiPhy::GetHeMcs7 ();
break;
case 8:
mode = WifiPhy::GetHeMcs8 ();
break;
case 9:
mode = WifiPhy::GetHeMcs9 ();
break;
case 10:
mode = WifiPhy::GetHeMcs10 ();
break;
case 11:
mode = WifiPhy::GetHeMcs11 ();
break;
default:
NS_ABORT_MSG ("Invalid HE MCS");
break;
}
return mode;
}
bool

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

@@ -620,7 +620,7 @@ public:
* \return the WifiMode object corresponding to the given MCS of the
* HT modulation class
*/
WifiMode GetHtMcs (uint8_t mcs) const;
static WifiMode GetHtMcs (uint8_t mcs);
/**
* Get the WifiMode object corresponding to the given MCS of the
* VHT modulation class.
@@ -630,7 +630,7 @@ public:
* \return the WifiMode object corresponding to the given MCS of the
* VHT modulation class
*/
WifiMode GetVhtMcs (uint8_t mcs) const;
static WifiMode GetVhtMcs (uint8_t mcs);
/**
* Get the WifiMode object corresponding to the given MCS of the
* HE modulation class.
@@ -640,7 +640,7 @@ public:
* \return the WifiMode object corresponding to the given MCS of the
* HE modulation class
*/
WifiMode GetHeMcs (uint8_t mcs) const;
static WifiMode GetHeMcs (uint8_t mcs);
/**
* \brief Set channel number.

189
src/wifi/model/wifi-ppdu.cc
View File

@@ -290,110 +290,7 @@ WifiPpdu::GetTxVector (void) const
}
case WIFI_MOD_CLASS_HT:
{
WifiMode mode;
switch (m_htSig.GetMcs ())
{
case 0:
mode = WifiPhy::GetHtMcs0 ();
break;
case 1:
mode = WifiPhy::GetHtMcs1 ();
break;
case 2:
mode = WifiPhy::GetHtMcs2 ();
break;
case 3:
mode = WifiPhy::GetHtMcs3 ();
break;
case 4:
mode = WifiPhy::GetHtMcs4 ();
break;
case 5:
mode = WifiPhy::GetHtMcs5 ();
break;
case 6:
mode = WifiPhy::GetHtMcs6 ();
break;
case 7:
mode = WifiPhy::GetHtMcs7 ();
break;
case 8:
mode = WifiPhy::GetHtMcs8 ();
break;
case 9:
mode = WifiPhy::GetHtMcs9 ();
break;
case 10:
mode = WifiPhy::GetHtMcs10 ();
break;
case 11:
mode = WifiPhy::GetHtMcs11 ();
break;
case 12:
mode = WifiPhy::GetHtMcs12 ();
break;
case 13:
mode = WifiPhy::GetHtMcs13 ();
break;
case 14:
mode = WifiPhy::GetHtMcs14 ();
break;
case 15:
mode = WifiPhy::GetHtMcs15 ();
break;
case 16:
mode = WifiPhy::GetHtMcs16 ();
break;
case 17:
mode = WifiPhy::GetHtMcs17 ();
break;
case 18:
mode = WifiPhy::GetHtMcs18 ();
break;
case 19:
mode = WifiPhy::GetHtMcs19 ();
break;
case 20:
mode = WifiPhy::GetHtMcs20 ();
break;
case 21:
mode = WifiPhy::GetHtMcs21 ();
break;
case 22:
mode = WifiPhy::GetHtMcs22 ();
break;
case 23:
mode = WifiPhy::GetHtMcs23 ();
break;
case 24:
mode = WifiPhy::GetHtMcs24 ();
break;
case 25:
mode = WifiPhy::GetHtMcs25 ();
break;
case 26:
mode = WifiPhy::GetHtMcs26 ();
break;
case 27:
mode = WifiPhy::GetHtMcs27 ();
break;
case 28:
mode = WifiPhy::GetHtMcs28 ();
break;
case 29:
mode = WifiPhy::GetHtMcs29 ();
break;
case 30:
mode = WifiPhy::GetHtMcs30 ();
break;
case 31:
mode = WifiPhy::GetHtMcs31 ();
break;
default:
NS_ASSERT_MSG (false, "Invalid MCS encoded in HT-SIG header");
break;
}
txVector.SetMode (mode);
txVector.SetMode (WifiPhy::GetHtMcs (m_htSig.GetMcs ()));
txVector.SetChannelWidth (m_htSig.GetChannelWidth ());
txVector.SetNss (1 + (m_htSig.GetMcs () / 8));
txVector.SetGuardInterval(m_htSig.GetShortGuardInterval () ? 400 : 800);
@@ -402,44 +299,7 @@ WifiPpdu::GetTxVector (void) const
}
case WIFI_MOD_CLASS_VHT:
{
WifiMode mode;
switch (m_vhtSig.GetSuMcs ())
{
case 0:
mode = WifiPhy::GetVhtMcs0 ();
break;
case 1:
mode = WifiPhy::GetVhtMcs1 ();
break;
case 2:
mode = WifiPhy::GetVhtMcs2 ();
break;
case 3:
mode = WifiPhy::GetVhtMcs3 ();
break;
case 4:
mode = WifiPhy::GetVhtMcs4 ();
break;
case 5:
mode = WifiPhy::GetVhtMcs5 ();
break;
case 6:
mode = WifiPhy::GetVhtMcs6 ();
break;
case 7:
mode = WifiPhy::GetVhtMcs7 ();
break;
case 8:
mode = WifiPhy::GetVhtMcs8 ();
break;
case 9:
mode = WifiPhy::GetVhtMcs9 ();
break;
default:
NS_ASSERT_MSG (false, "Invalid MCS encoded in VHT-SIG header");
break;
}
txVector.SetMode (mode);
txVector.SetMode (WifiPhy::GetVhtMcs (m_vhtSig.GetSuMcs ()));
txVector.SetChannelWidth (m_vhtSig.GetChannelWidth ());
txVector.SetNss (m_vhtSig.GetNStreams ());
txVector.SetGuardInterval (m_vhtSig.GetShortGuardInterval () ? 400 : 800);
@@ -448,50 +308,7 @@ WifiPpdu::GetTxVector (void) const
}
case WIFI_MOD_CLASS_HE:
{
WifiMode mode;
switch (m_heSig.GetMcs ())
{
case 0:
mode = WifiPhy::GetHeMcs0 ();
break;
case 1:
mode = WifiPhy::GetHeMcs1 ();
break;
case 2:
mode = WifiPhy::GetHeMcs2 ();
break;
case 3:
mode = WifiPhy::GetHeMcs3 ();
break;
case 4:
mode = WifiPhy::GetHeMcs4 ();
break;
case 5:
mode = WifiPhy::GetHeMcs5 ();
break;
case 6:
mode = WifiPhy::GetHeMcs6 ();
break;
case 7:
mode = WifiPhy::GetHeMcs7 ();
break;
case 8:
mode = WifiPhy::GetHeMcs8 ();
break;
case 9:
mode = WifiPhy::GetHeMcs9 ();
break;
case 10:
mode = WifiPhy::GetHeMcs10 ();
break;
case 11:
mode = WifiPhy::GetHeMcs11 ();
break;
default:
NS_ASSERT_MSG (false, "Invalid MCS encoded in HE-SIG header");
break;
}
txVector.SetMode (mode);
txVector.SetMode (WifiPhy::GetHeMcs (m_heSig.GetMcs ()));
txVector.SetChannelWidth (m_heSig.GetChannelWidth ());
txVector.SetNss (m_heSig.GetNStreams ());
txVector.SetGuardInterval (m_heSig.GetGuardInterval ());