diff --git a/Hardware/CPU/IntelCPU.cs b/Hardware/CPU/IntelCPU.cs index a78e46a..9d44288 100644 --- a/Hardware/CPU/IntelCPU.cs +++ b/Hardware/CPU/IntelCPU.cs @@ -4,7 +4,7 @@ License, v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/. - Copyright (C) 2009-2013 Michael Möller + Copyright (C) 2009-2014 Michael Möller */ @@ -137,8 +137,10 @@ namespace OpenHardwareMonitor.Hardware.CPU { tjMax = GetTjMaxFromMSR(); break; case 0x3C: // Intel Core i5, i7 4xxx LGA1150 (22nm) + case 0x3F: // Intel Xeon E5-2600/1600 v3, Core i7-59xx + // LGA2011-v3, Haswell-E (22nm) case 0x45: - case 0x46: + case 0x46: microarchitecture = Microarchitecture.Haswell; tjMax = GetTjMaxFromMSR(); break; @@ -252,7 +254,7 @@ namespace OpenHardwareMonitor.Hardware.CPU { uint eax, edx; if (Ring0.Rdmsr(MSR_RAPL_POWER_UNIT, out eax, out edx)) - energyUnitMultiplier = 1.0f / (1 << (int)((eax >> 8) & 0x1FF)); + energyUnitMultiplier = 1.0f / (1 << (int)((eax >> 8) & 0x1F)); if (energyUnitMultiplier != 0) { for (int i = 0; i < energyStatusMSRs.Length; i++) { diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index 04c26ca..6ce9581 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -18,7 +18,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("Open Hardware Monitor")] -[assembly: AssemblyCopyright("Copyright © 2009-2013 Michael Möller")] +[assembly: AssemblyCopyright("Copyright © 2009-2014 Michael Möller")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/Properties/AssemblyLibInfo.cs b/Properties/AssemblyLibInfo.cs index c3f642e..79af7c8 100644 --- a/Properties/AssemblyLibInfo.cs +++ b/Properties/AssemblyLibInfo.cs @@ -17,7 +17,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("Open Hardware Monitor Library")] -[assembly: AssemblyCopyright("Copyright © 2009-2013 Michael Möller")] +[assembly: AssemblyCopyright("Copyright © 2009-2014 Michael Möller")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/Properties/AssemblyVersion.cs b/Properties/AssemblyVersion.cs index 027d36c..50cc0f3 100644 --- a/Properties/AssemblyVersion.cs +++ b/Properties/AssemblyVersion.cs @@ -10,5 +10,5 @@ using System.Reflection; -[assembly: AssemblyVersion("0.6.0.11")] -[assembly: AssemblyInformationalVersion("0.6.0.11 Alpha")] \ No newline at end of file +[assembly: AssemblyVersion("0.6.0.12")] +[assembly: AssemblyInformationalVersion("0.6.0.12 Alpha")] \ No newline at end of file