diff options
| author | Martin Braun <martin.braun@ettus.com> | 2014-12-15 11:27:02 +0100 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2014-12-15 11:27:02 +0100 |
| commit | 84e1e3c9ced44eec4c93a474cef8c6f9b54acdd2 (patch) | |
| tree | 9519eaec40d56d74250459b4515d01f7c2a50674 /host/lib/transport | |
| parent | c7796ea9714d1781df3acb4cf2283c0266babf13 (diff) | |
| parent | f6dcf4a96449d2406ee0cb07aa6668377ceb3889 (diff) | |
| download | uhd-84e1e3c9ced44eec4c93a474cef8c6f9b54acdd2.tar.gz uhd-84e1e3c9ced44eec4c93a474cef8c6f9b54acdd2.tar.bz2 uhd-84e1e3c9ced44eec4c93a474cef8c6f9b54acdd2.zip | |
Merge branch 'maint'
Conflicts:
host/examples/rx_samples_to_file.cpp
Diffstat (limited to 'host/lib/transport')
| -rw-r--r-- | host/lib/transport/nirio/niriok_proxy_impl_v1.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/host/lib/transport/nirio/niriok_proxy_impl_v1.cpp b/host/lib/transport/nirio/niriok_proxy_impl_v1.cpp index 7ef0e3645..f4a8e4ff5 100644 --- a/host/lib/transport/nirio/niriok_proxy_impl_v1.cpp +++ b/host/lib/transport/nirio/niriok_proxy_impl_v1.cpp @@ -285,9 +285,10 @@ namespace uhd { namespace niusrprio niriok_proxy_impl_v1::nirio_syncop_out_params_t out = {}; in.function = niriok_proxy_impl_v1::NIRIO_FUNC::ADD_RESOURCE; - in.subfunction = (fifo_info.direction == OUTPUT_FIFO) ? - niriok_proxy_impl_v1::NIRIO_RESOURCE::OUTPUT_FIFO : - niriok_proxy_impl_v1::NIRIO_RESOURCE::INPUT_FIFO; + if (fifo_info.direction == OUTPUT_FIFO) + in.subfunction = niriok_proxy_impl_v1::NIRIO_RESOURCE::OUTPUT_FIFO; + else + in.subfunction = niriok_proxy_impl_v1::NIRIO_RESOURCE::INPUT_FIFO; in.params.add.fifoWithDataType.channel = fifo_info.channel; in.params.add.fifoWithDataType.baseAddress = fifo_info.base_addr; |