diff --git a/Hardware/CPU/AMD10CPU.cs b/Hardware/CPU/AMD10CPU.cs index 2e2584a..6d97751 100644 --- a/Hardware/CPU/AMD10CPU.cs +++ b/Hardware/CPU/AMD10CPU.cs @@ -59,7 +59,8 @@ namespace OpenHardwareMonitor.Hardware.CPU { private const byte MISCELLANEOUS_CONTROL_FUNCTION = 3; private const ushort FAMILY_10H_MISCELLANEOUS_CONTROL_DEVICE_ID = 0x1203; - private const ushort FAMILY_11H_MISCELLANEOUS_CONTROL_DEVICE_ID = 0x1303; + private const ushort FAMILY_11H_MISCELLANEOUS_CONTROL_DEVICE_ID = 0x1303; + private const ushort FAMILY_14H_MISCELLANEOUS_CONTROL_DEVICE_ID = 0x1703; private const uint REPORTED_TEMPERATURE_CONTROL_REGISTER = 0xA4; private readonly uint miscellaneousControlAddress; @@ -84,6 +85,8 @@ namespace OpenHardwareMonitor.Hardware.CPU { FAMILY_10H_MISCELLANEOUS_CONTROL_DEVICE_ID; break; case 0x11: miscellaneousControlDeviceId = FAMILY_11H_MISCELLANEOUS_CONTROL_DEVICE_ID; break; + case 0x14: miscellaneousControlDeviceId = + FAMILY_11H_MISCELLANEOUS_CONTROL_DEVICE_ID; break; default: miscellaneousControlDeviceId = 0; break; } diff --git a/Hardware/CPU/AMDCPU.cs b/Hardware/CPU/AMDCPU.cs index 3dcca5b..85e9650 100644 --- a/Hardware/CPU/AMDCPU.cs +++ b/Hardware/CPU/AMDCPU.cs @@ -40,7 +40,7 @@ namespace OpenHardwareMonitor.Hardware.CPU { internal abstract class AMDCPU : GenericCPU { private const byte PCI_BUS = 0; - private const byte PCI_BASE_DEVICE = 24; + private const byte PCI_BASE_DEVICE = 0x18; private const byte DEVICE_VENDOR_ID_REGISTER = 0; private const ushort AMD_VENDOR_ID = 0x1022; diff --git a/Hardware/CPU/CPUGroup.cs b/Hardware/CPU/CPUGroup.cs index 17344af..cb1bc6d 100644 --- a/Hardware/CPU/CPUGroup.cs +++ b/Hardware/CPU/CPUGroup.cs @@ -125,6 +125,7 @@ namespace OpenHardwareMonitor.Hardware.CPU { break; case 0x10: case 0x11: + case 0x14: hardware.Add(new AMD10CPU(index, coreThreads, settings)); break; default: diff --git a/Properties/AssemblyVersion.cs b/Properties/AssemblyVersion.cs index 8ca2009..29d3b4c 100644 --- a/Properties/AssemblyVersion.cs +++ b/Properties/AssemblyVersion.cs @@ -37,5 +37,5 @@ using System.Reflection; -[assembly: AssemblyVersion("0.2.1.18")] -[assembly: AssemblyInformationalVersion("0.2.1.18 Alpha")] \ No newline at end of file +[assembly: AssemblyVersion("0.2.1.19")] +[assembly: AssemblyInformationalVersion("0.2.1.19 Alpha")] \ No newline at end of file