- Implement support for split DMA transfers
 - Remove assert from CreateClose handler (still doesn't seem to get called
   consistently though)
 - Fixed an off-by-one bug for sector calculation

 --> Medium-sized files transfer to/from disk now

reactos/drivers/storage/floppy

diff -u -r1.1 -r1.2
--- floppy.c	1 Mar 2004 06:37:26 -0000	1.1
+++ floppy.c	11 Mar 2004 06:24:44 -0000	1.2
@@ -205,8 +205,6 @@

 {
   KdPrint(("floppy: CreateClose called\n"));
 

-  ASSERT(0);
-

   Irp->IoStatus.Status = STATUS_SUCCESS;
   Irp->IoStatus.Information = FILE_OPENED;
 

reactos/drivers/storage/floppy

diff -u -r1.3 -r1.4
--- readwrite.c	10 Mar 2004 20:17:26 -0000	1.3
+++ readwrite.c	11 Mar 2004 06:24:44 -0000	1.4
@@ -496,22 +496,26 @@

   /* Set up parameters for read or write */
   if(Stack->MajorFunction == IRP_MJ_READ)
     {

+      /*

       if(Stack->Parameters.Read.Length > PAGE_SIZE * DriveInfo->ControllerInfo->MapRegisters)
 	{
 	  KdPrint(("floppy: ReadWritePassive(): unable to transfer; would have to split\n"));
 	  ASSERT(0);
 	}

+        */

       Length = Stack->Parameters.Read.Length;
       DiskByteOffset = Stack->Parameters.Read.ByteOffset.u.LowPart;
       WriteToDevice = FALSE;
     }
   else
     {

+      /*

       if(Stack->Parameters.Write.Length > PAGE_SIZE * DriveInfo->ControllerInfo->MapRegisters)
 	{
 	  KdPrint(("floppy: ReadWritePassive(): unable to transfer; would have to split\n"));
 	  ASSERT(0);
 	}

+        */

       Length = Stack->Parameters.Write.Length;
       DiskByteOffset = Stack->Parameters.Write.ByteOffset.u.LowPart;
       WriteToDevice = TRUE;

@@ -579,9 +583,10 @@

    */ 
 
   /* Get map registers for DMA */

+  /* FIXME: Just request all of our map regiters for now */

   KeRaiseIrql(DISPATCH_LEVEL, &OldIrql);
   Status = IoAllocateAdapterChannel(DriveInfo->ControllerInfo->AdapterObject, DeviceObject,

-                                    DriveInfo->ControllerInfo->MapRegisters, MapRegisterCallback, DriveInfo->ControllerInfo);

+				    DriveInfo->ControllerInfo->MapRegisters, MapRegisterCallback, DriveInfo->ControllerInfo);

   KeLowerIrql(OldIrql);
 
   if(Status != STATUS_SUCCESS)

@@ -592,13 +597,13 @@

       return ;
     }
 

+

   /*
    * Read from (or write to) the device
    *
    * This has to be called in a loop, as you can only transfer data to/from a single track at
    * a time.
    */

-

   TransferByteOffset = 0;
   while(TransferByteOffset < Length)
     {

@@ -607,7 +612,10 @@

       UCHAR StartSector;
       ULONG CurrentTransferBytes;
       UCHAR CurrentTransferSectors;

-      

+
+      KdPrint(("floppy: ReadWritePassive(): iterating in while (TransferByteOffset = 0x%x of 0x%x total) - allocating %d registers\n", 
+	       TransferByteOffset, Length, DriveInfo->ControllerInfo->MapRegisters));
+  

       KeClearEvent(&DriveInfo->ControllerInfo->SynchEvent); 
 
       /*

@@ -643,13 +651,37 @@

        * We can only ask for a transfer up to the end of the track.  Then we have to re-seek and do more.
        * TODO: Support the MT bit
        */

-      if( (DriveInfo->DiskGeometry.SectorsPerTrack - StartSector) < Length / DriveInfo->DiskGeometry.BytesPerSector)
-	  CurrentTransferSectors = (UCHAR)DriveInfo->DiskGeometry.SectorsPerTrack - StartSector;

+      KdPrint(("floppy: ReadWritePassive(): computing number of sectors to transfer (StartSector 0x%x): ", StartSector));
+
+      /* 1-based sector number */
+      if( (DriveInfo->DiskGeometry.SectorsPerTrack - StartSector + 1) < Length / DriveInfo->DiskGeometry.BytesPerSector)
+	  CurrentTransferSectors = (UCHAR)DriveInfo->DiskGeometry.SectorsPerTrack - StartSector + 1;

       else
 	  CurrentTransferSectors = (UCHAR)(Length / DriveInfo->DiskGeometry.BytesPerSector);
 

+      KdPrint(("0x%x\n", CurrentTransferSectors));
+

       CurrentTransferBytes = CurrentTransferSectors * DriveInfo->DiskGeometry.BytesPerSector;
 

+      /*
+       * Adjust to map registers
+       * BUG: Does this take into account page crossings?
+       */
+      KdPrint(("floppy: ReadWritePassive(): Trying to transfer 0x%x bytes\n", CurrentTransferBytes));
+
+      ASSERT(CurrentTransferBytes);
+
+      if(BYTES_TO_PAGES(CurrentTransferBytes) > DriveInfo->ControllerInfo->MapRegisters)
+        {
+          CurrentTransferSectors = (UCHAR)((DriveInfo->ControllerInfo->MapRegisters * PAGE_SIZE) / 
+	                                    DriveInfo->DiskGeometry.BytesPerSector);
+
+          CurrentTransferBytes = CurrentTransferSectors * DriveInfo->DiskGeometry.BytesPerSector;
+
+	  KdPrint(("floppy: ReadWritePassive: limiting transfer to 0x%x bytes (0x%x sectors) due to map registers\n",
+		   CurrentTransferBytes, CurrentTransferSectors));
+        }
+

       /* set up this round's dma operation */
       /* param 2 is ReadOperation --> opposite of WriteToDevice that IoMapTransfer takes.  BAD MS. */
       KeFlushIoBuffers(Irp->MdlAddress, !WriteToDevice, TRUE);