diff options
author | Josh Blum <josh@joshknows.com> | 2011-04-30 17:11:46 -0700 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2011-04-30 17:11:46 -0700 |
commit | 493ed897f24fff5265b766ee634916b002cadf94 (patch) | |
tree | 09082fa8be0c71b92ca668083dd1519a452b679d /host/lib/usrp/usrp1/io_impl.cpp | |
parent | 7b509d6fe4ac4cfcafc63f11f5b298d3e0237acd (diff) | |
parent | 1e57d1c0496ca6263652cd84c9eeacafde833915 (diff) | |
download | uhd-493ed897f24fff5265b766ee634916b002cadf94.tar.gz uhd-493ed897f24fff5265b766ee634916b002cadf94.tar.bz2 uhd-493ed897f24fff5265b766ee634916b002cadf94.zip |
Merge branch 'master' into next
Conflicts:
host/lib/usrp/usrp2/usrp2_regs.cpp
Diffstat (limited to 'host/lib/usrp/usrp1/io_impl.cpp')
-rw-r--r-- | host/lib/usrp/usrp1/io_impl.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/host/lib/usrp/usrp1/io_impl.cpp b/host/lib/usrp/usrp1/io_impl.cpp index b3268298e..8fb639c4a 100644 --- a/host/lib/usrp/usrp1/io_impl.cpp +++ b/host/lib/usrp/usrp1/io_impl.cpp @@ -180,6 +180,9 @@ void usrp1_impl::io_impl::commit_send_buff( //commit the current buffer curr.buff->commit(num_bytes_to_commit); + + //store the next buffer for the next call + curr_buff = next; } /*! @@ -216,9 +219,6 @@ bool usrp1_impl::io_impl::get_send_buffs( //make a new managed buffer with the offset buffs buffs[0] = omsb.get_new(curr_buff, next_buff); - //store the next buffer for the next call - curr_buff = next_buff; - return true; } |