From d15044982206030b8ecb104c37073cb6292e819e Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Thu, 1 Mar 2018 11:59:52 -0800 Subject: 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. --- host/lib/usrp/mpmd/mpmd_prop_tree.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'host/lib/usrp/mpmd/mpmd_prop_tree.cpp') 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("/name") - .set(mb->device_info.get("name", "Unknown MPM device")) + .set(mb->device_info.get("description", "Unknown MPM device")) ; } tree->create(mb_path / "name") - .set(mb->device_info.get("type", "UNKNOWN")); + .set(mb->device_info.get("name", "UNKNOWN")); tree->create(mb_path / "serial") .set(mb->device_info.get("serial", "n/a")); tree->create(mb_path / "connection") .set(mb->device_info.get("connection", "UNKNOWN")); tree->create(mb_path / "link_max_rate").set(1e9 / 8); + tree->create(mb_path / "mpm_version") + .set(mb->device_info.get("mpm_version", "UNKNOWN")); + tree->create(mb_path / "fpga_version") + .set(mb->device_info.get("fpga_version", "UNKNOWN")); /*** Clocking *******************************************************/ tree->create(mb_path / "clock_source/value") -- cgit v1.2.3