diff options
author | Moritz Fischer <moritz.fischer@ettus.com> | 2015-04-14 15:12:04 -0500 |
---|---|---|
committer | Martin Braun <martin.braun@ettus.com> | 2015-07-31 13:52:01 -0700 |
commit | 0c7d748bbf6c282d3f1c759201e40f35f26133ca (patch) | |
tree | 1daf1ee1bd9c325e72739d032c42851160bf4e8b /host | |
parent | bd293b70f4128210b79823e1ce8597ba08d09df6 (diff) | |
download | uhd-0c7d748bbf6c282d3f1c759201e40f35f26133ca.tar.gz uhd-0c7d748bbf6c282d3f1c759201e40f35f26133ca.tar.bz2 uhd-0c7d748bbf6c282d3f1c759201e40f35f26133ca.zip |
x300: nirio: Fix compiler warnings
The old code used a non standard (though very common) way
to determine the size of an array.
In order to avoid warnings, pass another parameter to indicate
the size.
Signed-off-by: Moritz Fischer <moritz.fischer@ettus.com>
Diffstat (limited to 'host')
-rw-r--r-- | host/include/uhd/transport/nirio/nirio_quirks.h | 4 | ||||
-rw-r--r-- | host/lib/usrp/x300/x300_impl.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/host/include/uhd/transport/nirio/nirio_quirks.h b/host/include/uhd/transport/nirio/nirio_quirks.h index 8e58f80f1..45ef40394 100644 --- a/host/include/uhd/transport/nirio/nirio_quirks.h +++ b/host/include/uhd/transport/nirio/nirio_quirks.h @@ -35,8 +35,8 @@ public: nirio_quirks() : _tx_stream_count(0) { } - UHD_INLINE void register_tx_streams(const uint32_t tx_stream_indices[]) { - for (size_t i = 0; i < sizeof(tx_stream_indices)/sizeof(*tx_stream_indices); i++) { + UHD_INLINE void register_tx_streams(const uint32_t tx_stream_indices[], size_t size) { + for (size_t i = 0; i < size; i++) { _tx_stream_fifo_indices.insert(tx_stream_indices[i]); } } diff --git a/host/lib/usrp/x300/x300_impl.cpp b/host/lib/usrp/x300/x300_impl.cpp index f0332691d..c9cc0cabc 100644 --- a/host/lib/usrp/x300/x300_impl.cpp +++ b/host/lib/usrp/x300/x300_impl.cpp @@ -409,7 +409,7 @@ void x300_impl::setup_mb(const size_t mb_i, const uhd::device_addr_t &dev_addr) //Tell the quirks object which FIFOs carry TX stream data const boost::uint32_t tx_data_fifos[2] = {X300_RADIO_DEST_PREFIX_TX, X300_RADIO_DEST_PREFIX_TX + 3}; - mb.rio_fpga_interface->get_kernel_proxy()->get_rio_quirks().register_tx_streams(tx_data_fifos); + mb.rio_fpga_interface->get_kernel_proxy()->get_rio_quirks().register_tx_streams(tx_data_fifos, 2); _tree->create<double>(mb_path / "link_max_rate").set(X300_MAX_RATE_PCIE); } |