Enumerate FILE_DEVICE_BUS_EXTENDER and FILE_DEVICE_ACPI devices.

reactos/ntoskrnl/io

diff -u -r1.86 -r1.87
--- device.c	24 Dec 2004 17:06:58 -0000	1.86
+++ device.c	27 Dec 2004 14:21:35 -0000	1.87
@@ -1,4 +1,4 @@

-/* $Id: device.c,v 1.86 2004/12/24 17:06:58 navaraf Exp $

+/* $Id: device.c,v 1.87 2004/12/27 14:21:35 ekohl Exp $

  *
  * COPYRIGHT:      See COPYING in the top level directory
  * PROJECT:        ReactOS kernel

@@ -83,21 +83,9 @@

           return Status;
       }
 

-      if (Fdo->DeviceType == FILE_DEVICE_BUS_EXTENDER)
-      {
-         DPRINT("Bus extender found\n");
-
-         Status = IopInvalidateDeviceRelations(DeviceNode, BusRelations);
-
-         if (!NT_SUCCESS(Status))
-         {
-            ObDereferenceObject(Fdo);
-            return Status;
-         }
-      }
-      else if (Fdo->DeviceType == FILE_DEVICE_ACPI)
-      {

 #ifdef ACPI

+      if (Fdo->DeviceType == FILE_DEVICE_ACPI)
+      {

          static BOOLEAN SystemPowerDeviceNodeCreated = FALSE;
 
          /* There can be only one system power device */

@@ -106,7 +94,20 @@

             PopSystemPowerDeviceNode = DeviceNode;
             SystemPowerDeviceNodeCreated = TRUE;
          }

+      }

 #endif /* ACPI */

+
+      if (Fdo->DeviceType == FILE_DEVICE_BUS_EXTENDER ||
+          Fdo->DeviceType == FILE_DEVICE_ACPI)
+      {
+         DPRINT("Bus extender found\n");
+
+         Status = IopInvalidateDeviceRelations(DeviceNode, BusRelations);
+         if (!NT_SUCCESS(Status))
+         {
+            ObDereferenceObject(Fdo);
+            return Status;
+         }

       }
 
       ObDereferenceObject(Fdo);