diff options
| author | Nicholas Corgan <nick.corgan@ettus.com> | 2012-04-05 10:40:07 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2012-04-05 14:54:46 -0700 |
| commit | 5a6788525488e747cb0453282d8b0ebb533204bc (patch) | |
| tree | 42fbc34b37b37bd49a1432d3f42b9d52d03ad080 | |
| parent | 10a38e232b61fa2efdf746b6b97304b98683812e (diff) | |
| download | uhd-5a6788525488e747cb0453282d8b0ebb533204bc.tar.gz uhd-5a6788525488e747cb0453282d8b0ebb533204bc.tar.bz2 uhd-5a6788525488e747cb0453282d8b0ebb533204bc.zip | |
multi_usrp: added subdev spec and antenna to get_usrp_info functions
| -rw-r--r-- | host/lib/usrp/multi_usrp.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/host/lib/usrp/multi_usrp.cpp b/host/lib/usrp/multi_usrp.cpp index 37479573a..05dc8b4bb 100644 --- a/host/lib/usrp/multi_usrp.cpp +++ b/host/lib/usrp/multi_usrp.cpp @@ -229,8 +229,10 @@ public: usrp_info["mboard_name"] = mb_eeprom["name"]; usrp_info["mboard_serial"] = mb_eeprom["serial"]; usrp_info["rx_id"] = db_eeprom.id.to_pp_string(); - usrp_info["rx_subdev_name"] = _tree->access<std::string>(rx_rf_fe_root(chan) / "name").get(); + usrp_info["rx_subdev_name"] = _tree->access<std::string>(rx_rf_fe_root(mcp.chan) / "name").get(); + usrp_info["rx_subdev_spec"] = _tree->access<subdev_spec_t>(mb_root(mcp.mboard) / "rx_subdev_spec").get().to_string(); usrp_info["rx_serial"] = db_eeprom.serial; + usrp_info["rx_antenna"] = _tree->access<std::string>(rx_rf_fe_root(mcp.chan) / "antenna" / "value").get(); return usrp_info; } @@ -251,7 +253,9 @@ public: usrp_info["mboard_serial"] = mb_eeprom["serial"]; usrp_info["tx_id"] = db_eeprom.id.to_pp_string(); usrp_info["tx_subdev_name"] = _tree->access<std::string>(tx_rf_fe_root(mcp.chan) / "name").get(); + usrp_info["tx_subdev_spec"] = _tree->access<subdev_spec_t>(mb_root(mcp.mboard) / "tx_subdev_spec").get().to_string(); usrp_info["tx_serial"] = db_eeprom.serial; + usrp_infi["tx_antenna"] = _tree->access<std::string>(tx_rf_fe_root(mcp.chan) / "antenna" / "value").get(); return usrp_info; } |