diff options
author | Josh Blum <josh@joshknows.com> | 2010-11-05 21:22:54 -0700 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2010-11-05 21:22:54 -0700 |
commit | 374f6ff05e66d10830a7567d2d793de2bf77c06b (patch) | |
tree | ca170bd9473de690ffff45b2041cf10f83fb0228 /host/lib/usrp/usrp2/usrp2_iface.hpp | |
parent | 92b5034cb5a6e17fe7ebc437f7ef26147d69eba3 (diff) | |
parent | c2cc364f9fde9633e2d7c04fa5b07275e17ba093 (diff) | |
download | uhd-374f6ff05e66d10830a7567d2d793de2bf77c06b.tar.gz uhd-374f6ff05e66d10830a7567d2d793de2bf77c06b.tar.bz2 uhd-374f6ff05e66d10830a7567d2d793de2bf77c06b.zip |
Merge branch 'master' into flow_ctrl
Conflicts:
host/lib/usrp/usrp2/mboard_impl.cpp
host/lib/usrp/usrp2/usrp2_impl.hpp
Diffstat (limited to 'host/lib/usrp/usrp2/usrp2_iface.hpp')
-rw-r--r-- | host/lib/usrp/usrp2/usrp2_iface.hpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/host/lib/usrp/usrp2/usrp2_iface.hpp b/host/lib/usrp/usrp2/usrp2_iface.hpp index 12fd4730a..bf36cbf6e 100644 --- a/host/lib/usrp/usrp2/usrp2_iface.hpp +++ b/host/lib/usrp/usrp2/usrp2_iface.hpp @@ -20,6 +20,7 @@ #include <uhd/transport/udp_simple.hpp> #include <uhd/types/serial.hpp> +#include <uhd/usrp/mboard_eeprom.hpp> #include <boost/shared_ptr.hpp> #include <boost/utility.hpp> #include <boost/cstdint.hpp> @@ -102,6 +103,9 @@ public: size_t num_bits, bool readback ) = 0; + + //motherboard eeprom map structure + uhd::usrp::mboard_eeprom_t mb_eeprom; }; #endif /* INCLUDED_USRP2_IFACE_HPP */ |