diff options
author | Nicholas Corgan <nick.corgan@ettus.com> | 2012-04-04 17:03:35 -0700 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2012-04-04 17:12:12 -0700 |
commit | cf959252c0813729ca4db68dc1467319b15dae0c (patch) | |
tree | be3b73bb2b3fdc3eeec32d507ec44616072c3e2b /host/include | |
parent | 51c81a39cc15ac221376e5acc4eceb572e0467f9 (diff) | |
download | uhd-cf959252c0813729ca4db68dc1467319b15dae0c.tar.gz uhd-cf959252c0813729ca4db68dc1467319b15dae0c.tar.bz2 uhd-cf959252c0813729ca4db68dc1467319b15dae0c.zip |
lib: multi_usrp can now output motherboard and daughterboard data in a dictionary form
Diffstat (limited to 'host/include')
-rw-r--r-- | host/include/uhd/usrp/multi_usrp.hpp | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/host/include/uhd/usrp/multi_usrp.hpp b/host/include/uhd/usrp/multi_usrp.hpp index 88affa40c..3aeb16eed 100644 --- a/host/include/uhd/usrp/multi_usrp.hpp +++ b/host/include/uhd/usrp/multi_usrp.hpp @@ -1,5 +1,5 @@ // -// Copyright 2010-2011 Ettus Research LLC +// Copyright 2010-2012 Ettus Research LLC // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -25,6 +25,7 @@ #define UHD_USRP_MULTI_USRP_COMMAND_TIME_API #define UHD_USRP_MULTI_USRP_BW_RANGE_API #define UHD_USRP_MULTI_USRP_USER_REGS_API +#define UHD_USRP_MULTI_USRP_GET_USRP_INFO_API #include <uhd/config.hpp> #include <uhd/device.hpp> @@ -127,6 +128,26 @@ public: return this->get_device()->get_tx_stream(args); } + /*! + * Returns identifying information about this USRP's configuration. + * Returns motherboard ID, name, and serial. + * Returns daughterboard RX ID, subdev name, and serial. + * \param mboard the motherboard index 0 to M-1 + * \param chan channel index 0 to N-1 + * \return RX info + */ + virtual dict<std::string, std::string> get_usrp_rx_info(size_t chan = 0) = 0; + + /*! + * Returns identifying information about this USRP's configuration. + * Returns motherboard ID, name, and serial. + * Returns daughterboard TX ID, subdev name, and serial. + * \param mboard the motherboard index 0 to M-1 + * \param chan channel index 0 to N-1 + * \return TX info + */ + virtual dict<std::string, std::string> get_usrp_tx_info(size_t chan = 0) = 0; + /******************************************************************* * Mboard methods ******************************************************************/ |