summaryrefslogtreecommitdiff
path: root/gr-uhd/include/gr_uhd_usrp_sink.h
diff options
context:
space:
mode:
authorTom Rondeau2012-04-04 22:08:10 -0400
committerTom Rondeau2012-04-04 22:08:10 -0400
commita66a650a1f39118500434bc9c91b2ade24887149 (patch)
treeb90b341e42a776432053a54740ca7ce9e7e945e6 /gr-uhd/include/gr_uhd_usrp_sink.h
parentfd52df0f706195d937e287189024f8aa6fbeaf60 (diff)
parentb711a8683c8c4578c7a4ff0f3664f1321da1dcad (diff)
downloadgnuradio-a66a650a1f39118500434bc9c91b2ade24887149.tar.gz
gnuradio-a66a650a1f39118500434bc9c91b2ade24887149.tar.bz2
gnuradio-a66a650a1f39118500434bc9c91b2ade24887149.zip
Merge branch 'master' of gnuradio.org:gnuradio
Diffstat (limited to 'gr-uhd/include/gr_uhd_usrp_sink.h')
-rw-r--r--gr-uhd/include/gr_uhd_usrp_sink.h19
1 files changed, 18 insertions, 1 deletions
diff --git a/gr-uhd/include/gr_uhd_usrp_sink.h b/gr-uhd/include/gr_uhd_usrp_sink.h
index ff4856f9b..fff567438 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,12 +131,29 @@ 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 ID, subdev name, and serial.
+ * \param chan channel index 0 to N-1
+ * \return TX info
+ */
+ virtual uhd::dict<std::string, std::string> get_usrp_tx_info(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
*/
virtual void set_subdev_spec(const std::string &spec, size_t mboard = 0) = 0;
+
+ /*!
+ * Get the TX frontend specification.
+ * \param mboard the motherboard index 0 to M-1
+ * \return the frontend specification in use
+ */
+ virtual std::string get_subdev_spec (size_t mboard = 0) = 0;
+
/*!
* Set the sample rate for the usrp device.
* \param rate a new rate in Sps