diff options
author | Josh Blum <josh@joshknows.com> | 2011-06-29 14:00:22 -0700 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2011-06-29 14:00:22 -0700 |
commit | 11539ef6f690b4ebd69485be9a61f5422d8cdc99 (patch) | |
tree | 529cf29a314ac5b8b3dfaab94f98caca972cc462 /host/lib/usrp/usrp2/usrp2_iface.cpp | |
parent | bc8aaf3952f1c192030d1c9a0b6ddcbe14d9c062 (diff) | |
download | uhd-11539ef6f690b4ebd69485be9a61f5422d8cdc99.tar.gz uhd-11539ef6f690b4ebd69485be9a61f5422d8cdc99.tar.bz2 uhd-11539ef6f690b4ebd69485be9a61f5422d8cdc99.zip |
usrp2: moved impl back into usrp subdir
Diffstat (limited to 'host/lib/usrp/usrp2/usrp2_iface.cpp')
-rw-r--r-- | host/lib/usrp/usrp2/usrp2_iface.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/host/lib/usrp/usrp2/usrp2_iface.cpp b/host/lib/usrp/usrp2/usrp2_iface.cpp index 6ba364b28..0db9e5d58 100644 --- a/host/lib/usrp/usrp2/usrp2_iface.cpp +++ b/host/lib/usrp/usrp2/usrp2_iface.cpp @@ -160,24 +160,24 @@ public: /*********************************************************************** * Peek and Poke **********************************************************************/ - void poke32(boost::uint32_t addr, boost::uint32_t data){ + void poke32(wb_addr_type addr, boost::uint32_t data){ this->get_reg<boost::uint32_t, USRP2_REG_ACTION_FPGA_POKE32>(addr, data); } - boost::uint32_t peek32(boost::uint32_t addr){ + boost::uint32_t peek32(wb_addr_type addr){ return this->get_reg<boost::uint32_t, USRP2_REG_ACTION_FPGA_PEEK32>(addr); } - void poke16(boost::uint32_t addr, boost::uint16_t data){ + void poke16(wb_addr_type addr, boost::uint16_t data){ this->get_reg<boost::uint16_t, USRP2_REG_ACTION_FPGA_POKE16>(addr, data); } - boost::uint16_t peek16(boost::uint32_t addr){ + boost::uint16_t peek16(wb_addr_type addr){ return this->get_reg<boost::uint16_t, USRP2_REG_ACTION_FPGA_PEEK16>(addr); } template <class T, usrp2_reg_action_t action> - T get_reg(boost::uint32_t addr, T data = 0){ + T get_reg(wb_addr_type addr, T data = 0){ //setup the out data usrp2_ctrl_data_t out_data = usrp2_ctrl_data_t(); out_data.id = htonl(USRP2_CTRL_ID_GET_THIS_REGISTER_FOR_ME_BRO); |