[ros-diffs] [ion] 26250: - Cleanup /storage directory and prepare for NT5+ Storage Stack and Floppy Port/Class drop.

[ion at svn.reactos.org]

Author: ion
Date: Tue Apr  3 18:14:25 2007
New Revision: 26250

URL: http://svn.reactos.org/svn/reactos?rev=26250&view=rev
Log:
- Cleanup /storage directory and prepare for NT5+ Storage Stack and Floppy Port/Class drop.

Added:
    trunk/reactos/drivers/storage/class/
    trunk/reactos/drivers/storage/class/cdrom/
      - copied from r26249, trunk/reactos/drivers/storage/cdrom/
    trunk/reactos/drivers/storage/class/class2/
      - copied from r26249, trunk/reactos/drivers/storage/class2/
    trunk/reactos/drivers/storage/class/disk/
      - copied from r26249, trunk/reactos/drivers/storage/disk/
    trunk/reactos/drivers/storage/class/include/
      - copied from r26249, trunk/reactos/drivers/storage/include/
    trunk/reactos/drivers/storage/classpnp/
    trunk/reactos/drivers/storage/fdc/
    trunk/reactos/drivers/storage/fdc/fdc/
    trunk/reactos/drivers/storage/fdc/flpydisk/
    trunk/reactos/drivers/storage/ide/
    trunk/reactos/drivers/storage/ide/atapi/
      - copied from r26249, trunk/reactos/drivers/storage/atapi/
    trunk/reactos/drivers/storage/ide/pciide/
      - copied from r26249, trunk/reactos/drivers/storage/pciide/
    trunk/reactos/drivers/storage/ide/pciidex/
      - copied from r26249, trunk/reactos/drivers/storage/pciidex/
    trunk/reactos/drivers/storage/port/
    trunk/reactos/drivers/storage/port/buslogic/
      - copied from r26249, trunk/reactos/drivers/storage/buslogic/
    trunk/reactos/drivers/storage/port/diskdump/
      - copied from r26249, trunk/reactos/drivers/storage/diskdump/
Removed:
    trunk/reactos/drivers/storage/atapi/
    trunk/reactos/drivers/storage/buslogic/
    trunk/reactos/drivers/storage/cdrom/
    trunk/reactos/drivers/storage/class2/
    trunk/reactos/drivers/storage/disk/
    trunk/reactos/drivers/storage/diskdump/
    trunk/reactos/drivers/storage/include/
    trunk/reactos/drivers/storage/pciide/
    trunk/reactos/drivers/storage/pciidex/
    trunk/reactos/drivers/test/
Modified:
    trunk/reactos/drivers/drivers.rbuild
    trunk/reactos/drivers/storage/directory.rbuild
    trunk/reactos/drivers/storage/port/diskdump/diskdump.c

Modified: trunk/reactos/drivers/drivers.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/drivers.rbuild?rev=26250&r1=26249&r2=26250&view=diff
==============================================================================
--- trunk/reactos/drivers/drivers.rbuild (original)
+++ trunk/reactos/drivers/drivers.rbuild Tue Apr  3 18:14:25 2007
@@ -20,9 +20,6 @@
 <directory name="storage">
 	<xi:include href="storage/directory.rbuild" />
 </directory>
-<directory name="test">
-	<xi:include href="test/directory.rbuild" />
-</directory>
 <directory name="usb">
 	<xi:include href="usb/directory.rbuild" />
 </directory>

Modified: trunk/reactos/drivers/storage/directory.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/directory.rbuild?rev=26250&r1=26249&r2=26250&view=diff
==============================================================================
--- trunk/reactos/drivers/storage/directory.rbuild (original)
+++ trunk/reactos/drivers/storage/directory.rbuild Tue Apr  3 18:14:25 2007
@@ -1,30 +1,15 @@
-<directory name="atapi">
-	<xi:include href="atapi/atapi.rbuild" />
-</directory>
-<directory name="buslogic">
-	<xi:include href="buslogic/buslogic.rbuild" />
-</directory>
-<directory name="cdrom">
-	<xi:include href="cdrom/cdrom.rbuild" />
-</directory>
-<directory name="class2">
-	<xi:include href="class2/class2.rbuild" />
-</directory>
-<directory name="disk">
-	<xi:include href="disk/disk.rbuild" />
+<directory name="class">
+	<xi:include href="class/directory.rbuild" />
 </directory>
 <directory name="floppy">
 	<xi:include href="floppy/floppy.rbuild" />
 </directory>
-<directory name="pciide">
-	<xi:include href="pciide/pciide.rbuild" />
+<directory name="ide">
+	<xi:include href="ide/directory.rbuild" />
 </directory>
-<directory name="pciidex">
-	<xi:include href="pciidex/pciidex.rbuild" />
+<directory name="port">
+	<xi:include href="port/directory.rbuild" />
 </directory>
 <directory name="scsiport">
 	<xi:include href="scsiport/scsiport.rbuild" />
-</directory>
-<directory name="diskdump">
-	<xi:include href="diskdump/diskdump.rbuild" />
 </directory>

Modified: trunk/reactos/drivers/storage/port/diskdump/diskdump.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/port/diskdump/diskdump.c?rev=26250&r1=26249&r2=26250&view=diff
==============================================================================
--- trunk/reactos/drivers/storage/port/diskdump/diskdump.c (original)
+++ trunk/reactos/drivers/storage/port/diskdump/diskdump.c Tue Apr  3 18:14:25 2007
@@ -31,7 +31,7 @@
 #include <scsi.h>
 #include <ntdddisk.h>
 #include <ntddscsi.h>
-#include <include/class2.h>
+#include <../class/include/class2.h>
 #include <diskdump/diskdump.h>
 #include <ndk/rtlfuncs.h>