diff options
| author | Martin Braun <martin.braun@ettus.com> | 2016-11-08 11:38:19 -0800 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2018-03-16 10:48:46 -0700 |
| commit | 60a911cd460ca1e29d838ee0039d67bf7c8fe7f3 (patch) | |
| tree | 05182107d71ca74cb380c4081230b1130c797ec8 /host/lib/usrp/dboard/magnesium | |
| parent | 86dbaee5b80f203d1a9f28ced0307035d18368fa (diff) | |
| download | uhd-60a911cd460ca1e29d838ee0039d67bf7c8fe7f3.tar.gz uhd-60a911cd460ca1e29d838ee0039d67bf7c8fe7f3.tar.bz2 uhd-60a911cd460ca1e29d838ee0039d67bf7c8fe7f3.zip | |
rfnoc/x300: Make sure peek32() and peek64() are called with actual addresses
Before, we were calling peeks with the number of the readback register.
Diffstat (limited to 'host/lib/usrp/dboard/magnesium')
| -rw-r--r-- | host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_init.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_init.cpp b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_init.cpp index a95343574..4023a06c8 100644 --- a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_init.cpp +++ b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_init.cpp @@ -122,8 +122,9 @@ void magnesium_radio_ctrl_impl::_init_peripherals() / "tx_lo"; UHD_LOG_TRACE(unique_id(), "Initializing SPI core..."); _spi = spi_core_3000::make(_get_ctrl(0), - radio_ctrl_impl::regs::sr_addr(radio_ctrl_impl::regs::SPI), - radio_ctrl_impl::regs::RB_SPI); + regs::sr_addr(regs::SPI), + regs::rb_addr(regs::RB_SPI) + ); UHD_LOG_TRACE(unique_id(), "Initializing CPLD..."); UHD_LOG_TRACE(unique_id(), "CPLD path: " << cpld_path); @@ -199,7 +200,7 @@ void magnesium_radio_ctrl_impl::_init_peripherals() usrp::gpio_atr::gpio_atr_3000::make( _get_ctrl(radio_idx), regs::sr_addr(regs::GPIO), - regs::RB_DB_GPIO + regs::rb_addr(regs::RB_DB_GPIO) ) ); // DSA and AD9371 gain bits do *not* toggle on ATR modes. If we ever @@ -217,7 +218,10 @@ void magnesium_radio_ctrl_impl::_init_peripherals() } UHD_LOG_TRACE(unique_id(), "Initializing front-panel GPIO control...") _fp_gpio = usrp::gpio_atr::gpio_atr_3000::make( - _get_ctrl(0), regs::sr_addr(regs::FP_GPIO), regs::RB_FP_GPIO); + _get_ctrl(0), + regs::sr_addr(regs::FP_GPIO), + regs::rb_addr(regs::RB_FP_GPIO) + ); } void magnesium_radio_ctrl_impl::_init_frontend_subtree( |