diff options
| author | Josh Blum <josh@joshknows.com> | 2012-04-21 11:09:58 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2012-04-21 11:09:58 -0700 |
| commit | 4378ad458441e1431ea3bdaafd8d663d3061f6f3 (patch) | |
| tree | 75dc6a1b06e80c051f39ce101b72c2c10b0e1b54 /host/lib/usrp/multi_usrp.cpp | |
| parent | f84d7579aecaf2a90965331b200f6b298cd0c1d4 (diff) | |
| parent | 81e2262c9e41bbd3621c9753231e5eba23cd7292 (diff) | |
| download | uhd-4378ad458441e1431ea3bdaafd8d663d3061f6f3.tar.gz uhd-4378ad458441e1431ea3bdaafd8d663d3061f6f3.tar.bz2 uhd-4378ad458441e1431ea3bdaafd8d663d3061f6f3.zip | |
Merge branch 'master' into next
Diffstat (limited to 'host/lib/usrp/multi_usrp.cpp')
| -rw-r--r-- | host/lib/usrp/multi_usrp.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/host/lib/usrp/multi_usrp.cpp b/host/lib/usrp/multi_usrp.cpp index 43dd3bf14..fe3c923d3 100644 --- a/host/lib/usrp/multi_usrp.cpp +++ b/host/lib/usrp/multi_usrp.cpp @@ -242,11 +242,7 @@ public: dict<std::string, std::string> usrp_info; mboard_eeprom_t mb_eeprom = _tree->access<mboard_eeprom_t>(mb_root(mcp.mboard) / "eeprom").get(); - dboard_eeprom_t gdb_eeprom = _tree->access<dboard_eeprom_t>(tx_rf_fe_root(mcp.chan).branch_path().branch_path() / "gdb_eeprom").get(); - dboard_eeprom_t db_eeprom; - - if(gdb_eeprom.id != dboard_id_t::none()) db_eeprom = gdb_eeprom; - else db_eeprom = _tree->access<dboard_eeprom_t>(tx_rf_fe_root(mcp.chan).branch_path().branch_path() / "tx_eeprom").get(); + dboard_eeprom_t db_eeprom = _tree->access<dboard_eeprom_t>(tx_rf_fe_root(mcp.chan).branch_path().branch_path() / "tx_eeprom").get(); usrp_info["mboard_id"] = _tree->access<std::string>(mb_root(mcp.mboard) / "name").get(); usrp_info["mboard_name"] = mb_eeprom["name"]; |