[ros-diffs] [cgutman] 46171: - Don't enumerate the ACPI root device

[cgutman at svn.reactos.org]

Author: cgutman
Date: Sat Mar 13 17:31:53 2010
New Revision: 46171

URL: http://svn.reactos.org/svn/reactos?rev=46171&view=rev
Log:
 - Don't enumerate the ACPI root device

Modified:
    trunk/reactos/drivers/bus/acpi/acpienum.c
    trunk/reactos/drivers/bus/acpi/buspdo.c

Modified: trunk/reactos/drivers/bus/acpi/acpienum.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpienum.c?rev=46171&r1=46170&r2=46171&view=diff
==============================================================================
--- trunk/reactos/drivers/bus/acpi/acpienum.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/bus/acpi/acpienum.c [iso-8859-1] Sat Mar 13 17:31:53 2010
@@ -36,6 +36,10 @@
     PLIST_ENTRY         entry; 
 
     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;

Modified: trunk/reactos/drivers/bus/acpi/buspdo.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/buspdo.c?rev=46171&r1=46170&r2=46171&view=diff
==============================================================================
--- trunk/reactos/drivers/bus/acpi/buspdo.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/bus/acpi/buspdo.c [iso-8859-1] Sat Mar 13 17:31:53 2010
@@ -548,8 +548,6 @@
 			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)