aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/usrp/b100
diff options
context:
space:
mode:
Diffstat (limited to 'host/lib/usrp/b100')
-rw-r--r--host/lib/usrp/b100/b100_impl.hpp8
-rw-r--r--host/lib/usrp/b100/dboard_iface.cpp50
-rw-r--r--host/lib/usrp/b100/fifo_ctrl_excelsior.cpp20
-rw-r--r--host/lib/usrp/b100/usb_zero_copy_wrapper.cpp18
4 files changed, 48 insertions, 48 deletions
diff --git a/host/lib/usrp/b100/b100_impl.hpp b/host/lib/usrp/b100/b100_impl.hpp
index 0b46c4815..326b74103 100644
--- a/host/lib/usrp/b100/b100_impl.hpp
+++ b/host/lib/usrp/b100/b100_impl.hpp
@@ -84,12 +84,12 @@ class b100_impl : public uhd::device
public:
// structors
b100_impl(const uhd::device_addr_t&);
- ~b100_impl(void);
+ ~b100_impl(void) override;
// the io interface
- uhd::rx_streamer::sptr get_rx_stream(const uhd::stream_args_t& args);
- uhd::tx_streamer::sptr get_tx_stream(const uhd::stream_args_t& args);
- bool recv_async_msg(uhd::async_metadata_t&, double);
+ uhd::rx_streamer::sptr get_rx_stream(const uhd::stream_args_t& args) override;
+ uhd::tx_streamer::sptr get_tx_stream(const uhd::stream_args_t& args) override;
+ bool recv_async_msg(uhd::async_metadata_t&, double) override;
static uhd::usrp::mboard_eeprom_t get_mb_eeprom(uhd::i2c_iface::sptr);
diff --git a/host/lib/usrp/b100/dboard_iface.cpp b/host/lib/usrp/b100/dboard_iface.cpp
index 627e7a876..f457b2095 100644
--- a/host/lib/usrp/b100/dboard_iface.cpp
+++ b/host/lib/usrp/b100/dboard_iface.cpp
@@ -40,12 +40,12 @@ public:
this->set_clock_rate(UNIT_TX, _clock->get_fpga_clock_rate());
}
- ~b100_dboard_iface(void)
+ ~b100_dboard_iface(void) override
{
/* NOP */
}
- special_props_t get_special_props(void)
+ special_props_t get_special_props(void) override
{
special_props_t props;
props.soft_clock_divider = false;
@@ -53,39 +53,39 @@ public:
return props;
}
- void write_aux_dac(unit_t, aux_dac_t, double);
- double read_aux_adc(unit_t, aux_adc_t);
+ void write_aux_dac(unit_t, aux_dac_t, double) override;
+ double read_aux_adc(unit_t, aux_adc_t) override;
- void set_pin_ctrl(unit_t unit, uint32_t value, uint32_t mask = 0xffffffff);
- uint32_t get_pin_ctrl(unit_t unit);
+ void set_pin_ctrl(unit_t unit, uint32_t value, uint32_t mask = 0xffffffff) override;
+ uint32_t get_pin_ctrl(unit_t unit) override;
void set_atr_reg(
- unit_t unit, atr_reg_t reg, uint32_t value, uint32_t mask = 0xffffffff);
- uint32_t get_atr_reg(unit_t unit, atr_reg_t reg);
- void set_gpio_ddr(unit_t unit, uint32_t value, uint32_t mask = 0xffffffff);
- uint32_t get_gpio_ddr(unit_t unit);
- void set_gpio_out(unit_t unit, uint32_t value, uint32_t mask = 0xffffffff);
- uint32_t get_gpio_out(unit_t unit);
- uint32_t read_gpio(unit_t unit);
+ unit_t unit, atr_reg_t reg, uint32_t value, uint32_t mask = 0xffffffff) override;
+ uint32_t get_atr_reg(unit_t unit, atr_reg_t reg) override;
+ void set_gpio_ddr(unit_t unit, uint32_t value, uint32_t mask = 0xffffffff) override;
+ uint32_t get_gpio_ddr(unit_t unit) override;
+ void set_gpio_out(unit_t unit, uint32_t value, uint32_t mask = 0xffffffff) override;
+ uint32_t get_gpio_out(unit_t unit) override;
+ uint32_t read_gpio(unit_t unit) override;
- void set_command_time(const uhd::time_spec_t& t);
- uhd::time_spec_t get_command_time(void);
+ void set_command_time(const uhd::time_spec_t& t) override;
+ uhd::time_spec_t get_command_time(void) override;
- void write_i2c(uint16_t, const byte_vector_t&);
- byte_vector_t read_i2c(uint16_t, size_t);
+ void write_i2c(uint16_t, const byte_vector_t&) override;
+ byte_vector_t read_i2c(uint16_t, size_t) override;
void write_spi(
- unit_t unit, const spi_config_t& config, uint32_t data, size_t num_bits);
+ unit_t unit, const spi_config_t& config, uint32_t data, size_t num_bits) override;
uint32_t read_write_spi(
- unit_t unit, const spi_config_t& config, uint32_t data, size_t num_bits);
+ unit_t unit, const spi_config_t& config, uint32_t data, size_t num_bits) override;
- void set_clock_rate(unit_t, double);
- std::vector<double> get_clock_rates(unit_t);
- double get_clock_rate(unit_t);
- void set_clock_enabled(unit_t, bool);
- double get_codec_rate(unit_t);
+ void set_clock_rate(unit_t, double) override;
+ std::vector<double> get_clock_rates(unit_t) override;
+ double get_clock_rate(unit_t) override;
+ void set_clock_enabled(unit_t, bool) override;
+ double get_codec_rate(unit_t) override;
void set_fe_connection(
- unit_t unit, const std::string&, const fe_connection_t& fe_conn);
+ unit_t unit, const std::string&, const fe_connection_t& fe_conn) override;
private:
timed_wb_iface::sptr _wb_iface;
diff --git a/host/lib/usrp/b100/fifo_ctrl_excelsior.cpp b/host/lib/usrp/b100/fifo_ctrl_excelsior.cpp
index 4a21770b8..2d899a6b8 100644
--- a/host/lib/usrp/b100/fifo_ctrl_excelsior.cpp
+++ b/host/lib/usrp/b100/fifo_ctrl_excelsior.cpp
@@ -58,7 +58,7 @@ public:
this->init_spi();
}
- ~fifo_ctrl_excelsior_impl(void)
+ ~fifo_ctrl_excelsior_impl(void) override
{
_timeout = ACK_TIMEOUT; // reset timeout to something small
UHD_SAFE_CALL(
@@ -66,7 +66,7 @@ public:
)
}
- bool pop_async_msg(async_metadata_t& async_metadata, double timeout)
+ bool pop_async_msg(async_metadata_t& async_metadata, double timeout) override
{
return _async_fifo.pop_with_timed_wait(async_metadata, timeout);
}
@@ -109,7 +109,7 @@ public:
/*******************************************************************
* Peek and poke 32 bit implementation
******************************************************************/
- void poke32(const wb_addr_type addr, const uint32_t data)
+ void poke32(const wb_addr_type addr, const uint32_t data) override
{
std::lock_guard<std::mutex> lock(_mutex);
@@ -118,7 +118,7 @@ public:
this->wait_for_ack(_seq_out - MAX_SEQS_OUT);
}
- uint32_t peek32(const wb_addr_type addr)
+ uint32_t peek32(const wb_addr_type addr) override
{
std::lock_guard<std::mutex> lock(_mutex);
@@ -130,12 +130,12 @@ public:
/*******************************************************************
* Peek and poke 16 bit not implemented
******************************************************************/
- void poke16(const wb_addr_type, const uint16_t)
+ void poke16(const wb_addr_type, const uint16_t) override
{
throw uhd::not_implemented_error("poke16 not implemented in fifo ctrl module");
}
- uint16_t peek16(const wb_addr_type)
+ uint16_t peek16(const wb_addr_type) override
{
throw uhd::not_implemented_error("peek16 not implemented in fifo ctrl module");
}
@@ -157,7 +157,7 @@ public:
const spi_config_t& config,
uint32_t data,
size_t num_bits,
- bool readback)
+ bool readback) override
{
std::lock_guard<std::mutex> lock(_mutex);
@@ -196,7 +196,7 @@ public:
/*******************************************************************
* Update methods for time
******************************************************************/
- void set_time(const uhd::time_spec_t& time)
+ void set_time(const uhd::time_spec_t& time) override
{
std::lock_guard<std::mutex> lock(_mutex);
_time = time;
@@ -205,13 +205,13 @@ public:
_timeout = MASSIVE_TIMEOUT; // permanently sets larger timeout
}
- uhd::time_spec_t get_time(void)
+ uhd::time_spec_t get_time(void) override
{
std::lock_guard<std::mutex> lock(_mutex);
return _time;
}
- void set_tick_rate(const double rate)
+ void set_tick_rate(const double rate) override
{
std::lock_guard<std::mutex> lock(_mutex);
_tick_rate = rate;
diff --git a/host/lib/usrp/b100/usb_zero_copy_wrapper.cpp b/host/lib/usrp/b100/usb_zero_copy_wrapper.cpp
index 908841462..b2348c3a9 100644
--- a/host/lib/usrp/b100/usb_zero_copy_wrapper.cpp
+++ b/host/lib/usrp/b100/usb_zero_copy_wrapper.cpp
@@ -34,7 +34,7 @@ public:
{ /*NOP*/
}
- void release(void)
+ void release(void) override
{
_mrb.reset(); // decrement ref count, other MRB's may hold a ref
_claimer.release();
@@ -90,13 +90,13 @@ public:
_task = uhd::task::make(std::bind(&usb_zero_copy_wrapper_msb::auto_flush, this));
}
- ~usb_zero_copy_wrapper_msb(void)
+ ~usb_zero_copy_wrapper_msb(void) override
{
// ensure the task has exited before anything auto deconstructs
_task.reset();
}
- void release(void)
+ void release(void) override
{
boost::mutex::scoped_lock lock(_mutex);
_ok_to_auto_flush = true;
@@ -185,7 +185,7 @@ public:
std::make_shared<usb_zero_copy_wrapper_msb>(usb_zc, frame_boundary);
}
- managed_recv_buffer::sptr get_recv_buff(double timeout)
+ managed_recv_buffer::sptr get_recv_buff(double timeout) override
{
// lazy flush mechanism - negative timeout
if (timeout < 0.0) {
@@ -208,28 +208,28 @@ public:
_last_recv_buff, _last_recv_offset, timeout, _next_recv_buff_index);
}
- size_t get_num_recv_frames(void) const
+ size_t get_num_recv_frames(void) const override
{
return (_internal_zc->get_num_recv_frames() * _internal_zc->get_recv_frame_size())
/ this->get_recv_frame_size();
}
- size_t get_recv_frame_size(void) const
+ size_t get_recv_frame_size(void) const override
{
return std::min(_frame_boundary, _internal_zc->get_recv_frame_size());
}
- managed_send_buffer::sptr get_send_buff(double timeout)
+ managed_send_buffer::sptr get_send_buff(double timeout) override
{
return _the_only_msb->get_new(timeout);
}
- size_t get_num_send_frames(void) const
+ size_t get_num_send_frames(void) const override
{
return _internal_zc->get_num_send_frames();
}
- size_t get_send_frame_size(void) const
+ size_t get_send_frame_size(void) const override
{
return std::min(_frame_boundary, _internal_zc->get_send_frame_size());
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-30 20:16:44 +0000