summaryrefslogtreecommitdiffstats
path: root/host/lib/transport
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2011-10-05 14:41:57 -0700
committerJosh Blum <josh@joshknows.com>2011-11-03 20:37:11 -0700
commite4561a18cd4bbcf8a20799704c42bfb4c2543dc2 (patch)
tree0583973c563e6690dfbc1577bdc5a504f06e81d2 /host/lib/transport
parenta629bbe7e3c39a10bdc3a981f6badb85a436b443 (diff)
downloaduhd-e4561a18cd4bbcf8a20799704c42bfb4c2543dc2.tar.gz
uhd-e4561a18cd4bbcf8a20799704c42bfb4c2543dc2.tar.bz2
uhd-e4561a18cd4bbcf8a20799704c42bfb4c2543dc2.zip
usrp1: did work for stream interface on usrp1
Diffstat (limited to 'host/lib/transport')
-rw-r--r--host/lib/transport/super_recv_packet_handler.hpp9
-rw-r--r--host/lib/transport/super_send_packet_handler.hpp9
2 files changed, 0 insertions, 18 deletions
diff --git a/host/lib/transport/super_recv_packet_handler.hpp b/host/lib/transport/super_recv_packet_handler.hpp
index f0b053473..f4dbc5531 100644
--- a/host/lib/transport/super_recv_packet_handler.hpp
+++ b/host/lib/transport/super_recv_packet_handler.hpp
@@ -27,7 +27,6 @@
#include <uhd/types/metadata.hpp>
#include <uhd/transport/vrt_if_packet.hpp>
#include <uhd/transport/zero_copy.hpp>
-#include <boost/thread/mutex.hpp>
#include <boost/dynamic_bitset.hpp>
#include <boost/foreach.hpp>
#include <boost/function.hpp>
@@ -135,11 +134,6 @@ public:
_props.at(xport_chan).handle_overflow = handle_overflow;
}
- //! Get a scoped lock object for this instance
- boost::mutex::scoped_lock get_scoped_lock(void){
- return boost::mutex::scoped_lock(_mutex);
- }
-
//! Set the scale factor used in float conversion
void set_scale_factor(const double scale_factor){
_scale_factor = scale_factor;
@@ -156,8 +150,6 @@ public:
uhd::rx_metadata_t &metadata,
double timeout
){
- boost::mutex::scoped_lock lock(_mutex);
-
//handle metadata queued from a previous receive
if (_queue_error_for_next_call){
_queue_error_for_next_call = false;
@@ -197,7 +189,6 @@ public:
private:
- boost::mutex _mutex;
vrt_unpacker_type _vrt_unpacker;
size_t _header_offset_words32;
double _tick_rate, _samp_rate;
diff --git a/host/lib/transport/super_send_packet_handler.hpp b/host/lib/transport/super_send_packet_handler.hpp
index 87ae01d47..079fea11e 100644
--- a/host/lib/transport/super_send_packet_handler.hpp
+++ b/host/lib/transport/super_send_packet_handler.hpp
@@ -28,7 +28,6 @@
#include <uhd/transport/vrt_if_packet.hpp>
#include <uhd/transport/zero_copy.hpp>
#include <boost/thread/thread_time.hpp>
-#include <boost/thread/mutex.hpp>
#include <boost/foreach.hpp>
#include <boost/function.hpp>
#include <iostream>
@@ -115,11 +114,6 @@ public:
_max_samples_per_packet = num_samps;
}
- //! Get a scoped lock object for this instance
- boost::mutex::scoped_lock get_scoped_lock(void){
- return boost::mutex::scoped_lock(_mutex);
- }
-
//! Set the scale factor used in float conversion
void set_scale_factor(const double scale_factor){
_scale_factor = scale_factor;
@@ -136,8 +130,6 @@ public:
const uhd::tx_metadata_t &metadata,
double timeout
){
- boost::mutex::scoped_lock lock(_mutex);
-
//translate the metadata to vrt if packet info
vrt::if_packet_info_t if_packet_info;
if_packet_info.has_sid = false;
@@ -200,7 +192,6 @@ public:
private:
- boost::mutex _mutex;
vrt_packer_type _vrt_packer;
size_t _header_offset_words32;
double _tick_rate, _samp_rate;