Added initial support for AMD Fusion (family 14h) CPUs.

This commit is contained in:
Michael Möller
2011-04-16 13:19:13 +00:00
parent 0d80c84493
commit fb451bd475
4 changed files with 8 additions and 4 deletions

View File

@@ -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;
}

View File

@@ -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;

View File

@@ -125,6 +125,7 @@ namespace OpenHardwareMonitor.Hardware.CPU {
break;
case 0x10:
case 0x11:
case 0x14:
hardware.Add(new AMD10CPU(index, coreThreads, settings));
break;
default:

View File

@@ -37,5 +37,5 @@
using System.Reflection;
[assembly: AssemblyVersion("0.2.1.18")]
[assembly: AssemblyInformationalVersion("0.2.1.18 Alpha")]
[assembly: AssemblyVersion("0.2.1.19")]
[assembly: AssemblyInformationalVersion("0.2.1.19 Alpha")]