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/lib/usrp_clock/octoclock/octoclock_uart.hpp | |
| 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/lib/usrp_clock/octoclock/octoclock_uart.hpp')
| -rw-r--r-- | host/lib/usrp_clock/octoclock/octoclock_uart.hpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/host/lib/usrp_clock/octoclock/octoclock_uart.hpp b/host/lib/usrp_clock/octoclock/octoclock_uart.hpp index d7a77288f..d3a9738c4 100644 --- a/host/lib/usrp_clock/octoclock/octoclock_uart.hpp +++ b/host/lib/usrp_clock/octoclock/octoclock_uart.hpp @@ -31,7 +31,7 @@ namespace uhd{ class octoclock_uart_iface : public uhd::uart_iface{ public: - octoclock_uart_iface(uhd::transport::udp_simple::sptr udp); + octoclock_uart_iface(uhd::transport::udp_simple::sptr udp, uint32_t proto_ver); ~octoclock_uart_iface(void) {}; void write_uart(const std::string &buf); @@ -46,12 +46,14 @@ private: std::vector<boost::uint8_t> _cache; std::string _rxbuff; boost::uint32_t _sequence; + boost::uint32_t _proto_ver; + boost::system_time _last_cache_update; void _update_cache(); char _getchar(); }; -uart_iface::sptr octoclock_make_uart_iface(uhd::transport::udp_simple::sptr udp); +uart_iface::sptr octoclock_make_uart_iface(uhd::transport::udp_simple::sptr udp, uint32_t proto_ver); } |