diff options
| author | Josh Blum <josh@joshknows.com> | 2010-08-06 15:18:02 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-08-06 15:18:02 -0700 |
| commit | 03ccbeb6411c0c13adf54bde4c19372ffa141aa0 (patch) | |
| tree | b3b1c1b801495775db74b0c66f273166131b68a0 /host/lib/usrp/usrp2/usrp2_impl.hpp | |
| parent | 5fe5ff0655a410aac686d130daf9a77e39fd01b5 (diff) | |
| parent | d1711722dd432ba63b54f93d92270d4050465204 (diff) | |
| download | uhd-03ccbeb6411c0c13adf54bde4c19372ffa141aa0.tar.gz uhd-03ccbeb6411c0c13adf54bde4c19372ffa141aa0.tar.bz2 uhd-03ccbeb6411c0c13adf54bde4c19372ffa141aa0.zip | |
Merge branch 'codec_gains'
Conflicts:
host/lib/usrp/mimo_usrp.cpp
host/lib/usrp/simple_usrp.cpp
host/test/CMakeLists.txt
Diffstat (limited to 'host/lib/usrp/usrp2/usrp2_impl.hpp')
| -rw-r--r-- | host/lib/usrp/usrp2/usrp2_impl.hpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/host/lib/usrp/usrp2/usrp2_impl.hpp b/host/lib/usrp/usrp2/usrp2_impl.hpp index e7e560469..157d17057 100644 --- a/host/lib/usrp/usrp2/usrp2_impl.hpp +++ b/host/lib/usrp/usrp2/usrp2_impl.hpp @@ -163,6 +163,15 @@ private: void update_clock_config(void); void set_time_spec(const uhd::time_spec_t &time_spec, bool now); + //properties interface for the codec + void codec_init(void); + void rx_codec_get(const wax::obj &, wax::obj &); + void rx_codec_set(const wax::obj &, const wax::obj &); + void tx_codec_get(const wax::obj &, wax::obj &); + void tx_codec_set(const wax::obj &, const wax::obj &); + wax_obj_proxy::sptr _rx_codec_proxy; + wax_obj_proxy::sptr _tx_codec_proxy; + //properties interface for rx dboard void rx_dboard_get(const wax::obj &, wax::obj &); void rx_dboard_set(const wax::obj &, const wax::obj &); |