From: Cameron Gutman <aicommander@gmail.com>
Date: Sat, 13 Mar 2010 16:31:53 +0000 (+0000)
Subject:  - Don't enumerate the ACPI root device
X-Git-Tag: backups/header-work@57446~118^2~54
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=38f7f2fe0530928aed04532b83e863b34c3cff76;ds=sidebyside

 - Don't enumerate the ACPI root device

svn path=/trunk/; revision=46171
---

diff --git a/reactos/drivers/bus/acpi/acpienum.c b/reactos/drivers/bus/acpi/acpienum.c
index 50ab9eeee4b..13e72ddb9f4 100644
--- a/reactos/drivers/bus/acpi/acpienum.c
+++ b/reactos/drivers/bus/acpi/acpienum.c
@@ -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)
diff --git a/reactos/drivers/bus/acpi/buspdo.c b/reactos/drivers/bus/acpi/buspdo.c
index 4b44ecadd94..07ab1d445b6 100644
--- a/reactos/drivers/bus/acpi/buspdo.c
+++ b/reactos/drivers/bus/acpi/buspdo.c
@@ -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)