Attachment #2903 for bug #2492

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




                   DoubleValue (190),
                   MakeDoubleAccessor (&UanPhyDual::GetTxPowerDbPhy2, &UanPhyDual::SetTxPowerDbPhy2),
                   MakeDoubleChecker<double> ())
    .AddAttribute ("RxGainPhy1",
                   "Gain added to incoming signal at receiver of Phy1.",
                   DoubleValue (0),
                   MakeDoubleAccessor (&UanPhyDual::GetRxGainDbPhy1, &UanPhyDual::SetRxGainDbPhy1),
                   MakeDoubleChecker<double> ())
    .AddAttribute ("RxGainPhy2",
                   "Gain added to incoming signal at receiver of Phy2.",
                   DoubleValue (0),
                   MakeDoubleAccessor (&UanPhyDual::GetRxGainDbPhy2, &UanPhyDual::SetRxGainDbPhy2),
                   MakeDoubleChecker<double> ())
    .AddAttribute ("SupportedModesPhy1",
                   "List of modes supported by Phy1.",
                   UanModesListValue (UanPhyGen::GetDefaultModes ()),

  m_phy2->SetReceiveErrorCallback (cb);
}

void
UanPhyDual::SetRxGainDb (double gain)
{
  m_phy1->SetRxGainDb (gain);
  m_phy2->SetRxGainDb (gain);
}
void
UanPhyDual::SetRxGainDbPhy1 (double gain)
{
  m_phy1->SetRxGainDb (gain);
}

void
UanPhyDual::SetRxGainDbPhy2 (double gain)
{
  m_phy2->SetRxGainDb (gain);
}

void
UanPhyDual::SetTxPowerDb (double txpwr)

  m_phy2->SetCcaThresholdDb (thresh);
}

double
UanPhyDual::GetRxGainDb (void)
{
  NS_LOG_WARN ("Warning: UanPhyDual::GetRxGainDb returns RxGain of Phy 1");
  return m_phy1->GetRxGainDb ();
}
double
UanPhyDual::GetRxGainDbPhy1 (void) const
{
  return m_phy1->GetRxGainDb ();
}
double
UanPhyDual::GetRxGainDbPhy2 (void) const
{
  return m_phy2->GetRxGainDb ();
}

double
UanPhyDual::GetTxPowerDb (void)




  virtual void StartRxPacket (Ptr<Packet> pkt, double rxPowerDb, UanTxMode txMode, UanPdp pdp);
  virtual void SetReceiveOkCallback (RxOkCallback cb);
  virtual void SetReceiveErrorCallback (RxErrCallback cb);
  virtual void SetRxGainDb (double gain);
  virtual void SetTxPowerDb (double txpwr);
  virtual void SetRxThresholdDb (double thresh);
  virtual void SetCcaThresholdDb (double thresh);
  virtual double GetRxGainDb (void);
  virtual double GetTxPowerDb (void);
  virtual double GetRxThresholdDb (void);
  virtual double GetCcaThresholdDb (void);

  /** \copydoc UanPhy::SetTxPowerDb */
  void SetTxPowerDbPhy2 (double txpwr);

  /** \copydoc UanPhy::GetRxGainDb */
  double GetRxGainDbPhy1 (void) const;
  /** \copydoc UanPhy::GetRxGainDb */
  double GetRxGainDbPhy2 (void) const;
  /** \copydoc UanPhy::SetRxGainDb */
  void SetRxGainDbPhy1 (double gain);
  /** \copydoc UanPhy::SetRxGainDb */
  void SetRxGainDbPhy2 (double gain);

  /**
   * Get the list of available modes.




    m_transducer (0),
    m_device (0),
    m_mac (0),
    m_rxGainDb (0),
    m_txPwrDb (0),
    m_rxThreshDb (0),
    m_ccaThreshDb (0),

                   DoubleValue (190),
                   MakeDoubleAccessor (&UanPhyGen::m_txPwrDb),
                   MakeDoubleChecker<double> ())
    .AddAttribute ("RxGain",
                   "Gain added to incoming signal at receiver.",
                   DoubleValue (0),
                   MakeDoubleAccessor (&UanPhyGen::m_rxGainDb),
                   MakeDoubleChecker<double> ())
    .AddAttribute ("SupportedModes",
                   "List of modes supported by this PHY.",
                   UanModesListValue (UanPhyGen::GetDefaultModes ()),

void
UanPhyGen::StartRxPacket (Ptr<Packet> pkt, double rxPowerDb, UanTxMode txMode, UanPdp pdp)
{
  rxPowerDb += GetRxGainDb ();
  NS_LOG_DEBUG ("PHY " << m_mac->GetAddress () << ": rx power after RX gain = " << rxPowerDb << " dB re uPa");

  switch (m_state)



void
UanPhyGen::SetRxGainDb (double gain)
{
  m_rxGainDb = gain;

}
void
UanPhyGen::SetTxPowerDb (double txpwr)
{
  m_txPwrDb = txpwr;

{
  m_ccaThreshDb = thresh;
}

UanPhyGen::GetRxGainDb (void)
{
  return m_rxGainDb;
}
double
UanPhyGen::GetTxPowerDb (void)
{
  return m_txPwrDb;

}

double
UanPhyGen::GetRxThresholdDb (void)
{




  virtual bool IsStateRx (void);
  virtual bool IsStateTx (void);
  virtual bool IsStateCcaBusy (void);
  virtual void SetRxGainDb (double gain);
  virtual void SetTxPowerDb (double txpwr);
  virtual void SetRxThresholdDb (double thresh);
  virtual void SetCcaThresholdDb (double thresh);
  virtual double GetRxGainDb (void);
  virtual double GetTxPowerDb (void);
  virtual double GetRxThresholdDb (void);
  virtual double GetCcaThresholdDb (void);

  Ptr<UanPhyPer> m_per;             //!< Error model.
  Ptr<UanPhyCalcSinr> m_sinr;       //!< SINR calculator.

  double m_rxGainDb;                //!< Receive gain.
  double m_txPwrDb;                 //!< Transmit power.
  double m_rxThreshDb;              //!< Receive SINR threshold.
  double m_ccaThreshDb;             //!< CCA busy threshold.

  double m_minRxSinrDb;             //!< Minimum receive SINR during packet reception.
  double m_rxRecvPwrDb;             //!< Receiver power.
  Time m_pktRxArrTime;              //!< Packet arrival time.
  UanPdp m_pktRxPdp;                //!< Power delay profile of packet.
  UanTxMode m_pktRxMode;            //!< Packet transmission mode at receiver.

  bool m_cleared;                   //!< Flag when we've been cleared.




   */
  virtual void SetReceiveErrorCallback (RxErrCallback cb) = 0;

  /**
   * Set the receiver gain.
   *
   * \param gain Gain added at receiver, in dB.
   */
  virtual void SetRxGainDb (double gain) = 0;

  /**
   * Set the transmit power.

   */
  virtual void SetCcaThresholdDb (double thresh) = 0;

  /**
   * Get the receiver gain added to signal at receiver in dB.
   *
   * \return The gain.
   */
  virtual double GetRxGainDb (void) = 0;

  /**
   * Get the current transmit power, in dB.

(-)a/src/uan/model/uan-transducer-hd.cc (-2 / +32 lines)

Lines 25-31	Link Here

#include "uan-channel.h"

#include "uan-channel.h"

#include "ns3/log.h"

#include "ns3/log.h"

#include "ns3/pointer.h"

#include "ns3/pointer.h"

#include "ns3/double.h"

namespace ns3 {

namespace ns3 {

Lines 37-43	Link Here

  : UanTransducer (),

  : UanTransducer (),

    m_state (RX),

    m_state (RX),

    m_endTxTime (Seconds (0)),

    m_endTxTime (Seconds (0)),

    m_cleared (false)

    m_cleared (false),

    m_rxGainDb (0)

Lines 91-96	Link Here

    .SetParent<UanTransducer> ()

    .SetParent<UanTransducer> ()

    .SetGroupName ("Uan")

    .SetGroupName ("Uan")

    .AddConstructor<UanTransducerHd> ()

    .AddConstructor<UanTransducerHd> ()

    .AddAttribute ("RxGainDb",

                   "Gain in Db added to incoming signal at receiver.",

                   DoubleValue (0),

                   MakeDoubleAccessor (&UanTransducerHd::m_rxGainDb),

                   MakeDoubleChecker<double> ())

100

  return tid;

101

  return tid;

102

Lines 122-132	Link Here

122

128

123

129

124

void

130

void

131

UanTransducerHd::SetRxGainDb (double gainDb)

132

133

  m_rxGainDb = gainDb;

134

135

136

double

137

UanTransducerHd::GetRxGainDb (void)

138

139

  return m_rxGainDb;

140

141

142

double

143

UanTransducerHd::ApplyRxGainDb(double rxPowerDb, UanTxMode mode)

144

145

	rxPowerDb += GetRxGainDb ();

146

	NS_LOG_DEBUG ( "Rx power after RX gain = " << rxPowerDb << " db re uPa");

147

	return rxPowerDb;

148

149

150

void

125

UanTransducerHd::Receive (Ptr<Packet> packet,

151

UanTransducerHd::Receive (Ptr<Packet> packet,

126

                          double rxPowerDb,

152

                          double rxPowerDb,

127

                          UanTxMode txMode,

153

                          UanTxMode txMode,

128

                          UanPdp pdp)

154

                          UanPdp pdp)

129

155

156

  //Apply receiver gain in dB

157

  rxPowerDb = ApplyRxGainDb(rxPowerDb, txMode);

158

159

130

  UanPacketArrival arrival (packet,

160

  UanPacketArrival arrival (packet,

131

                            rxPowerDb,

161

                            rxPowerDb,

132

                            txMode,

162

                            txMode,

(-)a/src/uan/model/uan-transducer-hd.h (+4 lines)

Lines 52-57	Link Here

  virtual bool IsRx (void) const;

  virtual bool IsRx (void) const;

  virtual bool IsTx (void) const;

  virtual bool IsTx (void) const;

  virtual const ArrivalList &GetArrivalList (void) const;

  virtual const ArrivalList &GetArrivalList (void) const;

  virtual double ApplyRxGainDb(double rxPowerDb, UanTxMode mode);

  virtual void SetRxGainDb (double gainDb);

  virtual double GetRxGainDb (void);

  virtual void Receive (Ptr<Packet> packet, double rxPowerDb, UanTxMode txMode, UanPdp pdp);

  virtual void Receive (Ptr<Packet> packet, double rxPowerDb, UanTxMode txMode, UanPdp pdp);

  virtual void Transmit (Ptr<UanPhy> src, Ptr<Packet> packet, double txPowerDb, UanTxMode txMode);

  virtual void Transmit (Ptr<UanPhy> src, Ptr<Packet> packet, double txPowerDb, UanTxMode txMode);

  virtual void SetChannel (Ptr<UanChannel> chan);

  virtual void SetChannel (Ptr<UanChannel> chan);

Lines 68-73	Link Here

  EventId m_endTxEvent;       //!< Event scheduled for end of transmission.

  EventId m_endTxEvent;       //!< Event scheduled for end of transmission.

  Time m_endTxTime;           //!< Time at which transmission will be completed.

  Time m_endTxTime;           //!< Time at which transmission will be completed.

  bool m_cleared;             //!< Flab when we've been cleared.

  bool m_cleared;             //!< Flab when we've been cleared.

  double m_rxGainDb;          //!< Receive gain in Db.

/**

/**

   * Remove an entry from the arrival list.

   * Remove an entry from the arrival list.




   */
  virtual const ArrivalList &GetArrivalList (void) const = 0;
  /**
   * Set the receiver gain.
   *
   * \param gainDb Gain added at receiver, in dB.
   */
  virtual void SetRxGainDb (double gainDb) = 0;  
  /**
   * Get the receiver gain added to signal at receiver in dB.
   *
   * \return The gain.
   */
  virtual double GetRxGainDb (void) = 0;
  /**
   * Apply receiver gain in dB to the received power.
   *
   * \return Updated receive power with gain applied.
   */
  virtual double ApplyRxGainDb(double rxPowerDb, UanTxMode mode) = 0;
  /**
   * Notify this object that a new packet has arrived at this nodes location
   *
   * \param packet Packet arriving.

Return to bug 2492