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.hpp | |
| 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.hpp')
| -rw-r--r-- | host/lib/usrp/e300/e300_eeprom_manager.hpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/host/lib/usrp/e300/e300_eeprom_manager.hpp b/host/lib/usrp/e300/e300_eeprom_manager.hpp index e77f25ed5..86d7c3463 100644 --- a/host/lib/usrp/e300/e300_eeprom_manager.hpp +++ b/host/lib/usrp/e300/e300_eeprom_manager.hpp @@ -34,6 +34,12 @@ static const boost::uint16_t E310_MB_PID = 0x77d2; static const boost::uint16_t E300_DB_PID = 0x0100; static const boost::uint16_t E310_DB_PID = 0x0110; +static const boost::uint16_t E310_MB_MAP_MAJOR = 0x0001; +static const boost::uint16_t E310_MB_MAP_MINOR = 0x0000; + +static const boost::uint16_t E310_DB_MAP_MAJOR = 0x0001; +static const boost::uint16_t E310_DB_MAP_MINOR = 0x0000; + class e300_eeprom_manager : boost::noncopyable { public: @@ -69,11 +75,11 @@ public: std::string get_mb_type_string(void) const; private: // types - const static size_t MB_SERIAL_LEN = 6; + const static size_t MB_SERIAL_LEN = 8; const static size_t MB_NAME_LEN = 32; const static size_t MB_ADDR = 0x51; - const static size_t DB_SERIAL_LEN = 6; + const static size_t DB_SERIAL_LEN = 8; const static size_t DB_ADDR = 0x50; struct mb_eeprom_map_t @@ -108,8 +114,8 @@ private: // types boost::uint16_t hw_revision; // serial - boost::uint8_t serial[MB_SERIAL_LEN]; - boost::uint8_t pad[20 - MB_SERIAL_LEN]; + boost::uint8_t serial[DB_SERIAL_LEN]; + boost::uint8_t pad[20 - DB_SERIAL_LEN]; }; private: // members |