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/usrp1/usrp1_iface.cpp | |
| 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/usrp1/usrp1_iface.cpp')
| -rw-r--r-- | host/lib/usrp/usrp1/usrp1_iface.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/host/lib/usrp/usrp1/usrp1_iface.cpp b/host/lib/usrp/usrp1/usrp1_iface.cpp index 64ced2905..691c51fe8 100644 --- a/host/lib/usrp/usrp1/usrp1_iface.cpp +++ b/host/lib/usrp/usrp1/usrp1_iface.cpp @@ -25,6 +25,7 @@ #include <iomanip> using namespace uhd; +using namespace uhd::usrp; using namespace uhd::transport; static const bool iface_debug = false; @@ -36,7 +37,8 @@ public: ******************************************************************/ usrp1_iface_impl(usrp_ctrl::sptr ctrl_transport) { - _ctrl_transport = ctrl_transport; + _ctrl_transport = ctrl_transport; + mb_eeprom = mboard_eeprom_t(*this, mboard_eeprom_t::MAP_B1XX); } ~usrp1_iface_impl(void) |