From 3922f56adf33126abb288611f5a64b9fb1c11b25 Mon Sep 17 00:00:00 2001 From: Moritz Fischer Date: Thu, 16 Jul 2015 13:59:14 -0700 Subject: e3xx: Make all e3xx motherboards show up as such. All currently available e3xx daugherboards are equivalent from a UHD perspective, so make them consistently show up as "E3XX". Signed-off-by: Moritz Fischer --- host/lib/usrp/e300/e300_eeprom_manager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/host/lib/usrp/e300/e300_eeprom_manager.cpp b/host/lib/usrp/e300/e300_eeprom_manager.cpp index 778e3150c..45d1abea7 100644 --- a/host/lib/usrp/e300/e300_eeprom_manager.cpp +++ b/host/lib/usrp/e300/e300_eeprom_manager.cpp @@ -226,10 +226,10 @@ std::string e300_eeprom_manager::get_mb_type_string(void) const _mb_eeprom["product"]); switch (product) { case E300_MB_PID: - return "E300"; + return "E3XX"; case E310_MB_PID: - return "E310"; + return "E3XX"; default: return "UNKNOWN"; -- cgit v1.2.3 From f3e827ae2fcd3803403b0dec3be30825b9bd909e Mon Sep 17 00:00:00 2001 From: Moritz Fischer Date: Thu, 16 Jul 2015 15:04:06 -0700 Subject: e3xx: eeprom: Fix off by one error in serial number writing code. Signed-off-by: Moritz Fischer --- host/lib/usrp/e300/e300_eeprom_manager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/host/lib/usrp/e300/e300_eeprom_manager.cpp b/host/lib/usrp/e300/e300_eeprom_manager.cpp index 45d1abea7..752bd3768 100644 --- a/host/lib/usrp/e300/e300_eeprom_manager.cpp +++ b/host/lib/usrp/e300/e300_eeprom_manager.cpp @@ -38,7 +38,7 @@ static void _string_to_bytes(const std::string &string, size_t max_len, boost::u for (size_t i = 0; i < len; i++){ buffer[i] = string[i]; } - if (len < max_len - 1) + if (len < max_len) buffer[len] = '\0'; } -- cgit v1.2.3 From 4de2c75da3ae14ac6b7f447db2d7bd0a04f6bdc8 Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Mon, 20 Jul 2015 12:57:10 -0700 Subject: docs: OctoClock API link fixed. --- host/docs/octoclock.dox | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/host/docs/octoclock.dox b/host/docs/octoclock.dox index 45a12e93a..7469e0719 100644 --- a/host/docs/octoclock.dox +++ b/host/docs/octoclock.dox @@ -109,8 +109,8 @@ The same applies for an external signal. \subsection available_sensors Available Sensors -The following sensors are available on both the OctoClock and Octoclock-G; these can be queried through the -API. +The following sensors are available on both the OctoClock and Octoclock-G; +these can be queried through the API (see uhd::usrp_clock::multi_usrp_clock::get_sensor()). - `ext_ref_detected:` whether or not the device detects an external reference - `gps_detected:` whether or not the device detects an internal GPSDO -- cgit v1.2.3 From b84c1c8f2d6e50efb1d013ad5c1315cfb20d68f8 Mon Sep 17 00:00:00 2001 From: Nicholas Corgan Date: Mon, 20 Jul 2015 10:36:36 -0700 Subject: nirio: fixed defines for OS X vs. other unsupported platforms --- host/include/uhd/transport/nirio/nirio_driver_iface.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/host/include/uhd/transport/nirio/nirio_driver_iface.h b/host/include/uhd/transport/nirio/nirio_driver_iface.h index 83afd816a..10df8e04e 100644 --- a/host/include/uhd/transport/nirio/nirio_driver_iface.h +++ b/host/include/uhd/transport/nirio/nirio_driver_iface.h @@ -1,5 +1,5 @@ // -// Copyright 2013-2014 Ettus Research LLC +// Copyright 2013-2015 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 @@ -28,7 +28,7 @@ #pragma warning(disable:4201) // nonstandard extension used : nameless struct/union #include #pragma warning(default:4201) -#elif !defined(UHD_PLATFORM_LINUX) +#elif defined(UHD_PLATFORM_MACOS) #include #endif @@ -81,8 +81,10 @@ const uint32_t NIRIO_IOCTL_PRE_CLOSE = typedef int rio_dev_handle_t; #elif defined(UHD_PLATFORM_WIN32) typedef HANDLE rio_dev_handle_t; -#else +#elif defined(UHD_PLATFORM_MACOS) typedef io_connect_t rio_dev_handle_t; +#else //Unsupported platforms + typedef int rio_dev_handle_t; #endif static const rio_dev_handle_t INVALID_RIO_HANDLE = ((rio_dev_handle_t)-1); -- cgit v1.2.3