summaryrefslogtreecommitdiffstats
path: root/host/lib/usrp/dboard
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2010-04-14 08:41:13 -0700
committerJosh Blum <josh@joshknows.com>2010-04-14 08:41:13 -0700
commite2a9419385bee4d08862553ddd0a637964557272 (patch)
treede7472d318fb556433dc4f7c1ebaf7fe7c82446d /host/lib/usrp/dboard
parent91319520a5bd2b4cd875988b6c173435df1dbc47 (diff)
downloaduhd-e2a9419385bee4d08862553ddd0a637964557272.tar.gz
uhd-e2a9419385bee4d08862553ddd0a637964557272.tar.bz2
uhd-e2a9419385bee4d08862553ddd0a637964557272.zip
renamed dboard interface to dboard iface, the lengthy name was getting to be a burden
Diffstat (limited to 'host/lib/usrp/dboard')
-rw-r--r--host/lib/usrp/dboard/db_rfx.cpp28
1 files changed, 14 insertions, 14 deletions
diff --git a/host/lib/usrp/dboard/db_rfx.cpp b/host/lib/usrp/dboard/db_rfx.cpp
index 1cb39f83c..e5dc16808 100644
--- a/host/lib/usrp/dboard/db_rfx.cpp
+++ b/host/lib/usrp/dboard/db_rfx.cpp
@@ -112,19 +112,19 @@ rfx_xcvr::rfx_xcvr(
_freq_range = freq_range;
//enable the clocks that we need
- this->get_interface()->set_clock_enabled(dboard_interface::UNIT_TX, true);
- this->get_interface()->set_clock_enabled(dboard_interface::UNIT_RX, true);
+ this->get_iface()->set_clock_enabled(dboard_iface::UNIT_TX, true);
+ this->get_iface()->set_clock_enabled(dboard_iface::UNIT_RX, true);
//set the gpio directions
boost::uint16_t output_enables = POWER_UP | ANT_SW | MIX_EN;
- this->get_interface()->set_gpio_ddr(dboard_interface::UNIT_TX, output_enables);
- this->get_interface()->set_gpio_ddr(dboard_interface::UNIT_RX, output_enables);
+ this->get_iface()->set_gpio_ddr(dboard_iface::UNIT_TX, output_enables);
+ this->get_iface()->set_gpio_ddr(dboard_iface::UNIT_RX, output_enables);
//setup the tx atr (this does not change with antenna)
- this->get_interface()->set_atr_reg(dboard_interface::UNIT_TX, dboard_interface::ATR_REG_IDLE, POWER_UP | ANT_SW);
- this->get_interface()->set_atr_reg(dboard_interface::UNIT_TX, dboard_interface::ATR_REG_RX_ONLY, POWER_UP | ANT_SW);
- this->get_interface()->set_atr_reg(dboard_interface::UNIT_TX, dboard_interface::ATR_REG_TX_ONLY, POWER_UP | MIX_EN);
- this->get_interface()->set_atr_reg(dboard_interface::UNIT_TX, dboard_interface::ATR_REG_FULL_DUPLEX, POWER_UP | MIX_EN);
+ this->get_iface()->set_atr_reg(dboard_iface::UNIT_TX, dboard_iface::ATR_REG_IDLE, POWER_UP | ANT_SW);
+ this->get_iface()->set_atr_reg(dboard_iface::UNIT_TX, dboard_iface::ATR_REG_RX_ONLY, POWER_UP | ANT_SW);
+ this->get_iface()->set_atr_reg(dboard_iface::UNIT_TX, dboard_iface::ATR_REG_TX_ONLY, POWER_UP | MIX_EN);
+ this->get_iface()->set_atr_reg(dboard_iface::UNIT_TX, dboard_iface::ATR_REG_FULL_DUPLEX, POWER_UP | MIX_EN);
//set some default values
set_lo_freq((_freq_range.min + _freq_range.max)/2.0);
@@ -148,10 +148,10 @@ void rfx_xcvr::set_rx_ant(const std::string &ant){
boost::uint16_t ant_val = (ant == "tx/rx")? 0 : ANT_SW;
//set the rx atr regs
- this->get_interface()->set_atr_reg(dboard_interface::UNIT_RX, dboard_interface::ATR_REG_IDLE, POWER_UP | ant_val);
- this->get_interface()->set_atr_reg(dboard_interface::UNIT_RX, dboard_interface::ATR_REG_RX_ONLY, POWER_UP | ant_val | MIX_EN);
- this->get_interface()->set_atr_reg(dboard_interface::UNIT_RX, dboard_interface::ATR_REG_TX_ONLY, POWER_UP | ant_val);
- this->get_interface()->set_atr_reg(dboard_interface::UNIT_RX, dboard_interface::ATR_REG_FULL_DUPLEX, POWER_UP | ant_val | MIX_EN);
+ this->get_iface()->set_atr_reg(dboard_iface::UNIT_RX, dboard_iface::ATR_REG_IDLE, POWER_UP | ant_val);
+ this->get_iface()->set_atr_reg(dboard_iface::UNIT_RX, dboard_iface::ATR_REG_RX_ONLY, POWER_UP | ant_val | MIX_EN);
+ this->get_iface()->set_atr_reg(dboard_iface::UNIT_RX, dboard_iface::ATR_REG_TX_ONLY, POWER_UP | ant_val);
+ this->get_iface()->set_atr_reg(dboard_iface::UNIT_RX, dboard_iface::ATR_REG_FULL_DUPLEX, POWER_UP | ant_val | MIX_EN);
}
void rfx_xcvr::set_rx_pga0_gain(float gain){
@@ -165,8 +165,8 @@ void rfx_xcvr::reload_adf4360_regs(void){
(adf4360_regs_t::ADDR_RCOUNTER)
;
BOOST_FOREACH(adf4360_regs_t::addr_t addr, addrs){
- this->get_interface()->write_spi(
- dboard_interface::UNIT_TX,
+ this->get_iface()->write_spi(
+ dboard_iface::UNIT_TX,
spi_config_t::EDGE_RISE,
_adf4360_regs.get_reg(addr), 24
);