aboutsummaryrefslogtreecommitdiffstats
path: root/host/tests/rfnoc_block_tests
diff options
context:
space:
mode:
authorMartin Braun <martin.braun@ettus.com>2021-01-08 09:33:36 +0100
committerAaron Rossetto <aaron.rossetto@ni.com>2021-03-04 08:07:26 -0600
commit107a49c0c236940da7d3bd0f57da4bc1e2a34cb4 (patch)
treefdeaad56030a02948377c45838dab97beb7a5c84 /host/tests/rfnoc_block_tests
parent7d5e48032baa62cbe7467833b9e057900602f4b9 (diff)
downloaduhd-107a49c0c236940da7d3bd0f57da4bc1e2a34cb4.tar.gz
uhd-107a49c0c236940da7d3bd0f57da4bc1e2a34cb4.tar.bz2
uhd-107a49c0c236940da7d3bd0f57da4bc1e2a34cb4.zip
host: Update code base using clang-tidy
The checks from the new clang-tidy file are applied to the source tree using: $ find . -name "*.cpp" | sort -u | xargs \ --max-procs 8 --max-args 1 clang-tidy --format-style=file \ --fix -p /path/to/compile_commands.json
Diffstat (limited to 'host/tests/rfnoc_block_tests')
-rw-r--r--host/tests/rfnoc_block_tests/fft_block_test.cpp6
-rw-r--r--host/tests/rfnoc_block_tests/fir_filter_block_test.cpp6
-rw-r--r--host/tests/rfnoc_block_tests/fosphor_block_test.cpp6
-rw-r--r--host/tests/rfnoc_block_tests/keep_one_in_n_test.cpp2
-rw-r--r--host/tests/rfnoc_block_tests/siggen_block_test.cpp6
-rw-r--r--host/tests/rfnoc_block_tests/switchboard_block_test.cpp6
-rw-r--r--host/tests/rfnoc_block_tests/vector_iir_block_test.cpp6
-rw-r--r--host/tests/rfnoc_block_tests/window_block_test.cpp6
8 files changed, 23 insertions, 21 deletions
diff --git a/host/tests/rfnoc_block_tests/fft_block_test.cpp b/host/tests/rfnoc_block_tests/fft_block_test.cpp
index 0eac8cf43..15e1de8f2 100644
--- a/host/tests/rfnoc_block_tests/fft_block_test.cpp
+++ b/host/tests/rfnoc_block_tests/fft_block_test.cpp
@@ -25,8 +25,10 @@ noc_block_base::make_args_t::~make_args_t() = default;
class fft_mock_reg_iface_t : public mock_reg_iface_t
{
public:
- virtual void _poke_cb(
- uint32_t addr, uint32_t /*data*/, uhd::time_spec_t /*time*/, bool /*ack*/)
+ void _poke_cb(uint32_t addr,
+ uint32_t /*data*/,
+ uhd::time_spec_t /*time*/,
+ bool /*ack*/) override
{
if (addr == fft_block_control::REG_RESET_ADDR) {
fft_was_reset = true;
diff --git a/host/tests/rfnoc_block_tests/fir_filter_block_test.cpp b/host/tests/rfnoc_block_tests/fir_filter_block_test.cpp
index 0ef725599..fe660b626 100644
--- a/host/tests/rfnoc_block_tests/fir_filter_block_test.cpp
+++ b/host/tests/rfnoc_block_tests/fir_filter_block_test.cpp
@@ -37,8 +37,8 @@ public:
{
}
- virtual void _poke_cb(
- uint32_t addr, uint32_t data, uhd::time_spec_t /*time*/, bool /*ack*/)
+ void _poke_cb(
+ uint32_t addr, uint32_t data, uhd::time_spec_t /*time*/, bool /*ack*/) override
{
if (addr == fir_filter_block_control::REG_FIR_MAX_NUM_COEFFS_ADDR) {
throw uhd::assertion_error("Invalid write to read-only register");
@@ -52,7 +52,7 @@ public:
}
}
- virtual void _peek_cb(uint32_t addr, uhd::time_spec_t /*time*/)
+ void _peek_cb(uint32_t addr, uhd::time_spec_t /*time*/) override
{
if (addr == fir_filter_block_control::REG_FIR_MAX_NUM_COEFFS_ADDR) {
read_memory[addr] = uhd::narrow_cast<int32_t>(_max_num_coeffs);
diff --git a/host/tests/rfnoc_block_tests/fosphor_block_test.cpp b/host/tests/rfnoc_block_tests/fosphor_block_test.cpp
index 0cdc678d2..fb3624e02 100644
--- a/host/tests/rfnoc_block_tests/fosphor_block_test.cpp
+++ b/host/tests/rfnoc_block_tests/fosphor_block_test.cpp
@@ -32,8 +32,8 @@ noc_block_base::make_args_t::~make_args_t() = default;
class fosphor_mock_reg_iface_t : public mock_reg_iface_t
{
public:
- virtual void _poke_cb(
- uint32_t addr, uint32_t data, uhd::time_spec_t /*time*/, bool /*ack*/)
+ void _poke_cb(
+ uint32_t addr, uint32_t data, uhd::time_spec_t /*time*/, bool /*ack*/) override
{
if (addr == fosphor_block_control::REG_ENABLE_ADDR) {
fosphor_enable_reg = data;
@@ -47,7 +47,7 @@ public:
}
}
- virtual void _peek_cb(uint32_t addr, uhd::time_spec_t /*time*/)
+ void _peek_cb(uint32_t addr, uhd::time_spec_t /*time*/) override
{
if (addr == fosphor_block_control::REG_ENABLE_ADDR) {
read_memory[addr] = fosphor_enable_reg;
diff --git a/host/tests/rfnoc_block_tests/keep_one_in_n_test.cpp b/host/tests/rfnoc_block_tests/keep_one_in_n_test.cpp
index 694ba7957..86c97db8f 100644
--- a/host/tests/rfnoc_block_tests/keep_one_in_n_test.cpp
+++ b/host/tests/rfnoc_block_tests/keep_one_in_n_test.cpp
@@ -29,7 +29,7 @@ public:
{
}
- virtual void _peek_cb(uint32_t addr, uhd::time_spec_t /*time*/)
+ void _peek_cb(uint32_t addr, uhd::time_spec_t /*time*/) override
{
// Emulate the read-only behavior of the WIDTH_N register
if (addr == keep_one_in_n_block_control::REG_WIDTH_N_OFFSET) {
diff --git a/host/tests/rfnoc_block_tests/siggen_block_test.cpp b/host/tests/rfnoc_block_tests/siggen_block_test.cpp
index 6fdcb903b..ea52530e0 100644
--- a/host/tests/rfnoc_block_tests/siggen_block_test.cpp
+++ b/host/tests/rfnoc_block_tests/siggen_block_test.cpp
@@ -44,8 +44,8 @@ public:
{
}
- virtual void _poke_cb(
- uint32_t addr, uint32_t data, uhd::time_spec_t /*time*/, bool /*ack*/)
+ void _poke_cb(
+ uint32_t addr, uint32_t data, uhd::time_spec_t /*time*/, bool /*ack*/) override
{
const size_t port = addr / siggen_block_control::REG_BLOCK_SIZE;
if (port >= _num_ports) {
@@ -72,7 +72,7 @@ public:
}
}
- virtual void _peek_cb(uint32_t addr, uhd::time_spec_t /*time*/)
+ void _peek_cb(uint32_t addr, uhd::time_spec_t /*time*/) override
{
const size_t port = addr / siggen_block_control::REG_BLOCK_SIZE;
if (port >= _num_ports) {
diff --git a/host/tests/rfnoc_block_tests/switchboard_block_test.cpp b/host/tests/rfnoc_block_tests/switchboard_block_test.cpp
index 693923693..3cc9fd147 100644
--- a/host/tests/rfnoc_block_tests/switchboard_block_test.cpp
+++ b/host/tests/rfnoc_block_tests/switchboard_block_test.cpp
@@ -41,8 +41,8 @@ public:
input_select.push_back(0);
}
- virtual void _poke_cb(
- uint32_t addr, uint32_t data, uhd::time_spec_t /*time*/, bool /*ack*/)
+ void _poke_cb(
+ uint32_t addr, uint32_t data, uhd::time_spec_t /*time*/, bool /*ack*/) override
{
size_t chan = addr / switchboard_block_control::REG_BLOCK_SIZE;
size_t offset = addr % switchboard_block_control::REG_BLOCK_SIZE;
@@ -55,7 +55,7 @@ public:
}
}
- virtual void _peek_cb(uint32_t addr, uhd::time_spec_t /*time*/)
+ void _peek_cb(uint32_t addr, uhd::time_spec_t /*time*/) override
{
size_t chan = addr / switchboard_block_control::REG_BLOCK_SIZE;
size_t offset = addr % switchboard_block_control::REG_BLOCK_SIZE;
diff --git a/host/tests/rfnoc_block_tests/vector_iir_block_test.cpp b/host/tests/rfnoc_block_tests/vector_iir_block_test.cpp
index 5fc1fd90e..8721d7bb5 100644
--- a/host/tests/rfnoc_block_tests/vector_iir_block_test.cpp
+++ b/host/tests/rfnoc_block_tests/vector_iir_block_test.cpp
@@ -44,8 +44,8 @@ public:
}
}
- virtual void _poke_cb(
- uint32_t addr, uint32_t data, uhd::time_spec_t /*time*/, bool /*ack*/)
+ void _poke_cb(
+ uint32_t addr, uint32_t data, uhd::time_spec_t /*time*/, bool /*ack*/) override
{
size_t chan = addr / vector_iir_block_control::REG_BLOCK_SIZE;
size_t offset = addr % vector_iir_block_control::REG_BLOCK_SIZE;
@@ -54,7 +54,7 @@ public:
}
}
- virtual void _peek_cb(uint32_t addr, uhd::time_spec_t /*time*/)
+ void _peek_cb(uint32_t addr, uhd::time_spec_t /*time*/) override
{
size_t chan = addr / vector_iir_block_control::REG_BLOCK_SIZE;
size_t offset = addr % vector_iir_block_control::REG_BLOCK_SIZE;
diff --git a/host/tests/rfnoc_block_tests/window_block_test.cpp b/host/tests/rfnoc_block_tests/window_block_test.cpp
index 65e493c4b..a8fcb5db0 100644
--- a/host/tests/rfnoc_block_tests/window_block_test.cpp
+++ b/host/tests/rfnoc_block_tests/window_block_test.cpp
@@ -42,8 +42,8 @@ public:
reset();
}
- virtual void _poke_cb(
- uint32_t addr, uint32_t data, uhd::time_spec_t /*time*/, bool /*ack*/)
+ void _poke_cb(
+ uint32_t addr, uint32_t data, uhd::time_spec_t /*time*/, bool /*ack*/) override
{
size_t chan = addr / window_block_control::REG_WINDOW_BLOCK_SIZE;
size_t offset = addr % window_block_control::REG_WINDOW_BLOCK_SIZE;
@@ -63,7 +63,7 @@ public:
}
}
- virtual void _peek_cb(uint32_t addr, uhd::time_spec_t /*time*/)
+ void _peek_cb(uint32_t addr, uhd::time_spec_t /*time*/) override
{
size_t chan = addr / window_block_control::REG_WINDOW_BLOCK_SIZE;
size_t offset = addr % window_block_control::REG_WINDOW_BLOCK_SIZE;