diff options
| author | Martin Braun <martin.braun@ettus.com> | 2016-11-28 12:17:39 -0800 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2016-11-28 12:17:39 -0800 |
| commit | fc54c27b48028c9c8139175d40b4b061800f32e3 (patch) | |
| tree | bd4ef22159d5bd65458e50fb3e5050a9b63559bf /host/lib/usrp/cores | |
| parent | 9fe731cc371efee7f0051186697e611571c5b41b (diff) | |
| parent | 33c0b32db12ee154b1090360fbf76634590fdd3e (diff) | |
| download | uhd-fc54c27b48028c9c8139175d40b4b061800f32e3.tar.gz uhd-fc54c27b48028c9c8139175d40b4b061800f32e3.tar.bz2 uhd-fc54c27b48028c9c8139175d40b4b061800f32e3.zip | |
Merge branch 'maint'
Diffstat (limited to 'host/lib/usrp/cores')
| -rw-r--r-- | host/lib/usrp/cores/dma_fifo_core_3000.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/host/lib/usrp/cores/dma_fifo_core_3000.cpp b/host/lib/usrp/cores/dma_fifo_core_3000.cpp index 908ba906e..e1a841b96 100644 --- a/host/lib/usrp/cores/dma_fifo_core_3000.cpp +++ b/host/lib/usrp/cores/dma_fifo_core_3000.cpp @@ -223,7 +223,7 @@ public: public: dma_fifo_core_3000_impl(wb_iface::sptr iface, const size_t base, const size_t readback): - _iface(iface), _base(base), _fifo_readback(iface, base, readback), + _iface(iface), _fifo_readback(iface, base, readback), _fifo_ctrl_reg(base), _base_addr_reg(base), _addr_mask_reg(base), _bist_ctrl_reg(base), _bist_cfg_reg(base), _bist_delay_reg(base), _bist_sid_reg(base) { @@ -368,7 +368,6 @@ private: private: wb_iface::sptr _iface; - const size_t _base; boost::mutex _mutex; bool _has_ext_bist; |