Attachment #874 for bug #917

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

(-)a/src/devices/wifi/mac-low.cc (-1 / +1 lines)

Lines 1135-1141	Link Here

1135

            ", mode=" << txMode <<

1135

            ", mode=" << txMode <<

1136

            ", duration=" << hdr->GetDuration () <<

1136

            ", duration=" << hdr->GetDuration () <<

1137

            ", seq=0x"<< std::hex << m_currentHdr.GetSequenceControl () << std::dec);

1137

            ", seq=0x"<< std::hex << m_currentHdr.GetSequenceControl () << std::dec);

1138

  m_phy->SendPacket (packet, txMode, WIFI_PREAMBLE_LONG, 0);

1138

  m_phy->SendPacket (packet, txMode, WIFI_PREAMBLE_LONG, m_phy->GetTxPowerLevel ());

1139

1140

1141

void

1141

void

(-)a/src/devices/wifi/wifi-phy.h (+5 lines)

Lines 167-172	Link Here

167

  virtual uint32_t GetNTxPower (void) const = 0;

167

  virtual uint32_t GetNTxPower (void) const = 0;

168

169

/**

169

/**

170

   * \returns the tx power level.

171

*/

172

  virtual uint32_t GetTxPowerLevel (void) const = 0;

173

174

/**

170

   * \param callback the callback to invoke

175

   * \param callback the callback to invoke

171

   *        upon successful packet reception.

176

   *        upon successful packet reception.

172

*/

177

*/

(-)a/src/devices/wifi/yans-wifi-phy.cc (+18 lines)

Lines 81-86	Link Here

                   UintegerValue (1),

                   UintegerValue (1),

                   MakeUintegerAccessor (&YansWifiPhy::m_nTxPower),

                   MakeUintegerAccessor (&YansWifiPhy::m_nTxPower),

                   MakeUintegerChecker<uint32_t> ())

                   MakeUintegerChecker<uint32_t> ())

    .AddAttribute ("TxPowerLevel",

                   "Transmission power level to be used.",

                   UintegerValue (0),

                   MakeUintegerAccessor (&YansWifiPhy::SetTxPowerLevel,

                                         &YansWifiPhy::GetTxPowerLevel),

                   MakeUintegerChecker<uint32_t> ())

    .AddAttribute ("TxPowerEnd",

    .AddAttribute ("TxPowerEnd",

                   "Maximum available transmission level (dbm).",

                   "Maximum available transmission level (dbm).",

                   DoubleValue (16.0206),

                   DoubleValue (16.0206),

Lines 208-213	Link Here

208

  NS_LOG_FUNCTION (this << n);

214

  NS_LOG_FUNCTION (this << n);

209

  m_nTxPower = n;

215

  m_nTxPower = n;

210

216

217

void

218

YansWifiPhy::SetTxPowerLevel (uint32_t n)

219

220

  NS_ASSERT (n < GetNTxPower ());

221

  NS_LOG_FUNCTION (this << n);

222

  m_txPowerLevel = n;

223

211

void

224

void

212

YansWifiPhy::SetTxGain (double gain)

225

YansWifiPhy::SetTxGain (double gain)

213

226

Lines 528-533	Link Here

528

541

529

  return m_nTxPower;

542

  return m_nTxPower;

530

543

544

uint32_t

545

YansWifiPhy::GetTxPowerLevel (void) const

546

547

  return m_txPowerLevel;

548

531

549

532

void

550

void

533

YansWifiPhy::Configure80211a (void)

551

YansWifiPhy::Configure80211a (void)




  void SetTxPowerStart (double start);
  void SetTxPowerEnd (double end);
  void SetNTxPower (uint32_t n);
  void SetTxPowerLevel (uint32_t n);
  void SetTxGain (double gain);
  void SetRxGain (double gain);
  void SetEdThreshold (double threshold);

  virtual double GetTxPowerStart (void) const;
  virtual double GetTxPowerEnd (void) const;
  virtual uint32_t GetNTxPower (void) const;
  virtual uint32_t GetTxPowerLevel (void) const;
  virtual void SetReceiveOkCallback (WifiPhy::RxOkCallback callback);
  virtual void SetReceiveErrorCallback (WifiPhy::RxErrorCallback callback);
  virtual void SendPacket (Ptr<const Packet> packet, WifiMode mode, enum WifiPreamble preamble, uint8_t txPowerLevel);

  double   m_txPowerBaseDbm;
  double   m_txPowerEndDbm;
  uint32_t m_nTxPower;
  uint32_t m_txPowerLevel;

  Ptr<YansWifiChannel> m_channel;
  uint16_t m_channelNumber;

Return to bug 917