From e126931cb050cbdd0d93b6f3af10913c86908ac2 Mon Sep 17 00:00:00 2001
From: Aleksey Bragin <aleksey@reactos.org>
Date: Sat, 23 Sep 2006 09:34:34 +0000
Subject: [PATCH] - Issue a synchronous invalidate device relations request
 instead of asynchronous (eliminates the "can't open \SystemRoot\ bugcheck
 during 2nd stage startup) - Comment out usbport/usbhub/etc from bootcd, they
 will be enabled once they don't crash and/or slow down system.

svn path=/trunk/; revision=24233
---
 reactos/boot/bootdata/packages/reactos.dff |  8 ++++----
 reactos/ntoskrnl/io/iomgr/iomgr.c          | 11 ++++++++++-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/reactos/boot/bootdata/packages/reactos.dff b/reactos/boot/bootdata/packages/reactos.dff
index d78742bc0ef..f58d4ae39fb 100644
--- a/reactos/boot/bootdata/packages/reactos.dff
+++ b/reactos/boot/bootdata/packages/reactos.dff
@@ -265,10 +265,10 @@ drivers\network\dd\pcnet\pcnet.sys                  2
 drivers\storage\pciide\pciide.sys                   2
 drivers\storage\pciidex\pciidex.sys                 2
 
-drivers\usb\miniport\usbohci\usbohci.sys            2
-drivers\usb\miniport\usbuhci\usbuhci.sys            2
-drivers\usb\usbhub\usbhub.sys                       2
-drivers\usb\usbport\usbport.sys                     2
+;drivers\usb\miniport\usbohci\usbohci.sys            2
+;drivers\usb\miniport\usbuhci\usbuhci.sys            2
+;drivers\usb\usbhub\usbhub.sys                       2
+;drivers\usb\usbport\usbport.sys                     2
 
 drivers\video\displays\vga\vgaddi.dll               1
 drivers\video\displays\framebuf\framebuf.dll        1
diff --git a/reactos/ntoskrnl/io/iomgr/iomgr.c b/reactos/ntoskrnl/io/iomgr/iomgr.c
index 6e656d69600..2c1149fdc4e 100644
--- a/reactos/ntoskrnl/io/iomgr/iomgr.c
+++ b/reactos/ntoskrnl/io/iomgr/iomgr.c
@@ -15,6 +15,15 @@
 
 ULONG IopTraceLevel = IO_IRP_DEBUG;
 
+// should go into a proper header
+VOID
+NTAPI
+IoSynchronousInvalidateDeviceRelations(
+    IN PDEVICE_OBJECT DeviceObject,
+    IN DEVICE_RELATION_TYPE Type
+);
+
+
 /* DATA ********************************************************************/
 
 POBJECT_TYPE IoDeviceObjectType = NULL;
@@ -448,7 +457,7 @@ IoInit2(BOOLEAN BootLog)
   /*
    * Initialize PnP root releations
    */
-  IoInvalidateDeviceRelations(
+  IoSynchronousInvalidateDeviceRelations(
     IopRootDeviceNode->PhysicalDeviceObject,
     BusRelations);