Changeset 34966 in vbox for trunk/src/VBox/Devices/PC

Timestamp:

Dec 10, 2010 5:47:25 PM (14 years ago)

Author:

vboxsync

Message:

BIOS: Read multiple sectors at a time.

File:

• trunk/src/VBox/Devices/PC/BIOS/rombios.c (modified) (6 diffs)

trunk/src/VBox/Devices/PC/BIOS/rombios.c

@@ -2261 +2261 @@
 #ifdef VBOX
 #define ATA_CMD_READ_SECTORS_EXT             0x24
+#define ATA_CMD_READ_MULTIPLE_EXT            0x29
+#define ATA_CMD_WRITE_MULTIPLE_EXT           0x39
 #endif /* VBOX */
 #define ATA_CMD_READ_VERIFY_SECTORS          0x40
@@ -2338 +2340 @@
     write_byte(ebda_seg,&EbdaData->ata.devices[device].lock,0);
     write_byte(ebda_seg,&EbdaData->ata.devices[device].mode,ATA_MODE_NONE);
-    write_word(ebda_seg,&EbdaData->ata.devices[device].blksize,0);
+    write_word(ebda_seg,&EbdaData->ata.devices[device].blksize,0x200);
     write_byte(ebda_seg,&EbdaData->ata.devices[device].translation,ATA_TRANSLATION_NONE);
     write_word(ebda_seg,&EbdaData->ata.devices[device].lchs.heads,0);
@@ -2864 +2866 @@
   iobase2 = read_word(ebda_seg, &EbdaData->ata.channels[channel].iobase2);
   mode    = read_byte(ebda_seg, &EbdaData->ata.devices[device].mode);
-  blksize = 0x200; // was = read_word(ebda_seg, &EbdaData->ata.devices[device].blksize);
+  blksize = read_word(ebda_seg, &EbdaData->ata.devices[device].blksize);
   if (mode == ATA_MODE_PIO32) blksize>>=2;
   else blksize>>=1;
@@ -2919 +2921 @@
   outb(iobase1 + ATA_CB_DH, (slave ? ATA_CB_DH_DEV1 : ATA_CB_DH_DEV0) | (Bit8u) head );
   outb(iobase1 + ATA_CB_CMD, command);
+
+  if (command == ATA_CMD_READ_MULTIPLE)
+    count = 1;
 
   while (1) {
@@ -5576 +5581 @@
         else
 #endif
-          status=ata_cmd_data_in(device, ATA_CMD_READ_SECTORS, count, cylinder, head, sector, lba, segment, offset);
+          write_word(ebda_seg,&EbdaData->ata.devices[device].blksize,count * 0x200);  
+          status=ata_cmd_data_in(device, ATA_CMD_READ_MULTIPLE, count, cylinder, head, sector, lba, segment, offset);
+          write_word(ebda_seg,&EbdaData->ata.devices[device].blksize,0x200);  
       }
       else
@@ -5753 +5760 @@
           if (count >= 256 || lba + count >= 268435456)
             status=ata_cmd_data_in(device, ATA_CMD_READ_SECTORS_EXT, count, 0, 0, 0, lba, segment, offset);
-          else
-            status=ata_cmd_data_in(device, ATA_CMD_READ_SECTORS, count, 0, 0, 0, lba, segment, offset);
+          else {
+            write_word(ebda_seg,&EbdaData->ata.devices[device].blksize,count * 0x200);  
+            status=ata_cmd_data_in(device, ATA_CMD_READ_MULTIPLE, count, 0, 0, 0, lba, segment, offset);
+            write_word(ebda_seg,&EbdaData->ata.devices[device].blksize,0x200);  
+          }
         }
       }