diff options
| author | Martin Braun <martin.braun@ettus.com> | 2016-11-28 12:17:39 -0800 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2016-11-28 12:17:39 -0800 |
| commit | fc54c27b48028c9c8139175d40b4b061800f32e3 (patch) | |
| tree | bd4ef22159d5bd65458e50fb3e5050a9b63559bf /host/lib/transport | |
| parent | 9fe731cc371efee7f0051186697e611571c5b41b (diff) | |
| parent | 33c0b32db12ee154b1090360fbf76634590fdd3e (diff) | |
| download | uhd-fc54c27b48028c9c8139175d40b4b061800f32e3.tar.gz uhd-fc54c27b48028c9c8139175d40b4b061800f32e3.tar.bz2 uhd-fc54c27b48028c9c8139175d40b4b061800f32e3.zip | |
Merge branch 'maint'
Diffstat (limited to 'host/lib/transport')
| -rw-r--r-- | host/lib/transport/muxed_zero_copy_if.cpp | 4 | ||||
| -rw-r--r-- | host/lib/transport/nirio/niriok_proxy_impl_v1.cpp | 10 | ||||
| -rw-r--r-- | host/lib/transport/nirio_zero_copy.cpp | 2 | ||||
| -rw-r--r-- | host/lib/transport/udp_zero_copy.cpp | 2 |
4 files changed, 8 insertions, 10 deletions
diff --git a/host/lib/transport/muxed_zero_copy_if.cpp b/host/lib/transport/muxed_zero_copy_if.cpp index 7a2b76165..37bea7355 100644 --- a/host/lib/transport/muxed_zero_copy_if.cpp +++ b/host/lib/transport/muxed_zero_copy_if.cpp @@ -106,7 +106,7 @@ private: stream_mrb(size_t size) : _buff(new char[size]) {} ~stream_mrb() { - delete _buff; + delete[] _buff; } void release() {} @@ -118,7 +118,7 @@ private: } private: - char *_buff; + char *_buff; }; class stream_impl : public zero_copy_if diff --git a/host/lib/transport/nirio/niriok_proxy_impl_v1.cpp b/host/lib/transport/nirio/niriok_proxy_impl_v1.cpp index 444e98f1b..dbe9e4abd 100644 --- a/host/lib/transport/nirio/niriok_proxy_impl_v1.cpp +++ b/host/lib/transport/nirio/niriok_proxy_impl_v1.cpp @@ -49,11 +49,11 @@ const uint32_t NIRIO_IOCTL_GET_IFACE_NUM = METHOD_BUFFERED, FILE_READ_DATA); ///< Get the interface number for a device -const uint32_t NIRIO_IOCTL_GET_SESSION = - CTL_CODE(FILE_DEVICE_UNKNOWN, - NIRIO_IOCTL_BASE + 8, - METHOD_BUFFERED, - FILE_READ_ACCESS); ///< Gets a previously opened session to a device +//const uint32_t NIRIO_IOCTL_GET_SESSION = + //CTL_CODE(FILE_DEVICE_UNKNOWN, + //NIRIO_IOCTL_BASE + 8, + //METHOD_BUFFERED, + //FILE_READ_ACCESS); ///< Gets a previously opened session to a device const uint32_t NIRIO_IOCTL_POST_OPEN = CTL_CODE(FILE_DEVICE_UNKNOWN, diff --git a/host/lib/transport/nirio_zero_copy.cpp b/host/lib/transport/nirio_zero_copy.cpp index 1eb431a19..8bec49a5f 100644 --- a/host/lib/transport/nirio_zero_copy.cpp +++ b/host/lib/transport/nirio_zero_copy.cpp @@ -75,7 +75,6 @@ private: nirio_fifo<fifo_data_t>& _fifo; fifo_data_t* _typed_buffer; const size_t _frame_size; - size_t _num_frames; }; class nirio_zero_copy_msb : public managed_send_buffer @@ -116,7 +115,6 @@ private: nirio_fifo<fifo_data_t>& _fifo; fifo_data_t* _typed_buffer; const size_t _frame_size; - size_t _num_frames; }; class nirio_zero_copy_impl : public nirio_zero_copy { diff --git a/host/lib/transport/udp_zero_copy.cpp b/host/lib/transport/udp_zero_copy.cpp index 70fb5b552..036a84a05 100644 --- a/host/lib/transport/udp_zero_copy.cpp +++ b/host/lib/transport/udp_zero_copy.cpp @@ -32,7 +32,7 @@ using namespace uhd::transport; namespace asio = boost::asio; //A reasonable number of frames for send/recv and async/sync -static const size_t DEFAULT_NUM_FRAMES = 32; +//static const size_t DEFAULT_NUM_FRAMES = 32; /*********************************************************************** * Check registry for correct fast-path setting (windows only) |