Attachment #944 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);

1139

1140

1141

void

1141

void




private:
  void Send (void);
  void Receive (Ptr<Packet> p, double snr, WifiMode mode, enum WifiPreamble preamble);
  Ptr<YansWifiPhy> m_tx;
  struct Input m_input;
  struct Output m_output;
};

{
  Ptr<Packet> p = Create<Packet> (m_input.packetSize);
  WifiMode mode = WifiMode (m_input.txMode);
  m_tx->SetTxPowerLevel (m_input.txPowerLevel);
  m_tx->SendPacket (p, mode, WIFI_PREAMBLE_SHORT);
}

void 

  void SendA (void) const;
  void SendB (void) const;
  void Receive (Ptr<Packet> p, double snr, WifiMode mode, enum WifiPreamble preamble);
  Ptr<YansWifiPhy> m_txA;
  Ptr<YansWifiPhy> m_txB;
  uint32_t m_flowIdA;
  uint32_t m_flowIdB;
  struct Input m_input;

{
  Ptr<Packet> p = Create<Packet> (m_input.packetSizeA);
  p->AddByteTag (FlowIdTag (m_flowIdA));
  m_txA->SetTxPowerLevel (m_input.txPowerLevelA);
  m_txA->SendPacket (p, WifiMode (m_input.txModeA), 
		     WIFI_PREAMBLE_SHORT);
}

void 

{
  Ptr<Packet> p = Create<Packet> (m_input.packetSizeB);
  p->AddByteTag (FlowIdTag (m_flowIdB));
  m_txB->SetTxPowerLevel (m_input.txPowerLevelB);
  m_txB->SendPacket (p, WifiMode (m_input.txModeB), 
		     WIFI_PREAMBLE_SHORT);
}

void 




  virtual uint32_t GetNTxPower (void) const = 0;

  /**
   * \returns the tx power level.
   */
  virtual uint32_t GetTxPowerLevel (void) const = 0;

  /**
   * \param callback the callback to invoke
   *        upon successful packet reception.
   */

   * \param packet the packet to send
   * \param mode the transmission mode to use to send this packet
   * \param preamble the type of preamble to use to send this packet.
   * \param txPowerLevel a power level to use to send this packet. The real
   *        transmission power is calculated as txPowerMin + txPowerLevel * (txPowerMax - txPowerMin) / nTxLevels
   */
  virtual void SendPacket (Ptr<const Packet> packet, WifiMode mode, enum WifiPreamble preamble) = 0;

  /**
   * \param listener the new listener

(-)a/src/devices/wifi/yans-wifi-phy.cc (-4 / +22 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 489-497	Link Here

489

502

490

503

491

void

504

void

492

YansWifiPhy::SendPacket (Ptr<const Packet> packet, WifiMode txMode, WifiPreamble preamble, uint8_t txPower)

505

YansWifiPhy::SendPacket (Ptr<const Packet> packet, WifiMode txMode, WifiPreamble preamble)

493

506

494

  NS_LOG_FUNCTION (this << packet << txMode << preamble << (uint32_t)txPower);

507

  NS_LOG_FUNCTION (this << packet << txMode << preamble);

495

  /* Transmission can happen if:

508

  /* Transmission can happen if:

496

   *  - we are syncing on a packet. It is the responsability of the

509

   *  - we are syncing on a packet. It is the responsability of the

497

   *    MAC layer to avoid doing this but the PHY does nothing to

510

   *    MAC layer to avoid doing this but the PHY does nothing to

Lines 509-516	Link Here

509

  uint32_t dataRate500KbpsUnits = txMode.GetDataRate () / 500000;

522

  uint32_t dataRate500KbpsUnits = txMode.GetDataRate () / 500000;

510

  bool isShortPreamble = (WIFI_PREAMBLE_SHORT == preamble);

523

  bool isShortPreamble = (WIFI_PREAMBLE_SHORT == preamble);

511

  NotifyPromiscSniffTx (packet, (uint16_t)GetChannelFrequencyMhz (), GetChannelNumber (), dataRate500KbpsUnits, isShortPreamble);

524

  NotifyPromiscSniffTx (packet, (uint16_t)GetChannelFrequencyMhz (), GetChannelNumber (), dataRate500KbpsUnits, isShortPreamble);

512

  m_state->SwitchToTx (txDuration, packet, txMode, preamble, txPower);

525

  m_state->SwitchToTx (txDuration, packet, txMode, preamble, m_txPowerLevel);

513

  m_channel->Send (this, packet, GetPowerDbm (txPower) + m_txGainDb, txMode, preamble);

526

  m_channel->Send (this, packet, GetPowerDbm (m_txPowerLevel) + m_txGainDb, txMode, preamble);

514

527

515

528

516

uint32_t

529

uint32_t

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);
  virtual void RegisterListener (WifiPhyListener *listener);
  virtual bool IsStateCcaBusy (void);
  virtual bool IsStateIdle (void);

  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