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

rename snrDbm to snrDb

Browse Source
This commit is contained in:
Sébastien Deronne
2015-07-09 18:20:34 +02:00
parent a096ecca2f
commit b7e891ccfa
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/wave/helper/wave-helper.cc
View File

@@ -243,7 +243,7 @@ PcapSniffRxEvent (
WifiPreamble preamble,
WifiTxVector txvector,
struct mpduInfo aMpdu,
struct snrDbm snr)
struct snrDb snr)
{
uint32_t dlt = file->GetDataLinkType ();

2
src/wifi/helper/yans-wifi-helper.cc
View File

@@ -405,7 +405,7 @@ PcapSniffRxEvent (
WifiPreamble preamble,
WifiTxVector txvector,
struct mpduInfo aMpdu,
struct snrDbm snr)
struct snrDb snr)
{
uint32_t dlt = file->GetDataLinkType ();

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

@@ -592,7 +592,7 @@ WifiPhy::NotifyRxDrop (Ptr<const Packet> packet)
}
void
WifiPhy::NotifyMonitorSniffRx (Ptr<const Packet> packet, uint16_t channelFreqMhz, uint16_t channelNumber, uint32_t rate, WifiPreamble preamble, WifiTxVector txvector, struct mpduInfo aMpdu, struct snrDbm snr)
WifiPhy::NotifyMonitorSniffRx (Ptr<const Packet> packet, uint16_t channelFreqMhz, uint16_t channelNumber, uint32_t rate, WifiPreamble preamble, WifiTxVector txvector, struct mpduInfo aMpdu, struct snrDb snr)
{
m_phyMonitorSniffRxTrace (packet, channelFreqMhz, channelNumber, rate, preamble, txvector, aMpdu, snr);
}

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

@@ -38,7 +38,7 @@ namespace ns3 {
class WifiChannel;
class NetDevice;
struct snrDbm
struct snrDb
{
double signal;
double noise;
@@ -1014,11 +1014,11 @@ public:
* \param txVector the txvector that holds rx parameters
* \param aMpdu the type of the packet (0 is not A-MPDU, 1 is a MPDU that is part of an A-MPDU and 2 is the last MPDU in an A-MPDU)
* and the A-MPDU reference number (must be a different value for each A-MPDU but the same for each subframe within one A-MPDU)
* \param snr signal power and noise power in dBm
* \param snr signal power and noise power in dB
*/
void NotifyMonitorSniffRx (Ptr<const Packet> packet, uint16_t channelFreqMhz,
uint16_t channelNumber, uint32_t rate, WifiPreamble preamble,
WifiTxVector txvector, struct mpduInfo aMpdu, struct snrDbm snr);
WifiTxVector txvector, struct mpduInfo aMpdu, struct snrDb snr);
/**
* TracedCallback signature for monitor mode receive events.
@@ -1039,11 +1039,11 @@ public:
* \param txVector the txvector that holds rx parameters
* \param aMpdu the type of the packet (0 is not A-MPDU, 1 is a MPDU that is part of an A-MPDU and 2 is the last MPDU in an A-MPDU)
* and the A-MPDU reference number (must be a different value for each A-MPDU but the same for each subframe within one A-MPDU)
* \param snr signal power and noise power in dBm
* \param snr signal power and noise power in dB
*/
typedef void (* MonitorSnifferRxCallback)(Ptr<const Packet> packet, uint16_t channelFreqMhz,
uint16_t channelNumber, uint32_t rate, WifiPreamble preamble,
WifiTxVector txvector, struct mpduInfo aMpdu, struct snrDbm snr);
WifiTxVector txvector, struct mpduInfo aMpdu, struct snrDb snr);
/**
* Public method used to fire a MonitorSniffer trace for a wifi packet being transmitted.
@@ -1216,7 +1216,7 @@ private:
*
* \see class CallBackTraceSource
*/
TracedCallback<Ptr<const Packet>, uint16_t, uint16_t, uint32_t, WifiPreamble, WifiTxVector, struct mpduInfo, struct snrDbm> m_phyMonitorSniffRxTrace;
TracedCallback<Ptr<const Packet>, uint16_t, uint16_t, uint32_t, WifiPreamble, WifiTxVector, struct mpduInfo, struct snrDb> m_phyMonitorSniffRxTrace;
/**
* A trace source that emulates a wifi device in monitor mode

2
src/wifi/model/yans-wifi-phy.cc
View File

@@ -1108,7 +1108,7 @@ YansWifiPhy::EndReceive (Ptr<Packet> packet, enum WifiPreamble preamble, struct
{
dataRate500KbpsUnits = event->GetPayloadMode ().GetDataRate () * event->GetTxVector ().GetNss () / 500000;
}
struct snrDbm snr;
struct snrDb snr;
snr.signal = RatioToDb (event->GetRxPowerW ()) + 30;
snr.noise = RatioToDb (event->GetRxPowerW () / snrPer.snr) - GetRxNoiseFigure () + 30;
NotifyMonitorSniffRx (packet, (uint16_t)GetChannelFrequencyMhz (), GetChannelNumber (), dataRate500KbpsUnits, event->GetPreambleType (), event->GetTxVector (), aMpdu, snr);