Disabled disk-change notification because it was breaking on Model 30 controllers...

svn path=/trunk/; revision=8626

diff --git a/reactos/drivers/storage/floppy/hardware.c b/reactos/drivers/storage/floppy/hardware.c
index da4d67b..7945158 100644 (file)
--- a/reactos/drivers/storage/floppy/hardware.c
+++ b/reactos/drivers/storage/floppy/hardware.c
@@ -885,8 +885,9 @@ NTSTATUS NTAPI HwDiskChanged(PDRIVE_INFO DriveInfo,
     {
       if(!(Buffer & DIR_DISKETTE_CHANGE))
        {
+         /* FIXME FIXME FIXME: This is wrong */
          KdPrint(("floppy: HdDiskChanged - Model30 - returning TRUE\n"));
-         *DiskChanged = TRUE;
+         *DiskChanged = FALSE;
        }
       else
        {

diff --git a/reactos/drivers/storage/floppy/readwrite.c b/reactos/drivers/storage/floppy/readwrite.c
index dc05b6d..8951307 100644 (file)
--- a/reactos/drivers/storage/floppy/readwrite.c
+++ b/reactos/drivers/storage/floppy/readwrite.c
@@ -235,7 +235,7 @@ static NTSTATUS NTAPI RWDetermineMediaType(PDRIVE_INFO DriveInfo)
          return STATUS_UNSUCCESSFUL; /* if we can't even write to the controller, it's hopeless */
        }
    
-      /* Wait for the recalibrate to finish */
+      /* Wait for the ReadID to finish */
       WaitForControllerInterrupt(DriveInfo->ControllerInfo);
 
       if(HwReadIdResult(DriveInfo->ControllerInfo, NULL, NULL) != STATUS_SUCCESS)
@@ -280,6 +280,8 @@ static NTSTATUS NTAPI RWSeekToCylinder(PDRIVE_INFO DriveInfo,
 
   PAGED_CODE();
 
+  KdPrint(("floppy: RWSeekToCylinder called drive 0x%x cylinder %d\n", DriveInfo, Cylinder));
+
   /* Clear any spurious interrupts */
   KeClearEvent(&DriveInfo->ControllerInfo->SynchEvent);
 
@@ -319,6 +321,8 @@ static NTSTATUS NTAPI RWSeekToCylinder(PDRIVE_INFO DriveInfo,
       return STATUS_UNSUCCESSFUL;
     }
 
+  KdPrint(("floppy: RWSeekToCylinder: returning successfully, now on cyl %d\n", Cylinder));
+
   return STATUS_SUCCESS;
 }