From 49c79b8d4a8f797d85d29e13b3568f9dffda9f4a Mon Sep 17 00:00:00 2001 From: Nicholas Corgan Date: Tue, 14 Jun 2016 08:37:38 -0700 Subject: config: better platform detection --- host/include/uhd/config.h | 6 +++--- host/include/uhd/config.hpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/host/include/uhd/config.h b/host/include/uhd/config.h index 1d6cefcc0..1677c80ec 100644 --- a/host/include/uhd/config.h +++ b/host/include/uhd/config.h @@ -1,5 +1,5 @@ // -// Copyright 2015 Ettus Research LLC +// Copyright 2015-2016 Ettus Research LLC // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -69,13 +69,13 @@ typedef ptrdiff_t ssize_t; // Platform defines for conditional code: // Taken from boost/config/select_platform_config.hpp, // However, we define macros, not strings, for platforms. -#if defined(linux) || defined(__linux) || defined(__linux__) +#if (defined(linux) || defined(__linux) || defined(__linux__) || defined(__GLIBC__)) && !defined(_CRAYC) && !defined(__FreeBSD_kernel__) && !defined(__GNU__) #define UHD_PLATFORM_LINUX #elif defined(_WIN32) || defined(__WIN32__) || defined(WIN32) #define UHD_PLATFORM_WIN32 #elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) #define UHD_PLATFORM_MACOS -#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) +#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__) #define UHD_PLATFORM_BSD #endif diff --git a/host/include/uhd/config.hpp b/host/include/uhd/config.hpp index 8939cd773..00466501e 100644 --- a/host/include/uhd/config.hpp +++ b/host/include/uhd/config.hpp @@ -1,5 +1,5 @@ // -// Copyright 2010-2011,2014-2015 Ettus Research LLC +// Copyright 2010-2011,2014-2016 Ettus Research LLC // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -89,13 +89,13 @@ typedef ptrdiff_t ssize_t; // Platform defines for conditional parts of headers: // Taken from boost/config/select_platform_config.hpp, // however, we define macros, not strings for platforms. -#if defined(linux) || defined(__linux) || defined(__linux__) +#if (defined(linux) || defined(__linux) || defined(__linux__) || defined(__GLIBC__)) && !defined(_CRAYC) && !defined(__FreeBSD_kernel__) && !defined(__GNU__) #define UHD_PLATFORM_LINUX #elif defined(_WIN32) || defined(__WIN32__) || defined(WIN32) #define UHD_PLATFORM_WIN32 #elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) #define UHD_PLATFORM_MACOS -#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) +#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__) #define UHD_PLATFORM_BSD #endif -- cgit v1.2.3 From 8c3996d12b5fac3b64fb68ed62c1b1bc1da59dc1 Mon Sep 17 00:00:00 2001 From: Nicholas Corgan Date: Tue, 14 Jun 2016 08:41:21 -0700 Subject: Spelling fixes --- host/lib/usrp/dboard/db_tvrx2.cpp | 12 ++++++------ host/lib/usrp_clock/octoclock/octoclock_impl.cpp | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/host/lib/usrp/dboard/db_tvrx2.cpp b/host/lib/usrp/dboard/db_tvrx2.cpp index 00c2fef50..ccbac0b5d 100644 --- a/host/lib/usrp/dboard/db_tvrx2.cpp +++ b/host/lib/usrp/dboard/db_tvrx2.cpp @@ -1,5 +1,5 @@ // -// Copyright 2010,2012-2014 Ettus Research LLC +// Copyright 2010,2012-2014,2016 Ettus Research LLC // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -1529,7 +1529,7 @@ void tvrx2::test_rf_filter_robustness(void){ void tvrx2::transition_0(void){ //Transition 0: Initialize Tuner and place in standby UHD_LOGV(often) << boost::format( - "\nTVRX2 (%s): Transistion 0: Initialize Tuner, Calibrate and Standby\n") % (get_subdev_name()) << std::endl; + "\nTVRX2 (%s): Transition 0: Initialize Tuner, Calibrate and Standby\n") % (get_subdev_name()) << std::endl; //Check for Power-On Reset, if reset, initialze tuner if (get_power_reset()) { @@ -1583,7 +1583,7 @@ void tvrx2::transition_0(void){ void tvrx2::transition_1(void){ //Transition 1: Select TV Standard UHD_LOGV(often) << boost::format( - "\nTVRX2 (%s): Transistion 1: Select TV Standard\n") % (get_subdev_name()) << std::endl; + "\nTVRX2 (%s): Transition 1: Select TV Standard\n") % (get_subdev_name()) << std::endl; //send magic xtal_cal_dac setting send_reg(0x65, 0x65); @@ -1614,7 +1614,7 @@ void tvrx2::transition_1(void){ void tvrx2::transition_2(int rf_freq){ //Transition 2: Select RF Frequency after changing TV Standard UHD_LOGV(often) << boost::format( - "\nTVRX2 (%s): Transistion 2: Select RF Frequency after changing TV Standard\n") % (get_subdev_name()) << std::endl; + "\nTVRX2 (%s): Transition 2: Select RF Frequency after changing TV Standard\n") % (get_subdev_name()) << std::endl; //send magic xtal_cal_dac setting send_reg(0x65, 0x65); @@ -1652,7 +1652,7 @@ void tvrx2::transition_2(int rf_freq){ void tvrx2::transition_3(void){ //Transition 3: Standby Mode UHD_LOGV(often) << boost::format( - "\nTVRX2 (%s): Transistion 3: Standby Mode\n") % (get_subdev_name()) << std::endl; + "\nTVRX2 (%s): Transition 3: Standby Mode\n") % (get_subdev_name()) << std::endl; //send magic xtal_cal_dac setting send_reg(0x65, 0x65); @@ -1671,7 +1671,7 @@ void tvrx2::transition_3(void){ void tvrx2::transition_4(int rf_freq){ //Transition 4: Change RF Frequency without changing TV Standard UHD_LOGV(often) << boost::format( - "\nTVRX2 (%s): Transistion 4: Change RF Frequency without changing TV Standard\n") % (get_subdev_name()) << std::endl; + "\nTVRX2 (%s): Transition 4: Change RF Frequency without changing TV Standard\n") % (get_subdev_name()) << std::endl; //send magic xtal_cal_dac setting send_reg(0x65, 0x65); diff --git a/host/lib/usrp_clock/octoclock/octoclock_impl.cpp b/host/lib/usrp_clock/octoclock/octoclock_impl.cpp index 22c26b42c..5ea242ea1 100644 --- a/host/lib/usrp_clock/octoclock/octoclock_impl.cpp +++ b/host/lib/usrp_clock/octoclock/octoclock_impl.cpp @@ -1,5 +1,5 @@ // -// Copyright 2014 Ettus Research LLC +// Copyright 2014,2016 Ettus Research LLC // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -336,7 +336,7 @@ boost::uint32_t octoclock_impl::_get_fw_version(const std::string &oc){ if(UHD_OCTOCLOCK_PACKET_MATCHES(OCTOCLOCK_QUERY_ACK, pkt_out, pkt_in, len)){ return pkt_in->proto_ver; } - else throw uhd::runtime_error("Failed to retrive firmware version from OctoClock."); + else throw uhd::runtime_error("Failed to retrieve firmware version from OctoClock."); } void octoclock_impl::_get_state(const std::string &oc){ -- cgit v1.2.3 From 938a1b5c9fdeba069a060733f4a6f84dce1762c6 Mon Sep 17 00:00:00 2001 From: Nicholas Corgan Date: Tue, 14 Jun 2016 09:07:03 -0700 Subject: docs: no HTML timestamp for Doxygen --- host/docs/Doxyfile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/host/docs/Doxyfile.in b/host/docs/Doxyfile.in index d230352d4..1533f7edc 100644 --- a/host/docs/Doxyfile.in +++ b/host/docs/Doxyfile.in @@ -958,7 +958,7 @@ HTML_COLORSTYLE_GAMMA = 65 # page will contain the date and time when the page was generated. Setting # this to NO can help when comparing the output of multiple runs. -HTML_TIMESTAMP = YES +HTML_TIMESTAMP = NO # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML # documentation will contain sections that can be hidden and shown after the -- cgit v1.2.3