[ros-diffs] [fireball] 26169: - Add a few more IOCTLs needed for storage stack - Add a couple of structs from DDK - Change ScsiPort prototype to match DDK

Author: fireball
Date: Sun Mar 25 22:18:51 2007
New Revision: 26169

URL: http://svn.reactos.org/svn/reactos?rev=26169&view=rev
Log:
- Add a few more IOCTLs needed for storage stack
- Add a couple of structs from DDK
- Change ScsiPort prototype to match DDK

Modified:
    trunk/reactos/include/ddk/ntdddisk.h
    trunk/reactos/include/ddk/ntddstor.h
    trunk/reactos/include/ddk/srb.h

Modified: trunk/reactos/include/ddk/ntdddisk.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntdddisk.h?rev…
==============================================================================
--- trunk/reactos/include/ddk/ntdddisk.h (original)
+++ trunk/reactos/include/ddk/ntdddisk.h Sun Mar 25 22:18:51 2007
@@ -125,8 +125,23 @@
 #define IOCTL_DISK_REQUEST_STRUCTURE \
   CTL_CODE(IOCTL_DISK_BASE, 0x000f, METHOD_BUFFERED, FILE_ANY_ACCESS)
 
+#define IOCTL_DISK_MEDIA_REMOVAL \
+  CTL_CODE(IOCTL_DISK_BASE, 0x0201, METHOD_BUFFERED, FILE_READ_ACCESS)
+
+#define IOCTL_DISK_EJECT_MEDIA \
+  CTL_CODE(IOCTL_DISK_BASE, 0x0202, METHOD_BUFFERED, FILE_READ_ACCESS)
+
+#define IOCTL_DISK_LOAD_MEDIA \
+  CTL_CODE(IOCTL_DISK_BASE, 0x0203, METHOD_BUFFERED, FILE_READ_ACCESS)
+
 #define IOCTL_DISK_RESERVE \
   CTL_CODE(IOCTL_DISK_BASE, 0x0204, METHOD_BUFFERED, FILE_READ_ACCESS)
+
+#define IOCTL_DISK_RELEASE \
+  CTL_CODE(IOCTL_DISK_BASE, 0x0205, METHOD_BUFFERED, FILE_READ_ACCESS)
+
+#define IOCTL_DISK_FIND_NEW_DEVICES \
+  CTL_CODE(IOCTL_DISK_BASE, 0x0206, METHOD_BUFFERED, FILE_READ_ACCESS)
 
 #define IOCTL_DISK_SET_CACHE_INFORMATION \
   CTL_CODE(IOCTL_DISK_BASE, 0x0036, METHOD_BUFFERED, FILE_READ_ACCESS |
FILE_WRITE_ACCESS)
@@ -565,6 +580,15 @@
 #define RETURN_SMART_STATUS               0xDA
 #define ENABLE_DISABLE_AUTO_OFFLINE       0xDB
 
+typedef struct _MAPPED_ADDRESS {
+    struct _MAPPED_ADDRESS *NextMappedAddress;
+    PVOID MappedAddress;
+    ULONG NumberOfBytes;
+    LARGE_INTEGER IoAddress;
+    ULONG BusNumber;
+} MAPPED_ADDRESS, *PMAPPED_ADDRESS;
+
+
 #ifdef __cplusplus
 }
 #endif

Modified: trunk/reactos/include/ddk/ntddstor.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddstor.h?rev…
==============================================================================
--- trunk/reactos/include/ddk/ntddstor.h (original)
+++ trunk/reactos/include/ddk/ntddstor.h Sun Mar 25 22:18:51 2007
@@ -324,6 +324,10 @@
   UCHAR  AdditionalParameters[1];
 } STORAGE_PROPERTY_QUERY, *PSTORAGE_PROPERTY_QUERY;
 
+typedef struct _PREVENT_MEDIA_REMOVAL {
+    BOOLEAN PreventMediaRemoval;
+} PREVENT_MEDIA_REMOVAL, *PPREVENT_MEDIA_REMOVAL;
+
 #ifdef __cplusplus
 }
 #endif

Modified: trunk/reactos/include/ddk/srb.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/srb.h?rev=2616…
==============================================================================
--- trunk/reactos/include/ddk/srb.h (original)
+++ trunk/reactos/include/ddk/srb.h Sun Mar 25 22:18:51 2007
@@ -164,6 +164,11 @@
 #define SRB_FLAGS_DONT_START_NEXT_PACKET    0x00800000
 #define SRB_FLAGS_PORT_DRIVER_RESERVED      0x0F000000
 #define SRB_FLAGS_CLASS_DRIVER_RESERVED     0xF0000000
+
+/* Asynchronous events */
+#define SRBEV_BUS_RESET               0x0001
+#define SRBEV_SCSI_ASYNC_NOTIFICATION 0x0002
+
 
 typedef struct _SCSI_REQUEST_BLOCK {
   USHORT  Length;
@@ -496,7 +501,7 @@
 ScsiPortIoMapTransfer(
   IN PVOID  HwDeviceExtension,
   IN PSCSI_REQUEST_BLOCK  Srb,
-  IN ULONG  LogicalAddress,
+  IN PVOID  LogicalAddress,
   IN ULONG  Length);
 
 SCSIPORTAPI