Commit in reactos/drivers/storage/floppy on MAIN
floppy.c+1-11.4 -> 1.5
readwrite.c+3-31.8 -> 1.9
+4-4
2 modified files
fixed a couple motor start/stop bugs; fixed a seek offset

reactos/drivers/storage/floppy
floppy.c 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- floppy.c	12 Mar 2004 03:36:32 -0000	1.4
+++ floppy.c	13 Mar 2004 05:06:49 -0000	1.5
@@ -326,7 +326,7 @@
     }
 
   /* Seek back to 0 */
-  if(HwSeek(DriveInfo, 1) != STATUS_SUCCESS)
+  if(HwSeek(DriveInfo, 0) != STATUS_SUCCESS)
     {
       KdPrint(("floppy: ResetChangeFlag(): HwSeek failed; returning STATUS_IO_DEVICE_ERROR\n"));
       StopMotor(DriveInfo->ControllerInfo);

reactos/drivers/storage/floppy
readwrite.c 1.8 -> 1.9
diff -u -r1.8 -r1.9
--- readwrite.c	12 Mar 2004 03:36:32 -0000	1.8
+++ readwrite.c	13 Mar 2004 05:06:49 -0000	1.9
@@ -458,10 +458,12 @@
   /*
    * Check the change line, and if it's set, return
    */
+  StartMotor(DriveInfo);
   if(HwDiskChanged(DeviceObject->DeviceExtension, &DiskChanged) != STATUS_SUCCESS)
     {
       KdPrint(("floppy: ReadWritePassive(): unable to detect disk change; Completing with STATUS_UNSUCCESSFUL\n"));
       IoCompleteRequest(Irp, IO_NO_INCREMENT);
+      StopMotor(DriveInfo->ControllerInfo);
       return;
     }
       
@@ -479,12 +481,10 @@
 	Irp->IoStatus.Status = STATUS_NO_MEDIA_IN_DEVICE;
 
       IoCompleteRequest(Irp, IO_NO_INCREMENT);
+      StopMotor(DriveInfo->ControllerInfo);
       return;
     }
 
-  /* Start the motor and set the initial data rate */
-  StartMotor(DriveInfo);
-
   /* 
    * Figure out the media type, if we don't know it already 
    */ 
CVSspam 0.2.8