diff options
author | Josh Blum <josh@joshknows.com> | 2010-10-31 11:04:42 -0700 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2010-10-31 11:04:42 -0700 |
commit | cb4e30ec501aa201c0ca5d2676f2d568ae24356b (patch) | |
tree | 88e0fc7878338a96e83f2d5ff5fc23dcb05f04eb /host/lib/usrp | |
parent | a8d2c2944b329218af1c0b171b92f775b679b409 (diff) | |
download | uhd-cb4e30ec501aa201c0ca5d2676f2d568ae24356b.tar.gz uhd-cb4e30ec501aa201c0ca5d2676f2d568ae24356b.tar.bz2 uhd-cb4e30ec501aa201c0ca5d2676f2d568ae24356b.zip |
uhd: added dict get method, used in usrp1 image loading
Diffstat (limited to 'host/lib/usrp')
-rw-r--r-- | host/lib/usrp/usrp1/usrp1_impl.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/host/lib/usrp/usrp1/usrp1_impl.cpp b/host/lib/usrp/usrp1/usrp1_impl.cpp index 314384e72..bc478c7fb 100644 --- a/host/lib/usrp/usrp1/usrp1_impl.cpp +++ b/host/lib/usrp/usrp1/usrp1_impl.cpp @@ -59,9 +59,7 @@ static device_addrs_t usrp1_find(const device_addr_t &hint) //extract the firmware path for the USRP1 std::string usrp1_fw_image; try{ - usrp1_fw_image = find_image_path( - hint.has_key("fw")? hint["fw"] : "usrp1_fw.ihx" - ); + usrp1_fw_image = find_image_path(hint.get("fw", "usrp1_fw.ihx")); } catch(...){ uhd::warning::post( @@ -110,7 +108,7 @@ static device::sptr usrp1_make(const device_addr_t &device_addr){ //extract the FPGA path for the USRP1 std::string usrp1_fpga_image = find_image_path( - device_addr.has_key("fpga")? device_addr["fpga"] : "usrp1_fpga.rbf" + device_addr.get("fpga", "usrp1_fpga.rbf") ); //std::cout << "USRP1 FPGA image: " << usrp1_fpga_image << std::endl; |