summaryrefslogtreecommitdiffstats
path: root/host/lib/usrp
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2011-02-07 12:32:12 -0800
committerJosh Blum <josh@joshknows.com>2011-02-07 12:32:12 -0800
commitef351624eeb898e17662000a40b50076133118c7 (patch)
tree841cc50addc98183bf4b6a35dbe2b5375d08cc6c /host/lib/usrp
parentfec5fc2d319ab2808f88d2f4cec734a8102f18ca (diff)
downloaduhd-ef351624eeb898e17662000a40b50076133118c7.tar.gz
uhd-ef351624eeb898e17662000a40b50076133118c7.tar.bz2
uhd-ef351624eeb898e17662000a40b50076133118c7.zip
uhd: replace asio buffer in make safe w/ memory and length, makes things simpler
Diffstat (limited to 'host/lib/usrp')
-rw-r--r--host/lib/usrp/usrp1/io_impl.cpp6
-rw-r--r--host/lib/usrp/usrp_e100/usrp_e100_mmap_zero_copy.cpp4
2 files changed, 4 insertions, 6 deletions
diff --git a/host/lib/usrp/usrp1/io_impl.cpp b/host/lib/usrp/usrp1/io_impl.cpp
index 52a7c6650..7953447d1 100644
--- a/host/lib/usrp/usrp1/io_impl.cpp
+++ b/host/lib/usrp/usrp1/io_impl.cpp
@@ -159,10 +159,8 @@ bool usrp1_impl::io_impl::get_send_buffs(
//calculate the buffer pointer and size given the offset
//references to the buffers are held in the bound function
buffs[0] = managed_send_buffer::make_safe(
- boost::asio::buffer(
- curr_buff->buff->cast<char *>() + curr_buff->offset,
- curr_buff->buff->size() - curr_buff->offset
- ),
+ curr_buff->buff->cast<char *>() + curr_buff->offset,
+ curr_buff->buff->size() - curr_buff->offset,
boost::bind(&usrp1_impl::io_impl::commit_send_buff, this, curr_buff, next_buff, _1)
);
diff --git a/host/lib/usrp/usrp_e100/usrp_e100_mmap_zero_copy.cpp b/host/lib/usrp/usrp_e100/usrp_e100_mmap_zero_copy.cpp
index c07e6e011..4e0137fdb 100644
--- a/host/lib/usrp/usrp_e100/usrp_e100_mmap_zero_copy.cpp
+++ b/host/lib/usrp/usrp_e100/usrp_e100_mmap_zero_copy.cpp
@@ -124,7 +124,7 @@ public:
//return the managed buffer for this frame
if (fp_verbose) std::cout << " make_recv_buff: " << info->len << std::endl;
return managed_recv_buffer::make_safe(
- boost::asio::const_buffer(mem, info->len),
+ mem, info->len,
boost::bind(&usrp_e100_mmap_zero_copy_impl::release, this, info)
);
}
@@ -160,7 +160,7 @@ public:
//return the managed buffer for this frame
if (fp_verbose) std::cout << " make_send_buff: " << _frame_size << std::endl;
return managed_send_buffer::make_safe(
- boost::asio::mutable_buffer(mem, _frame_size),
+ mem, _frame_size,
boost::bind(&usrp_e100_mmap_zero_copy_impl::commit, this, info, _1)
);
}