diff options
| author | Josh Blum <josh@joshknows.com> | 2011-02-22 11:55:54 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-02-22 11:55:54 -0800 |
| commit | 76ebda895cae3bd0014a5e428b07440445f3b631 (patch) | |
| tree | b788354f6fd4cd5786bd6539cf5c77e37fd4300f /host/lib/usrp/usrp2 | |
| parent | 557d62ee648cef2a8edfd15602544064550f82fc (diff) | |
| download | uhd-76ebda895cae3bd0014a5e428b07440445f3b631.tar.gz uhd-76ebda895cae3bd0014a5e428b07440445f3b631.tar.bz2 uhd-76ebda895cae3bd0014a5e428b07440445f3b631.zip | |
uhd: switch dboard id prop to whole eeprom struct
modified implementation code and burner app
also made dboard manager use safe constructor that will use none ids if construction fails
Diffstat (limited to 'host/lib/usrp/usrp2')
| -rw-r--r-- | host/lib/usrp/usrp2/dboard_impl.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/host/lib/usrp/usrp2/dboard_impl.cpp b/host/lib/usrp/usrp2/dboard_impl.cpp index 52da50132..b668d435b 100644 --- a/host/lib/usrp/usrp2/dboard_impl.cpp +++ b/host/lib/usrp/usrp2/dboard_impl.cpp @@ -75,8 +75,8 @@ void usrp2_mboard_impl::rx_dboard_get(const wax::obj &key_, wax::obj &val){ val = _dboard_manager->get_rx_subdev_names(); return; - case DBOARD_PROP_DBOARD_ID: - val = _rx_db_eeprom.id; + case DBOARD_PROP_DBOARD_EEPROM: + val = _rx_db_eeprom; return; case DBOARD_PROP_DBOARD_IFACE: @@ -103,8 +103,8 @@ void usrp2_mboard_impl::rx_dboard_get(const wax::obj &key_, wax::obj &val){ void usrp2_mboard_impl::rx_dboard_set(const wax::obj &key, const wax::obj &val){ switch(key.as<dboard_prop_t>()){ - case DBOARD_PROP_DBOARD_ID: - _rx_db_eeprom.id = val.as<dboard_id_t>(); + case DBOARD_PROP_DBOARD_EEPROM: + _rx_db_eeprom = val.as<dboard_eeprom_t>(); _rx_db_eeprom.store(*_iface, USRP2_I2C_ADDR_RX_DB); return; @@ -132,8 +132,8 @@ void usrp2_mboard_impl::tx_dboard_get(const wax::obj &key_, wax::obj &val){ val = _dboard_manager->get_tx_subdev_names(); return; - case DBOARD_PROP_DBOARD_ID: - val = _tx_db_eeprom.id; + case DBOARD_PROP_DBOARD_EEPROM: + val = _tx_db_eeprom; return; case DBOARD_PROP_DBOARD_IFACE: @@ -160,8 +160,8 @@ void usrp2_mboard_impl::tx_dboard_get(const wax::obj &key_, wax::obj &val){ void usrp2_mboard_impl::tx_dboard_set(const wax::obj &key, const wax::obj &val){ switch(key.as<dboard_prop_t>()){ - case DBOARD_PROP_DBOARD_ID: - _tx_db_eeprom.id = val.as<dboard_id_t>(); + case DBOARD_PROP_DBOARD_EEPROM: + _tx_db_eeprom = val.as<dboard_eeprom_t>(); _tx_db_eeprom.store(*_iface, USRP2_I2C_ADDR_TX_DB); return; |