From 027f355b75f6022423525d760ebbf12057e682f6 Mon Sep 17 00:00:00 2001 From: Phyxion Date: Tue, 8 Aug 2017 14:32:13 +0200 Subject: [PATCH] Merge branch 'pr/7' --- Hardware/CPU/AMD10CPU.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Hardware/CPU/AMD10CPU.cs b/Hardware/CPU/AMD10CPU.cs index 1d0c885..7d919db 100644 --- a/Hardware/CPU/AMD10CPU.cs +++ b/Hardware/CPU/AMD10CPU.cs @@ -41,12 +41,13 @@ namespace OpenHardwareMonitor.Hardware.CPU { private const ushort FAMILY_15H_MODEL_60_MISC_CONTROL_DEVICE_ID = 0x1573; private const ushort FAMILY_16H_MODEL_00_MISC_CONTROL_DEVICE_ID = 0x1533; private const ushort FAMILY_16H_MODEL_30_MISC_CONTROL_DEVICE_ID = 0x1583; - private const ushort FAMILY_17H_MISC_CONTROL_DEVICE_ID = 0x1577; + private const ushort FAMILY_17H_MODEL_00_MISC_CONTROL_DEVICE_ID = 0x1577; private const uint REPORTED_TEMPERATURE_CONTROL_REGISTER = 0xA4; private const uint CLOCK_POWER_TIMING_CONTROL_0_REGISTER = 0xD4; private const uint F15H_M60H_REPORTED_TEMP_CTRL_OFFSET = 0xD8200CA4; + private readonly uint miscellaneousControlAddress; private readonly ushort miscellaneousControlDeviceId; @@ -95,7 +96,7 @@ namespace OpenHardwareMonitor.Hardware.CPU { default: miscellaneousControlDeviceId = 0; break; } break; case 0x17: miscellaneousControlDeviceId = - FAMILY_17H_MISC_CONTROL_DEVICE_ID; break; + FAMILY_17H_MODEL_00_MISC_CONTROL_DEVICE_ID; break; default: miscellaneousControlDeviceId = 0; break; }