From cf959252c0813729ca4db68dc1467319b15dae0c Mon Sep 17 00:00:00 2001 From: Nicholas Corgan Date: Wed, 4 Apr 2012 17:03:35 -0700 Subject: lib: multi_usrp can now output motherboard and daughterboard data in a dictionary form --- host/include/uhd/usrp/multi_usrp.hpp | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) (limited to 'host/include') 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 #include @@ -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 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 get_usrp_tx_info(size_t chan = 0) = 0; + /******************************************************************* * Mboard methods ******************************************************************/ -- cgit v1.2.3 From 10a38e232b61fa2efdf746b6b97304b98683812e Mon Sep 17 00:00:00 2001 From: Nicholas Corgan Date: Wed, 4 Apr 2012 17:13:55 -0700 Subject: lib: corrected multi_usrp docs --- host/include/uhd/usrp/multi_usrp.hpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'host/include') diff --git a/host/include/uhd/usrp/multi_usrp.hpp b/host/include/uhd/usrp/multi_usrp.hpp index 3aeb16eed..429ae356b 100644 --- a/host/include/uhd/usrp/multi_usrp.hpp +++ b/host/include/uhd/usrp/multi_usrp.hpp @@ -132,7 +132,6 @@ public: * 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 */ @@ -142,7 +141,6 @@ public: * 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 */ -- cgit v1.2.3 From bd3eeb5149efe5f9ca3e5b83b46cdb37f279d3d5 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Thu, 5 Apr 2012 14:58:16 -0700 Subject: uhd: changed ABI compat string to 3.4.0-1 for new multi usrp additions --- host/include/uhd/version.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'host/include') diff --git a/host/include/uhd/version.hpp b/host/include/uhd/version.hpp index ee0c4fe43..9a95b4786 100644 --- a/host/include/uhd/version.hpp +++ b/host/include/uhd/version.hpp @@ -27,7 +27,7 @@ * The format is oldest ABI compatible release - ABI compat number. * The compatibility number allows pre-release ABI to be versioned. */ -#define UHD_VERSION_ABI_STRING "3.4.0-0" +#define UHD_VERSION_ABI_STRING "3.4.0-1" namespace uhd{ -- cgit v1.2.3