diff options
author | Josh Blum <josh@joshknows.com> | 2010-10-21 15:32:20 -0700 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2010-10-21 15:32:20 -0700 |
commit | 2628d78e0d0348001cb8428c8064cd1e3179afc8 (patch) | |
tree | fa2064b84926751c9e4f4532e07f76a76340e751 /host/lib/usrp/usrp2/usrp2_impl.hpp | |
parent | 1e57eec9999e1a9d0a735c04173c78164ce8afcd (diff) | |
parent | bd59192bd4eceaf86b60d91651e6b0bf11c2274e (diff) | |
download | uhd-2628d78e0d0348001cb8428c8064cd1e3179afc8.tar.gz uhd-2628d78e0d0348001cb8428c8064cd1e3179afc8.tar.bz2 uhd-2628d78e0d0348001cb8428c8064cd1e3179afc8.zip |
Merge branch 'usrp2_overflow' into flow_ctrl
Conflicts:
host/lib/usrp/usrp2/usrp2_impl.hpp
Diffstat (limited to 'host/lib/usrp/usrp2/usrp2_impl.hpp')
-rw-r--r-- | host/lib/usrp/usrp2/usrp2_impl.hpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/host/lib/usrp/usrp2/usrp2_impl.hpp b/host/lib/usrp/usrp2/usrp2_impl.hpp index 2531bd6cb..62aeddbd3 100644 --- a/host/lib/usrp/usrp2/usrp2_impl.hpp +++ b/host/lib/usrp/usrp2/usrp2_impl.hpp @@ -94,10 +94,13 @@ public: return _clock_ctrl->get_master_clock_rate(); } + void handle_overflow(void); + private: size_t _index; int _rev_hi, _rev_lo; const size_t _recv_samps_per_packet; + bool _continuous_streaming; //properties for this mboard void get(const wax::obj &, wax::obj &); |