[ros-diffs] [cgutman] 46571: [NTOSKRNL] - Don't try to detect ACPI in IopEnumerateDetectedDevices because the only reason we got there is because ACPI is NOT present (as reported by IopIsAcpiComputer)

[cgutman at svn.reactos.org]

Author: cgutman
Date: Mon Mar 29 18:56:42 2010
New Revision: 46571

URL: http://svn.reactos.org/svn/reactos?rev=46571&view=rev
Log:
[NTOSKRNL]
- Don't try to detect ACPI in IopEnumerateDetectedDevices because the only reason we got there is because ACPI is NOT present (as reported by IopIsAcpiComputer)

Modified:
    trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c

Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c?rev=46571&r1=46570&r2=46571&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Mon Mar 29 18:56:42 2010
@@ -2166,11 +2166,6 @@
    const UNICODE_STRING IdentifierPci = RTL_CONSTANT_STRING(L"PCI");
    UNICODE_STRING HardwareIdPci = RTL_CONSTANT_STRING(L"*PNP0A03\0");
    static ULONG DeviceIndexPci = 0;
-#ifdef ENABLE_ACPI
-   const UNICODE_STRING IdentifierAcpi = RTL_CONSTANT_STRING(L"ACPI BIOS");
-   UNICODE_STRING HardwareIdAcpi = RTL_CONSTANT_STRING(L"*PNP0C08\0");
-   static ULONG DeviceIndexAcpi = 0;
-#endif
    const UNICODE_STRING IdentifierSerial = RTL_CONSTANT_STRING(L"SerialController");
    UNICODE_STRING HardwareIdSerial = RTL_CONSTANT_STRING(L"*PNP0501\0");
    static ULONG DeviceIndexSerial = 0;
@@ -2460,14 +2455,6 @@
             DeviceIndex = DeviceIndexIsa++;
             IsDeviceDesc = FALSE;
          }
-#ifdef ENABLE_ACPI
-         else if (RtlCompareUnicodeString(&ValueName, &IdentifierAcpi, FALSE) == 0)
-         {
-            pHardwareId = &HardwareIdAcpi;
-            DeviceIndex = DeviceIndexAcpi++;
-            IsDeviceDesc = FALSE;
-         }
-#endif
          else
          {
             DPRINT("Unknown device '%wZ'\n", &ValueName);