Commit in reactos/drivers/storage/floppy on MAIN
hardware.c+2-11.1 -> 1.2
readwrite.c+5-11.1 -> 1.2
+7-2
2 modified files
Disabled disk-change notification because it was breaking on Model 30 controllers; read/write is starting to work as a result

reactos/drivers/storage/floppy
hardware.c 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- hardware.c	1 Mar 2004 06:37:26 -0000	1.1
+++ hardware.c	10 Mar 2004 19:35:04 -0000	1.2
@@ -885,8 +885,9 @@
     {
       if(!(Buffer & DIR_DISKETTE_CHANGE))
 	{
+	  /* FIXME FIXME FIXME: This is wrong */
 	  KdPrint(("floppy: HdDiskChanged - Model30 - returning TRUE\n"));
-	  *DiskChanged = TRUE;
+	  *DiskChanged = FALSE;
 	}
       else
 	{

reactos/drivers/storage/floppy
readwrite.c 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- readwrite.c	1 Mar 2004 06:37:26 -0000	1.1
+++ readwrite.c	10 Mar 2004 19:35:04 -0000	1.2
@@ -235,7 +235,7 @@
 	  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 @@
 
   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 @@
       return STATUS_UNSUCCESSFUL;
     }
 
+  KdPrint(("floppy: RWSeekToCylinder: returning successfully, now on cyl %d\n", Cylinder));
+
   return STATUS_SUCCESS;
 }
 
CVSspam 0.2.8