diff options
| author | Martin Braun <martin.braun@ettus.com> | 2015-04-30 12:41:29 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-04-30 12:41:29 -0700 |
| commit | c6d0daaf034f3c1f20b8a0e6cd5c2555879760e2 (patch) | |
| tree | 4eafe1986aeb28a495a7ad52d1c2a303fbfa2bd6 | |
| parent | 121fbf3795332fb86ac24a4174e707a26265e982 (diff) | |
| parent | 7af2e970379fb8f58c8afbc99b1498e42698c0a5 (diff) | |
| download | uhd-c6d0daaf034f3c1f20b8a0e6cd5c2555879760e2.tar.gz uhd-c6d0daaf034f3c1f20b8a0e6cd5c2555879760e2.tar.bz2 uhd-c6d0daaf034f3c1f20b8a0e6cd5c2555879760e2.zip | |
Merge branch 'maint'
Conflicts:
fpga-src
host/CMakeLists.txt
| m--------- | fpga-src | 0 | ||||
| -rw-r--r-- | host/docs/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | host/lib/usrp/b200/b200_impl.cpp | 4 |
3 files changed, 2 insertions, 3 deletions
diff --git a/fpga-src b/fpga-src -Subproject 8aca31329f2fd1612df32383bb8bea80d5b7e47 +Subproject 9b69de6dc468ae6663c10e41a6322131bca0eb9 diff --git a/host/docs/CMakeLists.txt b/host/docs/CMakeLists.txt index a73d39356..eb4b67c29 100644 --- a/host/docs/CMakeLists.txt +++ b/host/docs/CMakeLists.txt @@ -55,7 +55,6 @@ IF(ENABLE_MANUAL) SET(DOXYGEN_FPGA_MANUAL_REFERENCE "\\subpage md_fpga \"Part III: FPGA Manual\"") SET(DOXYGEN_STRIP_EXTRA "${FPGA_SUBMODULE_DIR}/docs") ENDIF(HAS_FPGA_SUBMODULE) - message(STATUS ${manual_sources}) CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/mainpage.dox.in ${CMAKE_CURRENT_BINARY_DIR}/mainpage.dox diff --git a/host/lib/usrp/b200/b200_impl.cpp b/host/lib/usrp/b200/b200_impl.cpp index de61db610..2b423afa5 100644 --- a/host/lib/usrp/b200/b200_impl.cpp +++ b/host/lib/usrp/b200/b200_impl.cpp @@ -208,8 +208,8 @@ UHD_STATIC_BLOCK(register_b200_device) * Structors **********************************************************************/ b200_impl::b200_impl(const device_addr_t &device_addr) : - _tick_rate(0.0), // Forces a clock initialization at startup - _revision(0) + _revision(0), + _tick_rate(0.0) // Forces a clock initialization at startup { _tree = property_tree::make(); _type = device::USRP; |