use a single addr param for the usrp2

2 files changed, 4 insertions, 7 deletions

diff --git a/host/lib/device.cpp b/host/lib/device.cpp
index e376a5c50..f181d31e4 100644
--- a/host/lib/device.cpp
+++ b/host/lib/device.cpp
@@ -24,10 +24,7 @@ using namespace uhd;
 
 device_addrs_t device::discover(const device_addr_t &hint){
     device_addrs_t device_addrs;
-    if (not hint.has_key("type")){
-        //TODO call discover for others and append results
-    }
-    else if (hint["type"] == "udp"){
+    if (hint.has_key("addr")){
         std::vector<device_addr_t> usrp2_addrs = usrp::usrp2::discover(hint);
         device_addrs.insert(device_addrs.begin(), usrp2_addrs.begin(), usrp2_addrs.end());
     }
@@ -53,7 +50,7 @@ device::sptr device::make(const device_addr_t &hint, size_t which){
 
     //create the new device with the discovered address
     //TODO only a usrp2 device will be made (until others are supported)
-    if (hint.has_key("type") and hint["type"] == "udp"){
+    if (hint.has_key("addr")){
         return usrp::usrp2::make(device_addrs.at(which));
     }
     throw std::runtime_error("cant make a device");
diff --git a/host/lib/usrp/usrp2/usrp2_impl.cpp b/host/lib/usrp/usrp2/usrp2_impl.cpp
index 11e2f480b..770fa3e53 100644
--- a/host/lib/usrp/usrp2/usrp2_impl.cpp
+++ b/host/lib/usrp/usrp2/usrp2_impl.cpp
@@ -60,8 +60,8 @@ uhd::device_addrs_t usrp2::discover(const device_addr_t &hint){
                 //make a boost asio ipv4 with the raw addr in host byte order
                 boost::asio::ip::address_v4 ip_addr(ntohl(ctrl_data_in.data.ip_addr));
                 device_addr_t new_addr;
-                new_addr["name"] = "USRP2";
-                new_addr["type"] = "udp";
+                new_addr["name"] = "usrp2";
+                new_addr["transport"] = "udp";
                 new_addr["addr"] = ip_addr.to_string();
                 usrp2_addrs.push_back(new_addr);
                 break;