diff options
| author | Brant Thomsen <bthomsen14@gmail.com> | 2017-04-30 13:42:45 -0600 |
|---|---|---|
| committer | Brant Thomsen <bthomsen14@gmail.com> | 2017-04-30 13:42:45 -0600 |
| commit | 6634996824d0f25b9f8a05d422e2189f4202ef81 (patch) | |
| tree | a344ab5962397b46a6ea398e71682aefcf6243a7 /daemons | |
| parent | 3a716d352430125181da647af4f8ddeabdf9151b (diff) | |
| download | Open-AVB-6634996824d0f25b9f8a05d422e2189f4202ef81.tar.gz | |
Change to the gPTP daemon Windows support so that the Windows 8 SDK is not needed.
The updated code calls VerifyVersionInfoW() directly, rather than calling it using the IsWindowsVersionOrGreater() function in the VersionHelpers.h header file.
Diffstat (limited to 'daemons')
| -rw-r--r-- | daemons/gptp/windows/daemon_cl/tsc.hpp | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/daemons/gptp/windows/daemon_cl/tsc.hpp b/daemons/gptp/windows/daemon_cl/tsc.hpp index a958f461..ed22752c 100644 --- a/daemons/gptp/windows/daemon_cl/tsc.hpp +++ b/daemons/gptp/windows/daemon_cl/tsc.hpp @@ -38,11 +38,6 @@ #include <intrin.h> #include <stdint.h> -#include <VersionHelpers.h> - -#define WIN10_MAJOR 0x0A -#define WIN10_MINOR 0x00 -#define WIN10_SVC 0x00 /** * @brief Gets the processor timestamp @@ -106,6 +101,7 @@ inline uint32_t FindFrequencyByModel(uint8_t model_query) { inline uint64_t getTSCFrequency( unsigned millis ) { int max_cpuid_level; int tmp[4]; + BOOL is_windows_10; // Find the max cpuid level, and if possible find clock info __cpuid(tmp, 0); @@ -113,11 +109,22 @@ inline uint64_t getTSCFrequency( unsigned millis ) { if (max_cpuid_level >= CLOCK_INFO_CPUID_LEAF) __cpuid(tmp, CLOCK_INFO_CPUID_LEAF); + // Determine if the OS is Windows 10 or later. + { + OSVERSIONINFOEXW osvi = { sizeof(osvi), 0, 0, 0, 0, {0}, 0, 0 }; + DWORDLONG const dwlConditionMask = VerSetConditionMask(0, VER_MAJORVERSION, VER_GREATER_EQUAL); + osvi.dwMajorVersion = 10; + + // NOTE: VerifyVersionInfo returns false when called by applications that do not have a compatibility manifest for Windows 10, + // even when the current operating system version is Windows 10. + is_windows_10 = VerifyVersionInfoW(&osvi, VER_MAJORVERSION, dwlConditionMask) != FALSE; + } + // For pre-Win10 on 6th Generation or greater Intel CPUs the raw hardware // clock will be returned, *else* use QPC for everything else // // EAX (tmp[0]) must be >= 1, See Intel SDM 17.15.4 "Invariant Time-keeping" - if (!IsWindowsVersionOrGreater(WIN10_MAJOR, WIN10_MINOR, WIN10_SVC) && + if (is_windows_10 && max_cpuid_level >= CLOCK_INFO_CPUID_LEAF && tmp[0] >= 1) { SYSTEM_INFO info; |