diff options
| author | Josh Blum <josh@joshknows.com> | 2010-06-04 21:13:53 +0000 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-06-04 21:13:53 +0000 |
| commit | 9fa97e153d01985bc7bdf9db8a97d79a328a3e61 (patch) | |
| tree | 68606b25eff9d2d88878bbd89c794fc86ac18fb5 /host/lib/usrp/usrp2/usrp2_impl.hpp | |
| parent | 685cf432a373ee7556db507f7958f51e6ccf581a (diff) | |
| parent | 4f0736ef7ce93d58f0768d99257b2624d5711490 (diff) | |
| download | uhd-9fa97e153d01985bc7bdf9db8a97d79a328a3e61.tar.gz uhd-9fa97e153d01985bc7bdf9db8a97d79a328a3e61.tar.bz2 uhd-9fa97e153d01985bc7bdf9db8a97d79a328a3e61.zip | |
Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into usrp_e
Diffstat (limited to 'host/lib/usrp/usrp2/usrp2_impl.hpp')
| -rw-r--r-- | host/lib/usrp/usrp2/usrp2_impl.hpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/host/lib/usrp/usrp2/usrp2_impl.hpp b/host/lib/usrp/usrp2/usrp2_impl.hpp index 40c193866..6ad151a0a 100644 --- a/host/lib/usrp/usrp2/usrp2_impl.hpp +++ b/host/lib/usrp/usrp2/usrp2_impl.hpp @@ -43,7 +43,7 @@ */ uhd::usrp::dboard_iface::sptr make_usrp2_dboard_iface( usrp2_iface::sptr iface, - clock_ctrl::sptr clk_ctrl + usrp2_clock_ctrl::sptr clk_ctrl ); /*! @@ -124,8 +124,8 @@ public: ); private: - double get_master_clock_freq(void){ - return _iface->get_master_clock_freq(); + inline double get_master_clock_freq(void){ + return _clock_ctrl->get_master_clock_rate(); } //device properties interface @@ -134,9 +134,9 @@ private: //interfaces usrp2_iface::sptr _iface; - clock_ctrl::sptr _clock_ctrl; - codec_ctrl::sptr _codec_ctrl; - serdes_ctrl::sptr _serdes_ctrl; + usrp2_clock_ctrl::sptr _clock_ctrl; + usrp2_codec_ctrl::sptr _codec_ctrl; + usrp2_serdes_ctrl::sptr _serdes_ctrl; /******************************************************************* * Deal with the rx and tx packet sizes |