Attachment #2988 for bug #2843

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

(-)a/examples/wireless/wifi-spectrum-saturation-example.cc (-2 / +2 lines)

Lines 198-205 int main (int argc, char *argv[])	Link Here

198

          //Bug 2460: CcaMode1Threshold default should be set to -62 dBm when using Spectrum

198

          //Bug 2460: CcaMode1Threshold default should be set to -62 dBm when using Spectrum

199

          Config::SetDefault ("ns3::WifiPhy::CcaMode1Threshold", DoubleValue (-62.0));

199

          Config::SetDefault ("ns3::WifiPhy::CcaMode1Threshold", DoubleValue (-62.0));

200

201

          Ptr<SingleModelSpectrumChannel> spectrumChannel

201

          Ptr<MultiModelSpectrumChannel> spectrumChannel

202

            = CreateObject<SingleModelSpectrumChannel> ();

202

            = CreateObject<MultiModelSpectrumChannel> ();

203

          Ptr<FriisPropagationLossModel> lossModel

203

          Ptr<FriisPropagationLossModel> lossModel

204

            = CreateObject<FriisPropagationLossModel> ();

204

            = CreateObject<FriisPropagationLossModel> ();

205

          spectrumChannel->AddPropagationLossModel (lossModel);

205

          spectrumChannel->AddPropagationLossModel (lossModel);




  switch (channelWidth)
    {
    case 20:
    default:
      // 52 subcarriers (48 data + 4 pilot)
      // skip guard band and 6 subbands, then place power in 26 subbands, then
      // skip the center subband, then place power in 26 subbands, then skip

      start2 = stop1 + 2;
      stop2 = start2 + 8 - 1;
      break;
    default:
      NS_FATAL_ERROR ("Channel width should be correctly set.");
      return 0;
    }
  NS_LOG_DEBUG ("Power per band " << txPowerPerBand);
  Values::iterator vit = c->ValuesBegin ();




MacLow::GetRtsTxVector (Ptr<const Packet> packet, const WifiMacHeader *hdr) const
{
  Mac48Address to = hdr->GetAddr1 ();
  WifiTxVector txVector = m_stationManager->GetRtsTxVector (to, hdr, packet);
  return AdjustChannelWidthToMode (txVector);
}

WifiTxVector
MacLow::GetDataTxVector (Ptr<const Packet> packet, const WifiMacHeader *hdr) const
{
  Mac48Address to = hdr->GetAddr1 ();
  WifiTxVector txVector = m_stationManager->GetDataTxVector (to, hdr, packet);
  return AdjustChannelWidthToMode (txVector);
}

WifiTxVector
MacLow::GetCtsTxVector (Mac48Address to, WifiMode rtsTxMode) const
{
  WifiTxVector txVector = m_stationManager->GetCtsTxVector (to, rtsTxMode);
  return AdjustChannelWidthToMode (txVector);
}

WifiTxVector
MacLow::GetAckTxVector (Mac48Address to, WifiMode dataTxMode) const
{
  WifiTxVector txVector = m_stationManager->GetAckTxVector (to, dataTxMode);
  return AdjustChannelWidthToMode (txVector);
}

WifiTxVector
MacLow::GetBlockAckTxVector (Mac48Address to, WifiMode dataTxMode) const
{
  WifiTxVector txVector = m_stationManager->GetBlockAckTxVector (to, dataTxMode);
  return AdjustChannelWidthToMode (txVector);
}

WifiTxVector

  return GetAckTxVector (to, dataTxMode);
}

WifiTxVector
MacLow::AdjustChannelWidthToMode (WifiTxVector initialTxVector) const
{
  NS_LOG_FUNCTION (this << initialTxVector);
  WifiModulationClass modulationClass = initialTxVector.GetMode ().GetModulationClass ();
  uint8_t defaultChannelWidth = initialTxVector.GetChannelWidth ();
  if (defaultChannelWidth > 20 &&
      (modulationClass == WifiModulationClass::WIFI_MOD_CLASS_OFDM || // all non-HT OFDM control and management frames
       modulationClass == WifiModulationClass::WIFI_MOD_CLASS_ERP_OFDM)) // special case of beacons at 2.4 GHz
    {
      WifiTxVector updatedTxVector = initialTxVector;
      updatedTxVector.SetChannelWidth (20);
      NS_LOG_LOGIC ("Channel width in TXVECTOR has been updated to 20 MHz channel");
      return updatedTxVector;
    }
  return initialTxVector;
}

Time
MacLow::CalculateOverallTxTime (Ptr<const Packet> packet,
                                const WifiMacHeader* hdr,

(-)a/src/wifi/model/mac-low.h (+9 lines)

Lines 497-502 private:	Link Here

497

*/

497

*/

498

  WifiTxVector GetAckTxVectorForData (Mac48Address to, WifiMode dataTxMode) const;

498

  WifiTxVector GetAckTxVectorForData (Mac48Address to, WifiMode dataTxMode) const;

499

/**

499

/**

500

   * Adjust the channel width to the selected mode (instead of letting the PHY's

501

   * default channel width). This is especially useful when using non-HT modes

502

   * with HT/VHT/HE capable stations (with default width above 20 MHz).

503

504

   * \param initialTxVector TXVECTOR returned by the WifiRemoteStationManager using the PHY's default channel width

505

   * \return TXVECTOR with channel width adapted to the selected mode

506

*/

507

  WifiTxVector AdjustChannelWidthToMode (WifiTxVector initialTxVector) const;

508

/**

500

   * Return the time required to transmit the CTS (including preamble and FCS).

509

   * Return the time required to transmit the CTS (including preamble and FCS).

501

510

502

   * \param ctsTxVector

511

   * \param ctsTxVector




  return v;
}

uint32_t
SpectrumWifiPhy::GetCenterFrequencyForChannelWidth (WifiTxVector txVector) const
{
  NS_LOG_FUNCTION (txVector);
  uint32_t centerFrequencyForSupportedWidth = GetFrequency ();
  uint32_t supportedWidth = static_cast<uint32_t> (GetChannelWidth ());
  uint32_t currentWidth = static_cast<uint32_t> (txVector.GetChannelWidth ());
  if (currentWidth != supportedWidth)
    {
      uint32_t startingFrequency = centerFrequencyForSupportedWidth - (supportedWidth / 2);
      return startingFrequency + (currentWidth / 2); // primary channel is in the lower part (for the time being)
    }
  return centerFrequencyForSupportedWidth;
}

void
SpectrumWifiPhy::StartTx (Ptr<Packet> packet, WifiTxVector txVector, Time txDuration)
{
  NS_LOG_DEBUG ("Start transmission: signal power before antenna gain=" << GetPowerDbm (txVector.GetTxPowerLevel ()) << "dBm");
  double txPowerWatts = DbmToW (GetPowerDbm (txVector.GetTxPowerLevel ()) + GetTxGain ());
  Ptr<SpectrumValue> txPowerSpectrum = GetTxPowerSpectralDensity (GetCenterFrequencyForChannelWidth (txVector), txVector.GetChannelWidth (), txPowerWatts, txVector.GetMode ().GetModulationClass ());
  Ptr<WifiSpectrumSignalParameters> txParams = Create<WifiSpectrumSignalParameters> ();
  txParams->duration = txDuration;
  txParams->psd = txPowerSpectrum;

(-)a/src/wifi/model/spectrum-wifi-phy.h (+9 lines)

Lines 100-105 public:	Link Here

100

   * \param txDuration duration of the transmission.

100

   * \param txDuration duration of the transmission.

101

*/

101

*/

102

  void StartTx (Ptr<Packet> packet, WifiTxVector txVector, Time txDuration);

102

  void StartTx (Ptr<Packet> packet, WifiTxVector txVector, Time txDuration);

103

/**

104

   * Get the center frequency of the channel corresponding the current TxVector rather than

105

   * that of the supported channel width.

106

   * Consider that this "primary channel" is on the lower part for the time being.

107

108

   * \param txVector the TXVECTOR that has the channel width that is to be used

109

   * \return the center frequency corresponding to the channel width to be used

110

*/

111

  uint32_t GetCenterFrequencyForChannelWidth (WifiTxVector txVector) const;

103

112

104

/**

113

/**

105

   * Method to encapsulate the creation of the WifiSpectrumPhyInterface

114

   * Method to encapsulate the creation of the WifiSpectrumPhyInterface

Return to bug 2843