From 12aa8ad74cf3a343159ddbb452455bf4e7f435b8 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Mon, 5 Apr 2010 12:18:17 -0700 Subject: added 16 bit peek and poke, 16 bit register defs for gpios and atrs --- host/lib/usrp/usrp2/usrp2_impl.cpp | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) (limited to 'host/lib/usrp/usrp2/usrp2_impl.cpp') diff --git a/host/lib/usrp/usrp2/usrp2_impl.cpp b/host/lib/usrp/usrp2/usrp2_impl.cpp index b3a22e175..d7a9845cd 100644 --- a/host/lib/usrp/usrp2/usrp2_impl.cpp +++ b/host/lib/usrp/usrp2/usrp2_impl.cpp @@ -174,28 +174,47 @@ double usrp2_impl::get_master_clock_freq(void){ return 100e6; } -void usrp2_impl::poke(boost::uint32_t addr, boost::uint32_t data){ +template void impl_poke(usrp2_impl *impl, boost::uint32_t addr, T data){ //setup the out data usrp2_ctrl_data_t out_data; out_data.id = htonl(USRP2_CTRL_ID_POKE_THIS_REGISTER_FOR_ME_BRO); out_data.data.poke_args.addr = htonl(addr); - out_data.data.poke_args.data = htonl(data); + out_data.data.poke_args.data = htonl(boost::uint32_t(data)); + out_data.data.poke_args.num_bytes = sizeof(T); //send and recv - usrp2_ctrl_data_t in_data = this->ctrl_send_and_recv(out_data); + usrp2_ctrl_data_t in_data = impl->ctrl_send_and_recv(out_data); ASSERT_THROW(htonl(in_data.id) == USRP2_CTRL_ID_OMG_POKED_REGISTER_SO_BAD_DUDE); } -boost::uint32_t usrp2_impl::peek(boost::uint32_t addr){ +template T impl_peek(usrp2_impl *impl, boost::uint32_t addr){ //setup the out data usrp2_ctrl_data_t out_data; out_data.id = htonl(USRP2_CTRL_ID_PEEK_AT_THIS_REGISTER_FOR_ME_BRO); out_data.data.poke_args.addr = htonl(addr); + out_data.data.poke_args.num_bytes = sizeof(T); //send and recv - usrp2_ctrl_data_t in_data = this->ctrl_send_and_recv(out_data); + usrp2_ctrl_data_t in_data = impl->ctrl_send_and_recv(out_data); ASSERT_THROW(htonl(in_data.id) == USRP2_CTRL_ID_WOAH_I_DEFINITELY_PEEKED_IT_DUDE); - return ntohl(out_data.data.poke_args.data); + return T(ntohl(out_data.data.poke_args.data)); +} + + +void usrp2_impl::poke32(boost::uint32_t addr, boost::uint32_t data){ + return impl_poke(this, addr, data); +} + +boost::uint32_t usrp2_impl::peek32(boost::uint32_t addr){ + return impl_peek(this, addr); +} + +void usrp2_impl::poke16(boost::uint32_t addr, boost::uint16_t data){ + return impl_poke(this, addr, data); +} + +boost::uint16_t usrp2_impl::peek16(boost::uint32_t addr){ + return impl_peek(this, addr); } /*********************************************************************** -- cgit v1.2.3