From f0520a8b63acfdda63600d78beccc7d6a2d22683 Mon Sep 17 00:00:00 2001
From: Johannes Anderwald <johannes.anderwald@reactos.org>
Date: Mon, 6 Feb 2012 07:35:22 +0000
Subject: [PATCH] [DDK] - More header fixes for disk_new

svn path=/branches/usb-bringup-trunk/; revision=55449
---
 include/psdk/ntdddisk.h | 91 ++++++++++++++++++++++++++---------------
 1 file changed, 57 insertions(+), 34 deletions(-)

diff --git a/include/psdk/ntdddisk.h b/include/psdk/ntdddisk.h
index c52a72d7192..36f66eed273 100644
--- a/include/psdk/ntdddisk.h
+++ b/include/psdk/ntdddisk.h
@@ -178,8 +178,17 @@ extern "C" {
 #define SMART_SEND_DRIVE_COMMAND \
   CTL_CODE(IOCTL_DISK_BASE, 0x0021, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
 
-#define IOCTL_DISK_UPDATE_PROPERTIES \
-  CTL_CODE(IOCTL_DISK_BASE, 0x50, METHOD_BUFFERED, FILE_ANY_ACCESS)
+#if(_WIN32_WINNT >= 0x0500)
+#define IOCTL_DISK_UPDATE_DRIVE_SIZE        CTL_CODE(IOCTL_DISK_BASE, 0x0032, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
+#define IOCTL_DISK_GROW_PARTITION           CTL_CODE(IOCTL_DISK_BASE, 0x0034, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
+#define IOCTL_DISK_GET_CACHE_INFORMATION    CTL_CODE(IOCTL_DISK_BASE, 0x0035, 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)
+#define IOCTL_DISK_GET_WRITE_CACHE_STATE    CTL_CODE(IOCTL_DISK_BASE, 0x0037, METHOD_BUFFERED, FILE_READ_ACCESS)
+#define IOCTL_DISK_DELETE_DRIVE_LAYOUT      CTL_CODE(IOCTL_DISK_BASE, 0x0040, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
+#define IOCTL_DISK_UPDATE_PROPERTIES        CTL_CODE(IOCTL_DISK_BASE, 0x0050, METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define IOCTL_DISK_FORMAT_DRIVE             CTL_CODE(IOCTL_DISK_BASE, 0x00f3, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
+#define IOCTL_DISK_SENSE_DEVICE             CTL_CODE(IOCTL_DISK_BASE, 0x00f8, METHOD_BUFFERED, FILE_ANY_ACCESS)
+#endif
 
 #define PARTITION_ENTRY_UNUSED            0x00
 #define PARTITION_FAT_12                  0x01
@@ -465,38 +474,6 @@ typedef struct _VERIFY_INFORMATION {
   ULONG  Length;
 } VERIFY_INFORMATION, *PVERIFY_INFORMATION;
 
-typedef enum {
-	EqualPriority,
-	KeepPrefetchedData,
-	KeepReadData
-} DISK_CACHE_RETENTION_PRIORITY;
-
-typedef struct _DISK_CACHE_INFORMATION {
-	BOOLEAN  ParametersSavable;
-	BOOLEAN  ReadCacheEnabled;
-	BOOLEAN  WriteCacheEnabled;
-	DISK_CACHE_RETENTION_PRIORITY  ReadRetentionPriority;
-	DISK_CACHE_RETENTION_PRIORITY  WriteRetentionPriority;
-	USHORT  DisablePrefetchTransferLength;
-	BOOLEAN  PrefetchScalar;
-	_ANONYMOUS_UNION union {
-		struct {
-			USHORT  Minimum;
-			USHORT  Maximum;
-			USHORT  MaximumBlocks;
-		} ScalarPrefetch;
-		struct {
-			USHORT  Minimum;
-			USHORT  Maximum;
-		} BlockPrefetch;
-	} DUMMYUNIONNAME;
-} DISK_CACHE_INFORMATION, *PDISK_CACHE_INFORMATION;
-
-typedef struct _DISK_GROW_PARTITION {
-  ULONG  PartitionNumber;
-  LARGE_INTEGER  BytesToGrow;
-} DISK_GROW_PARTITION, *PDISK_GROW_PARTITION;
-
 /* GETVERSIONINPARAMS.fCapabilities constants */
 #define CAP_ATA_ID_CMD                    1
 #define CAP_ATAPI_ID_CMD                  2
@@ -602,6 +579,52 @@ typedef struct _MAPPED_ADDRESS {
 } MAPPED_ADDRESS, *PMAPPED_ADDRESS;
 
 
+
+#if(_WIN32_WINNT >= 0x0500)
+typedef enum {
+    EqualPriority,
+    KeepPrefetchedData,
+    KeepReadData
+} DISK_CACHE_RETENTION_PRIORITY;
+
+typedef enum _DISK_WRITE_CACHE_STATE {
+    DiskWriteCacheNormal,
+    DiskWriteCacheForceDisable,
+    DiskWriteCacheDisableNotSupported
+} DISK_WRITE_CACHE_STATE, *PDISK_WRITE_CACHE_STATE;
+
+
+typedef struct _DISK_CACHE_INFORMATION
+{
+    BOOLEAN ParametersSavable;
+    BOOLEAN ReadCacheEnabled;
+    BOOLEAN WriteCacheEnabled;
+    DISK_CACHE_RETENTION_PRIORITY ReadRetentionPriority;
+    DISK_CACHE_RETENTION_PRIORITY WriteRetentionPriority;
+    USHORT DisablePrefetchTransferLength;
+    BOOLEAN PrefetchScalar;
+    union {
+        struct {
+            USHORT Minimum;
+            USHORT Maximum;
+            USHORT MaximumBlocks;
+        } ScalarPrefetch;
+
+        struct {
+            USHORT Minimum;
+            USHORT Maximum;
+        } BlockPrefetch;
+    };
+
+} DISK_CACHE_INFORMATION, *PDISK_CACHE_INFORMATION;
+
+typedef struct _DISK_GROW_PARTITION {
+    ULONG PartitionNumber;
+    LARGE_INTEGER BytesToGrow;
+} DISK_GROW_PARTITION, *PDISK_GROW_PARTITION;
+#endif
+
+
 #ifdef __cplusplus
 }
 #endif