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

(-)a/src/lte/model/lte-spectrum-phy.cc (-2 / +2 lines)
 Lines 104-110    Link Here 
104 

          104
          

        

        

          105
          

          105
          

        

        

          106
          

          106
          

        

          
            

              107
              
Ptr<Object>


              107
              
Ptr<NetDevice>

            

        

          108
          
LteSpectrumPhy::GetDevice ()

          108
          
LteSpectrumPhy::GetDevice ()

        

        

          109
          
{

          109
          
{

        

        

          110
          
  NS_LOG_FUNCTION (this);

          110
          
  NS_LOG_FUNCTION (this);

        

  

    

    

       Lines 121-127
       
    
  Link Here 
    

  

        

          121
          

          121
          

        

        

          122
          

          122
          

        

        

          123
          
void

          123
          
void

        

          
            

              124
              
LteSpectrumPhy::SetDevice (Ptr<Object> d)


              124
              
LteSpectrumPhy::SetDevice (Ptr<NetDevice> d)

            

        

          125
          
{

          125
          
{

        

        

          126
          
  NS_LOG_FUNCTION (this << d);

          126
          
  NS_LOG_FUNCTION (this << d);

        

        

          127
          
  m_device = d;

          127
          
  m_device = d;

        



(-)a/src/lte/model/lte-spectrum-phy.h
      (-3 / +3 lines)




  

    

    

       Lines 66-74
       
    
  Link Here 
    

  

        

          66
          
  // inherited from SpectrumPhy

          66
          
  // inherited from SpectrumPhy

        

        

          67
          
  void SetChannel (Ptr<SpectrumChannel> c);

          67
          
  void SetChannel (Ptr<SpectrumChannel> c);

        

        

          68
          
  void SetMobility (Ptr<Object> m);

          68
          
  void SetMobility (Ptr<Object> m);

        

          
            

              69
              
  void SetDevice (Ptr<Object> d);


              69
              
  void SetDevice (Ptr<NetDevice> d);

            

        

          70
          
  Ptr<Object> GetMobility ();

          70
          
  Ptr<Object> GetMobility ();

        

          
            

              71
              
  Ptr<Object> GetDevice ();


              71
              
  Ptr<NetDevice> GetDevice ();

            

        

          72
          
  Ptr<const SpectrumModel> GetRxSpectrumModel () const;

          72
          
  Ptr<const SpectrumModel> GetRxSpectrumModel () const;

        

        

          73
          

          73
          

        

        

          74
          
  /**

          74
          
  /**

        

  

    

    

       Lines 184-190
       
    
  Link Here 
    

  

        

          184
          

          184
          

        

        

          185
          
  Ptr<Object> m_mobility;

          185
          
  Ptr<Object> m_mobility;

        

        

          186
          

          186
          

        

          
            

              187
              
  Ptr<Object> m_device;


              187
              
  Ptr<NetDevice> m_device;

            

        

          188
          

          188
          

        

        

          189
          
  Ptr<SpectrumChannel> m_channel;

          189
          
  Ptr<SpectrumChannel> m_channel;

        

        

          190
          

          190
          

        



(-)a/src/spectrum/model/half-duplex-ideal-phy.cc
      (-2 / +2 lines)




  

    

    

       Lines 126-132
       
    
  Link Here 
    

  

        

          126
          

          126
          

        

        

          127
          

          127
          

        

        

          128
          

          128
          

        

          
            

              129
              
Ptr<Object>


              129
              
Ptr<NetDevice>

            

        

          130
          
HalfDuplexIdealPhy::GetDevice ()

          130
          
HalfDuplexIdealPhy::GetDevice ()

        

        

          131
          
{

          131
          
{

        

        

          132
          
  NS_LOG_FUNCTION (this);

          132
          
  NS_LOG_FUNCTION (this);

        

  

    

    

       Lines 143-149
       
    
  Link Here 
    

  

        

          143
          

          143
          

        

        

          144
          

          144
          

        

        

          145
          
void

          145
          
void

        

          
            

              146
              
HalfDuplexIdealPhy::SetDevice (Ptr<Object> d)


              146
              
HalfDuplexIdealPhy::SetDevice (Ptr<NetDevice> d)

            

        

          147
          
{

          147
          
{

        

        

          148
          
  NS_LOG_FUNCTION (this << d);

          148
          
  NS_LOG_FUNCTION (this << d);

        

        

          149
          
  m_netDevice = d;

          149
          
  m_netDevice = d;

        



(-)a/src/spectrum/model/half-duplex-ideal-phy.h
      (-3 / +3 lines)




  

    

    

       Lines 95-103
       
    
  Link Here 
    

  

        

          95
          
  // inherited from SpectrumPhy

          95
          
  // inherited from SpectrumPhy

        

        

          96
          
  void SetChannel (Ptr<SpectrumChannel> c);

          96
          
  void SetChannel (Ptr<SpectrumChannel> c);

        

        

          97
          
  void SetMobility (Ptr<Object> m);

          97
          
  void SetMobility (Ptr<Object> m);

        

          
            

              98
              
  void SetDevice (Ptr<Object> d);


              98
              
  void SetDevice (Ptr<NetDevice> d);

            

        

          99
          
  Ptr<Object> GetMobility ();

          99
          
  Ptr<Object> GetMobility ();

        

          
            

              100
              
  Ptr<Object> GetDevice ();


              100
              
  Ptr<NetDevice> GetDevice ();

            

        

          101
          
  Ptr<const SpectrumModel> GetRxSpectrumModel () const;

          101
          
  Ptr<const SpectrumModel> GetRxSpectrumModel () const;

        

        

          102
          
  void StartRx (Ptr<PacketBurst> p, Ptr <const SpectrumValue> rxPsd, SpectrumType st, Time duration);

          102
          
  void StartRx (Ptr<PacketBurst> p, Ptr <const SpectrumValue> rxPsd, SpectrumType st, Time duration);

        

        

          103
          

          103
          

        

  

    

    

       Lines 196-202
       
    
  Link Here 
    

  

        

          196
          
  EventId m_endRxEventId;

          196
          
  EventId m_endRxEventId;

        

        

          197
          

          197
          

        

        

          198
          
  Ptr<Object> m_mobility;

          198
          
  Ptr<Object> m_mobility;

        

          
            

              199
              
  Ptr<Object> m_netDevice;


              199
              
  Ptr<NetDevice> m_netDevice;

            

        

          200
          
  Ptr<SpectrumChannel> m_channel;

          200
          
  Ptr<SpectrumChannel> m_channel;

        

        

          201
          

          201
          

        

        

          202
          
  Ptr<SpectrumValue> m_txPsd;

          202
          
  Ptr<SpectrumValue> m_txPsd;

        



(-)a/src/spectrum/model/spectrum-analyzer.cc
      (-2 / +2 lines)




  

    

    

       Lines 89-95
       
    
  Link Here 
    

  

        

          89
          

          89
          

        

        

          90
          

          90
          

        

        

          91
          

          91
          

        

          
            

              92
              
Ptr<Object>


              92
              
Ptr<NetDevice>

            

        

          93
          
SpectrumAnalyzer::GetDevice ()

          93
          
SpectrumAnalyzer::GetDevice ()

        

        

          94
          
{

          94
          
{

        

        

          95
          
  return m_netDevice;

          95
          
  return m_netDevice;

        

  

    

    

       Lines 110-116
       
    
  Link Here 
    

  

        

          110
          
}

          110
          
}

        

        

          111
          

          111
          

        

        

          112
          
void

          112
          
void

        

          
            

              113
              
SpectrumAnalyzer::SetDevice (Ptr<Object> d)


              113
              
SpectrumAnalyzer::SetDevice (Ptr<NetDevice> d)

            

        

          114
          
{

          114
          
{

        

        

          115
          
  NS_LOG_FUNCTION (this << d);

          115
          
  NS_LOG_FUNCTION (this << d);

        

        

          116
          
  m_netDevice = d;

          116
          
  m_netDevice = d;

        



(-)a/src/spectrum/model/spectrum-analyzer.h
      (-3 / +3 lines)




  

    

    

       Lines 54-62
       
    
  Link Here 
    

  

        

          54
          
// inherited from SpectrumPhy

          54
          
// inherited from SpectrumPhy

        

        

          55
          
  void SetChannel (Ptr<SpectrumChannel> c);

          55
          
  void SetChannel (Ptr<SpectrumChannel> c);

        

        

          56
          
  void SetMobility (Ptr<Object> m);

          56
          
  void SetMobility (Ptr<Object> m);

        

          
            

              57
              
  void SetDevice (Ptr<Object> d);


              57
              
  void SetDevice (Ptr<NetDevice> d);

            

        

          58
          
  Ptr<Object> GetMobility ();

          58
          
  Ptr<Object> GetMobility ();

        

          
            

              59
              
  Ptr<Object> GetDevice ();


              59
              
  Ptr<NetDevice> GetDevice ();

            

        

          60
          
  Ptr<const SpectrumModel> GetRxSpectrumModel () const;

          60
          
  Ptr<const SpectrumModel> GetRxSpectrumModel () const;

        

        

          61
          
  void StartRx (Ptr<PacketBurst> pb, Ptr <const SpectrumValue> rxPowerSpectralDensity, SpectrumType st, Time duration);

          61
          
  void StartRx (Ptr<PacketBurst> pb, Ptr <const SpectrumValue> rxPowerSpectralDensity, SpectrumType st, Time duration);

        

        

          62
          

          62
          

        

  

    

    

       Lines 87-93
       
    
  Link Here 
    

  

        

          87
          

          87
          

        

        

          88
          
private:

          88
          
private:

        

        

          89
          
  Ptr<Object> m_mobility;

          89
          
  Ptr<Object> m_mobility;

        

          
            

              90
              
  Ptr<Object> m_netDevice;


              90
              
  Ptr<NetDevice> m_netDevice;

            

        

          91
          
  Ptr<SpectrumChannel> m_channel;

          91
          
  Ptr<SpectrumChannel> m_channel;

        

        

          92
          

          92
          

        

        

          93
          
  virtual void GenerateReport ();

          93
          
  virtual void GenerateReport ();

        



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




  

    

    

       Lines 54-67
       
    
  Link Here 
    

  

        

          54
          
   *

          54
          
   *

        

        

          55
          
   * @param d the NetDevice instance

          55
          
   * @param d the NetDevice instance

        

        

          56
          
   */

          56
          
   */

        

          
            

              57
              
  virtual void SetDevice (Ptr<Object> d) = 0;


              57
              
  virtual void SetDevice (Ptr<NetDevice> d) = 0;

            

        

          58
          

          58
          

        

        

          59
          
  /**

          59
          
  /**

        

        

          60
          
   * get the associated NetDevice instance

          60
          
   * get the associated NetDevice instance

        

        

          61
          
   *

          61
          
   *

        

        

          62
          
   * @return a Ptr to the associated NetDevice instance

          62
          
   * @return a Ptr to the associated NetDevice instance

        

        

          63
          
   */

          63
          
   */

        

          
            

              64
              
  virtual Ptr<Object> GetDevice () = 0;


              64
              
  virtual Ptr<NetDevice> GetDevice () = 0;

            

        

          65
          

          65
          

        

        

          66
          
  /**

          66
          
  /**

        

        

          67
          
   * Set the mobility model associated with this device.

          67
          
   * Set the mobility model associated with this device.

        



(-)a/src/spectrum/model/waveform-generator.cc
      (-2 / +2 lines)




  

    

    

       Lines 89-95
       
    
  Link Here 
    

  

        

          89
          

          89
          

        

        

          90
          

          90
          

        

        

          91
          

          91
          

        

          
            

              92
              
Ptr<Object>


              92
              
Ptr<NetDevice>

            

        

          93
          
WaveformGenerator::GetDevice ()

          93
          
WaveformGenerator::GetDevice ()

        

        

          94
          
{

          94
          
{

        

        

          95
          
  return m_netDevice;

          95
          
  return m_netDevice;

        

  

    

    

       Lines 111-117
       
    
  Link Here 
    

  

        

          111
          
}

          111
          
}

        

        

          112
          

          112
          

        

        

          113
          
void

          113
          
void

        

          
            

              114
              
WaveformGenerator::SetDevice (Ptr<Object> d)


              114
              
WaveformGenerator::SetDevice (Ptr<NetDevice> d)

            

        

          115
          
{

          115
          
{

        

        

          116
          
  m_netDevice = d;

          116
          
  m_netDevice = d;

        

        

          117
          
}

          117
          
}

        



(-)a/src/spectrum/model/waveform-generator.h
      (-3 / +3 lines)




  

    

    

       Lines 57-65
       
    
  Link Here 
    

  

        

          57
          
  // inherited from SpectrumPhy

          57
          
  // inherited from SpectrumPhy

        

        

          58
          
  void SetChannel (Ptr<SpectrumChannel> c);

          58
          
  void SetChannel (Ptr<SpectrumChannel> c);

        

        

          59
          
  void SetMobility (Ptr<Object> m);

          59
          
  void SetMobility (Ptr<Object> m);

        

          
            

              60
              
  void SetDevice (Ptr<Object> d);


              60
              
  void SetDevice (Ptr<NetDevice> d);

            

        

          61
          
  Ptr<Object> GetMobility ();

          61
          
  Ptr<Object> GetMobility ();

        

          
            

              62
              
  Ptr<Object> GetDevice ();


              62
              
  Ptr<NetDevice> GetDevice ();

            

        

          63
          
  Ptr<const SpectrumModel> GetRxSpectrumModel () const;

          63
          
  Ptr<const SpectrumModel> GetRxSpectrumModel () const;

        

        

          64
          
  void StartRx (Ptr<PacketBurst> p, Ptr <const SpectrumValue> rxPsd, SpectrumType st, Time duration);

          64
          
  void StartRx (Ptr<PacketBurst> p, Ptr <const SpectrumValue> rxPsd, SpectrumType st, Time duration);

        

        

          65
          

          65
          

        

  

    

    

       Lines 130-136
       
    
  Link Here 
    

  

        

          130
          
  virtual void DoDispose (void);

          130
          
  virtual void DoDispose (void);

        

        

          131
          

          131
          

        

        

          132
          
  Ptr<Object> m_mobility;

          132
          
  Ptr<Object> m_mobility;

        

          
            

              133
              
  Ptr<Object> m_netDevice;


              133
              
  Ptr<NetDevice> m_netDevice;

            

        

          134
          
  Ptr<SpectrumChannel> m_channel;

          134
          
  Ptr<SpectrumChannel> m_channel;

        

        

          135
          

          135
          

        

        

          136
          
  virtual void GenerateWaveform ();

          136
          
  virtual void GenerateWaveform ();

        






  

  Return to bug 1271