--- a/src/wifi/model/yans-wifi-phy.h Fri May 06 13:21:20 2011 -0700
+++ b/src/wifi/model/yans-wifi-phy.h Sat May 07 21:49:46 2011 +0200
@@ -3,7 +3,7 @@
* Copyright (c) 2005,2006 INRIA
*
* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
+ * it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation;
*
* This program is distributed in the hope that it will be useful,
@@ -51,7 +51,7 @@
*
* This PHY implements a model of 802.11a. The model
* implemented here is based on the model described
- * in "Yet Another Network Simulator",
+ * in "Yet Another Network Simulator",
* (http://cutebugs.net/files/wns2-yans.pdf).
*
*
@@ -63,35 +63,34 @@
class YansWifiPhy : public WifiPhy
{
public:
-
static TypeId GetTypeId (void);
YansWifiPhy ();
virtual ~YansWifiPhy ();
void SetChannel (Ptr<YansWifiChannel> channel);
-
- /**
- * \brief Set channel number.
- *
+
+ /**
+ * \brief Set channel number.
+ *
* Channel center frequency = Channel starting frequency + 5 MHz * (nch - 1)
*
* where Starting channel frequency is standard-dependent, see SetStandard()
* as defined in IEEE 802.11-2007 17.3.8.3.2.
*
- * YansWifiPhy can switch among different channels. Basically, YansWifiPhy
- * has a private attribute m_channelNumber that identifies the channel the
+ * YansWifiPhy can switch among different channels. Basically, YansWifiPhy
+ * has a private attribute m_channelNumber that identifies the channel the
* PHY operates on. Channel switching cannot interrupt an ongoing transmission.
* When PHY is in TX state, the channel switching is postponed until the end
- * of the current transmission. When the PHY is in RX state, the channel
- * switching causes the drop of the synchronized packet.
- */
+ * of the current transmission. When the PHY is in RX state, the channel
+ * switching causes the drop of the synchronized packet.
+ */
void SetChannelNumber (uint16_t id);
/// Return current channel number, see SetChannelNumber()
uint16_t GetChannelNumber () const;
/// Return current center channel frequency in MHz, see SetChannelNumber()
- double GetChannelFrequencyMhz() const;
-
+ double GetChannelFrequencyMhz () const;
+
void StartReceivePacket (Ptr<Packet> packet,
double rxPowerDbm,
WifiMode mode,
@@ -116,8 +115,8 @@
Ptr<ErrorRateModel> GetErrorRateModel (void) const;
Ptr<Object> GetDevice (void) const;
Ptr<Object> GetMobility (void);
-
-
+
+
virtual double GetTxPowerStart (void) const;
@@ -132,7 +131,7 @@
virtual bool IsStateBusy (void);
virtual bool IsStateRx (void);
virtual bool IsStateTx (void);
- virtual bool IsStateSwitching (void);
+ virtual bool IsStateSwitching (void);
virtual Time GetStateDuration (void);
virtual Time GetDelayUntilIdle (void);
virtual Time GetLastRxStartTime (void) const;
@@ -216,7 +215,7 @@
EventId m_endRxEvent;
UniformVariable m_random;
- /// Standard-dependent center frequency of 0-th channel, MHz
+ /// Standard-dependent center frequency of 0-th channel, MHz
double m_channelStartingFrequency;
Ptr<WifiPhyStateHelper> m_state;
InterferenceHelper m_interference;