diff options
| author | Nicholas Corgan <nick.corgan@ettus.com> | 2012-04-17 12:19:05 -0700 |
|---|---|---|
| committer | Nicholas Corgan <nick.corgan@ettus.com> | 2012-04-17 12:19:05 -0700 |
| commit | 1c61865d1a1c4bd385e790abe3eaa5acb174a5e9 (patch) | |
| tree | d420701f950dba53fe92c680db7727b5d75e914e /host/lib/usrp | |
| parent | 12958f67e10e4b0de025f4d48760b5062b1ffca5 (diff) | |
| download | uhd-1c61865d1a1c4bd385e790abe3eaa5acb174a5e9.tar.gz uhd-1c61865d1a1c4bd385e790abe3eaa5acb174a5e9.tar.bz2 uhd-1c61865d1a1c4bd385e790abe3eaa5acb174a5e9.zip | |
multi_usrp: returns db_eeprom instead of gdb_eeprom in both TX/RX cases
Diffstat (limited to 'host/lib/usrp')
| -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 39f9cb490..70a8481db 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"]; |