diff options
author | Martin Braun <martin.braun@ettus.com> | 2015-03-27 13:35:27 -0700 |
---|---|---|
committer | Martin Braun <martin.braun@ettus.com> | 2015-03-27 13:35:27 -0700 |
commit | 88ffeb35dadb3d10593be39c9eae2f90c4d7c008 (patch) | |
tree | 4dc3fb96097260c3eb46e45ebba39c17efb3af7a /host/lib/usrp/usrp2/usrp2_fifo_ctrl.cpp | |
parent | 5b285598d367b936caf91b615e30e90af8af2a5d (diff) | |
parent | 1200721b696751edaceb70a332861f84fb8c16d5 (diff) | |
download | uhd-88ffeb35dadb3d10593be39c9eae2f90c4d7c008.tar.gz uhd-88ffeb35dadb3d10593be39c9eae2f90c4d7c008.tar.bz2 uhd-88ffeb35dadb3d10593be39c9eae2f90c4d7c008.zip |
Merge branch 'maint'
Diffstat (limited to 'host/lib/usrp/usrp2/usrp2_fifo_ctrl.cpp')
-rw-r--r-- | host/lib/usrp/usrp2/usrp2_fifo_ctrl.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/host/lib/usrp/usrp2/usrp2_fifo_ctrl.cpp b/host/lib/usrp/usrp2/usrp2_fifo_ctrl.cpp index efb88eb82..9e8687b94 100644 --- a/host/lib/usrp/usrp2/usrp2_fifo_ctrl.cpp +++ b/host/lib/usrp/usrp2/usrp2_fifo_ctrl.cpp @@ -67,7 +67,7 @@ public: /******************************************************************* * Peek and poke 32 bit implementation ******************************************************************/ - void poke32(wb_addr_type addr, boost::uint32_t data){ + void poke32(const wb_addr_type addr, const boost::uint32_t data){ boost::mutex::scoped_lock lock(_mutex); this->send_pkt((addr - SETTING_REGS_BASE)/4, data, POKE32_CMD); @@ -75,7 +75,7 @@ public: this->wait_for_ack(_seq_out-MAX_SEQS_OUT); } - boost::uint32_t peek32(wb_addr_type addr){ + boost::uint32_t peek32(const wb_addr_type addr){ boost::mutex::scoped_lock lock(_mutex); this->send_pkt((addr - READBACK_BASE)/4, 0, PEEK32_CMD); @@ -86,11 +86,11 @@ public: /******************************************************************* * Peek and poke 16 bit not implemented ******************************************************************/ - void poke16(wb_addr_type, boost::uint16_t){ + void poke16(const wb_addr_type, const boost::uint16_t){ throw uhd::not_implemented_error("poke16 not implemented in fifo ctrl module"); } - boost::uint16_t peek16(wb_addr_type){ + boost::uint16_t peek16(const wb_addr_type){ throw uhd::not_implemented_error("peek16 not implemented in fifo ctrl module"); } |