aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/usrp/usrp_e/usrp_e_impl.hpp
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2010-06-04 21:13:27 +0000
committerJosh Blum <josh@joshknows.com>2010-06-04 21:13:27 +0000
commit685cf432a373ee7556db507f7958f51e6ccf581a (patch)
tree56524f4d40152aa419832ddd7d8a05ac9045766e /host/lib/usrp/usrp_e/usrp_e_impl.hpp
parentfcdbea4f089db2405820ad598979e639cf131ff5 (diff)
downloaduhd-685cf432a373ee7556db507f7958f51e6ccf581a.tar.gz
uhd-685cf432a373ee7556db507f7958f51e6ccf581a.tar.bz2
uhd-685cf432a373ee7556db507f7958f51e6ccf581a.zip
prefixed helper classes with usrp_e to avoid collision
Diffstat (limited to 'host/lib/usrp/usrp_e/usrp_e_impl.hpp')
-rw-r--r--host/lib/usrp/usrp_e/usrp_e_impl.hpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/host/lib/usrp/usrp_e/usrp_e_impl.hpp b/host/lib/usrp/usrp_e/usrp_e_impl.hpp
index 12d4c9d9e..bdb1a675b 100644
--- a/host/lib/usrp/usrp_e/usrp_e_impl.hpp
+++ b/host/lib/usrp/usrp_e/usrp_e_impl.hpp
@@ -36,8 +36,8 @@
*/
uhd::usrp::dboard_iface::sptr make_usrp_e_dboard_iface(
usrp_e_iface::sptr iface,
- clock_ctrl::sptr clock,
- codec_ctrl::sptr codec
+ usrp_e_clock_ctrl::sptr clock,
+ usrp_e_codec_ctrl::sptr codec
);
/*!
@@ -96,10 +96,10 @@ private:
//TODO otw type recv/send
//ad9522 clock control
- clock_ctrl::sptr _clock_ctrl;
+ usrp_e_clock_ctrl::sptr _clock_ctrl;
//ad9862 codec control
- codec_ctrl::sptr _codec_ctrl;
+ usrp_e_codec_ctrl::sptr _codec_ctrl;
//device functions and settings
void get(const wax::obj &, wax::obj &);