Patch by tinus.Fix media change support for CDROMs. This fixes bug #471. Patch by...

[reactos.git] / reactos / drivers / storage / class2 / class2.c

diff --git a/reactos/drivers/storage/class2/class2.c b/reactos/drivers/storage/class2/class2.c
index 81561db..a76ce65 100644 (file)
--- a/reactos/drivers/storage/class2/class2.c
+++ b/reactos/drivers/storage/class2/class2.c
@@ -1026,6 +1026,46 @@ ScsiClassInternalIoControl(IN PDEVICE_OBJECT DeviceObject,
 }
 
 
+/*
+ * Implements part of the directives on:
+ * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/kmarch/hh/kmarch/other_c694d732-fa95-4841-8d61-2a55ee787905.xml.asp
+ */
+static VOID
+ScsiClassInvalidateMedia(IN PDEVICE_OBJECT DeviceObject,
+                        OUT NTSTATUS *Status)
+{
+  PDEVICE_EXTENSION DeviceExtension;
+  PDEVICE_EXTENSION PhysicalExtension;
+
+  DeviceExtension = (PDEVICE_EXTENSION)DeviceObject->DeviceExtension;
+  PhysicalExtension = (PDEVICE_EXTENSION)DeviceExtension->PhysicalDevice->DeviceExtension;
+
+  if (DeviceObject->Characteristics & FILE_REMOVABLE_MEDIA)
+    {
+      DPRINT("Invalidate: test char yields TRUE\n");
+    }
+  else
+    {
+      DPRINT("Invalidate: test char yields FALSE\n");
+    }
+
+  if ((DeviceObject->Characteristics & FILE_REMOVABLE_MEDIA) &&
+      (DeviceObject->Vpb->Flags & VPB_MOUNTED))
+    {
+      DPRINT("Set DO_VERIFY_VOLUME\n");
+      DeviceObject->Flags |= DO_VERIFY_VOLUME;
+      *Status = STATUS_VERIFY_REQUIRED;
+    }
+  else
+    {
+      *Status = STATUS_IO_DEVICE_ERROR;
+    }
+
+  /* Increment the media change count */
+  PhysicalExtension->MediaChangeCount++;
+}
+
+
 /*
  * @implemented
  */
@@ -1106,9 +1146,12 @@ ScsiClassInterpretSenseInfo(IN PDEVICE_OBJECT DeviceObject,
 
                case SCSI_ADSENSE_NO_MEDIA_IN_DEVICE:
                  DPRINT("SCSI_ADSENSE_NO_MEDIA_IN_DEVICE\n");
-                 *Status = STATUS_NO_MEDIA_IN_DEVICE;
+                 ScsiClassInvalidateMedia(DeviceObject,
+                                          Status);
+
+                 *Status = STATUS_NO_MEDIA_IN_DEVICE;
                  Retry = FALSE;
-                 
+
                  if((DeviceExtension->MediaChangeEvent != NULL) &&
                    (!DeviceExtension->MediaChangeEvent))
                    {
@@ -1200,22 +1243,9 @@ ScsiClassInterpretSenseInfo(IN PDEVICE_OBJECT DeviceObject,
                  break;
              }
 
-           if ((DeviceObject->Characteristics & FILE_REMOVABLE_MEDIA) &&
-               (DeviceObject->Vpb->Flags & VPB_MOUNTED))
-             {
-           DPRINT("SCSI_SENSE_UNIT_ATTENTION set DoVerifyVol\n");
-
-               DeviceObject->Flags |= DO_VERIFY_VOLUME;
-               *Status = STATUS_VERIFY_REQUIRED;
-               Retry = FALSE;
-             }
-           else
-             {
-               *Status = STATUS_IO_DEVICE_ERROR;
-             }
-
-           /* Increment the media change count */
-           PhysicalExtension->MediaChangeCount++;
+           ScsiClassInvalidateMedia(DeviceObject,
+                                    Status);
+           Retry = FALSE;
            break;
 
          case SCSI_SENSE_DATA_PROTECT: