[DISK]

Get rid of explicit status definition. Import ntiologc.h instead.

svn path=/trunk/; revision=68059

diff --git a/reactos/drivers/storage/class/disk/disk.c b/reactos/drivers/storage/class/disk/disk.c
index d896ec4..1c40a14 100644 (file)
--- a/reactos/drivers/storage/class/disk/disk.c
+++ b/reactos/drivers/storage/class/disk/disk.c
@@ -12,14 +12,13 @@
 #include <ntddscsi.h>
 #include <mountdev.h>
 #include <mountmgr.h>
 #include <ntddscsi.h>
 #include <mountdev.h>
 #include <mountmgr.h>

+#include <ntiologc.h>

 #include <include/class2.h>
 #include <stdio.h>
 
 #define NDEBUG
 #include <debug.h>
 
 #include <include/class2.h>
 #include <stdio.h>
 
 #define NDEBUG
 #include <debug.h>
 

-#define IO_WRITE_CACHE_ENABLED  ((NTSTATUS)0x80040020L)
-#define IO_WRITE_CACHE_DISABLED ((NTSTATUS)0x80040022L)

 
 #ifdef POOL_TAGGING
 #ifdef ExAllocatePool
 
 #ifdef POOL_TAGGING
 #ifdef ExAllocatePool


@@ -4810,6 +4809,7 @@ Return Value:
     ULONG                     numberListElements;
     BOOLEAN                   found;
 
     ULONG                     numberListElements;
     BOOLEAN                   found;
 

+            DPRINT1("UpdateDeviceObjects()\n");

     partitionCount = ((partitionList->PartitionCount + 3) / 4) * 4;
 
     //
     partitionCount = ((partitionList->PartitionCount + 3) / 4) * 4;
 
     //


@@ -4910,10 +4910,11 @@ Return Value:
             if (partitionEntry->PartitionLength.QuadPart ==
                       deviceExtension->PartitionLength.QuadPart) {
 
             if (partitionEntry->PartitionLength.QuadPart ==
                       deviceExtension->PartitionLength.QuadPart) {
 

-                DebugPrint((3,
+//                DebugPrint((3,
+            DPRINT1(

                            "UpdateDeviceObjects: Found match for \\Harddisk%d\\Partition%d\n",
                            physicalExtension->DeviceNumber,
                            "UpdateDeviceObjects: Found match for \\Harddisk%d\\Partition%d\n",
                            physicalExtension->DeviceNumber,

-                           diskData->PartitionNumber));
+                           diskData->PartitionNumber);

 
                 //
                 // Indicate match is found and set partition number
 
                 //
                 // Indicate match is found and set partition number


@@ -4949,11 +4950,12 @@ Return Value:
 
             diskData->PartitionOrdinal = partitionOrdinal;
 
 
             diskData->PartitionOrdinal = partitionOrdinal;
 

-            DebugPrint((1,
+//            DebugPrint((1,
+            DPRINT1(

                        "UpdateDeviceObjects: Disk %d ordinal %d is partition %d\n",
                        physicalExtension->DeviceNumber,
                        diskData->PartitionOrdinal,
                        "UpdateDeviceObjects: Disk %d ordinal %d is partition %d\n",
                        physicalExtension->DeviceNumber,
                        diskData->PartitionOrdinal,

-                       diskData->PartitionNumber));
+                       diskData->PartitionNumber);

 
         } else {
 
 
         } else {
 


@@ -4961,10 +4963,11 @@ Return Value:
             // no match was found, indicate this partition is gone.
             //
 
             // no match was found, indicate this partition is gone.
             //
 

-            DebugPrint((1,
+//            DebugPrint((1,
+            DPRINT1(

                        "UpdateDeviceObjects: Deleting \\Device\\Harddisk%x\\Partition%x\n",
                        physicalExtension->DeviceNumber,
                        "UpdateDeviceObjects: Deleting \\Device\\Harddisk%x\\Partition%x\n",
                        physicalExtension->DeviceNumber,

-                       diskData->PartitionNumber));
+                       diskData->PartitionNumber);

 
             deviceExtension->PartitionLength.QuadPart = (LONGLONG) 0;
         }
 
             deviceExtension->PartitionLength.QuadPart = (LONGLONG) 0;
         }


@@ -5086,9 +5089,10 @@ Return Value:
                 continue;
             }
 
                 continue;
             }
 

-            DebugPrint((3,
+//            DebugPrint((3,
+            DPRINT1(

                         "UpdateDeviceObjects: Create device object %s\n",
                         "UpdateDeviceObjects: Create device object %s\n",

-                        ntNameBuffer));
+                        ntNameBuffer);

 
             //
             // This is a new name. Create the device object to represent it.
 
             //
             // This is a new name. Create the device object to represent it.


@@ -5103,9 +5107,10 @@ Return Value:
                                     &deviceObject);
 
             if (!NT_SUCCESS(status)) {
                                     &deviceObject);
 
             if (!NT_SUCCESS(status)) {

-                DebugPrint((1,
+//                DebugPrint((1,
+            DPRINT1(

                             "UpdateDeviceObjects: Can't create device %s\n",
                             "UpdateDeviceObjects: Can't create device %s\n",

-                            ntNameBuffer));
+                            ntNameBuffer);

                 RtlFreeUnicodeString(&ntUnicodeString);
                 continue;
             }
                 RtlFreeUnicodeString(&ntUnicodeString);
                 continue;
             }


@@ -5196,10 +5201,11 @@ Return Value:
 
             diskData = (PDISK_DATA)(deviceExtension + 1);
 
 
             diskData = (PDISK_DATA)(deviceExtension + 1);
 

-            DebugPrint((1,
+//            DebugPrint((1,
+            DPRINT1(

                         "UpdateDeviceObjects: Used existing device object \\Device\\Harddisk%x\\Partition%x\n",
                         physicalExtension->DeviceNumber,
                         "UpdateDeviceObjects: Used existing device object \\Device\\Harddisk%x\\Partition%x\n",
                         physicalExtension->DeviceNumber,

-                        partitionNumber));
+                        partitionNumber);

         }
 
         //
         }
 
         //


@@ -5214,10 +5220,11 @@ Return Value:
         diskData->HiddenSectors = partitionEntry->HiddenSectors;
         diskData->PartitionOrdinal = partitionOrdinal;
 
         diskData->HiddenSectors = partitionEntry->HiddenSectors;
         diskData->PartitionOrdinal = partitionOrdinal;
 

-        DebugPrint((1,
+//        DebugPrint((1,
+            DPRINT1(

                    "UpdateDeviceObjects: Ordinal %d is partition %d\n",
                    diskData->PartitionOrdinal,
                    "UpdateDeviceObjects: Ordinal %d is partition %d\n",
                    diskData->PartitionOrdinal,

-                   diskData->PartitionNumber));
+                   diskData->PartitionNumber);

 
         //
         // Update partition number passed in to indicate the
 
         //
         // Update partition number passed in to indicate the