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

(-)a/src/lr-wpan/model/lr-wpan-phy.cc (-3 / +7 lines)
 Lines 81-86    Link Here 
81
                   TimeValue (Seconds (0.001792)),
81
                   TimeValue (Seconds (0.001792)),
82
                   MakeTimeAccessor (&LrWpanPhy::m_rxSetupTime),
82
                   MakeTimeAccessor (&LrWpanPhy::m_rxSetupTime),
83
                   MakeTimeChecker ())
83
                   MakeTimeChecker ())
84
    .AddAttribute ("RxSetupTime", "Switching time between transceiver states (Atmel RF231)",
85
                   TimeValue (MicroSeconds (110)),
86
                   MakeTimeAccessor (&LrWpanPhy::m_TRxTransitionTime),
87
                   MakeTimeChecker ())
84
    .AddTraceSource ("TrxState",
88
    .AddTraceSource ("TrxState",
85
                     "The state of the transceiver",
89
                     "The state of the transceiver",
86
                     MakeTraceSourceAccessor (&LrWpanPhy::m_trxStateLogger),
90
                     MakeTraceSourceAccessor (&LrWpanPhy::m_trxStateLogger),
 Lines 752-758    Link Here 
752
          // Delay for rxSetupTime
756
          // Delay for rxSetupTime
753
          m_trxStatePending = IEEE_802_15_4_PHY_TRX_OFF;
757
          m_trxStatePending = IEEE_802_15_4_PHY_TRX_OFF;
754
          NotifyListenersTransition (IEEE_802_15_4_PHY_TRX_OFF);
758
          NotifyListenersTransition (IEEE_802_15_4_PHY_TRX_OFF);
755
          m_setTRXState = Simulator::Schedule (m_rxSetupTime, &LrWpanPhy::EndSetTRXState, this);
759
          m_setTRXState = Simulator::Schedule (m_TRxTransitionTime, &LrWpanPhy::EndSetTRXState, this);
756
          return;
760
          return;
757
        }
761
        }
758
    }
762
    }
 Lines 806-812    Link Here 
806
        {
810
        {
807
          // Delay for rxSetupTime
811
          // Delay for rxSetupTime
808
          m_trxStatePending = IEEE_802_15_4_PHY_TX_ON;
812
          m_trxStatePending = IEEE_802_15_4_PHY_TX_ON;
809
          m_setTRXState = Simulator::Schedule (m_rxSetupTime, &LrWpanPhy::EndSetTRXState, this);
813
          m_setTRXState = Simulator::Schedule (m_TRxTransitionTime, &LrWpanPhy::EndSetTRXState, this);
810
          NotifyListenersTransition (IEEE_802_15_4_PHY_TX_ON);
814
          NotifyListenersTransition (IEEE_802_15_4_PHY_TX_ON);
811
          return;
815
          return;
812
        }
816
        }
 Lines 863-869    Link Here 
863
          m_trxStatePending = IEEE_802_15_4_PHY_RX_ON;
867
          m_trxStatePending = IEEE_802_15_4_PHY_RX_ON;
864
          NotifyListenersTransition (IEEE_802_15_4_PHY_RX_ON);
868
          NotifyListenersTransition (IEEE_802_15_4_PHY_RX_ON);
865
869
866
          m_setTRXState = Simulator::Schedule (m_rxSetupTime, &LrWpanPhy::EndSetTRXState, this);
870
          m_setTRXState = Simulator::Schedule (m_TRxTransitionTime, &LrWpanPhy::EndSetTRXState, this);
867
          return;
871
          return;
868
        }
872
        }
869
873
(-)a/src/lr-wpan/model/lr-wpan-phy.h (+7 lines)
 Lines 539-544    Link Here 
539
   */
539
   */
540
  Time m_rxSetupTime;
540
  Time m_rxSetupTime;
541
541
542
  /**
543
   * The time for switching the transceiver between states (e.g., Tx to Rx)
544
   *
545
   * The default value (110 us) is for ATMEL RF231 chips
546
   */
547
  Time m_TRxTransitionTime;
548
542
  /** List of Phy Listeners. */
549
  /** List of Phy Listeners. */
543
  typedef std::list<LrWpanPhyListener *> ListenerList;
550
  typedef std::list<LrWpanPhyListener *> ListenerList;
544
  ListenerList m_listeners;         //!< List of listeners.
551
  ListenerList m_listeners;         //!< List of listeners.

Return to bug 2169