aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Braun <martin.braun@ettus.com>2022-06-04 09:52:57 +0200
committerskooNI <60897865+skooNI@users.noreply.github.com>2022-07-20 15:57:20 -0500
commit7466cefb0d4c65687b782c5718d6c21c8d2d9c3c (patch)
treec4b28093665d1daee97c8cd4a2d87cd7c4878028
parentf96b8e7059b53958fa5fa8263160f26174a3d1b9 (diff)
downloaduhd-7466cefb0d4c65687b782c5718d6c21c8d2d9c3c.tar.gz
uhd-7466cefb0d4c65687b782c5718d6c21c8d2d9c3c.tar.bz2
uhd-7466cefb0d4c65687b782c5718d6c21c8d2d9c3c.zip
rfnoc: Fix warnings in replay_block_control
- Missing override statements - Rephrase logical statement when reading command FIFO space. The statement was correct, but Clang12 issues a warning because it considers the choice of syntax error-prone.
-rw-r--r--host/lib/rfnoc/replay_block_control.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/host/lib/rfnoc/replay_block_control.cpp b/host/lib/rfnoc/replay_block_control.cpp
index 565108420..2b3ce16bf 100644
--- a/host/lib/rfnoc/replay_block_control.cpp
+++ b/host/lib/rfnoc/replay_block_control.cpp
@@ -289,7 +289,7 @@ public:
}
bool get_record_async_metadata(
- uhd::rx_metadata_t& metadata, const double timeout = 0.0)
+ uhd::rx_metadata_t& metadata, const double timeout = 0.0) override
{
return _record_msg_queue.pop_with_timed_wait(metadata, timeout);
}
@@ -338,7 +338,8 @@ public:
return uhd::convert::get_bytes_per_item(get_play_type(port));
}
- bool get_play_async_metadata(uhd::async_metadata_t& metadata, const double timeout)
+ bool get_play_async_metadata(
+ uhd::async_metadata_t& metadata, const double timeout) override
{
return _playback_msg_queue.pop_with_timed_wait(metadata, timeout);
}
@@ -406,7 +407,7 @@ public:
// The register to get the command FIFO space was added in v1.1
if (_fpga_compat >= 0x00010001) {
// Make sure the command queue has space. Allow stop commands to pass.
- if (not play_cmd == PLAY_CMD_STOP and _cmd_fifo_spaces[port] == 0) {
+ if (play_cmd != PLAY_CMD_STOP and _cmd_fifo_spaces[port] == 0) {
_cmd_fifo_spaces[port] = _replay_reg_iface.peek32(
REG_PLAY_CMD_FIFO_SPACE_ADDR, port);
if (_cmd_fifo_spaces[port] == 0) {