diff options
author | Josh Blum <josh@joshknows.com> | 2010-11-05 19:55:19 -0700 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2010-11-05 19:55:19 -0700 |
commit | 13d735c65e40af23f978f96b5b418712976ab5f2 (patch) | |
tree | 020be6fd66df9a9d8ed9f328fa7c50713b6daa71 /host/lib/usrp/usrp2/usrp2_impl.hpp | |
parent | 9d50dea1c2f884835b606ccaa1444e5de96926cb (diff) | |
parent | f740a51cc0737b07fd4906f8ca80683ec6e87faa (diff) | |
download | uhd-13d735c65e40af23f978f96b5b418712976ab5f2.tar.gz uhd-13d735c65e40af23f978f96b5b418712976ab5f2.tar.bz2 uhd-13d735c65e40af23f978f96b5b418712976ab5f2.zip |
Merge branch 'mb_eeprom'
Diffstat (limited to 'host/lib/usrp/usrp2/usrp2_impl.hpp')
-rw-r--r-- | host/lib/usrp/usrp2/usrp2_impl.hpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/host/lib/usrp/usrp2/usrp2_impl.hpp b/host/lib/usrp/usrp2/usrp2_impl.hpp index 558726a2b..71f52878c 100644 --- a/host/lib/usrp/usrp2/usrp2_impl.hpp +++ b/host/lib/usrp/usrp2/usrp2_impl.hpp @@ -32,7 +32,7 @@ #include <boost/shared_ptr.hpp> #include <boost/function.hpp> #include <uhd/transport/vrt_if_packet.hpp> -#include <uhd/transport/udp_simple.hpp> //mtu +#include <uhd/transport/udp_simple.hpp> #include <uhd/transport/udp_zero_copy.hpp> #include <uhd/usrp/dboard_manager.hpp> #include <uhd/usrp/subdev_spec.hpp> @@ -92,15 +92,12 @@ public: return _clock_ctrl->get_master_clock_rate(); } + void handle_overflow(void); + private: size_t _index; - int _rev_hi, _rev_lo; const size_t _recv_frame_size; - - //properties for this mboard - void get(const wax::obj &, wax::obj &); - void set(const wax::obj &, const wax::obj &); - uhd::usrp::subdev_spec_t _rx_subdev_spec, _tx_subdev_spec; + bool _continuous_streaming; //interfaces usrp2_iface::sptr _iface; @@ -108,6 +105,11 @@ private: usrp2_codec_ctrl::sptr _codec_ctrl; usrp2_serdes_ctrl::sptr _serdes_ctrl; + //properties for this mboard + void get(const wax::obj &, wax::obj &); + void set(const wax::obj &, const wax::obj &); + uhd::usrp::subdev_spec_t _rx_subdev_spec, _tx_subdev_spec; + //rx and tx dboard methods and objects uhd::usrp::dboard_manager::sptr _dboard_manager; uhd::usrp::dboard_iface::sptr _dboard_iface; |