diff options
| author | Nick Foster <nick@nerdnetworks.org> | 2010-11-17 18:31:21 -0800 |
|---|---|---|
| committer | Nick Foster <nick@nerdnetworks.org> | 2010-11-17 18:31:21 -0800 |
| commit | 95cf7753c175e868d1aacaad378bfe74d9454200 (patch) | |
| tree | 2eef9c811655d7a1b4d0fb020db7fa5125a2adc7 /host/lib/usrp/usrp2/usrp2_impl.cpp | |
| parent | 81c9f77306dc82f250bfb2871b8bd7db67a40085 (diff) | |
| parent | 89ae5f3f651cff22226e2b2c0ce0ed796dad4c71 (diff) | |
| download | uhd-95cf7753c175e868d1aacaad378bfe74d9454200.tar.gz uhd-95cf7753c175e868d1aacaad378bfe74d9454200.tar.bz2 uhd-95cf7753c175e868d1aacaad378bfe74d9454200.zip | |
Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into flow_ctrl
Conflicts:
host/lib/transport/udp_simple.cpp
host/lib/usrp/usrp2/mboard_impl.cpp
host/lib/usrp/usrp2/usrp2_iface.cpp
host/lib/usrp/usrp2/usrp2_regs.hpp
Diffstat (limited to 'host/lib/usrp/usrp2/usrp2_impl.cpp')
| -rw-r--r-- | host/lib/usrp/usrp2/usrp2_impl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/usrp/usrp2/usrp2_impl.cpp b/host/lib/usrp/usrp2/usrp2_impl.cpp index e2b3c2cdc..610e2f404 100644 --- a/host/lib/usrp/usrp2/usrp2_impl.cpp +++ b/host/lib/usrp/usrp2/usrp2_impl.cpp @@ -217,8 +217,8 @@ void usrp2_impl::get(const wax::obj &key_, wax::obj &val){ //handle the get request conditioned on the key switch(key.as<device_prop_t>()){ case DEVICE_PROP_NAME: - if (_mboards.size() > 1) val = std::string("usrp2 mimo device"); - else val = std::string("usrp2 device"); + if (_mboards.size() > 1) val = std::string("USRP-NXXX mimo device"); + else val = std::string("USRP-NXXX device"); return; case DEVICE_PROP_MBOARD: |