diff options
| author | Martin Braun <martin.braun@ettus.com> | 2015-06-23 11:01:25 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-06-23 11:01:25 -0700 |
| commit | a9befaac7627c0530a2cbf539fa6388b0b6e1896 (patch) | |
| tree | 7cbb4df31307d62c37dba050ccb4ffee3aa4857f /host | |
| parent | 218d25b004956583c81aa51772f3f199a7179faf (diff) | |
| parent | fd432e3765fcb27a2d170b1366f6d88528eb9812 (diff) | |
| download | uhd-a9befaac7627c0530a2cbf539fa6388b0b6e1896.tar.gz uhd-a9befaac7627c0530a2cbf539fa6388b0b6e1896.tar.bz2 uhd-a9befaac7627c0530a2cbf539fa6388b0b6e1896.zip | |
Merge branch 'maint'
Diffstat (limited to 'host')
| -rw-r--r-- | host/include/uhd/device.hpp | 1 | ||||
| -rw-r--r-- | host/include/uhd/utils/paths.hpp | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/host/include/uhd/device.hpp b/host/include/uhd/device.hpp index 5ca48f8e9..894b48c47 100644 --- a/host/include/uhd/device.hpp +++ b/host/include/uhd/device.hpp @@ -55,6 +55,7 @@ public: * * \param find a function that discovers devices * \param make a factory function that makes a device + * \param filter include only USRP devices, clock devices, or both */ static void register_device( const find_t &find, diff --git a/host/include/uhd/utils/paths.hpp b/host/include/uhd/utils/paths.hpp index aa31fd5a2..cc054b019 100644 --- a/host/include/uhd/utils/paths.hpp +++ b/host/include/uhd/utils/paths.hpp @@ -1,5 +1,5 @@ // -// Copyright 2011-2012 Ettus Research LLC +// Copyright 2011-2012,2015 Ettus Research LLC // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -77,8 +77,8 @@ namespace uhd { /*! * Search for the location of a particular UHD utility. * The utility must be installed in the `uhd/utils` directory. - * \param the name of the utility to search for - * \return the full system path to @param + * \param name the name of the utility to search for + * \return the full system path to the given utility */ UHD_API std::string find_utility(std::string name); |