diff options
| author | Lane Kolbly <lane.kolbly@ni.com> | 2021-10-14 13:15:48 -0500 |
|---|---|---|
| committer | Aaron Rossetto <aaron.rossetto@ni.com> | 2021-10-27 07:56:33 -0700 |
| commit | 62d467f3fc024f6a43abca9c3a2b194b5d3829bf (patch) | |
| tree | 45e13cf7624f0539febb37478c305e05055d7cb5 /host/lib/usrp/dboard/e3xx/e3xx_radio_control_init.cpp | |
| parent | 4e6531f30648ede5be8f93fa49fdcd4973b73813 (diff) | |
| download | uhd-62d467f3fc024f6a43abca9c3a2b194b5d3829bf.tar.gz uhd-62d467f3fc024f6a43abca9c3a2b194b5d3829bf.tar.bz2 uhd-62d467f3fc024f6a43abca9c3a2b194b5d3829bf.zip | |
host: gpio: Create gpio_atr_offsets to store GPIO registers
Refactors register addresses into a gpio_atr_offsets structure which
contains the various register addresses. This allows creating other
devices with different GPIO register layouts with greater ease, and
eliminates the use of macros (yay!)
Diffstat (limited to 'host/lib/usrp/dboard/e3xx/e3xx_radio_control_init.cpp')
| -rw-r--r-- | host/lib/usrp/dboard/e3xx/e3xx_radio_control_init.cpp | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/host/lib/usrp/dboard/e3xx/e3xx_radio_control_init.cpp b/host/lib/usrp/dboard/e3xx/e3xx_radio_control_init.cpp index 995133442..95f6301f2 100644 --- a/host/lib/usrp/dboard/e3xx/e3xx_radio_control_init.cpp +++ b/host/lib/usrp/dboard/e3xx/e3xx_radio_control_init.cpp @@ -86,9 +86,10 @@ void e3xx_radio_control_impl::_init_peripherals() // Note: The register offset is baked into the different _wb_iface // objects! _db_gpio.emplace_back( - usrp::gpio_atr::gpio_atr_3000::make_write_only(_wb_ifaces.at(radio_idx), - e3xx_regs::SR_DB_GPIO + (radio_idx * e3xx_regs::PERIPH_REG_CHAN_OFFSET), - e3xx_regs::PERIPH_REG_OFFSET)); + usrp::gpio_atr::gpio_atr_3000::make(_wb_ifaces.at(radio_idx), + usrp::gpio_atr::gpio_atr_offsets::make_write_only( + e3xx_regs::SR_DB_GPIO + (radio_idx * e3xx_regs::PERIPH_REG_CHAN_OFFSET), + e3xx_regs::PERIPH_REG_OFFSET))); _db_gpio[radio_idx]->set_atr_mode( usrp::gpio_atr::MODE_ATR, usrp::gpio_atr::gpio_atr_3000::MASK_SET_ALL); } @@ -96,17 +97,19 @@ void e3xx_radio_control_impl::_init_peripherals() for (size_t radio_idx = 0; radio_idx < E3XX_NUM_CHANS; radio_idx++) { RFNOC_LOG_TRACE("Initializing LED GPIOs for channel " << radio_idx); _leds_gpio.emplace_back( - usrp::gpio_atr::gpio_atr_3000::make_write_only(_wb_ifaces.at(radio_idx), - e3xx_regs::SR_LEDS + (radio_idx * e3xx_regs::PERIPH_REG_CHAN_OFFSET), - e3xx_regs::PERIPH_REG_OFFSET)); + usrp::gpio_atr::gpio_atr_3000::make(_wb_ifaces.at(radio_idx), + usrp::gpio_atr::gpio_atr_offsets::make_write_only( + e3xx_regs::SR_LEDS + (radio_idx * e3xx_regs::PERIPH_REG_CHAN_OFFSET), + e3xx_regs::PERIPH_REG_OFFSET))); _leds_gpio[radio_idx]->set_atr_mode( usrp::gpio_atr::MODE_ATR, usrp::gpio_atr::gpio_atr_3000::MASK_SET_ALL); } RFNOC_LOG_TRACE("Initializing front-panel GPIO control...") _fp_gpio = usrp::gpio_atr::gpio_atr_3000::make(_wb_ifaces.at(0), - e3xx_regs::SR_FP_GPIO, - e3xx_regs::RB_FP_GPIO, - e3xx_regs::PERIPH_REG_OFFSET); + usrp::gpio_atr::gpio_atr_offsets::make_default( + e3xx_regs::SR_FP_GPIO, + e3xx_regs::RB_FP_GPIO, + e3xx_regs::PERIPH_REG_OFFSET)); auto block_args = get_block_args(); |