diff options
| author | Martin Braun <martin.braun@ettus.com> | 2015-01-20 10:37:49 +0100 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-01-20 10:37:49 +0100 |
| commit | 28373cc1f7eddfb11748674316ffd4c52eeec3d9 (patch) | |
| tree | d4afed980a4c9e8476f32be8811014157324aae8 /host/lib/usrp/e300/e300_eeprom_manager.cpp | |
| parent | adb20365db6dec7c7a4e23cd8b2feb78e83a7a33 (diff) | |
| parent | 876269193db3392247e4af57bbfbdd7e8b433895 (diff) | |
| download | uhd-28373cc1f7eddfb11748674316ffd4c52eeec3d9.tar.gz uhd-28373cc1f7eddfb11748674316ffd4c52eeec3d9.tar.bz2 uhd-28373cc1f7eddfb11748674316ffd4c52eeec3d9.zip | |
Merge branch 'maint'
Conflicts:
host/include/uhd/types/direction.hpp
Diffstat (limited to 'host/lib/usrp/e300/e300_eeprom_manager.cpp')
| -rw-r--r-- | host/lib/usrp/e300/e300_eeprom_manager.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/host/lib/usrp/e300/e300_eeprom_manager.cpp b/host/lib/usrp/e300/e300_eeprom_manager.cpp index af1235b6b..dad6741f5 100644 --- a/host/lib/usrp/e300/e300_eeprom_manager.cpp +++ b/host/lib/usrp/e300/e300_eeprom_manager.cpp @@ -126,6 +126,10 @@ void e300_eeprom_manager::write_db_eeprom(const dboard_eeprom_t& eeprom) db_eeprom_map_t &map = *map_ptr; + // set the data version, that can be used to distinguish eeprom layouts + map.data_version_major = E310_DB_MAP_MAJOR; + map.data_version_minor = E310_DB_MAP_MINOR; + if (_db_eeprom.id != dboard_id_t::none()) { map.hw_product = uhd::htonx<boost::uint16_t>( _db_eeprom.id.to_uint16()); @@ -160,6 +164,11 @@ void e300_eeprom_manager::write_mb_eeprom(const mboard_eeprom_t& eeprom) mb_eeprom_map_t &map = *map_ptr; + // set the data version, that can be used to distinguish eeprom layouts + map.data_version_major = E310_MB_MAP_MAJOR; + map.data_version_minor = E310_MB_MAP_MINOR; + + if (_mb_eeprom.has_key("product")) { map.hw_product = uhd::htonx<boost::uint16_t>( boost::lexical_cast<boost::uint16_t>(_mb_eeprom["product"])); |