diff options
author | Josh Blum <josh@joshknows.com> | 2010-11-04 19:39:57 -0700 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2010-11-04 19:39:57 -0700 |
commit | c8cb4bcadc32e59e98fc2901eb94830f600d5d28 (patch) | |
tree | 52e03a130bb3611b927aa80f436cc5d8d9cf9c41 /host/lib/usrp/usrp2/usrp2_impl.hpp | |
parent | 20c9b194aa40e28f08898256039fbbbd7883b2ad (diff) | |
download | uhd-c8cb4bcadc32e59e98fc2901eb94830f600d5d28.tar.gz uhd-c8cb4bcadc32e59e98fc2901eb94830f600d5d28.tar.bz2 uhd-c8cb4bcadc32e59e98fc2901eb94830f600d5d28.zip |
usrp2: implemented mboard eeprom into usrp2 mboard
Diffstat (limited to 'host/lib/usrp/usrp2/usrp2_impl.hpp')
-rw-r--r-- | host/lib/usrp/usrp2/usrp2_impl.hpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/host/lib/usrp/usrp2/usrp2_impl.hpp b/host/lib/usrp/usrp2/usrp2_impl.hpp index 558726a2b..7b1a2b1eb 100644 --- a/host/lib/usrp/usrp2/usrp2_impl.hpp +++ b/host/lib/usrp/usrp2/usrp2_impl.hpp @@ -29,10 +29,11 @@ #include <uhd/types/stream_cmd.hpp> #include <uhd/types/clock_config.hpp> #include <uhd/usrp/dboard_eeprom.hpp> +#include <uhd/usrp/mboard_eeprom.hpp> #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> @@ -94,20 +95,20 @@ public: 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; - //interfaces usrp2_iface::sptr _iface; usrp2_clock_ctrl::sptr _clock_ctrl; 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; + uhd::usrp::mboard_eeprom_t _mboard_eeprom; + //rx and tx dboard methods and objects uhd::usrp::dboard_manager::sptr _dboard_manager; uhd::usrp::dboard_iface::sptr _dboard_iface; |