use find to discover devices

3 files changed, 11 insertions, 13 deletions

diff --git a/host/include/uhd/device.hpp b/host/include/uhd/device.hpp
index 1d0360799..4d4196d98 100644
--- a/host/include/uhd/device.hpp
+++ b/host/include/uhd/device.hpp
@@ -38,22 +38,22 @@ class UHD_API device : boost::noncopyable, public wax::obj{
 
 public:
     typedef boost::shared_ptr<device> sptr;
-    typedef boost::function<device_addrs_t(const device_addr_t &)> discover_t;
+    typedef boost::function<device_addrs_t(const device_addr_t &)> find_t;
     typedef boost::function<sptr(const device_addr_t &)> make_t;
 
     /*!
      * Register a device into the discovery and factory system.
      *
-     * \param discover a function that discovers devices
+     * \param find a function that discovers devices
      * \param make a factory function that makes a device
      */
     static void register_device(
-        const discover_t &discover,
+        const find_t &find,
         const make_t &make
     );
 
     /*!
-     * \brief Discover usrp devices attached to the host.
+     * \brief Find usrp devices attached to the host.
      *
      * The hint device address should be used to narrow down the search
      * to particular transport types and/or transport arguments.
@@ -61,17 +61,17 @@ public:
      * \param hint a partially (or fully) filled in device address
      * \return a vector of device addresses for all usrps on the system
      */
-    static device_addrs_t discover(const device_addr_t &hint);
+    static device_addrs_t find(const device_addr_t &hint);
 
     /*!
      * \brief Create a new usrp device from the device address hint.
      *
-     * The make routine will call discover and pick one of the results.
+     * The make routine will call find and pick one of the results.
      * By default, the first result will be used to create a new device.
      * Use the which parameter as an index into the list of results.
      *
      * \param hint a partially (or fully) filled in device address
-     * \param which which address to use when multiple are discovered
+     * \param which which address to use when multiple are found
      * \return a shared pointer to a new device instance
      */
     static sptr make(const device_addr_t &hint, size_t which = 0);
diff --git a/host/include/uhd/usrp/usrp1e.hpp b/host/include/uhd/usrp/usrp1e.hpp
index 5cba4ef52..cee9dc3d5 100644
--- a/host/include/uhd/usrp/usrp1e.hpp
+++ b/host/include/uhd/usrp/usrp1e.hpp
@@ -29,12 +29,11 @@ namespace uhd{ namespace usrp{
 class UHD_API usrp1e : public device{
 public:
     /*!
-     * Discover usrp1e devices on the system via the device node.
-     * This static method will be called by the device::discover.
+     * Find usrp1e devices on the system via the device node.
      * \param hint a device addr with the usrp1e address filled in
      * \return a vector of device addresses for all usrp1es found
      */
-    static device_addrs_t discover(const device_addr_t &hint);
+    static device_addrs_t find(const device_addr_t &hint);
 
     /*!
      * Make a usrp1e from a device address.
diff --git a/host/include/uhd/usrp/usrp2.hpp b/host/include/uhd/usrp/usrp2.hpp
index 277ddc131..613b40ae3 100644
--- a/host/include/uhd/usrp/usrp2.hpp
+++ b/host/include/uhd/usrp/usrp2.hpp
@@ -29,17 +29,16 @@ namespace uhd{ namespace usrp{
 class UHD_API usrp2 : public device{
 public:
     /*!
-     * Discover usrp2 devices over the ethernet.
+     * Find usrp2 devices over the ethernet.
      *
      * Recommended key/value pairs for the device hint address:
      * hint["addr"] = address, where address is a resolvable address
      * or ip address, which may or may not be a broadcast address.
      *
-     * This static method will be called by the device::discover.
      * \param hint a device addr with the usrp2 address filled in
      * \return a vector of device addresses for all usrp2s found
      */
-    static device_addrs_t discover(const device_addr_t &hint);
+    static device_addrs_t find(const device_addr_t &hint);
 
     /*!
      * Make a usrp2 from a device address.