Merge branch 'pr/7'

This commit is contained in:
Phyxion
2017-08-08 14:32:13 +02:00
parent dd653c675e
commit 027f355b75
+3 -2
View File
@@ -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;
}