View | Details | Raw Unified | Return to bug 2337
Collapse All | Expand All

(-)a/src/wifi/model/wifi-phy.cc (-15 / +15 lines)
 Lines 243-256    Link Here 
243
    case WIFI_MOD_CLASS_VHT:
243
    case WIFI_MOD_CLASS_VHT:
244
      switch (txVector.GetChannelWidth ())
244
      switch (txVector.GetChannelWidth ())
245
        {
245
        {
246
        case 5000000:
246
        case 5:
247
          return WifiPhy::GetOfdmRate1_5MbpsBW5MHz ();
247
          return WifiPhy::GetOfdmRate1_5MbpsBW5MHz ();
248
        case 10000000:
248
        case 10:
249
          return WifiPhy::GetOfdmRate3MbpsBW10MHz ();
249
          return WifiPhy::GetOfdmRate3MbpsBW10MHz ();
250
        case 20000000:
250
        case 20:
251
        case 40000000:
251
        case 40:
252
        case 80000000:
252
        case 80:
253
        case 160000000:
253
        case 160:
254
        default:
254
        default:
255
          //(Section 18.3.2 "PLCP frame format"; IEEE Std 802.11-2012)
255
          //(Section 18.3.2 "PLCP frame format"; IEEE Std 802.11-2012)
256
          //actually this is only the first part of the PlcpHeader,
256
          //actually this is only the first part of the PlcpHeader,
 Lines 291-297    Link Here 
291
      {
291
      {
292
        switch (txVector.GetChannelWidth ())
292
        switch (txVector.GetChannelWidth ())
293
          {
293
          {
294
          case 20000000:
294
          case 20:
295
          default:
295
          default:
296
            //(Section 18.3.3 "PLCP preamble (SYNC))" and Figure 18-4 "OFDM training structure"; IEEE Std 802.11-2012)
296
            //(Section 18.3.3 "PLCP preamble (SYNC))" and Figure 18-4 "OFDM training structure"; IEEE Std 802.11-2012)
297
            //also (Section 18.3.2.4 "Timing related parameters" Table 18-5 "Timing-related parameters"; IEEE Std 802.11-2012)
297
            //also (Section 18.3.2.4 "Timing related parameters" Table 18-5 "Timing-related parameters"; IEEE Std 802.11-2012)
 Lines 300-309    Link Here 
300
            //header, see Section 18.3.2 and Figure 18-1) is sent using the
300
            //header, see Section 18.3.2 and Figure 18-1) is sent using the
301
            //payload mode.
301
            //payload mode.
302
            return MicroSeconds (4);
302
            return MicroSeconds (4);
303
          case 10000000:
303
          case 10:
304
            //(Section 18.3.2.4 "Timing related parameters" Table 18-5 "Timing-related parameters"; IEEE Std 802.11-2012)
304
            //(Section 18.3.2.4 "Timing related parameters" Table 18-5 "Timing-related parameters"; IEEE Std 802.11-2012)
305
            return MicroSeconds (8);
305
            return MicroSeconds (8);
306
          case 5000000:
306
          case 5:
307
            //(Section 18.3.2.4 "Timing related parameters" Table 18-5 "Timing-related parameters"; IEEE Std 802.11-2012)
307
            //(Section 18.3.2.4 "Timing related parameters" Table 18-5 "Timing-related parameters"; IEEE Std 802.11-2012)
308
            return MicroSeconds (16);
308
            return MicroSeconds (16);
309
          }
309
          }
 Lines 355-370    Link Here 
355
      {
355
      {
356
        switch (txVector.GetChannelWidth ())
356
        switch (txVector.GetChannelWidth ())
357
          {
357
          {
358
          case 20000000:
358
          case 20:
359
          default:
359
          default:
360
            //(Section 18.3.3 "PLCP preamble (SYNC))" Figure 18-4 "OFDM training structure"
360
            //(Section 18.3.3 "PLCP preamble (SYNC))" Figure 18-4 "OFDM training structure"
361
            //also Section 18.3.2.3 "Modulation-dependent parameters" Table 18-4 "Modulation-dependent parameters"; IEEE Std 802.11-2012)
361
            //also Section 18.3.2.3 "Modulation-dependent parameters" Table 18-4 "Modulation-dependent parameters"; IEEE Std 802.11-2012)
362
            return MicroSeconds (16);
362
            return MicroSeconds (16);
363
          case 10000000:
363
          case 10:
364
            //(Section 18.3.3 "PLCP preamble (SYNC))" Figure 18-4 "OFDM training structure"
364
            //(Section 18.3.3 "PLCP preamble (SYNC))" Figure 18-4 "OFDM training structure"
365
            //also Section 18.3.2.3 "Modulation-dependent parameters" Table 18-4 "Modulation-dependent parameters"; IEEE Std 802.11-2012)
365
            //also Section 18.3.2.3 "Modulation-dependent parameters" Table 18-4 "Modulation-dependent parameters"; IEEE Std 802.11-2012)
366
            return MicroSeconds (32);
366
            return MicroSeconds (32);
367
          case 5000000:
367
          case 5:
368
            //(Section 18.3.3 "PLCP preamble (SYNC))" Figure 18-4 "OFDM training structure"
368
            //(Section 18.3.3 "PLCP preamble (SYNC))" Figure 18-4 "OFDM training structure"
369
            //also Section 18.3.2.3 "Modulation-dependent parameters" Table 18-4 "Modulation-dependent parameters"; IEEE Std 802.11-2012)
369
            //also Section 18.3.2.3 "Modulation-dependent parameters" Table 18-4 "Modulation-dependent parameters"; IEEE Std 802.11-2012)
370
            return MicroSeconds (64);
370
            return MicroSeconds (64);
 Lines 417-430    Link Here 
417
417
418
        switch (txVector.GetChannelWidth ())
418
        switch (txVector.GetChannelWidth ())
419
          {
419
          {
420
          case 20000000:
420
          case 20:
421
          default:
421
          default:
422
            symbolDuration = MicroSeconds (4);
422
            symbolDuration = MicroSeconds (4);
423
            break;
423
            break;
424
          case 10000000:
424
          case 10:
425
            symbolDuration = MicroSeconds (8);
425
            symbolDuration = MicroSeconds (8);
426
            break;
426
            break;
427
          case 5000000:
427
          case 5:
428
            symbolDuration = MicroSeconds (16);
428
            symbolDuration = MicroSeconds (16);
429
            break;
429
            break;
430
          }
430
          }

Return to bug 2337