diff options
author | eb | 2008-10-22 00:56:40 +0000 |
---|---|---|
committer | eb | 2008-10-22 00:56:40 +0000 |
commit | bfe79d23738f24562dc7612049a90e8b20b53f79 (patch) | |
tree | 312e66fc143621f320f6e57592f5194e15e52e1f /usrp2/host/lib/usrp2.cc | |
parent | afc6e2b005581d1061b47c464f47ff2b48c6418b (diff) | |
download | gnuradio-bfe79d23738f24562dc7612049a90e8b20b53f79.tar.gz gnuradio-bfe79d23738f24562dc7612049a90e8b20b53f79.tar.bz2 gnuradio-bfe79d23738f24562dc7612049a90e8b20b53f79.zip |
Added methods to query daughterboard parameters. Merged eb/u2-wip2
-r9804:9814 into trunk; initialized dacmux in firmware.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9816 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'usrp2/host/lib/usrp2.cc')
-rw-r--r-- | usrp2/host/lib/usrp2.cc | 116 |
1 files changed, 109 insertions, 7 deletions
diff --git a/usrp2/host/lib/usrp2.cc b/usrp2/host/lib/usrp2.cc index eda73cdc5..114b925ce 100644 --- a/usrp2/host/lib/usrp2.cc +++ b/usrp2/host/lib/usrp2.cc @@ -160,13 +160,6 @@ namespace usrp2 { return d_impl->mac_addr(); } - bool - usrp2::burn_mac_addr(const std::string &new_addr) - { - return d_impl->burn_mac_addr(new_addr); - } - - // Receive bool @@ -175,12 +168,42 @@ namespace usrp2 { return d_impl->set_rx_gain(gain); } + double + usrp2::rx_gain_min() + { + return d_impl->rx_gain_min(); + } + + double + usrp2::rx_gain_max() + { + return d_impl->rx_gain_max(); + } + + double + usrp2::rx_gain_db_per_step() + { + return d_impl->rx_gain_db_per_step(); + } + bool usrp2::set_rx_center_freq(double frequency, tune_result *result) { return d_impl->set_rx_center_freq(frequency, result); } + double + usrp2::rx_freq_min() + { + return d_impl->rx_freq_min(); + } + + double + usrp2::rx_freq_max() + { + return d_impl->rx_freq_max(); + } + bool usrp2::set_rx_decim(int decimation_factor) { @@ -231,12 +254,43 @@ namespace usrp2 { return d_impl->set_tx_gain(gain); } + double + usrp2::tx_gain_min() + { + return d_impl->tx_gain_min(); + } + + double + usrp2::tx_gain_max() + { + return d_impl->tx_gain_max(); + } + + double + usrp2::tx_gain_db_per_step() + { + return d_impl->tx_gain_db_per_step(); + } + bool usrp2::set_tx_center_freq(double frequency, tune_result *result) { return d_impl->set_tx_center_freq(frequency, result); } + double + usrp2::tx_freq_min() + { + return d_impl->tx_freq_min(); + } + + double + usrp2::tx_freq_max() + { + return d_impl->tx_freq_max(); + } + + bool usrp2::set_tx_interp(int interpolation_factor) { @@ -276,6 +330,54 @@ namespace usrp2 { return d_impl->tx_raw(channel, items, nitems, metadata); } + // miscellaneous methods + + bool + usrp2::config_mimo(int flags) + { + return d_impl->config_mimo(flags); + } + + bool + usrp2::fpga_master_clock_freq(long *freq) + { + return d_impl->fpga_master_clock_freq(freq); + } + + bool + usrp2::adc_rate(long *rate) + { + return d_impl->adc_rate(rate); + } + + bool + usrp2::dac_rate(long *rate) + { + return d_impl->dac_rate(rate); + } + + bool + usrp2::tx_daughterboard_id(int *dbid) + { + return d_impl->tx_daughterboard_id(dbid); + } + + bool + usrp2::rx_daughterboard_id(int *dbid) + { + return d_impl->rx_daughterboard_id(dbid); + } + + + // low level methods + + bool + usrp2::burn_mac_addr(const std::string &new_addr) + { + return d_impl->burn_mac_addr(new_addr); + } + + } // namespace usrp2 |