diff options
| author | Martin Braun <martin.braun@ettus.com> | 2020-04-21 14:37:15 -0700 |
|---|---|---|
| committer | Aaron Rossetto <aaron.rossetto@ni.com> | 2020-04-28 13:04:00 -0500 |
| commit | b78e06df03ad2c5cdf1828f162bf8c21ad4b5e4f (patch) | |
| tree | 1b2d566f442f3085bec5041e70e484c2edd33867 /host/lib | |
| parent | 67cf90aef6bb8528ad4c1a4a9ff80d64026c1e1d (diff) | |
| download | uhd-b78e06df03ad2c5cdf1828f162bf8c21ad4b5e4f.tar.gz uhd-b78e06df03ad2c5cdf1828f162bf8c21ad4b5e4f.tar.bz2 uhd-b78e06df03ad2c5cdf1828f162bf8c21ad4b5e4f.zip | |
multi_usrp: Remove rfnoc-specific code from multi_usrp.cpp
This implementation of multi_usrp is only for non-RFNoC devices; the
section was thus dead code.
Diffstat (limited to 'host/lib')
| -rw-r--r-- | host/lib/usrp/multi_usrp.cpp | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/host/lib/usrp/multi_usrp.cpp b/host/lib/usrp/multi_usrp.cpp index 0392d4df9..067377423 100644 --- a/host/lib/usrp/multi_usrp.cpp +++ b/host/lib/usrp/multi_usrp.cpp @@ -442,25 +442,6 @@ public: usrp_info["rx_serial"] = db_eeprom.serial; usrp_info["rx_id"] = db_eeprom.id.to_pp_string(); } - const auto rfnoc_path = mb_root(mcp.mboard) / "xbar"; - if (_tree->exists(rfnoc_path)) { - const auto spec = get_rx_subdev_spec(mcp.mboard).at(mcp.chan); - const auto radio_index = get_radio_index(spec.db_name); - const auto radio_path = - rfnoc_path / str(boost::format("Radio_%d") % radio_index); - const auto eeprom_path = radio_path / "eeprom"; - if (_tree->exists(eeprom_path)) { - const auto db_eeprom = _tree->access<eeprom_map_t>(eeprom_path).get(); - usrp_info["rx_serial"] = db_eeprom.count("serial") - ? std::string(db_eeprom.at("serial").begin(), - db_eeprom.at("serial").end()) - : "n/a"; - usrp_info["rx_id"] = db_eeprom.count("pid") - ? std::string(db_eeprom.at("pid").begin(), - db_eeprom.at("pid").end()) - : "n/a"; - } - } return usrp_info; } @@ -492,25 +473,6 @@ public: usrp_info["tx_serial"] = db_eeprom.serial; usrp_info["tx_id"] = db_eeprom.id.to_pp_string(); } - const auto rfnoc_path = mb_root(mcp.mboard) / "xbar"; - if (_tree->exists(rfnoc_path)) { - const auto spec = get_tx_subdev_spec(mcp.mboard).at(mcp.chan); - const auto radio_index = get_radio_index(spec.db_name); - const auto radio_path = - rfnoc_path / str(boost::format("Radio_%d") % radio_index); - const auto path = radio_path / "eeprom"; - if (_tree->exists(path)) { - const auto db_eeprom = _tree->access<eeprom_map_t>(path).get(); - usrp_info["tx_serial"] = db_eeprom.count("serial") - ? std::string(db_eeprom.at("serial").begin(), - db_eeprom.at("serial").end()) - : "n/a"; - usrp_info["tx_id"] = db_eeprom.count("pid") - ? std::string(db_eeprom.at("pid").begin(), - db_eeprom.at("pid").end()) - : "n/a"; - } - } return usrp_info; } |