CVS: winex/include ntddstor.h,1.1.1.2,1.2

Subject: winex/include ntddstor.h,1.1.1.2,1.2Update of /var/lib/cvsd/cvsroot/winex/include
In directory agravaine:/tmp/cvs-serv32485/include

Modified Files:
	ntddstor.h 
Log Message:

- flesh out structures & types for some IOCTLs


Index: ntddstor.h
===================================================================
RCS file: /var/lib/cvsd/cvsroot/winex/include/ntddstor.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- ntddstor.h	25 Sep 2002 19:21:58 -0000	1.1.1.2
+++ ntddstor.h	31 Jul 2007 19:44:38 -0000	1.2
@@ -33,6 +33,25 @@
     UCHAR               PathId;
 } STORAGE_BUS_RESET_REQUEST, *PSTORAGE_BUS_RESET_REQUEST;
 
+typedef enum _STORAGE_BUS_TYPE {
+   BusTypeUnknown = 0,
+   BusTypeScsi,
+   BusTypeAtapi,
+   BusTypeAta,
+   BusType1394,
+   BusTypeSsa,
+   BusTypeFibre,
+   BusTypeUsb,
+   BusTypeRAID,
+   BusTypeiScsi,
+   BusTypeSas,
+   BusTypeSata,
+   BusTypeSd,
+   BusTypeMmc,
+   BusTypeMax,
+   BusTypeMaxReserved = 0x7F
+} STORAGE_BUS_TYPE, *PSTORAGE_BUS_TYPE;
+
 typedef struct _PREVENT_MEDIA_REMOVAL {
     BOOLEAN             PreventMediaRemoval;
 } PREVENT_MEDIA_REMOVAL, *PPREVENT_MEDIA_REMOVAL;
@@ -147,6 +166,13 @@
             STORAGE_MEDIA_TYPE  MediaType;
             ULONG               MediaCharacteristics;
             ULONG               CurrentBlockSize;
+            STORAGE_BUS_TYPE    BusType;
+            union {
+               struct {
+                  UCHAR MediumType;
+                  UCHAR DensityCode;
+               } ScsiInformation;
+            } BusSpecificData;
         } TapeInfo;
     } DeviceSpecific;
 } DEVICE_MEDIA_INFO, *PDEVICE_MEDIA_INFO;
@@ -158,15 +184,20 @@
 } GET_MEDIA_TYPES, *PGET_MEDIA_TYPES;
 
 typedef enum _STORAGE_QUERY_TYPE {
-    PropertyStandardQuery = 0,
-    PropertyExistsQuery,
-    PropertyMaskQuery,
-    PropertyQueryMaxDefined
+   PropertyStandardQuery = 0, 
+   PropertyIncludeSwIds,
+   PropertyExistsQuery, 
+   PropertyMaskQuery, 
+   PropertyQueryMaxDefined 
 } STORAGE_QUERY_TYPE, *PSTORAGE_QUERY_TYPE;
 
 typedef enum _STORAGE_PROPERTY_ID {
-    StorageDeviceProperty = 0,
-    StorageAdapterProperty
+   StorageDeviceProperty = 0,
+   StorageAccessAlignmentProperty,
+   StorageAdapterProperty,
+   StorageDeviceIdProperty,
+   StorageDeviceUniqueIdProperty,
+   StorageDeviceWriteCacheProperty
 } STORAGE_PROPERTY_ID, *PSTORAGE_PROPERTY_ID;
 
 typedef struct _STORAGE_PROPERTY_QUERY {
@@ -180,17 +211,6 @@
     ULONG                       Size;
 } STORAGE_DESCRIPTOR_HEADER, *PSTORAGE_DESCRIPTOR_HEADER;
 
-typedef enum _STORAGE_BUS_TYPE {
-    BusTypeUnknown = 0x00,
-    BusTypeScsi,
-    BusTypeAtapi,
-    BusTypeAta,
-    BusType1394,
-    BusTypeSsa,
-    BusTypeFibre,
-    BusTypeMaxReserved = 0x7F
-} STORAGE_BUS_TYPE, *PSTORAGE_BUS_TYPE;
-
 typedef struct _STORAGE_DEVICE_DESCRIPTOR {
     ULONG                       Version;
     ULONG                       Size;
@@ -217,11 +237,18 @@
     BOOLEAN                     AdapterScansDown;
     BOOLEAN                     CommandQueueing;
     BOOLEAN                     AcceleratedTransfer;
-    BOOLEAN                     BusType;
+    STORAGE_BUS_TYPE            BusType;
     USHORT                      BusMajorVersion;
     USHORT                      BusMinorVersion;
 } STORAGE_ADAPTER_DESCRIPTOR, *PSTORAGE_ADAPTER_DESCRIPTOR;
 
+typedef struct _STORAGE_DEVICE_ID_DESCRIPTOR {
+   ULONG  Version;
+   ULONG  Size;
+   ULONG  NumberOfIdentifiers;
+   UCHAR  Identifiers[1];
+} STORAGE_DEVICE_ID_DESCRIPTOR, *PSTORAGE_DEVICE_ID_DESCRIPTOR;
+
 #ifdef __cplusplus
 }
 #endif