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

(-)a/src/devices/wifi/yans-wifi-phy.cc (-1 / +21 lines)
 Lines 155-160    Link Here 
155 
YansWifiPhy::ConfigureStandard (enum WifiPhyStandard standard)
 155 
YansWifiPhy::ConfigureStandard (enum WifiPhyStandard standard)
156 
{
 156 
{
157 
  NS_LOG_FUNCTION (this << standard);
 157 
  NS_LOG_FUNCTION (this << standard);
158 
  m_standard = standard;
158 
  switch (standard) {
 159 
  switch (standard) {
159 
  case WIFI_PHY_STANDARD_80211a:
 160 
  case WIFI_PHY_STANDARD_80211a:
160 
    Configure80211a ();
 161 
    Configure80211a ();
 Lines 380-386    Link Here 
380 
double
 381 
double
381 
YansWifiPhy::GetChannelFrequencyMhz() const
 382 
YansWifiPhy::GetChannelFrequencyMhz() const
382 
{
 383 
{
383 
  return m_channelStartingFrequency + 5 * (GetChannelNumber() - 1);
 384 
  double channelFreq;
385 
  switch (m_standard) {
386 
  case WIFI_PHY_STANDARD_80211b:
387 
  case WIFI_PHY_STANDARD_80211g:
388 
    channelFreq = m_channelStartingFrequency + 5 * (GetChannelNumber() - 1);
389 
    break;
390 
  case WIFI_PHY_STANDARD_80211a:
391 
  case WIFI_PHY_STANDARD_80211_10Mhz:
392 
  case WIFI_PHY_STANDARD_80211_5Mhz:
393 
  case WIFI_PHY_STANDARD_holland:
394 
  case WIFI_PHY_STANDARD_80211p_CCH:
395 
  case WIFI_PHY_STANDARD_80211p_SCH:
396 
    channelFreq = m_channelStartingFrequency + 5 * GetChannelNumber();
397 
    break;
398 
  default:
399 
    NS_ASSERT (false);
400 
    break;
401 
  }
402 

            

            


              403
              
  return channelFreq;

            

        

          384
          
}

          404
          
}

        

        

          385
          

          405
          

        

        

          386
          
void 

          406
          
void 

        



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




  

    

    

       Lines 217-222
       
    
  Link Here 
    

  

        

          217
          
  UniformVariable m_random;

          217
          
  UniformVariable m_random;

        

        

          218
          
  /// Standard-dependent center frequency of 0-th channel, MHz 

          218
          
  /// Standard-dependent center frequency of 0-th channel, MHz 

        

        

          219
          
  double m_channelStartingFrequency;

          219
          
  double m_channelStartingFrequency;

        

            

              
              
              220
              
  enum WifiPhyStandard m_standard;

            

        

          220
          
  Ptr<WifiPhyStateHelper> m_state;

          221
          
  Ptr<WifiPhyStateHelper> m_state;

        

        

          221
          
  InterferenceHelper m_interference;

          222
          
  InterferenceHelper m_interference;

        

        

          222
          
  Time m_channelSwitchDelay;

          223
          
  Time m_channelSwitchDelay;

        






  

  Return to bug 1015