diff options
| author | Josh Blum <josh@joshknows.com> | 2012-08-23 14:50:43 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2012-08-23 14:50:43 -0700 |
| commit | 8404ee981f879cffd5078a0d316ee2298f7faddb (patch) | |
| tree | a3a9ce56e5773c49bf750e23d1effbd6c6ce514c | |
| parent | 9f36d5bee7726ee6e9d278b0999edf03823f58d6 (diff) | |
| parent | 584b7ae26c4e61688c06043a0587ca50ac83b1dc (diff) | |
| download | uhd-8404ee981f879cffd5078a0d316ee2298f7faddb.tar.gz uhd-8404ee981f879cffd5078a0d316ee2298f7faddb.tar.bz2 uhd-8404ee981f879cffd5078a0d316ee2298f7faddb.zip | |
Merge branch 'master' into next
| -rw-r--r-- | host/lib/usrp/usrp2/io_impl.cpp | 1 | ||||
| -rw-r--r-- | host/utils/uhd_images_downloader.py.in | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/usrp/usrp2/io_impl.cpp b/host/lib/usrp/usrp2/io_impl.cpp index ea4aa716c..e06cf8f6f 100644 --- a/host/lib/usrp/usrp2/io_impl.cpp +++ b/host/lib/usrp/usrp2/io_impl.cpp @@ -395,6 +395,7 @@ void usrp2_impl::program_stream_dest( managed_send_buffer::sptr send_buff = xport->get_send_buff(); std::memcpy(send_buff->cast<void *>(), &stream_ctrl, sizeof(stream_ctrl)); send_buff->commit(sizeof(stream_ctrl)); + send_buff.reset(); boost::this_thread::sleep(boost::posix_time::milliseconds(300)); managed_recv_buffer::sptr recv_buff = xport->get_recv_buff(0.0); if (recv_buff and recv_buff->size() >= sizeof(boost::uint32_t)){ diff --git a/host/utils/uhd_images_downloader.py.in b/host/utils/uhd_images_downloader.py.in index be76f5b2d..6aa619660 100644 --- a/host/utils/uhd_images_downloader.py.in +++ b/host/utils/uhd_images_downloader.py.in @@ -46,8 +46,7 @@ if __name__ == "__main__": u = urllib2.urlopen(images_src) f = open(filename, "wb") meta = u.info() - #filesize = int(meta.getheaders("Content-Length")[0]) - filesize = float(int(meta.getheaders("Content-Length")[0])) + filesize = float(meta.getheaders("Content-Length")[0]) print "Downloading images from: %s" % images_src |