aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/usrp/usrp1/usrp1_impl.hpp
diff options
context:
space:
mode:
authorMartin Braun <martin.braun@ettus.com>2020-03-02 15:25:13 -0800
committeratrnati <54334261+atrnati@users.noreply.github.com>2020-03-03 08:51:32 -0600
commit876d4150aa3da531ddd687b48afada6e43f79146 (patch)
treefd72a71419f4cd800d4e500cfcaded4dfc8dc367 /host/lib/usrp/usrp1/usrp1_impl.hpp
parent1393553d623bdf4ba40d5435c9719b6ce990d9ac (diff)
downloaduhd-876d4150aa3da531ddd687b48afada6e43f79146.tar.gz
uhd-876d4150aa3da531ddd687b48afada6e43f79146.tar.bz2
uhd-876d4150aa3da531ddd687b48afada6e43f79146.zip
uhd: Apply clang-format against all .cpp and .hpp files in host/
Note: template_lvbitx.{cpp,hpp} need to be excluded from the list of files that clang-format gets applied against.
Diffstat (limited to 'host/lib/usrp/usrp1/usrp1_impl.hpp')
-rw-r--r--host/lib/usrp/usrp1/usrp1_impl.hpp142
1 files changed, 73 insertions, 69 deletions
diff --git a/host/lib/usrp/usrp1/usrp1_impl.hpp b/host/lib/usrp/usrp1/usrp1_impl.hpp
index 9e0a97f47..336b82baa 100644
--- a/host/lib/usrp/usrp1/usrp1_impl.hpp
+++ b/host/lib/usrp/usrp1/usrp1_impl.hpp
@@ -24,79 +24,79 @@
#include <memory>
#ifndef INCLUDED_USRP1_IMPL_HPP
-#define INCLUDED_USRP1_IMPL_HPP
+# define INCLUDED_USRP1_IMPL_HPP
static const std::string USRP1_EEPROM_MAP_KEY = "B000";
-static const size_t USRP1_MAX_RATE_USB2 = 32000000; // bytes/s
-
-#define FR_RB_CAPS 3
-#define FR_MODE 13
-#define FR_DEBUG_EN 14
-#define FR_DC_OFFSET_CL_EN 15
-#define FR_ADC_OFFSET_0 16
-#define FR_ADC_OFFSET_1 17
-#define FR_ADC_OFFSET_2 18
-#define FR_ADC_OFFSET_3 19
-
-#define I2C_DEV_EEPROM 0x50
-#define I2C_ADDR_BOOT (I2C_DEV_EEPROM | 0x0)
-#define I2C_ADDR_TX_A (I2C_DEV_EEPROM | 0x4)
-#define I2C_ADDR_RX_A (I2C_DEV_EEPROM | 0x5)
-#define I2C_ADDR_TX_B (I2C_DEV_EEPROM | 0x6)
-#define I2C_ADDR_RX_B (I2C_DEV_EEPROM | 0x7)
-
-#define SPI_ENABLE_CODEC_A 0x02
-#define SPI_ENABLE_CODEC_B 0x04
+static const size_t USRP1_MAX_RATE_USB2 = 32000000; // bytes/s
+
+# define FR_RB_CAPS 3
+# define FR_MODE 13
+# define FR_DEBUG_EN 14
+# define FR_DC_OFFSET_CL_EN 15
+# define FR_ADC_OFFSET_0 16
+# define FR_ADC_OFFSET_1 17
+# define FR_ADC_OFFSET_2 18
+# define FR_ADC_OFFSET_3 19
+
+# define I2C_DEV_EEPROM 0x50
+# define I2C_ADDR_BOOT (I2C_DEV_EEPROM | 0x0)
+# define I2C_ADDR_TX_A (I2C_DEV_EEPROM | 0x4)
+# define I2C_ADDR_RX_A (I2C_DEV_EEPROM | 0x5)
+# define I2C_ADDR_TX_B (I2C_DEV_EEPROM | 0x6)
+# define I2C_ADDR_RX_B (I2C_DEV_EEPROM | 0x7)
+
+# define SPI_ENABLE_CODEC_A 0x02
+# define SPI_ENABLE_CODEC_B 0x04
/*!
* USRP1 implementation guts:
* The implementation details are encapsulated here.
* Handles properties on the mboard, dboard, dsps...
*/
-class usrp1_impl : public uhd::device {
+class usrp1_impl : public uhd::device
+{
public:
//! used everywhere to differentiate slots/sides...
- enum dboard_slot_t{
- DBOARD_SLOT_A = 'A',
- DBOARD_SLOT_B = 'B'
- };
- //and a way to enumerate through a list of the above...
+ enum dboard_slot_t { DBOARD_SLOT_A = 'A', DBOARD_SLOT_B = 'B' };
+ // and a way to enumerate through a list of the above...
static const std::vector<dboard_slot_t> _dboard_slots;
- //structors
- usrp1_impl(const uhd::device_addr_t &);
+ // structors
+ usrp1_impl(const uhd::device_addr_t&);
~usrp1_impl(void);
- //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);
+ // 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);
static uhd::usrp::mboard_eeprom_t get_mb_eeprom(uhd::i2c_iface::sptr);
private:
- //controllers
+ // controllers
uhd::usrp::fx2_ctrl::sptr _fx2_ctrl;
usrp1_iface::sptr _iface;
uhd::usrp::soft_time_ctrl::sptr _soft_time_ctrl;
uhd::transport::usb_zero_copy::sptr _data_transport;
- struct db_container_type{
+ struct db_container_type
+ {
usrp1_codec_ctrl::sptr codec;
uhd::usrp::dboard_manager::sptr dboard_manager;
};
uhd::dict<std::string, db_container_type> _dbc;
- double _master_clock_rate; //clock rate shadow
+ double _master_clock_rate; // clock rate shadow
- //weak pointers to streamers for update purposes
+ // weak pointers to streamers for update purposes
std::weak_ptr<uhd::rx_streamer> _rx_streamer;
std::weak_ptr<uhd::tx_streamer> _tx_streamer;
- void set_mb_eeprom(const uhd::usrp::mboard_eeprom_t &);
- void set_db_eeprom(const std::string &, const std::string &, const uhd::usrp::dboard_eeprom_t &);
- double update_rx_codec_gain(const std::string &, const double); //sets A and B at once
- void update_rx_subdev_spec(const uhd::usrp::subdev_spec_t &);
- void update_tx_subdev_spec(const uhd::usrp::subdev_spec_t &);
+ void set_mb_eeprom(const uhd::usrp::mboard_eeprom_t&);
+ void set_db_eeprom(
+ const std::string&, const std::string&, const uhd::usrp::dboard_eeprom_t&);
+ double update_rx_codec_gain(const std::string&, const double); // sets A and B at once
+ void update_rx_subdev_spec(const uhd::usrp::subdev_spec_t&);
+ void update_tx_subdev_spec(const uhd::usrp::subdev_spec_t&);
double update_rx_samp_rate(size_t dspno, const double);
double update_tx_samp_rate(size_t dspno, const double);
void update_rates(void);
@@ -108,76 +108,80 @@ private:
uhd::meta_range_t get_rx_dsp_host_rates(void);
uhd::meta_range_t get_tx_dsp_host_rates(void);
size_t _rx_dc_offset_shadow;
- void set_enb_rx_dc_offset(const std::string &db, const bool);
- std::complex<double> set_rx_dc_offset(const std::string &db, const std::complex<double> &);
+ void set_enb_rx_dc_offset(const std::string& db, const bool);
+ std::complex<double> set_rx_dc_offset(
+ const std::string& db, const std::complex<double>&);
- static uhd::usrp::dboard_iface::sptr make_dboard_iface(
- usrp1_iface::sptr,
+ static uhd::usrp::dboard_iface::sptr make_dboard_iface(usrp1_iface::sptr,
usrp1_codec_ctrl::sptr,
dboard_slot_t,
- const double &,
- const uhd::usrp::dboard_id_t &
- );
+ const double&,
+ const uhd::usrp::dboard_id_t&);
- //handle io stuff
+ // handle io stuff
UHD_PIMPL_DECL(io_impl) _io_impl;
void io_init(void);
void rx_stream_on_off(bool);
void tx_stream_on_off(bool);
void handle_overrun(size_t);
- //channel mapping shadows
+ // channel mapping shadows
uhd::usrp::subdev_spec_t _rx_subdev_spec, _tx_subdev_spec;
- //capabilities
+ // capabilities
size_t get_num_ducs(void);
size_t get_num_ddcs(void);
bool has_rx_halfband(void);
bool has_tx_halfband(void);
- void vandal_conquest_loop(std::atomic<bool> &);
+ void vandal_conquest_loop(std::atomic<bool>&);
- void set_reg(const std::pair<uint8_t, uint32_t> &reg);
+ void set_reg(const std::pair<uint8_t, uint32_t>& reg);
- //handle the enables
+ // handle the enables
bool _rx_enabled, _tx_enabled;
- void enable_rx(bool enb){
+ void enable_rx(bool enb)
+ {
_rx_enabled = enb;
_fx2_ctrl->usrp_rx_enable(enb);
}
- void enable_tx(bool enb){
+ void enable_tx(bool enb)
+ {
_tx_enabled = enb;
_fx2_ctrl->usrp_tx_enable(enb);
- for(const std::string &key: _dbc.keys())
- {
+ for (const std::string& key : _dbc.keys()) {
_dbc[key].codec->enable_tx_digital(enb);
}
}
- //conditionally disable and enable rx
- bool disable_rx(void){
- if (_rx_enabled){
+ // conditionally disable and enable rx
+ bool disable_rx(void)
+ {
+ if (_rx_enabled) {
enable_rx(false);
return true;
}
return false;
}
- void restore_rx(bool last){
- if (last != _rx_enabled){
+ void restore_rx(bool last)
+ {
+ if (last != _rx_enabled) {
enable_rx(last);
}
}
- //conditionally disable and enable tx
- bool disable_tx(void){
- if (_tx_enabled){
+ // conditionally disable and enable tx
+ bool disable_tx(void)
+ {
+ if (_tx_enabled) {
enable_tx(false);
return true;
}
return false;
}
- void restore_tx(bool last){
- if (last != _tx_enabled){
+ void restore_tx(bool last)
+ {
+ if (last != _tx_enabled) {
enable_tx(last);
}
}