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

(-)a/src/spectrum/model/half-duplex-ideal-phy.cc (+1 lines)
 Lines 380-385    Link Here 
380 
  NS_LOG_LOGIC (this << "state: " << m_state);
 380 
  NS_LOG_LOGIC (this << "state: " << m_state);
381 

          381
          

        

        

          382
          
  NS_ASSERT (m_state == RX);

          382
          
  NS_ASSERT (m_state == RX);

        

            

              
              
              383
              
  m_interference.AbortRx ();

            

        

          383
          
  m_phyRxAbortTrace (m_rxPacket);

          384
          
  m_phyRxAbortTrace (m_rxPacket);

        

        

          384
          
  m_endRxEventId.Cancel ();

          385
          
  m_endRxEventId.Cancel ();

        

        

          385
          
  m_rxPacket = 0;

          386
          
  m_rxPacket = 0;

        



(-)a/src/spectrum/model/spectrum-interference.cc
      (+5 lines)




  

    

    

       Lines 67-72
       
    
  Link Here 
    

  

        

          67
          
  m_errorModel->StartRx (p);

          67
          
  m_errorModel->StartRx (p);

        

        

          68
          
}

          68
          
}

        

        

          69
          

          69
          

        

            

              
              
              70
              
void

            

            

              71
              
SpectrumInterference::AbortRx ()

            

            

              72
              
{

            

            

              73
              
  m_receiving = false;

            

            

              74
              
}

            

        

          70
          

          75
          

        

        

          71
          
bool

          76
          
bool

        

        

          72
          
SpectrumInterference::EndRx ()

          77
          
SpectrumInterference::EndRx ()

        



(-)a/src/spectrum/model/spectrum-interference.h
      (+4 lines)




  

    

    

       Lines 64-69
       
    
  Link Here 
    

  

        

          64
          
   */

          64
          
   */

        

        

          65
          
  void StartRx (Ptr<const Packet> p, Ptr<const SpectrumValue> rxPsd);

          65
          
  void StartRx (Ptr<const Packet> p, Ptr<const SpectrumValue> rxPsd);

        

        

          66
          

          66
          

        

            

              
              
              67
              
  /**

            

            

              68
              
   * notify that the PHY has aborted RX

            

            

              69
              
   */

            

            

              70
              
  void AbortRx ();

            

        

          67
          

          71
          

        

        

          68
          
  /**

          72
          
  /**

        

        

          69
          
   * notify that the RX attempt has ended. The receiving PHY must call

          73
          
   * notify that the RX attempt has ended. The receiving PHY must call

        






  

  Return to bug 1300