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 6360 d8975477ff6a
parent 6342 a2bdd767bb67
child 6372 0fafd9716f44 
--- a/src/devices/wifi/yans-wifi-phy.cc	Tue Jun 15 11:27:51 2010 -0700
+++ b/src/devices/wifi/yans-wifi-phy.cc	Wed Jun 16 10:55:13 2010 +0100
@@ -534,14 +534,15 @@
 {
   NS_LOG_FUNCTION (this);
   m_channelStartingFrequency = 5e3; // 5.000 GHz 
-  m_modes.push_back (WifiPhy::Get6mba ());
-  m_modes.push_back (WifiPhy::Get9mba ());
-  m_modes.push_back (WifiPhy::Get12mba ());
-  m_modes.push_back (WifiPhy::Get18mba ());
-  m_modes.push_back (WifiPhy::Get24mba ());
-  m_modes.push_back (WifiPhy::Get36mba ());
-  m_modes.push_back (WifiPhy::Get48mba ());
-  m_modes.push_back (WifiPhy::Get54mba ());
+
+  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 ());
 }
 
 
@@ -550,10 +551,11 @@
 {
   NS_LOG_FUNCTION (this);
   m_channelStartingFrequency = 2412; // 2.412 GHz 
-  m_modes.push_back (WifiPhy::Get1mbb ());
-  m_modes.push_back (WifiPhy::Get2mbb ());
-  m_modes.push_back (WifiPhy::Get5_5mbb ());
-  m_modes.push_back (WifiPhy::Get11mbb ());
+
+  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 ());
 }
 
 void
@@ -561,14 +563,15 @@
 {
   NS_LOG_FUNCTION (this);
   m_channelStartingFrequency = 5e3; // 5.000 GHz, suppose 802.11a 
-  m_modes.push_back (WifiPhy::Get3mb10Mhz ());
-  m_modes.push_back (WifiPhy::Get4_5mb10Mhz ());
-  m_modes.push_back (WifiPhy::Get6mb10Mhz ());
-  m_modes.push_back (WifiPhy::Get9mb10Mhz ());
-  m_modes.push_back (WifiPhy::Get12mb10Mhz ());
-  m_modes.push_back (WifiPhy::Get18mb10Mhz ());
-  m_modes.push_back (WifiPhy::Get24mb10Mhz ());
-  m_modes.push_back (WifiPhy::Get27mb10Mhz  ());
+
+  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 ());
 }
 
 void
@@ -576,14 +579,15 @@
 {
   NS_LOG_FUNCTION (this); 
   m_channelStartingFrequency = 5e3; // 5.000 GHz, suppose 802.11a
-  m_modes.push_back (WifiPhy::Get1_5mb5Mhz ());
-  m_modes.push_back (WifiPhy::Get2_25mb5Mhz ());
-  m_modes.push_back (WifiPhy::Get3mb5Mhz ());
-  m_modes.push_back (WifiPhy::Get4_5mb5Mhz ());
-  m_modes.push_back (WifiPhy::Get6mb5Mhz ());
-  m_modes.push_back (WifiPhy::Get9mb5Mhz ());
-  m_modes.push_back (WifiPhy::Get12mb5Mhz ());
-  m_modes.push_back (WifiPhy::Get13_5mb5Mhz  ());
+
+  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 ());
 }
 
 void
@@ -591,11 +595,11 @@
 {
   NS_LOG_FUNCTION (this);
   m_channelStartingFrequency = 5e3; // 5.000 GHz 
-  m_modes.push_back (WifiPhy::Get6mba ());
-  m_modes.push_back (WifiPhy::Get12mba ());
-  m_modes.push_back (WifiPhy::Get18mba ());
-  m_modes.push_back (WifiPhy::Get36mba ());
-  m_modes.push_back (WifiPhy::Get54mba ());
+  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 ());
 }
 
 void
@@ -603,14 +607,15 @@
 {
   NS_LOG_FUNCTION (this);
   m_channelStartingFrequency = 5e3; // 802.11p works over the 5Ghz freq range
-  m_modes.push_back (WifiPhy::Get3mb10Mhz ());
-  m_modes.push_back (WifiPhy::Get4_5mb10Mhz ());
-  m_modes.push_back (WifiPhy::Get6mb10Mhz ());
-  m_modes.push_back (WifiPhy::Get9mb10Mhz ());
-  m_modes.push_back (WifiPhy::Get12mb10Mhz ());
-  m_modes.push_back (WifiPhy::Get18mb10Mhz ());
-  m_modes.push_back (WifiPhy::Get24mb10Mhz ());
-  m_modes.push_back (WifiPhy::Get27mb10Mhz  ());
+
+  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 ());
 }
 
 void
@@ -618,14 +623,15 @@
 {
   NS_LOG_FUNCTION (this);
   m_channelStartingFrequency = 5e3; // 802.11p works over the 5Ghz freq range
-  m_modes.push_back (WifiPhy::Get3mb10Mhz ());
-  m_modes.push_back (WifiPhy::Get4_5mb10Mhz ());
-  m_modes.push_back (WifiPhy::Get6mb10Mhz ());
-  m_modes.push_back (WifiPhy::Get9mb10Mhz ());
-  m_modes.push_back (WifiPhy::Get12mb10Mhz ());
-  m_modes.push_back (WifiPhy::Get18mb10Mhz ());
-  m_modes.push_back (WifiPhy::Get24mb10Mhz ());
-  m_modes.push_back (WifiPhy::Get27mb10Mhz  ());
+
+  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 ());
 }
 
 void
ns-3.24