# HG changeset patch
# User moel.mich
# Date 1265560946 0
# Node ID f0640baf7128adf8c57b341f63bfb893c7f8ce60
# Parent  9b205b2ab0565b667f3d3e9b6f38746f8b080496
Changed ATI GPU device enumeration.

diff -r 9b205b2ab056 -r f0640baf7128 Hardware/ATI/ATIGroup.cs
--- a/Hardware/ATI/ATIGroup.cs	Sun Feb 07 16:37:15 2010 +0000
+++ b/Hardware/ATI/ATIGroup.cs	Sun Feb 07 16:42:26 2010 +0000
@@ -73,6 +73,9 @@
                 int isActive;
                 ADL.ADL_Adapter_Active_Get(adapterInfo[i].AdapterIndex,
                   out isActive);
+                int adapterID;
+                ADL.ADL_Adapter_ID_Get(adapterInfo[i].AdapterIndex,
+                  out adapterID);
 
                 report.Append("AdapterIndex: "); 
                 report.AppendLine(i.ToString());
@@ -91,36 +94,26 @@
                 report.Append("DeviceNumber: ");
                 report.AppendLine(adapterInfo[i].DeviceNumber.ToString());
                 report.Append("FunctionNumber: ");
-                report.AppendLine(adapterInfo[i].FunctionNumber.ToString());                
+                report.AppendLine(adapterInfo[i].FunctionNumber.ToString());
+                report.Append("AdapterID: 0x");
+                report.AppendLine(adapterID.ToString("X"));
 
-                if (isActive == 1) {
-                  int adapterID;
-                  ADL.ADL_Adapter_ID_Get(adapterInfo[i].AdapterIndex,
-                    out adapterID);
-
-                  report.Append("AdapterID: 0x");
-                  report.AppendLine(adapterID.ToString("X"));
-
-                  if (adapterID != 0 && 
-                    adapterInfo[i].UDID != "" && 
-                    adapterInfo[i].Present > 0 &&
-                    (adapterInfo[i].VendorID == ADL.ATI_VENDOR_ID1 ||
-                     adapterInfo[i].VendorID == ADL.ATI_VENDOR_ID2)) 
-                  {
-                    bool found = false;
-                    foreach (ATIGPU gpu in hardware)
-                      if (gpu.BusNumber == adapterInfo[i].BusNumber &&
-                        gpu.DeviceNumber == adapterInfo[i].DeviceNumber) {
-                        found = true;
-                        break;
-                      }
-                    if (!found)
-                      hardware.Add(new ATIGPU(
-                        adapterInfo[i].AdapterName.Trim(),
-                        adapterInfo[i].AdapterIndex,
-                        adapterInfo[i].BusNumber, 
-                        adapterInfo[i].DeviceNumber));
-                  }
+                if (adapterID != 0 && adapterInfo[i].UDID != "" &&
+                  (adapterInfo[i].VendorID == ADL.ATI_VENDOR_ID1 ||
+                   adapterInfo[i].VendorID == ADL.ATI_VENDOR_ID2)) {
+                  bool found = false;
+                  foreach (ATIGPU gpu in hardware)
+                    if (gpu.BusNumber == adapterInfo[i].BusNumber &&
+                      gpu.DeviceNumber == adapterInfo[i].DeviceNumber) {
+                      found = true;
+                      break;
+                    }
+                  if (!found)
+                    hardware.Add(new ATIGPU(
+                      adapterInfo[i].AdapterName.Trim(),
+                      adapterInfo[i].AdapterIndex,
+                      adapterInfo[i].BusNumber,
+                      adapterInfo[i].DeviceNumber));
                 }
 
                 report.AppendLine();
diff -r 9b205b2ab056 -r f0640baf7128 OpenHardwareMonitor.csproj
--- a/OpenHardwareMonitor.csproj	Sun Feb 07 16:37:15 2010 +0000
+++ b/OpenHardwareMonitor.csproj	Sun Feb 07 16:42:26 2010 +0000
@@ -80,7 +80,6 @@
     <Compile Include="Hardware\ATI\ADL.cs" />
     <Compile Include="Hardware\ATI\ATIGroup.cs" />
     <Compile Include="Hardware\ATI\ATIGPU.cs" />
-    <Compile Include="Utilities\IconFactory.cs" />
     <Compile Include="Utilities\Configuration.cs" />
     <Compile Include="Utilities\CrashReport.cs" />
     <Compile Include="Utilities\EmbeddedResources.cs" />