ns-3.24: comparison src/wifi/model/wifi-phy.cc

equal deleted inserted replaced

-:4ec4b3dcb42a
+:2a29a9bd6fd6
 case 5000000:
 return WifiPhy::GetOfdmRate1_5MbpsBW5MHz ();
 case 10000000:
 return WifiPhy::GetOfdmRate3MbpsBW10MHz ();
 default:
-// IEEE Std 802.11-2007, 17.3.2
+// (Section 18.3.2 "PLCP frame format"; IEEE Std 802.11-2012)
 // actually this is only the first part of the PlcpHeader,
 // because the last 16 bits of the PlcpHeader are using the
 // same mode of the payload
 return WifiPhy::GetOfdmRate6Mbps ();
 }
 return WifiPhy::GetErpOfdmRate6Mbps ();
 case WIFI_MOD_CLASS_DSSS:
 if (preamble == WIFI_PREAMBLE_LONG)
 {
-// IEEE Std 802.11-2007, sections 15.2.3 and 18.2.2.1
+// (Section 16.2.3 "PLCP field definitions" and Section 17.2.2.2 "Long PPDU format"; IEEE Std 802.11-2012)
 return WifiPhy::GetDsssRate1Mbps ();
 }
 else  //  WIFI_PREAMBLE_SHORT
 {
-// IEEE Std 802.11-2007, section 18.2.2.2
+// (Section 17.2.2.3 "Short PPDU format"; IEEE Std 802.11-2012)
 return WifiPhy::GetDsssRate2Mbps ();
 }
 default:
 NS_FATAL_ERROR ("unsupported modulation class");
 {
 switch (payloadMode.GetBandwidth ())
 {
 case 20000000:
 default:
-// IEEE Std 802.11-2007, section 17.3.3 and figure 17-4
+// (Section 18.3.3 "PLCP preamble (SYNC))" and Figure 18-4 "OFDM training structure"; IEEE Std 802.11-2012)
-// also section 17.3.2.3, table 17-4
+// also (Section 18.3.2.4 "Timing related parameters" Table 18-5 "Timing-related parameters"; IEEE Std 802.11-2012)
 // We return the duration of the SIGNAL field only, since the
 // SERVICE field (which strictly speaking belongs to the PLCP
-// header, see section 17.3.2 and figure 17-1) is sent using the
+// header, see Section 18.3.2 and Figure 18-1) is sent using the
 // payload mode.
 return 4;
 case 10000000:
-// IEEE Std 802.11-2007, section 17.3.2.3, table 17-4
+// (Section 18.3.2.4 "Timing related parameters" Table 18-5 "Timing-related parameters"; IEEE Std 802.11-2012)
 return 8;
 case 5000000:
-// IEEE Std 802.11-2007, section 17.3.2.3, table 17-4
+// (Section 18.3.2.4 "Timing related parameters" Table 18-5 "Timing-related parameters"; IEEE Std 802.11-2012)
 return 16;
 }
 }
 //Added by Ghada to support 11n
 case WIFI_MOD_CLASS_HT:
 return 4;
 case WIFI_MOD_CLASS_DSSS:
 if (preamble == WIFI_PREAMBLE_SHORT)
 {
-// IEEE Std 802.11-2007, section 18.2.2.2 and figure 18-2
+// (Section 17.2.2.3 "Short PPDU format" and Figure 17-2 "Short PPDU format"; IEEE Std 802.11-2012)
 return 24;
 }
 else // WIFI_PREAMBLE_LONG
 {
-// IEEE Std 802.11-2007, sections 18.2.2.1 and figure 18-1
+// (Section 17.2.2.2 "Long PPDU format" and Figure 17-1 "Short PPDU format"; IEEE Std 802.11-2012)
 return 48;
 }
 default:
 NS_FATAL_ERROR ("unsupported modulation class");
 {
 switch (payloadMode.GetBandwidth ())
 {
 case 20000000:
 default:
-// IEEE Std 802.11-2007, section 17.3.3,  figure 17-4
+// (Section 18.3.3 "PLCP preamble (SYNC))" Figure 18-4 "OFDM training structure"
-// also section 17.3.2.3, table 17-4
+// also Section 18.3.2.3 "Modulation-dependent parameters" Table 18-4 "Modulation-dependent parameters"; IEEE Std 802.11-2012)
 return 16;
 case 10000000:
-// IEEE Std 802.11-2007, section 17.3.3, table 17-4
+// (Section 18.3.3 "PLCP preamble (SYNC))" Figure 18-4 "OFDM training structure"
-// also section 17.3.2.3, table 17-4
+// also Section 18.3.2.3 "Modulation-dependent parameters" Table 18-4 "Modulation-dependent parameters"; IEEE Std 802.11-2012)
 return 32;
 case 5000000:
-// IEEE Std 802.11-2007, section 17.3.3
+// (Section 18.3.3 "PLCP preamble (SYNC))" Figure 18-4 "OFDM training structure"
-// also section 17.3.2.3, table 17-4
+// also Section 18.3.2.3 "Modulation-dependent parameters" Table 18-4 "Modulation-dependent parameters"; IEEE Std 802.11-2012)
 return 64;
 }
 }
 case WIFI_MOD_CLASS_HT:
 { //IEEE 802.11n Figure 20.1 the training symbols before L_SIG or HT_SIG
 return 16;
 case WIFI_MOD_CLASS_DSSS:
 if (preamble == WIFI_PREAMBLE_SHORT)
 {
-// IEEE Std 802.11-2007, section 18.2.2.2 and figure 18-2
+// (Section 17.2.2.3 "Short PPDU format)" Figure 17-2 "Short PPDU format"; IEEE Std 802.11-2012)
 return 72;
 }
 else // WIFI_PREAMBLE_LONG
 {
-// IEEE Std 802.11-2007, sections 18.2.2.1 and figure 18-1
+// (Section 17.2.2.2 "Long PPDU format)" Figure 17-1 "Long PPDU format"; IEEE Std 802.11-2012)
 return 144;
 }
 default:
 NS_FATAL_ERROR ("unsupported modulation class");
 return 0;
 switch (payloadMode.GetModulationClass ())
 {
 case WIFI_MOD_CLASS_OFDM:
 case WIFI_MOD_CLASS_ERP_OFDM:
 {
-// IEEE Std 802.11-2007, section 17.3.2.3, table 17-4
+// (Section 18.3.2.4 "Timing related parameters" Table 18-5 "Timing-related parameters"; IEEE Std 802.11-2012
-// corresponds to T_{SYM} in the table
+// corresponds to T_{SYM} in the table)
 uint32_t symbolDurationUs;
 switch (payloadMode.GetBandwidth ())
 {
 case 20000000:
 case 5000000:
 symbolDurationUs = 16;
 break;
 }
-// IEEE Std 802.11-2007, section 17.3.2.2, table 17-3
+// (Section 18.3.2.3 "Modulation-dependent parameters" Table 18-4 "Modulation-dependent parameters"; IEEE Std 802.11-2012)
 // corresponds to N_{DBPS} in the table
 double numDataBitsPerSymbol = payloadMode.GetDataRate () * symbolDurationUs / 1e6;
-// IEEE Std 802.11-2007, section 17.3.5.3, equation (17-11)
+// (Section 18.3.5.4 "Pad bits (PAD)" Equation 18-11; IEEE Std 802.11-2012)
 uint32_t numSymbols = lrint (ceil ((16 + size * 8.0 + 6.0) / numDataBitsPerSymbol));
 // Add signal extension for ERP PHY
 if (payloadMode.GetModulationClass () == WIFI_MOD_CLASS_ERP_OFDM)
 {
 return numSymbols * symbolDurationUs;
 }
 case WIFI_MOD_CLASS_DSSS:
-// IEEE Std 802.11-2007, section 18.2.3.5
+// (Section 17.2.3.6 "Long PLCP LENGTH field"; IEEE Std 802.11-2012)
 NS_LOG_LOGIC (" size=" << size
 << " mode=" << payloadMode
 << " rate=" << payloadMode.GetDataRate () );
 return lrint (ceil ((size * 8.0) / (payloadMode.GetDataRate () / 1.0e6)));

changeset 10580	2a29a9bd6fd6
parent 10424	9d29c9a5ddcb
child 10652	dc18deba4502