Mercurial Mercurial > ns-3.24 / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
src/devices/wifi/yans-wifi-phy.cc
changeset 6372 0fafd9716f44
parent 6360 d8975477ff6a
child 6474 0894b2a245e9 
--- a/src/devices/wifi/yans-wifi-phy.cc	Wed Jun 23 06:43:21 2010 +0200
+++ b/src/devices/wifi/yans-wifi-phy.cc	Wed Jun 23 08:47:29 2010 +0100
@@ -145,7 +145,7 @@
 {
   NS_LOG_FUNCTION (this);
   m_channel = 0;
-  m_modes.clear ();
+  m_deviceRateSet.clear ();
   m_device = 0;
   m_mobility = 0;
   m_state = 0;
@@ -516,12 +516,12 @@
 uint32_t 
 YansWifiPhy::GetNModes (void) const
 {
-  return m_modes.size ();
+  return m_deviceRateSet.size ();
 }
 WifiMode 
 YansWifiPhy::GetMode (uint32_t mode) const
 {
-  return m_modes[mode];
+  return m_deviceRateSet[mode];
 }
 uint32_t 
 YansWifiPhy::GetNTxPower (void) const
@@ -535,14 +535,14 @@
   NS_LOG_FUNCTION (this);
   m_channelStartingFrequency = 5e3; // 5.000 GHz 
 
-  m_modes.push_back (WifiPhy::GetOfdmRate6Mbps ());
-  m_modes.push_back (WifiPhy::GetOfdmRate9Mbps ());
-  m_modes.push_back (WifiPhy::GetOfdmRate12Mbps ());
-  m_modes.push_back (WifiPhy::GetOfdmRate18Mbps ());
-  m_modes.push_back (WifiPhy::GetOfdmRate24Mbps ());
-  m_modes.push_back (WifiPhy::GetOfdmRate36Mbps ());
-  m_modes.push_back (WifiPhy::GetOfdmRate48Mbps ());
-  m_modes.push_back (WifiPhy::GetOfdmRate54Mbps ());
+  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate6Mbps ());
+  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate9Mbps ());
+  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate12Mbps ());
+  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate18Mbps ());
+  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate24Mbps ());
+  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate36Mbps ());
+  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate48Mbps ());
+  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate54Mbps ());
 }
 
 
@@ -552,10 +552,10 @@
   NS_LOG_FUNCTION (this);
   m_channelStartingFrequency = 2412; // 2.412 GHz 
 
-  m_modes.push_back (WifiPhy::GetDsssRate1Mbps ());
-  m_modes.push_back (WifiPhy::GetDsssRate2Mbps ());
-  m_modes.push_back (WifiPhy::GetDsssRate5_5Mbps ());
-  m_modes.push_back (WifiPhy::GetDsssRate11Mbps ());
+  m_deviceRateSet.push_back (WifiPhy::GetDsssRate1Mbps ());
+  m_deviceRateSet.push_back (WifiPhy::GetDsssRate2Mbps ());
+  m_deviceRateSet.push_back (WifiPhy::GetDsssRate5_5Mbps ());
+  m_deviceRateSet.push_back (WifiPhy::GetDsssRate11Mbps ());
 }
 
 void
@@ -564,14 +564,14 @@
   NS_LOG_FUNCTION (this);
   m_channelStartingFrequency = 5e3; // 5.000 GHz, suppose 802.11a 
 
-  m_modes.push_back (WifiPhy::GetOfdmRate3MbpsBW10MHz ());
-  m_modes.push_back (WifiPhy::GetOfdmRate4_5MbpsBW10MHz ());
-  m_modes.push_back (WifiPhy::GetOfdmRate6MbpsBW10MHz ());
-  m_modes.push_back (WifiPhy::GetOfdmRate9MbpsBW10MHz ());
-  m_modes.push_back (WifiPhy::GetOfdmRate12MbpsBW10MHz ());
-  m_modes.push_back (WifiPhy::GetOfdmRate18MbpsBW10MHz ());
-  m_modes.push_back (WifiPhy::GetOfdmRate24MbpsBW10MHz ());
-  m_modes.push_back (WifiPhy::GetOfdmRate27MbpsBW10MHz ());
+  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate3MbpsBW10MHz ());
+  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate4_5MbpsBW10MHz ());
+  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate6MbpsBW10MHz ());
+  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate9MbpsBW10MHz ());
+  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate12MbpsBW10MHz ());
+  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate18MbpsBW10MHz ());
+  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate24MbpsBW10MHz ());
+  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate27MbpsBW10MHz ());
 }
 
 void
@@ -580,14 +580,14 @@
   NS_LOG_FUNCTION (this); 
   m_channelStartingFrequency = 5e3; // 5.000 GHz, suppose 802.11a
 
-  m_modes.push_back (WifiPhy::GetOfdmRate1_5MbpsBW5MHz ());
-  m_modes.push_back (WifiPhy::GetOfdmRate2_25MbpsBW5MHz ());
-  m_modes.push_back (WifiPhy::GetOfdmRate3MbpsBW5MHz ());
-  m_modes.push_back (WifiPhy::GetOfdmRate4_5MbpsBW5MHz ());
-  m_modes.push_back (WifiPhy::GetOfdmRate6MbpsBW5MHz ());
-  m_modes.push_back (WifiPhy::GetOfdmRate9MbpsBW5MHz ());
-  m_modes.push_back (WifiPhy::GetOfdmRate12MbpsBW5MHz ());
-  m_modes.push_back (WifiPhy::GetOfdmRate13_5MbpsBW5MHz ());
+  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate1_5MbpsBW5MHz ());
+  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate2_25MbpsBW5MHz ());
+  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate3MbpsBW5MHz ());
+  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate4_5MbpsBW5MHz ());
+  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate6MbpsBW5MHz ());
+  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate9MbpsBW5MHz ());
+  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate12MbpsBW5MHz ());
+  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate13_5MbpsBW5MHz ());
 }
 
 void
@@ -595,11 +595,11 @@
 {
   NS_LOG_FUNCTION (this);
   m_channelStartingFrequency = 5e3; // 5.000 GHz 
-  m_modes.push_back (WifiPhy::GetOfdmRate6Mbps ());
-  m_modes.push_back (WifiPhy::GetOfdmRate12Mbps ());
-  m_modes.push_back (WifiPhy::GetOfdmRate18Mbps ());
-  m_modes.push_back (WifiPhy::GetOfdmRate36Mbps ());
-  m_modes.push_back (WifiPhy::GetOfdmRate54Mbps ());
+  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate6Mbps ());
+  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate12Mbps ());
+  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate18Mbps ());
+  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate36Mbps ());
+  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate54Mbps ());
 }
 
 void
@@ -608,14 +608,14 @@
   NS_LOG_FUNCTION (this);
   m_channelStartingFrequency = 5e3; // 802.11p works over the 5Ghz freq range
 
-  m_modes.push_back (WifiPhy::GetOfdmRate3MbpsBW10MHz ());
-  m_modes.push_back (WifiPhy::GetOfdmRate4_5MbpsBW10MHz ());
-  m_modes.push_back (WifiPhy::GetOfdmRate6MbpsBW10MHz ());
-  m_modes.push_back (WifiPhy::GetOfdmRate9MbpsBW10MHz ());
-  m_modes.push_back (WifiPhy::GetOfdmRate12MbpsBW10MHz ());
-  m_modes.push_back (WifiPhy::GetOfdmRate18MbpsBW10MHz ());
-  m_modes.push_back (WifiPhy::GetOfdmRate24MbpsBW10MHz ());
-  m_modes.push_back (WifiPhy::GetOfdmRate27MbpsBW10MHz ());
+  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate3MbpsBW10MHz ());
+  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate4_5MbpsBW10MHz ());
+  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate6MbpsBW10MHz ());
+  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate9MbpsBW10MHz ());
+  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate12MbpsBW10MHz ());
+  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate18MbpsBW10MHz ());
+  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate24MbpsBW10MHz ());
+  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate27MbpsBW10MHz ());
 }
 
 void
@@ -624,14 +624,14 @@
   NS_LOG_FUNCTION (this);
   m_channelStartingFrequency = 5e3; // 802.11p works over the 5Ghz freq range
 
-  m_modes.push_back (WifiPhy::GetOfdmRate3MbpsBW10MHz ());
-  m_modes.push_back (WifiPhy::GetOfdmRate4_5MbpsBW10MHz ());
-  m_modes.push_back (WifiPhy::GetOfdmRate6MbpsBW10MHz ());
-  m_modes.push_back (WifiPhy::GetOfdmRate9MbpsBW10MHz ());
-  m_modes.push_back (WifiPhy::GetOfdmRate12MbpsBW10MHz ());
-  m_modes.push_back (WifiPhy::GetOfdmRate18MbpsBW10MHz ());
-  m_modes.push_back (WifiPhy::GetOfdmRate24MbpsBW10MHz ());
-  m_modes.push_back (WifiPhy::GetOfdmRate27MbpsBW10MHz ());
+  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate3MbpsBW10MHz ());
+  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate4_5MbpsBW10MHz ());
+  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate6MbpsBW10MHz ());
+  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate9MbpsBW10MHz ());
+  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate12MbpsBW10MHz ());
+  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate18MbpsBW10MHz ());
+  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate24MbpsBW10MHz ());
+  m_deviceRateSet.push_back (WifiPhy::GetOfdmRate27MbpsBW10MHz ());
 }
 
 void
ns-3.24