Added initial support for AMD Fusion (family 14h) CPUs.
1.1 --- a/Hardware/CPU/AMD10CPU.cs Fri Apr 15 23:52:07 2011 +0000
1.2 +++ b/Hardware/CPU/AMD10CPU.cs Sat Apr 16 13:19:13 2011 +0000
1.3 @@ -59,7 +59,8 @@
1.4
1.5 private const byte MISCELLANEOUS_CONTROL_FUNCTION = 3;
1.6 private const ushort FAMILY_10H_MISCELLANEOUS_CONTROL_DEVICE_ID = 0x1203;
1.7 - private const ushort FAMILY_11H_MISCELLANEOUS_CONTROL_DEVICE_ID = 0x1303;
1.8 + private const ushort FAMILY_11H_MISCELLANEOUS_CONTROL_DEVICE_ID = 0x1303;
1.9 + private const ushort FAMILY_14H_MISCELLANEOUS_CONTROL_DEVICE_ID = 0x1703;
1.10 private const uint REPORTED_TEMPERATURE_CONTROL_REGISTER = 0xA4;
1.11
1.12 private readonly uint miscellaneousControlAddress;
1.13 @@ -84,6 +85,8 @@
1.14 FAMILY_10H_MISCELLANEOUS_CONTROL_DEVICE_ID; break;
1.15 case 0x11: miscellaneousControlDeviceId =
1.16 FAMILY_11H_MISCELLANEOUS_CONTROL_DEVICE_ID; break;
1.17 + case 0x14: miscellaneousControlDeviceId =
1.18 + FAMILY_11H_MISCELLANEOUS_CONTROL_DEVICE_ID; break;
1.19 default: miscellaneousControlDeviceId = 0; break;
1.20 }
1.21
2.1 --- a/Hardware/CPU/AMDCPU.cs Fri Apr 15 23:52:07 2011 +0000
2.2 +++ b/Hardware/CPU/AMDCPU.cs Sat Apr 16 13:19:13 2011 +0000
2.3 @@ -40,7 +40,7 @@
2.4 internal abstract class AMDCPU : GenericCPU {
2.5
2.6 private const byte PCI_BUS = 0;
2.7 - private const byte PCI_BASE_DEVICE = 24;
2.8 + private const byte PCI_BASE_DEVICE = 0x18;
2.9 private const byte DEVICE_VENDOR_ID_REGISTER = 0;
2.10 private const ushort AMD_VENDOR_ID = 0x1022;
2.11
3.1 --- a/Hardware/CPU/CPUGroup.cs Fri Apr 15 23:52:07 2011 +0000
3.2 +++ b/Hardware/CPU/CPUGroup.cs Sat Apr 16 13:19:13 2011 +0000
3.3 @@ -125,6 +125,7 @@
3.4 break;
3.5 case 0x10:
3.6 case 0x11:
3.7 + case 0x14:
3.8 hardware.Add(new AMD10CPU(index, coreThreads, settings));
3.9 break;
3.10 default:
4.1 --- a/Properties/AssemblyVersion.cs Fri Apr 15 23:52:07 2011 +0000
4.2 +++ b/Properties/AssemblyVersion.cs Sat Apr 16 13:19:13 2011 +0000
4.3 @@ -37,5 +37,5 @@
4.4
4.5 using System.Reflection;
4.6
4.7 -[assembly: AssemblyVersion("0.2.1.18")]
4.8 -[assembly: AssemblyInformationalVersion("0.2.1.18 Alpha")]
4.9 \ No newline at end of file
4.10 +[assembly: AssemblyVersion("0.2.1.19")]
4.11 +[assembly: AssemblyInformationalVersion("0.2.1.19 Alpha")]
4.12 \ No newline at end of file