JMR-dev/ReLibreHardwareMonitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

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").

Browse Source
This commit is contained in:
Michael Möller
2014-09-16 20:35:33 +00:00
parent bf0e26c554
commit fdc917d504
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Hardware/CPU/IntelCPU.cs
+5 -3
View File
@@ -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 @@ 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++) {
Properties/AssemblyInfo.cs
+1 -1
View File
@@ -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("")]
Properties/AssemblyLibInfo.cs
+1 -1
View File
@@ -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("")]
Properties/AssemblyVersion.cs
+2 -2
View File
@@ -10,5 +10,5 @@
using System.Reflection;
[assembly: AssemblyVersion("0.6.0.11")]
[assembly: AssemblyInformationalVersion("0.6.0.11 Alpha")]
[assembly: AssemblyVersion("0.6.0.12")]
[assembly: AssemblyInformationalVersion("0.6.0.12 Alpha")]