diff options
| author | Johnathan Corgan <jcorgan@corganenterprises.com> | 2012-04-04 17:08:42 -0700 |
|---|---|---|
| committer | Johnathan Corgan <jcorgan@corganenterprises.com> | 2012-04-04 17:08:42 -0700 |
| commit | 29c887da604206aa6f3ad1859f70958231a7a1cb (patch) | |
| tree | bea8f24090bf4c1755a9445d16c15339e86d648d /gr-uhd/include | |
| parent | c787fb66bf3512b5cd4870ef74cd1e4d91802820 (diff) | |
| parent | b711a8683c8c4578c7a4ff0f3664f1321da1dcad (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'gr-uhd/include')
| -rw-r--r-- | gr-uhd/include/gr_uhd_usrp_sink.h | 14 | ||||
| -rw-r--r-- | gr-uhd/include/gr_uhd_usrp_source.h | 13 |
2 files changed, 21 insertions, 6 deletions
diff --git a/gr-uhd/include/gr_uhd_usrp_sink.h b/gr-uhd/include/gr_uhd_usrp_sink.h index 169d581526..fff567438c 100644 --- a/gr-uhd/include/gr_uhd_usrp_sink.h +++ b/gr-uhd/include/gr_uhd_usrp_sink.h @@ -133,11 +133,11 @@ public: /*! * 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 + * 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_info(size_t mboard = 0, size_t chan = 0) = 0; + virtual uhd::dict<std::string, std::string> get_usrp_tx_info(size_t chan = 0) = 0; /*! * Set the frontend specification. @@ -146,6 +146,14 @@ public: */ 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 diff --git a/gr-uhd/include/gr_uhd_usrp_source.h b/gr-uhd/include/gr_uhd_usrp_source.h index 20cc863d7a..0dde4b1946 100644 --- a/gr-uhd/include/gr_uhd_usrp_source.h +++ b/gr-uhd/include/gr_uhd_usrp_source.h @@ -125,11 +125,11 @@ public: /*! * 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 + * Returns daughterboard RX ID, subdev name, and serial. * \param chan channel index 0 to N-1 + * \return RX info */ - virtual uhd::dict<std::string, std::string> get_usrp_info(size_t mboard = 0, size_t chan = 0) = 0; + virtual uhd::dict<std::string, std::string> get_usrp_rx_info(size_t chan = 0) = 0; /*! * Set the frontend specification. @@ -139,6 +139,13 @@ public: virtual void set_subdev_spec(const std::string &spec, size_t mboard = 0) = 0; /*! + * Get the RX 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 */ |