diff options
| author | Martin Braun <martin.braun@ettus.com> | 2017-03-24 19:06:32 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2017-03-24 19:06:32 -0700 |
| commit | f3cabe9ffd7a27ee8c0a6d57b4e1dd6835760a18 (patch) | |
| tree | 073efbb38e81ad1f8563c4844dad3f7449eab38b /host/include | |
| parent | 4d3572494e979bb94a929a0485813c0ba3fcc453 (diff) | |
| parent | 04b205d15bea5ef56d4f96446db6ec20124df9e7 (diff) | |
| download | uhd-f3cabe9ffd7a27ee8c0a6d57b4e1dd6835760a18.tar.gz uhd-f3cabe9ffd7a27ee8c0a6d57b4e1dd6835760a18.tar.bz2 uhd-f3cabe9ffd7a27ee8c0a6d57b4e1dd6835760a18.zip | |
Merge branch 'maint'
Diffstat (limited to 'host/include')
| -rw-r--r-- | host/include/uhd/types/sid.hpp | 8 | ||||
| -rw-r--r-- | host/include/uhd/usrp/multi_usrp.hpp | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/host/include/uhd/types/sid.hpp b/host/include/uhd/types/sid.hpp index f1471549e..f9fa40273 100644 --- a/host/include/uhd/types/sid.hpp +++ b/host/include/uhd/types/sid.hpp @@ -39,7 +39,13 @@ namespace uhd { * is required, we use the combination of the 8-bit address and the 8-bit * endpoint. * - * \section sid_str_repr String Representation + * <pre> + * +-------------+--------------+-------------+--------------+ + * | SRC address | SRC endpoint | DST address | DST endpoint | + * +-------------+--------------+-------------+--------------+ + * </pre> + * + * \section sid_str_repr String Representation (pretty printing) * * The string representation of a SID is of the form * diff --git a/host/include/uhd/usrp/multi_usrp.hpp b/host/include/uhd/usrp/multi_usrp.hpp index 1a64a8f3a..fee430fe0 100644 --- a/host/include/uhd/usrp/multi_usrp.hpp +++ b/host/include/uhd/usrp/multi_usrp.hpp @@ -120,6 +120,8 @@ public: * Make a new multi usrp from the device address. * \param dev_addr the device address * \return a new single usrp object + * \throws uhd::key_error no device found + * \throws uhd::index_error fewer devices found than expected */ static sptr make(const device_addr_t &dev_addr); |