diff options
| author | Josh Blum <josh@joshknows.com> | 2011-09-03 21:56:08 +0000 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-09-03 21:56:08 +0000 |
| commit | 13681fb7bb640eb778c1450532a35d2a85c630f8 (patch) | |
| tree | c77915e7d9e00771fb1ea461e373a08c2139deba /host | |
| parent | 725f72a4517d97a0d95038d3b80b3f8c7a0ec1b0 (diff) | |
| download | uhd-13681fb7bb640eb778c1450532a35d2a85c630f8.tar.gz uhd-13681fb7bb640eb778c1450532a35d2a85c630f8.tar.bz2 uhd-13681fb7bb640eb778c1450532a35d2a85c630f8.zip | |
e100: fix FPGA filename lookup, and use model string for name
Diffstat (limited to 'host')
| -rw-r--r-- | host/lib/usrp/e100/e100_impl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/usrp/e100/e100_impl.cpp b/host/lib/usrp/e100/e100_impl.cpp index 052785d4e..5c7ff04fd 100644 --- a/host/lib/usrp/e100/e100_impl.cpp +++ b/host/lib/usrp/e100/e100_impl.cpp @@ -124,7 +124,7 @@ e100_impl::e100_impl(const uhd::device_addr_t &device_addr){ ("E100", "usrp_e100_fpga_v2.bin") ("E110", "usrp_e110_fpga.bin") ; - const std::string default_fpga_file_name = model_to_fpga_file_name(model); + const std::string default_fpga_file_name = model_to_fpga_file_name[model]; const std::string e100_fpga_image = find_image_path(device_addr.get("fpga", default_fpga_file_name)); const boost::uint32_t file_hash = boost::uint32_t(hash_fpga_file(e100_fpga_image)); @@ -183,7 +183,7 @@ e100_impl::e100_impl(const uhd::device_addr_t &device_addr){ _tree = property_tree::make(); _tree->create<std::string>("/name").set("E-Series Device"); const fs_path mb_path = "/mboards/0"; - _tree->create<std::string>(mb_path / "name").set("E100 (euewanee)"); + _tree->create<std::string>(mb_path / "name").set(str(boost::format("%s (euewanee)") % model)); //////////////////////////////////////////////////////////////////// // setup the mboard eeprom |