- Don't enumerate the ACPI root device
authorCameron Gutman <aicommander@gmail.com>
Sat, 13 Mar 2010 16:31:53 +0000 (16:31 +0000)
committerCameron Gutman <aicommander@gmail.com>
Sat, 13 Mar 2010 16:31:53 +0000 (16:31 +0000)
svn path=/trunk/; revision=46171

reactos/drivers/bus/acpi/acpienum.c
reactos/drivers/bus/acpi/buspdo.c

index 50ab9ee..13e72dd 100644 (file)
@@ -37,6 +37,10 @@ Bus_PlugInDevice (
 
     PAGED_CODE ();
 
+    //Don't enumerate the root device
+    if (Device->handle == ACPI_ROOT_OBJECT)
+        return STATUS_SUCCESS;
+
     /* Check we didnt add this already */
     for (entry = FdoData->ListOfPDOs.Flink;
         entry != &FdoData->ListOfPDOs; entry = entry->Flink)
index 4b44eca..07ab1d4 100644 (file)
@@ -548,8 +548,6 @@ Bus_PDO_QueryDeviceText(
                        Buffer = L"ACPI Power Resource";
                   else if (wcsstr(DeviceData->HardwareIDs, L"Processor") != 0)
                        Buffer = L"Processor";
-                  else if (wcsstr(DeviceData->HardwareIDs, L"ACPI_SYS") != 0)
-                       Buffer = L"ACPI System";
                   else if (wcsstr(DeviceData->HardwareIDs, L"ThermalZone") != 0)
                        Buffer = L"ACPI Thermal Zone";
                   else if (wcsstr(DeviceData->HardwareIDs, L"ACPI0002") != 0)