diff options
| author | Martin Braun <martin.braun@ettus.com> | 2016-08-01 18:49:22 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2016-08-01 18:49:22 -0700 |
| commit | 3df0f6e9e4b2784c7c23a566a34391b9629d32c1 (patch) | |
| tree | 3b050febb23a25ea5279b21628684b1ff92ee970 /host/include | |
| parent | 031839052be29825e4d28b341dfc98abc9d1a903 (diff) | |
| parent | 4503c7e6287e4204af946c9aa6e669f76c9b8289 (diff) | |
| download | uhd-3df0f6e9e4b2784c7c23a566a34391b9629d32c1.tar.gz uhd-3df0f6e9e4b2784c7c23a566a34391b9629d32c1.tar.bz2 uhd-3df0f6e9e4b2784c7c23a566a34391b9629d32c1.zip | |
Merge branch 'maint'
Conflicts:
host/lib/usrp/dboard/db_wbx_version2.cpp
host/lib/usrp/dboard/db_wbx_version3.cpp
Diffstat (limited to 'host/include')
| -rw-r--r-- | host/include/uhd/usrp_clock/octoclock_eeprom.hpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/host/include/uhd/usrp_clock/octoclock_eeprom.hpp b/host/include/uhd/usrp_clock/octoclock_eeprom.hpp index a521000dd..aaa6296ae 100644 --- a/host/include/uhd/usrp_clock/octoclock_eeprom.hpp +++ b/host/include/uhd/usrp_clock/octoclock_eeprom.hpp @@ -40,8 +40,9 @@ public: /*! * Make a new OctoClock EEPROM handler. * \param transport the UDP transport to the OctoClock + * \param proto_ver firmware protocol version */ - octoclock_eeprom_t(transport::udp_simple::sptr transport); + octoclock_eeprom_t(transport::udp_simple::sptr transport, boost::uint32_t proto_ver); /*! * Write the contents of this object to the EEPROM. @@ -50,6 +51,7 @@ public: private: transport::udp_simple::sptr xport; + boost::uint32_t _proto_ver; void _load(); void _store() const; |