diff options
| author | Martin Braun <martin.braun@ettus.com> | 2016-10-07 16:44:49 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2016-10-07 16:44:49 -0700 |
| commit | 1b70b3e70df40aae4d1e53037212d77af2fdc4e4 (patch) | |
| tree | dcde2a418b7cfb4672e5ef5e57bbf85ae3c2d4b1 /host/lib/usrp/x300/x300_radio_ctrl_impl.hpp | |
| parent | 811444b126ed40aed115af4464422122afd0c607 (diff) | |
| parent | 006c321c552781501bcb0cff9e156c991c24ce45 (diff) | |
| download | uhd-1b70b3e70df40aae4d1e53037212d77af2fdc4e4.tar.gz uhd-1b70b3e70df40aae4d1e53037212d77af2fdc4e4.tar.bz2 uhd-1b70b3e70df40aae4d1e53037212d77af2fdc4e4.zip | |
Merge branch 'maint'
Diffstat (limited to 'host/lib/usrp/x300/x300_radio_ctrl_impl.hpp')
| -rw-r--r-- | host/lib/usrp/x300/x300_radio_ctrl_impl.hpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/host/lib/usrp/x300/x300_radio_ctrl_impl.hpp b/host/lib/usrp/x300/x300_radio_ctrl_impl.hpp index 46540a0c7..65d4443eb 100644 --- a/host/lib/usrp/x300/x300_radio_ctrl_impl.hpp +++ b/host/lib/usrp/x300/x300_radio_ctrl_impl.hpp @@ -150,7 +150,7 @@ private: static const uint32_t RX_FE_BASE = 232; }; - void _update_atr_leds(const std::string &rx_ant); + void _update_atr_leds(const std::string &rx_ant, const size_t chan); void _self_cal_adc_capture_delay(bool print_status); @@ -170,12 +170,12 @@ private: // members // Not necessarily this block's sampling rate (tick rate). double _radio_clk_rate; - radio_regmap_t::sptr _regs; - usrp::gpio_atr::gpio_atr_3000::sptr _leds; - spi_core_3000::sptr _spi; - x300_adc_ctrl::sptr _adc; - x300_dac_ctrl::sptr _dac; - usrp::gpio_atr::gpio_atr_3000::sptr _fp_gpio; + radio_regmap_t::sptr _regs; + std::map<size_t, usrp::gpio_atr::gpio_atr_3000::sptr> _leds; + spi_core_3000::sptr _spi; + x300_adc_ctrl::sptr _adc; + x300_dac_ctrl::sptr _dac; + usrp::gpio_atr::gpio_atr_3000::sptr _fp_gpio; std::map<size_t, usrp::dboard_eeprom_t> _db_eeproms; usrp::dboard_manager::sptr _db_manager; |