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

(-)a/src/wifi/model/dca-txop.cc (-10 / +10 lines)
 Lines 24-29    Link Here 
24 
#include "ns3/simulator.h"
 24 
#include "ns3/simulator.h"
25 
#include "ns3/node.h"
 25 
#include "ns3/node.h"
26 
#include "ns3/uinteger.h"
 26 
#include "ns3/uinteger.h"
27 
#include "ns3/pointer.h"
27 

          28
          

        

        

          28
          
#include "dca-txop.h"

          29
          
#include "dca-txop.h"

        

        

          29
          
#include "dcf-manager.h"

          30
          
#include "dcf-manager.h"

        

  

    

    

       Lines 102-107
       
    
  Link Here 
    

  

        

          102
          
  static TypeId tid = TypeId ("ns3::DcaTxop")

          103
          
  static TypeId tid = TypeId ("ns3::DcaTxop")

        

        

          103
          
    .SetParent (ns3::Dcf::GetTypeId ())

          104
          
    .SetParent (ns3::Dcf::GetTypeId ())

        

        

          104
          
    .AddConstructor<DcaTxop> ()

          105
          
    .AddConstructor<DcaTxop> ()

        

            

              
              
              106
              
    .AddAttribute ("Queue", "The WifiMacQueue object",

            

            

              107
              
                   PointerValue (),

            

            

              108
              
                   MakePointerAccessor (&DcaTxop::GetQueue),

            

            

              109
              
                   MakePointerChecker<WifiMacQueue> ())

            

        

          105
          
    ;

          110
          
    ;

        

        

          106
          
  return tid;

          111
          
  return tid;

        

        

          107
          
}

          112
          
}

        

  

    

    

       Lines 171-188
       
    
  Link Here 
    

  

        

          171
          
  m_txFailedCallback = callback;

          176
          
  m_txFailedCallback = callback;

        

        

          172
          
}

          177
          
}

        

        

          173
          

          178
          

        

          
            

              174
              
void 


              179
              
Ptr<WifiMacQueue >

            

            

              175
              
DcaTxop::SetMaxQueueSize (uint32_t size)


              180
              
DcaTxop::GetQueue () const

            

        

          176
          
{

          181
          
{

        

          
            

              177
              
  NS_LOG_FUNCTION (this << size);


              182
              
  NS_LOG_FUNCTION (this);

            

            

              178
              
  m_queue->SetMaxSize (size);


              183
              
  return m_queue;

            

        

          179
          
}

          184
          
}

        

          
            

              180
              
void 


              185
              

            

            

              181
              
DcaTxop::SetMaxQueueDelay (Time delay)


              
              
            

            

              182
              
{


            

            

              183
              
  NS_LOG_FUNCTION (this << delay);


            

            

              184
              
  m_queue->SetMaxDelay (delay);


            

            

              185
              
}


            

        

          186
          
void 

          186
          
void 

        

        

          187
          
DcaTxop::SetMinCw (uint32_t minCw)

          187
          
DcaTxop::SetMinCw (uint32_t minCw)

        

        

          188
          
{

          188
          
{

        



(-)a/src/wifi/model/dca-txop.h
      (-2 / +1 lines)




  

    

    

       Lines 89-96
       
    
  Link Here 
    

  

        

          89
          
   */

          89
          
   */

        

        

          90
          
  void SetTxFailedCallback (TxFailed callback);

          90
          
  void SetTxFailedCallback (TxFailed callback);

        

        

          91
          

          91
          

        

          
            

              92
              
  void SetMaxQueueSize (uint32_t size);


              92
              
  Ptr<WifiMacQueue > GetQueue () const; 

            

            

              93
              
  void SetMaxQueueDelay (Time delay);


              
              
            

        

          94
          
  virtual void SetMinCw (uint32_t minCw);

          93
          
  virtual void SetMinCw (uint32_t minCw);

        

        

          95
          
  virtual void SetMaxCw (uint32_t maxCw);

          94
          
  virtual void SetMaxCw (uint32_t maxCw);

        

        

          96
          
  virtual void SetAifsn (uint32_t aifsn);

          95
          
  virtual void SetAifsn (uint32_t aifsn);

        



(-)a/src/wifi/model/edca-txop-n.cc
      (-11 / +9 lines)




  

    

    

       Lines 21-26
       
    
  Link Here 
    

  

        

          21
          
 */

          21
          
 */

        

        

          22
          
#include "ns3/log.h"

          22
          
#include "ns3/log.h"

        

        

          23
          
#include "ns3/assert.h"

          23
          
#include "ns3/assert.h"

        

            

              
              
              24
              
#include "ns3/pointer.h"

            

        

          24
          

          25
          

        

        

          25
          
#include "edca-txop-n.h"

          26
          
#include "edca-txop-n.h"

        

        

          26
          
#include "mac-low.h"

          27
          
#include "mac-low.h"

        

  

    

    

       Lines 138-143
       
    
  Link Here 
    

  

        

          138
          
                   UintegerValue(0),

          139
          
                   UintegerValue(0),

        

        

          139
          
                   MakeUintegerAccessor (&EdcaTxopN::SetBlockAckInactivityTimeout),

          140
          
                   MakeUintegerAccessor (&EdcaTxopN::SetBlockAckInactivityTimeout),

        

        

          140
          
                   MakeUintegerChecker<uint16_t> ())

          141
          
                   MakeUintegerChecker<uint16_t> ())

        

            

              
              
              142
              
    .AddAttribute ("Queue", "The WifiMacQueue object",

            

            

              143
              
                   PointerValue (),

            

            

              144
              
                   MakePointerAccessor (&EdcaTxopN::GetQueue),

            

            

              145
              
                   MakePointerChecker<WifiMacQueue> ())

            

        

          141
          
    ;

          146
          
    ;

        

        

          142
          
  return tid;

          147
          
  return tid;

        

        

          143
          
}

          148
          
}

        

  

    

    

       Lines 230-247
       
    
  Link Here 
    

  

        

          230
          
  return m_typeOfStation;

          235
          
  return m_typeOfStation;

        

        

          231
          
}

          236
          
}

        

        

          232
          

          237
          

        

          
            

              233
              
void 


              238
              
Ptr<WifiMacQueue >

            

            

              234
              
EdcaTxopN::SetMaxQueueSize (uint32_t size)


              239
              
EdcaTxopN::GetQueue () const

            

        

          235
          
{

          240
          
{

        

          
            

              236
              
  NS_LOG_FUNCTION (this << size);


              241
              
  NS_LOG_FUNCTION (this);

            

            

              237
              
  m_queue->SetMaxSize (size);


              242
              
  return m_queue;

            

            

              238
              
}


              
              
            

            

              239
              


            

            

              240
              
void


            

            

              241
              
EdcaTxopN::SetMaxQueueDelay (Time delay)


            

            

              242
              
{


            

            

              243
              
  NS_LOG_FUNCTION (this << delay);


            

            

              244
              
  m_queue->SetMaxDelay (delay);


            

        

          245
          
}

          243
          
}

        

        

          246
          

          244
          

        

        

          247
          
void 

          245
          
void 

        



(-)a/src/wifi/model/edca-txop-n.h
      (-2 / +1 lines)




  

    

    

       Lines 93-100
       
    
  Link Here 
    

  

        

          93
          
  void SetTypeOfStation (enum TypeOfStation type);

          93
          
  void SetTypeOfStation (enum TypeOfStation type);

        

        

          94
          
  enum TypeOfStation GetTypeOfStation (void) const;

          94
          
  enum TypeOfStation GetTypeOfStation (void) const;

        

        

          95
          

          95
          

        

          
            

              96
              
  void SetMaxQueueSize (uint32_t size);


              96
              
  Ptr<WifiMacQueue > GetQueue () const; 

            

            

              97
              
  void SetMaxQueueDelay (Time delay);


              
              
            

        

          98
          
  virtual void SetMinCw (uint32_t minCw);

          97
          
  virtual void SetMinCw (uint32_t minCw);

        

        

          99
          
  virtual void SetMaxCw (uint32_t maxCw);

          98
          
  virtual void SetMaxCw (uint32_t maxCw);

        

        

          100
          
  virtual void SetAifsn (uint32_t aifsn);

          99
          
  virtual void SetAifsn (uint32_t aifsn);

        






  

  Return to bug 1090