diff options
| author | Johnathan Corgan <jcorgan@corganenterprises.com> | 2012-04-03 18:18:41 -0700 |
|---|---|---|
| committer | Johnathan Corgan <jcorgan@corganenterprises.com> | 2012-04-03 18:18:41 -0700 |
| commit | 6522dd051302a1691a7ce27be78acd81d733fdb2 (patch) | |
| tree | 13e8c6308e43e5a65cd730be3479a02812e37429 /gr-uhd/include | |
| parent | fb8292238c7efff4a5b2a7ae26d3a2835f9be3ce (diff) | |
| parent | fc03a9b18ca874cac546b7a414089d3649dce48d (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'gr-uhd/include')
| -rw-r--r-- | gr-uhd/include/gr_uhd_usrp_sink.h | 11 | ||||
| -rw-r--r-- | gr-uhd/include/gr_uhd_usrp_source.h | 9 |
2 files changed, 19 insertions, 1 deletions
diff --git a/gr-uhd/include/gr_uhd_usrp_sink.h b/gr-uhd/include/gr_uhd_usrp_sink.h index ff4856f9bf..169d581526 100644 --- a/gr-uhd/include/gr_uhd_usrp_sink.h +++ b/gr-uhd/include/gr_uhd_usrp_sink.h @@ -1,5 +1,5 @@ /* - * Copyright 2010-2011 Free Software Foundation, Inc. + * Copyright 2010-2012 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -131,6 +131,15 @@ public: virtual void set_start_time(const uhd::time_spec_t &time) = 0; /*! + * Returns identifying information about this USRP's configuration. + * Returns motherboard ID, name, and serial. + * Returns daughterboard TX/RX ID, subdev name, and serial. + * \param mboard the motherboard index 0 to M-1 + * \param chan channel index 0 to N-1 + */ + virtual uhd::dict<std::string, std::string> get_usrp_info(size_t mboard = 0, size_t chan = 0) = 0; + + /*! * Set the frontend specification. * \param spec the subdev spec markup string * \param mboard the motherboard index 0 to M-1 diff --git a/gr-uhd/include/gr_uhd_usrp_source.h b/gr-uhd/include/gr_uhd_usrp_source.h index 415503bc1d..20cc863d7a 100644 --- a/gr-uhd/include/gr_uhd_usrp_source.h +++ b/gr-uhd/include/gr_uhd_usrp_source.h @@ -123,6 +123,15 @@ public: virtual void set_start_time(const uhd::time_spec_t &time) = 0; /*! + * Returns identifying information about this USRP's configuration. + * Returns motherboard ID, name, and serial. + * Returns daughterboard TX/RX ID, subdev name, and serial. + * \param mboard the motherboard index 0 to M-1 + * \param chan channel index 0 to N-1 + */ + virtual uhd::dict<std::string, std::string> get_usrp_info(size_t mboard = 0, size_t chan = 0) = 0; + + /*! * Set the frontend specification. * \param spec the subdev spec markup string * \param mboard the motherboard index 0 to M-1 |