diff options
| author | Martin Braun <martin.braun@ettus.com> | 2017-03-31 13:44:31 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2017-03-31 13:44:31 -0700 |
| commit | cecf54772ee040fb4cd15cef8d177b5e30550996 (patch) | |
| tree | 8e78cc079a8af69ea019185855f1df89d0f64ab0 /host/lib/transport/nirio | |
| parent | 379f922dabee3d8684a98a64787e9f0ba46caa68 (diff) | |
| parent | 47672ede5034df17bdc2f314f4e3b7afa8622bda (diff) | |
| download | uhd-cecf54772ee040fb4cd15cef8d177b5e30550996.tar.gz uhd-cecf54772ee040fb4cd15cef8d177b5e30550996.tar.bz2 uhd-cecf54772ee040fb4cd15cef8d177b5e30550996.zip | |
Merge branch 'maint'
Diffstat (limited to 'host/lib/transport/nirio')
| -rw-r--r-- | host/lib/transport/nirio/niriok_proxy_impl_v2.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/host/lib/transport/nirio/niriok_proxy_impl_v2.cpp b/host/lib/transport/nirio/niriok_proxy_impl_v2.cpp index f75de01e1..4e88b8a6e 100644 --- a/host/lib/transport/nirio/niriok_proxy_impl_v2.cpp +++ b/host/lib/transport/nirio/niriok_proxy_impl_v2.cpp @@ -759,14 +759,14 @@ namespace uhd { namespace niusrprio in.timeout = timeout; in.status = NiRio_Status_Success; - ioctl_status = + ioctl_status = nirio_driver_iface::rio_ioctl( - _device_handle, - IOCTL_TRANSPORT_FIFO_WAIT, - &in, - sizeof(in), - &out, - sizeof(out)); + _device_handle, + IOCTL_TRANSPORT_FIFO_WAIT, + &in, + sizeof(in), + &out, + sizeof(out)); if (nirio_status_fatal(ioctl_status)) return ioctl_status; data_pointer = reinterpret_cast<void*>(out.elements); |