Added support for Intel Xeon E5-2600/1600 v3, Core i7-59xx CPUs (Fixed Issue 617). Corrected an error in the Intel CPU power calculation (wrong bit mask for "Energy Status Units: bits 12:8").
1.1 --- a/Hardware/CPU/IntelCPU.cs Sat Sep 07 08:07:11 2013 +0000
1.2 +++ b/Hardware/CPU/IntelCPU.cs Tue Sep 16 20:35:33 2014 +0000
1.3 @@ -4,7 +4,7 @@
1.4 License, v. 2.0. If a copy of the MPL was not distributed with this
1.5 file, You can obtain one at http://mozilla.org/MPL/2.0/.
1.6
1.7 - Copyright (C) 2009-2013 Michael Möller <mmoeller@openhardwaremonitor.org>
1.8 + Copyright (C) 2009-2014 Michael Möller <mmoeller@openhardwaremonitor.org>
1.9
1.10 */
1.11
1.12 @@ -137,8 +137,10 @@
1.13 tjMax = GetTjMaxFromMSR();
1.14 break;
1.15 case 0x3C: // Intel Core i5, i7 4xxx LGA1150 (22nm)
1.16 + case 0x3F: // Intel Xeon E5-2600/1600 v3, Core i7-59xx
1.17 + // LGA2011-v3, Haswell-E (22nm)
1.18 case 0x45:
1.19 - case 0x46:
1.20 + case 0x46:
1.21 microarchitecture = Microarchitecture.Haswell;
1.22 tjMax = GetTjMaxFromMSR();
1.23 break;
1.24 @@ -252,7 +254,7 @@
1.25
1.26 uint eax, edx;
1.27 if (Ring0.Rdmsr(MSR_RAPL_POWER_UNIT, out eax, out edx))
1.28 - energyUnitMultiplier = 1.0f / (1 << (int)((eax >> 8) & 0x1FF));
1.29 + energyUnitMultiplier = 1.0f / (1 << (int)((eax >> 8) & 0x1F));
1.30
1.31 if (energyUnitMultiplier != 0) {
1.32 for (int i = 0; i < energyStatusMSRs.Length; i++) {
2.1 --- a/Properties/AssemblyInfo.cs Sat Sep 07 08:07:11 2013 +0000
2.2 +++ b/Properties/AssemblyInfo.cs Tue Sep 16 20:35:33 2014 +0000
2.3 @@ -18,7 +18,7 @@
2.4 [assembly: AssemblyConfiguration("")]
2.5 [assembly: AssemblyCompany("")]
2.6 [assembly: AssemblyProduct("Open Hardware Monitor")]
2.7 -[assembly: AssemblyCopyright("Copyright © 2009-2013 Michael Möller")]
2.8 +[assembly: AssemblyCopyright("Copyright © 2009-2014 Michael Möller")]
2.9 [assembly: AssemblyTrademark("")]
2.10 [assembly: AssemblyCulture("")]
2.11
3.1 --- a/Properties/AssemblyLibInfo.cs Sat Sep 07 08:07:11 2013 +0000
3.2 +++ b/Properties/AssemblyLibInfo.cs Tue Sep 16 20:35:33 2014 +0000
3.3 @@ -17,7 +17,7 @@
3.4 [assembly: AssemblyConfiguration("")]
3.5 [assembly: AssemblyCompany("")]
3.6 [assembly: AssemblyProduct("Open Hardware Monitor Library")]
3.7 -[assembly: AssemblyCopyright("Copyright © 2009-2013 Michael Möller")]
3.8 +[assembly: AssemblyCopyright("Copyright © 2009-2014 Michael Möller")]
3.9 [assembly: AssemblyTrademark("")]
3.10 [assembly: AssemblyCulture("")]
3.11
4.1 --- a/Properties/AssemblyVersion.cs Sat Sep 07 08:07:11 2013 +0000
4.2 +++ b/Properties/AssemblyVersion.cs Tue Sep 16 20:35:33 2014 +0000
4.3 @@ -10,5 +10,5 @@
4.4
4.5 using System.Reflection;
4.6
4.7 -[assembly: AssemblyVersion("0.6.0.11")]
4.8 -[assembly: AssemblyInformationalVersion("0.6.0.11 Alpha")]
4.9 \ No newline at end of file
4.10 +[assembly: AssemblyVersion("0.6.0.12")]
4.11 +[assembly: AssemblyInformationalVersion("0.6.0.12 Alpha")]
4.12 \ No newline at end of file