diff options
| author | Josh Blum <josh@joshknows.com> | 2010-08-04 11:11:06 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-08-04 11:11:06 -0700 |
| commit | fe622fb28654e6a578395d7b688e7c1958d373be (patch) | |
| tree | c4cad6eb4c77895ddbc7bf8b297f4c115e6c52f7 /host/lib/usrp/usrp2/dboard_impl.cpp | |
| parent | ee32fa2290f8b6abe83f1b8b33aff922f9d1e24c (diff) | |
| parent | 4240d5a2a1b705fe8ed5c3a1d1deef24be00d444 (diff) | |
| download | uhd-fe622fb28654e6a578395d7b688e7c1958d373be.tar.gz uhd-fe622fb28654e6a578395d7b688e7c1958d373be.tar.bz2 uhd-fe622fb28654e6a578395d7b688e7c1958d373be.zip | |
Merge branch 'fw_reorg'
Diffstat (limited to 'host/lib/usrp/usrp2/dboard_impl.cpp')
| -rw-r--r-- | host/lib/usrp/usrp2/dboard_impl.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/host/lib/usrp/usrp2/dboard_impl.cpp b/host/lib/usrp/usrp2/dboard_impl.cpp index 8942f9d31..0aeb0ec1a 100644 --- a/host/lib/usrp/usrp2/dboard_impl.cpp +++ b/host/lib/usrp/usrp2/dboard_impl.cpp @@ -35,8 +35,8 @@ using namespace uhd::usrp; **********************************************************************/ void usrp2_mboard_impl::dboard_init(void){ //read the dboard eeprom to extract the dboard ids - _rx_db_eeprom = dboard_eeprom_t(_iface->read_eeprom(I2C_ADDR_RX_DB, 0, dboard_eeprom_t::num_bytes())); - _tx_db_eeprom = dboard_eeprom_t(_iface->read_eeprom(I2C_ADDR_TX_DB, 0, dboard_eeprom_t::num_bytes())); + _rx_db_eeprom = dboard_eeprom_t(_iface->read_eeprom(USRP2_I2C_ADDR_RX_DB, 0, dboard_eeprom_t::num_bytes())); + _tx_db_eeprom = dboard_eeprom_t(_iface->read_eeprom(USRP2_I2C_ADDR_TX_DB, 0, dboard_eeprom_t::num_bytes())); //create a new dboard interface and manager _dboard_iface = make_usrp2_dboard_iface(_iface, _clock_ctrl); @@ -111,7 +111,7 @@ void usrp2_mboard_impl::rx_dboard_set(const wax::obj &key, const wax::obj &val){ case DBOARD_PROP_DBOARD_ID: _rx_db_eeprom.id = val.as<dboard_id_t>(); - _iface->write_eeprom(I2C_ADDR_RX_DB, 0, _rx_db_eeprom.get_eeprom_bytes()); + _iface->write_eeprom(USRP2_I2C_ADDR_RX_DB, 0, _rx_db_eeprom.get_eeprom_bytes()); return; default: UHD_THROW_PROP_SET_ERROR(); @@ -170,7 +170,7 @@ void usrp2_mboard_impl::tx_dboard_set(const wax::obj &key, const wax::obj &val){ case DBOARD_PROP_DBOARD_ID: _tx_db_eeprom.id = val.as<dboard_id_t>(); - _iface->write_eeprom(I2C_ADDR_TX_DB, 0, _tx_db_eeprom.get_eeprom_bytes()); + _iface->write_eeprom(USRP2_I2C_ADDR_TX_DB, 0, _tx_db_eeprom.get_eeprom_bytes()); return; default: UHD_THROW_PROP_SET_ERROR(); |