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

use dB instead of dbm where appropriate

Browse Source
This commit is contained in:
Mathieu Lacage
2007-11-05 18:55:49 +01:00
parent 1acb811437
commit d030b978ab
4 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/devices/wifi/wifi-default-parameters.cc
View File

@@ -116,12 +116,12 @@ static NumericDefaultValue<uint32_t> g_phyNTxPower
1);
static NumericDefaultValue<double> g_phyTxGain
("WifiPhyTxGain",
"Transmission gain (dbm).",
1.0);
"Transmission gain (dB).",
0.0);
static NumericDefaultValue<double> g_phyRxGain
("WifiPhyRxGain",
"Reception gain (dbm).",
1.0);
"Reception gain (dB).",
0.0);
static StringDefaultValue g_ssid
("WifiSsid",
"The ssid to use. \"\" is the broadcast ssid.",
@@ -273,12 +273,12 @@ GetPhyTxPowerLevels (void)
}
double
GetPhyTxGainDbm (void)
GetPhyTxGainDb (void)
{
return g_phyTxGain.GetValue ();
}
double
GetPhyRxGainDbm (void)
GetPhyRxGainDb (void)
{
return g_phyRxGain.GetValue ();
}

4
src/devices/wifi/wifi-default-parameters.h
View File

@@ -71,8 +71,8 @@ double GetPhyRxNoiseDb (void);
double GetPhyTxPowerBaseDbm (void);
double GetPhyTxPowerEndDbm (void);
uint32_t GetPhyTxPowerLevels (void);
double GetPhyTxGainDbm (void);
double GetPhyRxGainDbm (void);
double GetPhyTxGainDb (void);
double GetPhyRxGainDb (void);
Ssid GetSsid (void);

11
src/devices/wifi/wifi-phy.cc
View File

@@ -175,8 +175,8 @@ WifiPhy::NiChange::operator < (WifiPhy::NiChange const &o) const
WifiPhy::WifiPhy (Ptr<WifiNetDevice> device)
: m_edThresholdW (DbmToW (WifiDefaultParameters::GetPhyEnergyDetectionThresholdDbm ())),
m_txGainDbm (WifiDefaultParameters::GetPhyTxGainDbm ()),
m_rxGainDbm (WifiDefaultParameters::GetPhyRxGainDbm ()),
m_txGainDb (WifiDefaultParameters::GetPhyTxGainDb ()),
m_rxGainDb (WifiDefaultParameters::GetPhyRxGainDb ()),
m_rxNoiseRatio (DbToRatio (WifiDefaultParameters::GetPhyRxNoiseDb ())),
m_txPowerBaseDbm (WifiDefaultParameters::GetPhyTxPowerBaseDbm ()),
m_txPowerEndDbm (WifiDefaultParameters::GetPhyTxPowerEndDbm ()),
@@ -243,7 +243,7 @@ WifiPhy::ReceivePacket (Packet const packet,
WifiMode txMode,
enum WifiPreamble preamble)
{
rxPowerDbm += m_rxGainDbm;
rxPowerDbm += m_rxGainDb;
double rxPowerW = DbmToW (rxPowerDbm);
Time rxDuration = CalculateTxDuration (packet.GetSize (), txMode, preamble);
Time endRx = Simulator::Now () + rxDuration;
@@ -276,6 +276,7 @@ WifiPhy::ReceivePacket (Packet const packet,
case WifiPhy::IDLE:
if (rxPowerW > m_edThresholdW)
{
NS_LOG_DEBUG ("sync power="<<rxPowerW<<"W)");
// sync to signal
NotifySyncStart (rxDuration);
SwitchToSync (rxDuration);
@@ -283,7 +284,7 @@ WifiPhy::ReceivePacket (Packet const packet,
m_endSyncEvent = Simulator::Schedule (rxDuration, &WifiPhy::EndSync, this,
packet,
event);
}
}
else
{
NS_LOG_DEBUG ("drop packet because signal power too Small ("<<
@@ -345,7 +346,7 @@ WifiPhy::SendPacket (Packet const packet, WifiMode txMode, WifiPreamble preamble
Time txDuration = CalculateTxDuration (packet.GetSize (), txMode, preamble);
NotifyTxStart (txDuration);
SwitchToTx (txDuration);
m_channel->Send (m_device, packet, GetPowerDbm (txPower) + m_txGainDbm, txMode, preamble);
m_channel->Send (m_device, packet, GetPowerDbm (txPower) + m_txGainDb, txMode, preamble);
}
uint32_t

4
src/devices/wifi/wifi-phy.h
View File

@@ -304,8 +304,8 @@ private:
Time m_maxPacketDuration;
double m_edThresholdW; /* unit: W */
double m_txGainDbm;
double m_rxGainDbm;
double m_txGainDb;
double m_rxGainDb;
double m_rxNoiseRatio;
double m_txPowerBaseDbm;
double m_txPowerEndDbm;