diff options
author | Martin Braun <martin.braun@ettus.com> | 2016-09-02 11:27:37 -0700 |
---|---|---|
committer | Martin Braun <martin.braun@ettus.com> | 2016-09-02 11:27:37 -0700 |
commit | 83912104a9c1ab3631f755a4d98ee86e195db690 (patch) | |
tree | 4c7ba7da761b1b9b5508bffdb77b9e0696ff46ae /host/lib/usrp/b200/b200_uart.hpp | |
parent | 670eeda6e4c9ff2ab81f4e387bce49ea4dc79dcc (diff) | |
parent | 065065e90ce970f8eed0941ded6ae4377e649c2b (diff) | |
download | uhd-83912104a9c1ab3631f755a4d98ee86e195db690.tar.gz uhd-83912104a9c1ab3631f755a4d98ee86e195db690.tar.bz2 uhd-83912104a9c1ab3631f755a4d98ee86e195db690.zip |
Merge branch 'UHD-3.9.LTS' into maint
This provides the GPS fixes.
Conflicts:
host/CMakeLists.txt
tools/debs/upload_debs.sh
Diffstat (limited to 'host/lib/usrp/b200/b200_uart.hpp')
-rw-r--r-- | host/lib/usrp/b200/b200_uart.hpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/host/lib/usrp/b200/b200_uart.hpp b/host/lib/usrp/b200/b200_uart.hpp index 1c8e44ddc..f58479888 100644 --- a/host/lib/usrp/b200/b200_uart.hpp +++ b/host/lib/usrp/b200/b200_uart.hpp @@ -29,7 +29,6 @@ public: typedef boost::shared_ptr<b200_uart> sptr; static sptr make(uhd::transport::zero_copy_if::sptr, const boost::uint32_t sid); virtual void handle_uart_packet(uhd::transport::managed_recv_buffer::sptr buff) = 0; - virtual void set_baud_divider(const double baud_div) = 0; }; |