1 files changed, 12 insertions, 14 deletions

diff --git a/host/lib/transport/libusb1_zero_copy.cpp b/host/lib/transport/libusb1_zero_copy.cpp
index 311a8953b..ca37f351f 100644
--- a/host/lib/transport/libusb1_zero_copy.cpp
+++ b/host/lib/transport/libusb1_zero_copy.cpp
@@ -23,7 +23,6 @@
 #include <uhd/utils/assert.hpp>
 #include <boost/foreach.hpp>
 #include <boost/thread.hpp>
-#include <boost/enable_shared_from_this.hpp>
 #include <vector>
 #include <iostream>
 
@@ -99,8 +98,7 @@ private:
     bool _input;
 
     //! hold a bounded buffer of completed transfers
-    typedef bounded_buffer<libusb_transfer *> lut_buff_type;
-    lut_buff_type::sptr _completed_list;
+    bounded_buffer<libusb_transfer *> _completed_list;
 
     //! a list of all transfer structs we allocated
     std::vector<libusb_transfer *> _all_luts;
@@ -134,7 +132,7 @@ static void callback(libusb_transfer *lut){
  * \param pointer to libusb_transfer
  */
 void usb_endpoint::callback_handle_transfer(libusb_transfer *lut){
-    _completed_list->push_with_wait(lut);
+    _completed_list.push_with_wait(lut);
 }
 
 
@@ -153,9 +151,9 @@ usb_endpoint::usb_endpoint(
 ):
     _handle(handle),
     _endpoint(endpoint),
-    _input(input)
+    _input(input),
+    _completed_list(num_transfers)
 {
-    _completed_list = lut_buff_type::make(num_transfers);
     _buffer_pool = buffer_pool::make(num_transfers, transfer_size);
     for (size_t i = 0; i < num_transfers; i++){
         _all_luts.push_back(allocate_transfer(_buffer_pool->at(i), transfer_size));
@@ -163,7 +161,7 @@ usb_endpoint::usb_endpoint(
         //input luts are immediately submitted to be filled
         //output luts go into the completed list as free buffers
         if (_input) this->submit(_all_luts.back());
-        else _completed_list->push_with_wait(_all_luts.back());
+        else _completed_list.push_with_wait(_all_luts.back());
     }
 }
 
@@ -272,15 +270,15 @@ void usb_endpoint::print_transfer_status(libusb_transfer *lut){
 
 libusb_transfer *usb_endpoint::get_lut_with_wait(double timeout){
     boost::this_thread::disable_interruption di; //disable because the wait can throw
-    libusb_transfer *lut;
-    if (_completed_list->pop_with_timed_wait(lut, timeout)) return lut;
+    libusb_transfer *lut = NULL;
+    if (_completed_list.pop_with_timed_wait(lut, timeout)) return lut;
     return NULL;
 }
 
 /***********************************************************************
  * USB zero_copy device class
  **********************************************************************/
-class libusb_zero_copy_impl : public usb_zero_copy, public boost::enable_shared_from_this<libusb_zero_copy_impl> {
+class libusb_zero_copy_impl : public usb_zero_copy{
 public:
 
     libusb_zero_copy_impl(
@@ -400,8 +398,8 @@ managed_recv_buffer::sptr libusb_zero_copy_impl::get_recv_buff(double timeout){
     }
     else {
         return managed_recv_buffer::make_safe(
-            boost::asio::const_buffer(lut->buffer, lut->actual_length),
-            boost::bind(&libusb_zero_copy_impl::release, shared_from_this(), lut)
+            lut->buffer, lut->actual_length,
+            boost::bind(&libusb_zero_copy_impl::release, this, lut)
         );
     }
 }
@@ -420,8 +418,8 @@ managed_send_buffer::sptr libusb_zero_copy_impl::get_send_buff(double timeout){
     }
     else {
         return managed_send_buffer::make_safe(
-            boost::asio::mutable_buffer(lut->buffer, this->get_send_frame_size()),
-            boost::bind(&libusb_zero_copy_impl::commit, shared_from_this(), lut, _1)
+            lut->buffer, this->get_send_frame_size(),
+            boost::bind(&libusb_zero_copy_impl::commit, this, lut, _1)
         );
     }
 }