diff options
| author | Martin Braun <martin.braun@ettus.com> | 2016-11-08 08:41:46 -0800 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2016-11-08 08:41:46 -0800 |
| commit | 9b852f5f243e5cf68662b7152b5fa331a83e55fb (patch) | |
| tree | 159ffe0761f78dd87e2ecc97abea14494abab4ff /host/lib/rfnoc/wb_iface_adapter.hpp | |
| parent | c66cb1bad0d881394f3519bd94f4693cceab4c64 (diff) | |
| parent | 99c2730bc9db270560671f2d7d173768465ed51f (diff) | |
| download | uhd-9b852f5f243e5cf68662b7152b5fa331a83e55fb.tar.gz uhd-9b852f5f243e5cf68662b7152b5fa331a83e55fb.tar.bz2 uhd-9b852f5f243e5cf68662b7152b5fa331a83e55fb.zip | |
Merge branch 'maint'
Diffstat (limited to 'host/lib/rfnoc/wb_iface_adapter.hpp')
| -rw-r--r-- | host/lib/rfnoc/wb_iface_adapter.hpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/host/lib/rfnoc/wb_iface_adapter.hpp b/host/lib/rfnoc/wb_iface_adapter.hpp index 04623d203..d83bf9427 100644 --- a/host/lib/rfnoc/wb_iface_adapter.hpp +++ b/host/lib/rfnoc/wb_iface_adapter.hpp @@ -29,9 +29,9 @@ class UHD_API wb_iface_adapter : public uhd::timed_wb_iface { public: typedef boost::shared_ptr<wb_iface_adapter> sptr; - typedef boost::function<void(wb_addr_type, boost::uint32_t)> poke32_type; - typedef boost::function<boost::uint32_t(wb_addr_type)> peek32_type; - typedef boost::function<boost::uint64_t(wb_addr_type)> peek64_type; + typedef boost::function<void(wb_addr_type, uint32_t)> poke32_type; + typedef boost::function<uint32_t(wb_addr_type)> peek32_type; + typedef boost::function<uint64_t(wb_addr_type)> peek64_type; typedef boost::function<time_spec_t(void)> gettime_type; typedef boost::function<void(const time_spec_t&)> settime_type; @@ -51,9 +51,9 @@ public: virtual ~wb_iface_adapter(void) {}; - virtual void poke32(const wb_addr_type addr, const boost::uint32_t data); - virtual boost::uint32_t peek32(const wb_addr_type addr); - virtual boost::uint64_t peek64(const wb_addr_type addr); + virtual void poke32(const wb_addr_type addr, const uint32_t data); + virtual uint32_t peek32(const wb_addr_type addr); + virtual uint64_t peek64(const wb_addr_type addr); virtual time_spec_t get_time(void); virtual void set_time(const time_spec_t& t); |