diff options
| author | Ashish Chaudhari <ashish@ettus.com> | 2015-03-17 13:52:29 -0700 |
|---|---|---|
| committer | Ashish Chaudhari <ashish@ettus.com> | 2015-03-17 13:52:29 -0700 |
| commit | 6a34824ad10eaa2d2b642b959f278f6c4e326d6d (patch) | |
| tree | 1aa582ee8e5cef716b59ec4deb3a8e5f4f532929 /host/lib/usrp/usrp2/usrp2_impl.hpp | |
| parent | 5682321efa26bb97f5d0c37d8e9921fc11a9b923 (diff) | |
| parent | 306b5243e12af0db493856ad8397abac9835db0c (diff) | |
| download | uhd-6a34824ad10eaa2d2b642b959f278f6c4e326d6d.tar.gz uhd-6a34824ad10eaa2d2b642b959f278f6c4e326d6d.tar.bz2 uhd-6a34824ad10eaa2d2b642b959f278f6c4e326d6d.zip | |
Merge branch 'master' into ashish/vivado
Diffstat (limited to 'host/lib/usrp/usrp2/usrp2_impl.hpp')
| -rw-r--r-- | host/lib/usrp/usrp2/usrp2_impl.hpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/host/lib/usrp/usrp2/usrp2_impl.hpp b/host/lib/usrp/usrp2/usrp2_impl.hpp index edbb7888b..fac4b3907 100644 --- a/host/lib/usrp/usrp2/usrp2_impl.hpp +++ b/host/lib/usrp/usrp2/usrp2_impl.hpp @@ -116,6 +116,7 @@ private: bool _ignore_cal_file; //io impl methods and members + uhd::device_addr_t device_addr; UHD_PIMPL_DECL(io_impl) _io_impl; void io_init(void); void update_tick_rate(const double rate); |