# HG changeset patch
# User moel.mich
# Date 1410899733 0
# Node ID 427fc32e589f3260686874469f6ea5369de9db5d
# Parent  47f5dcaf8e9fe7883b9c0b9547ae557753f29790
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").

diff -r 47f5dcaf8e9f -r 427fc32e589f Hardware/CPU/IntelCPU.cs
--- a/Hardware/CPU/IntelCPU.cs	Sat Sep 07 08:07:11 2013 +0000
+++ b/Hardware/CPU/IntelCPU.cs	Tue Sep 16 20:35:33 2014 +0000
@@ -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 <mmoeller@openhardwaremonitor.org>
+  Copyright (C) 2009-2014 Michael Möller <mmoeller@openhardwaremonitor.org>
 	
 */
 
@@ -137,8 +137,10 @@
                 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 @@
 
         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 -r 47f5dcaf8e9f -r 427fc32e589f Properties/AssemblyInfo.cs
--- a/Properties/AssemblyInfo.cs	Sat Sep 07 08:07:11 2013 +0000
+++ b/Properties/AssemblyInfo.cs	Tue Sep 16 20:35:33 2014 +0000
@@ -18,7 +18,7 @@
 [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 -r 47f5dcaf8e9f -r 427fc32e589f Properties/AssemblyLibInfo.cs
--- a/Properties/AssemblyLibInfo.cs	Sat Sep 07 08:07:11 2013 +0000
+++ b/Properties/AssemblyLibInfo.cs	Tue Sep 16 20:35:33 2014 +0000
@@ -17,7 +17,7 @@
 [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 -r 47f5dcaf8e9f -r 427fc32e589f Properties/AssemblyVersion.cs
--- a/Properties/AssemblyVersion.cs	Sat Sep 07 08:07:11 2013 +0000
+++ b/Properties/AssemblyVersion.cs	Tue Sep 16 20:35:33 2014 +0000
@@ -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