# HG changeset patch
# User moel.mich
# Date 1302959953 0
# Node ID 8635fa73eaccd94e872a478fe998777d0d128772
# Parent  ef89cbe45b7cadf403f677180baa7bee204cb456
Added initial support for AMD Fusion (family 14h) CPUs.

diff -r ef89cbe45b7c -r 8635fa73eacc Hardware/CPU/AMD10CPU.cs
--- a/Hardware/CPU/AMD10CPU.cs	Fri Apr 15 23:52:07 2011 +0000
+++ b/Hardware/CPU/AMD10CPU.cs	Sat Apr 16 13:19:13 2011 +0000
@@ -59,7 +59,8 @@
 
     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 @@
           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 -r ef89cbe45b7c -r 8635fa73eacc Hardware/CPU/AMDCPU.cs
--- a/Hardware/CPU/AMDCPU.cs	Fri Apr 15 23:52:07 2011 +0000
+++ b/Hardware/CPU/AMDCPU.cs	Sat Apr 16 13:19:13 2011 +0000
@@ -40,7 +40,7 @@
   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 -r ef89cbe45b7c -r 8635fa73eacc Hardware/CPU/CPUGroup.cs
--- a/Hardware/CPU/CPUGroup.cs	Fri Apr 15 23:52:07 2011 +0000
+++ b/Hardware/CPU/CPUGroup.cs	Sat Apr 16 13:19:13 2011 +0000
@@ -125,6 +125,7 @@
                 break;
               case 0x10:
               case 0x11:
+              case 0x14:
                 hardware.Add(new AMD10CPU(index, coreThreads, settings));
                 break;
               default:
diff -r ef89cbe45b7c -r 8635fa73eacc Properties/AssemblyVersion.cs
--- a/Properties/AssemblyVersion.cs	Fri Apr 15 23:52:07 2011 +0000
+++ b/Properties/AssemblyVersion.cs	Sat Apr 16 13:19:13 2011 +0000
@@ -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