- Move efi.c to \ex, because the functions are related to environmental variables, not I/O.

- Create \wmi directory and put wmi.c, since it's the start of a large chunk of the XP+ kernel dedicated to WMI support.
- Separate \io into \iomgr and \pnpmgr

svn path=/trunk/; revision=22747

reactos/ntoskrnl/include/internal/io.h

@@ -324,6 +324,15 @@ typedef struct _IO_BUS_TYPE_GUID_LIST
 } IO_BUS_TYPE_GUID_LIST, *PIO_BUS_TYPE_GUID_LIST;
 extern PIO_BUS_TYPE_GUID_LIST IopBusTypeGuidList;
 
+//
+// Shutdown entry for registed devices
+//
+typedef struct _SHUTDOWN_ENTRY
+{
+    LIST_ENTRY ShutdownList;
+    PDEVICE_OBJECT DeviceObject;
+} SHUTDOWN_ENTRY, *PSHUTDOWN_ENTRY;
+
 //
 // Called on every visit of a node during a preorder-traversal of the device
 // node tree.

reactos/ntoskrnl/io/iomgr/device.c

@@ -18,12 +18,6 @@
 
 ULONG IopDeviceObjectNumber = 0;
 
-typedef struct _SHUTDOWN_ENTRY
-{
-    LIST_ENTRY ShutdownList;
-    PDEVICE_OBJECT DeviceObject;
-} SHUTDOWN_ENTRY, *PSHUTDOWN_ENTRY;
-
 LIST_ENTRY ShutdownListHead, LastChanceShutdownListHead;
 KSPIN_LOCK ShutdownListLock;
 

reactos/ntoskrnl/ntoskrnl.rbuild

@@ -123,6 +123,7 @@
 			<file>callback.c</file>
 			<file>dbgctrl.c</file>
 			<file>error.c</file>
+            <file>efi.c</file>
 			<file>event.c</file>
 			<file>evtpair.c</file>
 			<file>fmutex.c</file>
@@ -162,6 +163,7 @@
 		<file>inbv.c</file>
 	</directory>
 	<directory name="io">
+        <directory name="iomgr">
 			<file>adapter.c</file>
 			<file>arcname.c</file>
 			<file>bootlog.c</file>
@@ -170,33 +172,34 @@
 			<file>deviface.c</file>
 			<file>disk.c</file>
 			<file>driver.c</file>
-			<file>efi.c</file>
 			<file>error.c</file>
 			<file>event.c</file>
-			<file>fs.c</file>
-			<file>iocomp.c</file>
-			<file>iomgr.c</file>
-			<file>iowork.c</file>
-			<file>irp.c</file>
-			<file>irq.c</file>
-			<file>mdl.c</file>
-			<file>plugplay.c</file>
-			<file>pnpdma.c</file>
-			<file>pnpmgr.c</file>
-			<file>pnpnotify.c</file>
-			<file>pnpreport.c</file>
-			<file>pnproot.c</file>
-			<file>rawfs.c</file>
-			<file>remlock.c</file>
-			<file>resource.c</file>
-			<file>util.c</file>
-			<file>symlink.c</file>
-			<file>timer.c</file>
-			<file>vpb.c</file>
-			<file>wmi.c</file>
-		    <file>file.c</file>
+            <file>file.c</file>
+            <file>fs.c</file>
+            <file>iocomp.c</file>
             <file>iofunc.c</file>
-	</directory>
+            <file>iomgr.c</file>
+            <file>iowork.c</file>
+            <file>irp.c</file>
+            <file>irq.c</file>
+            <file>mdl.c</file>
+            <file>rawfs.c</file>
+            <file>remlock.c</file>
+            <file>resource.c</file>
+            <file>util.c</file>
+            <file>symlink.c</file>
+            <file>timer.c</file>
+            <file>vpb.c</file>
+        </directory>
+        <directory name="pnpmgr">
+            <file>plugplay.c</file>
+            <file>pnpdma.c</file>
+            <file>pnpmgr.c</file>
+            <file>pnpnotify.c</file>
+            <file>pnpreport.c</file>
+            <file>pnproot.c</file>
+        </directory>
+    </directory>
 	<directory name="kd">
 			<directory name="wrappers">
 				<file>bochs.c</file>
@@ -321,6 +324,9 @@
 			<file>sid.c</file>
 			<file>token.c</file>
 	</directory>
+    <directory name="wmi">
+        <file>wmi.c</file>
+    </directory>
 	<file>ntoskrnl.rc</file>
 	<linkerflag>-nostartfiles</linkerflag>
 	<linkerflag>-nostdlib</linkerflag>