diff options
| author | Ashish Chaudhari <ashish@ettus.com> | 2015-07-20 13:55:17 -0700 |
|---|---|---|
| committer | Ashish Chaudhari <ashish@ettus.com> | 2015-07-20 13:55:17 -0700 |
| commit | ccb4e5ad4882792830c61a27a4badf8148513c28 (patch) | |
| tree | be0d5f937a1ca9a3227b8ca615e43a809ece50f7 | |
| parent | b95f8af1da6640f09b3cc2491ab9a22a139e24ba (diff) | |
| parent | af42e93a6e71c9b7ed03e6a208c8f4adfa74b68e (diff) | |
| download | uhd-ccb4e5ad4882792830c61a27a4badf8148513c28.tar.gz uhd-ccb4e5ad4882792830c61a27a4badf8148513c28.tar.bz2 uhd-ccb4e5ad4882792830c61a27a4badf8148513c28.zip | |
Merge branch 'master' into x300/rev7_support
| -rw-r--r-- | host/docs/octoclock.dox | 4 | ||||
| -rw-r--r-- | host/include/uhd/transport/nirio/nirio_driver_iface.h | 6 | ||||
| -rw-r--r-- | host/lib/usrp/e300/e300_eeprom_manager.cpp | 6 |
3 files changed, 9 insertions, 7 deletions
diff --git a/host/docs/octoclock.dox b/host/docs/octoclock.dox index 58d2b1f99..362ee779f 100644 --- a/host/docs/octoclock.dox +++ b/host/docs/octoclock.dox @@ -92,8 +92,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 -<a href="classuhd_1_1octoclock.html">API</a>. +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 diff --git a/host/include/uhd/transport/nirio/nirio_driver_iface.h b/host/include/uhd/transport/nirio/nirio_driver_iface.h index c562f0ca5..2668c10b9 100644 --- a/host/include/uhd/transport/nirio/nirio_driver_iface.h +++ b/host/include/uhd/transport/nirio/nirio_driver_iface.h @@ -32,7 +32,7 @@ #ifdef _MSC_VER #pragma warning(default:4201) #endif -#elif !defined(UHD_PLATFORM_LINUX) +#elif defined(UHD_PLATFORM_MACOS) #include <IOKit/IOKitLib.h> #endif @@ -85,8 +85,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 + typedef int rio_dev_handle_t; #endif static const rio_dev_handle_t INVALID_RIO_HANDLE = ((rio_dev_handle_t)-1); diff --git a/host/lib/usrp/e300/e300_eeprom_manager.cpp b/host/lib/usrp/e300/e300_eeprom_manager.cpp index 778e3150c..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'; } @@ -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"; |