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

wifi: Add HE SIG-B Content Channel Allocation

Browse Source
This commit is contained in:
Sharan Naribole
2022-06-29 08:16:33 +02:00
committed by Sébastien Deronne
parent 05695ee45c
commit 57f74f5d8d
2 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/wifi/model/he/he-ppdu.cc
View File

@@ -64,6 +64,7 @@ HePpdu::HePpdu (const WifiConstPsduMap & psdus, const WifiTxVector& txVector, ui
auto [it, ret] = m_muUserInfos.emplace (heMuUserInfo);
NS_ABORT_MSG_IF (!ret, "STA-ID " << heMuUserInfo.first << " already present");
}
m_contentChannelAlloc = txVector.GetContentChannelAllocation ();
}
SetPhyHeaders (txVector, ppduDuration);
SetTxPsdFlag (flag);
@@ -273,6 +274,20 @@ HePpdu::SetTxPsdFlag (TxPsdFlag flag)
m_txPsdFlag = flag;
}
bool
HePpdu::IsAllocated (uint16_t staId) const
{
return (m_muUserInfos.find (staId) != m_muUserInfos.cend ());
}
bool
HePpdu::IsStaInContentChannel (uint16_t staId, std::size_t channelId) const
{
NS_ASSERT_MSG (channelId < m_contentChannelAlloc.size (), "Invalid content channel ID " << channelId);
const auto& channelAlloc = m_contentChannelAlloc.at (channelId);
return (std::find (channelAlloc.cbegin (), channelAlloc.cend (), staId) != channelAlloc.cend ());
}
std::string
HePpdu::PrintPayload (void) const
{

18
src/wifi/model/he/he-ppdu.h
View File

@@ -223,6 +223,21 @@ public:
*/
void SetTxPsdFlag (TxPsdFlag flag);
/**
* Check if STA ID is in HE SIG-B Content Channel ID
* \param staId STA ID
* \param channelId Content Channel ID
* \return true if STA ID in content channel ID, false otherwise
*/
bool IsStaInContentChannel (uint16_t staId, size_t channelId) const;
/**
* Check if STA ID is allocated
* \param staId STA ID
* \return true if allocated, false otherwise
*/
bool IsAllocated (uint16_t staId) const;
protected:
std::string PrintPayload (void) const override;
WifiTxVector DoGetTxVector (void) const override;
@@ -254,7 +269,8 @@ protected:
HeSigHeader m_heSig; //!< the HE-SIG PHY header
TxPsdFlag m_txPsdFlag; //!< the transmit power spectral density flag
WifiTxVector::HeMuUserInfoMap m_muUserInfos; //!< the HE MU specific per-user information (to be removed once HE-SIG-B headers are implemented)
WifiTxVector::HeMuUserInfoMap m_muUserInfos; //!< HE MU specific per-user information (to be removed once HE-SIG-B headers are implemented)
ContentChannelAllocation m_contentChannelAlloc; //!< HE SIG-B Content Channel allocation (to be removed once HE-SIG-B headers are implemented)
}; //class HePpdu
/**