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

wifi: Cleanup unit from parameters names

Browse Source
This commit is contained in:
Sébastien Deronne
2024-09-09 20:16:06 +02:00
parent 76d419a4f5
commit 496657e0e4
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/wifi/model/he/he-phy.cc
View File

@@ -1473,14 +1473,14 @@ HePhy::StartTx(Ptr<const WifiPpdu> ppdu)
} }
if (ppdu->GetType() == WIFI_PPDU_TYPE_UL_MU || ppdu->GetType() == WIFI_PPDU_TYPE_DL_MU) if (ppdu->GetType() == WIFI_PPDU_TYPE_UL_MU || ppdu->GetType() == WIFI_PPDU_TYPE_DL_MU)
{ {
auto nonHeTxPowerDbm = m_wifiPhy->GetTxPowerForTransmission(ppdu) + m_wifiPhy->GetTxGain(); dBm_u nonHeTxPower = m_wifiPhy->GetTxPowerForTransmission(ppdu) + m_wifiPhy->GetTxGain();
// temporarily set WifiPpdu flag to PSD_HE_PORTION for correct calculation of TX power for // temporarily set WifiPpdu flag to PSD_HE_PORTION for correct calculation of TX power for
// the HE portion // the HE portion
auto hePpdu = DynamicCast<const HePpdu>(ppdu); auto hePpdu = DynamicCast<const HePpdu>(ppdu);
NS_ASSERT(hePpdu); NS_ASSERT(hePpdu);
hePpdu->SetTxPsdFlag(HePpdu::PSD_HE_PORTION); hePpdu->SetTxPsdFlag(HePpdu::PSD_HE_PORTION);
auto heTxPowerDbm = m_wifiPhy->GetTxPowerForTransmission(ppdu) + m_wifiPhy->GetTxGain(); dBm_u heTxPower = m_wifiPhy->GetTxPowerForTransmission(ppdu) + m_wifiPhy->GetTxGain();
hePpdu->SetTxPsdFlag(HePpdu::PSD_NON_HE_PORTION); hePpdu->SetTxPsdFlag(HePpdu::PSD_NON_HE_PORTION);
// non-HE portion // non-HE portion
@@ -1488,22 +1488,22 @@ HePhy::StartTx(Ptr<const WifiPpdu> ppdu)
? CalculateNonHeDurationForHeTb(txVector) ? CalculateNonHeDurationForHeTb(txVector)
: CalculateNonHeDurationForHeMu(txVector); : CalculateNonHeDurationForHeMu(txVector);
auto nonHeTxPowerSpectrum = auto nonHeTxPowerSpectrum =
GetTxPowerSpectralDensity(DbmToW(nonHeTxPowerDbm), ppdu, HePpdu::PSD_NON_HE_PORTION); GetTxPowerSpectralDensity(DbmToW(nonHeTxPower), ppdu, HePpdu::PSD_NON_HE_PORTION);
Transmit(nonHePortionDuration, Transmit(nonHePortionDuration,
ppdu, ppdu,
nonHeTxPowerDbm, nonHeTxPower,
nonHeTxPowerSpectrum, nonHeTxPowerSpectrum,
"non-HE portion transmission"); "non-HE portion transmission");
// HE portion // HE portion
auto hePortionDuration = ppdu->GetTxDuration() - nonHePortionDuration; auto hePortionDuration = ppdu->GetTxDuration() - nonHePortionDuration;
auto heTxPowerSpectrum = auto heTxPowerSpectrum =
GetTxPowerSpectralDensity(DbmToW(heTxPowerDbm), ppdu, HePpdu::PSD_HE_PORTION); GetTxPowerSpectralDensity(DbmToW(heTxPower), ppdu, HePpdu::PSD_HE_PORTION);
Simulator::Schedule(nonHePortionDuration, Simulator::Schedule(nonHePortionDuration,
&HePhy::StartTxHePortion, &HePhy::StartTxHePortion,
this, this,
ppdu, ppdu,
heTxPowerDbm, heTxPower,
heTxPowerSpectrum, heTxPowerSpectrum,
hePortionDuration); hePortionDuration);
} }