diff options
| author | Martin Braun <martin.braun@ettus.com> | 2018-03-01 11:59:52 -0800 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2018-03-02 13:48:14 -0800 |
| commit | d15044982206030b8ecb104c37073cb6292e819e (patch) | |
| tree | 1e0a76662e4768a64194c2c885d7e2ac4eb17bbd /host | |
| parent | d04b6e3a62e2ad213ef3ac8ce80649d1932a6e04 (diff) | |
| download | uhd-d15044982206030b8ecb104c37073cb6292e819e.tar.gz uhd-d15044982206030b8ecb104c37073cb6292e819e.tar.bz2 uhd-d15044982206030b8ecb104c37073cb6292e819e.zip | |
n310: Make MPM report FPGA version and description, UHD read it
The FPGA and MPM version as well as the description of the device
("N300-Series Device") and its name (its the hostname) are now properly
reported coming from MPM, properly saved in the prop tree, and
uhd_usrp_probe can nicely display them this way.
Diffstat (limited to 'host')
| -rw-r--r-- | host/lib/usrp/mpmd/mpmd_prop_tree.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/host/lib/usrp/mpmd/mpmd_prop_tree.cpp b/host/lib/usrp/mpmd/mpmd_prop_tree.cpp index a087b02dd..9f6fdd1a3 100644 --- a/host/lib/usrp/mpmd/mpmd_prop_tree.cpp +++ b/host/lib/usrp/mpmd/mpmd_prop_tree.cpp @@ -94,16 +94,20 @@ void mpmd_impl::init_property_tree( /*** Device info ****************************************************/ if (not tree->exists("/name")) { tree->create<std::string>("/name") - .set(mb->device_info.get("name", "Unknown MPM device")) + .set(mb->device_info.get("description", "Unknown MPM device")) ; } tree->create<std::string>(mb_path / "name") - .set(mb->device_info.get("type", "UNKNOWN")); + .set(mb->device_info.get("name", "UNKNOWN")); tree->create<std::string>(mb_path / "serial") .set(mb->device_info.get("serial", "n/a")); tree->create<std::string>(mb_path / "connection") .set(mb->device_info.get("connection", "UNKNOWN")); tree->create<size_t>(mb_path / "link_max_rate").set(1e9 / 8); + tree->create<std::string>(mb_path / "mpm_version") + .set(mb->device_info.get("mpm_version", "UNKNOWN")); + tree->create<std::string>(mb_path / "fpga_version") + .set(mb->device_info.get("fpga_version", "UNKNOWN")); /*** Clocking *******************************************************/ tree->create<std::string>(mb_path / "clock_source/value") |