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

Timestamp:

Aug 28, 2013 11:52:38 AM (11 years ago)

Author:

vboxsync

Message:

BIOS: Fixed disk logging, stripped trailing spaces.

File:

• trunk/src/VBox/Devices/PC/BIOS/disk.c (modified) (26 diffs)

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

@@ -94 +94 @@
 
 
-/* 
+/*
  * Build translated CHS geometry given a disk size in sectors. Based on
  * Phoenix EDD 3.0. This is used as a fallback to generate sane logical
@@ -104 +104 @@
     unsigned    heads = 255;
     int         i;
-    
+
     /* Start with ~4GB limit, go down to 504MB. */
     for (i = 0; i < 4; ++i) {
@@ -133 +133 @@
     bios_dsk = read_word(0x0040,0x000E) :> &EbdaData->bdisk;
     write_byte(0x0040, 0x008e, 0);  // clear completion flag
-    
+
     // basic check : device has to be defined
     if ( (GET_ELDL() < 0x80) || (GET_ELDL() >= 0x80 + BX_MAX_STORAGE_DEVICES) ) {
@@ -139 +139 @@
         goto int13_fail;
     }
-    
+
     // Get the ata channel
     device = bios_dsk->hdidmap[GET_ELDL()-0x80];
-    
+
     // basic check : device has to be valid
     if (device >= BX_MAX_STORAGE_DEVICES) {
@@ -178 +178 @@
         sector      = (GET_CL() & 0x3f);
         head        = GET_DH();
-        
-        /* Segment and offset are in ES:BX. */        
+
+        /* Segment and offset are in ES:BX. */
         if ( (count > 128) || (count == 0) ) {
             BX_INFO("%s: function %02x, count out of range!\n", __func__, GET_AH());
@@ -195 +195 @@
             goto int13_fail;
         }
-        
+
         // FIXME verify
         if ( GET_AH() == 0x04 )
@@ -206 +206 @@
             sector = 0; // this forces the command to be lba
         }
+
+        BX_DEBUG_INT13_HD("%s: %d sectors from lba %lu @ %04x:%04x\n", __func__,
+                          count, lba, ES, BX);
 
         /* Clear the count of transferred sectors/bytes. */
@@ -225 +228 @@
         // Set nb of sector transferred
         SET_AL(bios_dsk->drqp.trsfsectors);
-        
+
         if (status != 0) {
             BX_INFO("%s: function %02x, error %02x !\n", __func__, GET_AH(), status);
@@ -231 +234 @@
             goto int13_fail_noah;
         }
-        
+
         goto int13_success;
         break;
@@ -256 +259 @@
         SET_DH(nlh - 1);
         SET_DL(count); /* FIXME returns 0, 1, or n hard drives */
-        
+
         // FIXME should set ES & DI
         // @todo: Actually, the above comment is nonsense.
-        
+
         goto int13_success;
         break;
@@ -287 +290 @@
         CX = lba >> 16;
         DX = lba & 0xffff;
-        
+
         SET_AH(3);  // hard disk accessible
         goto int13_success_noah;
@@ -341 +344 @@
     bios_dsk = read_word(0x0040,0x000E) :> &EbdaData->bdisk;
 
-    BX_DEBUG_INT13_HD("%s: AX=%04x BX=%04x CX=%04x DX=%04x ES=%04x\n", __func__, AX, BX, CX, DX, ES);
-    
+    BX_DEBUG_INT13_HD("%s: AX=%04x BX=%04x CX=%04x DX=%04x ES=%04x DS=%04x SI=%04x\n",
+                      __func__, AX, BX, CX, DX, ES, DS, SI);
+
     write_byte(0x0040, 0x008e, 0);  // clear completion flag
-    
+
     // basic check : device has to be defined
     if ( (GET_ELDL() < 0x80) || (GET_ELDL() >= 0x80 + BX_MAX_STORAGE_DEVICES) ) {
@@ -350 +354 @@
         goto int13x_fail;
     }
-    
+
     // Get the ata channel
     device = bios_dsk->hdidmap[GET_ELDL()-0x80];
-    
+
     // basic check : device has to be valid
     if (device >= BX_MAX_STORAGE_DEVICES) {
@@ -380 +384 @@
         offset  = i13_ext->offset;
 
-        BX_DEBUG_INT13_HD("%s: %d sectors from lba %u @ %04x:%04x\n", __func__, 
+        BX_DEBUG_INT13_HD("%s: %d sectors from lba %lu @ %04x:%04x\n", __func__,
                           count, i13_ext->lba1, segment, offset);
 
@@ -389 +393 @@
             goto int13x_fail;
         }
-        
+
         // Get 32 bits lba and check
         lba = i13_ext->lba1;
@@ -414 +418 @@
         bios_dsk->drqp.sector  = 0;     /* Indicate LBA. */
         bios_dsk->drqp.dev_id  = device;
-        
+
         /* Execute the read or write command. */
         status = dskacc[type].a[GET_AH() - 0x42](bios_dsk);
         count  = bios_dsk->drqp.trsfsectors;
         i13_ext->count = count;
-        
+
         if (status != 0) {
             BX_INFO("%s: function %02x, error %02x !\n", __func__, GET_AH(), status);
@@ -425 +429 @@
             goto int13x_fail_noah;
         }
-        
+
         goto int13x_success;
         break;
@@ -446 +450 @@
         if (size < 0x1a)
             goto int13x_fail;
-        
+
         /* Fill in EDD 1.x table. */
         if (size >= 0x1a) {
@@ -471 +475 @@
             uint8_t     channel, irq, mode, checksum, i, translation;
             uint16_t    iobase1, iobase2, options;
-            
+
             dpt->size = 0x1e;
             dpt->dpte_segment = ebda_seg;
             dpt->dpte_offset  = (uint16_t)&EbdaData->bdisk.dpte;
-            
+
             // Fill in dpte
             channel = device / 2;
@@ -483 +487 @@
             mode    = bios_dsk->devices[device].mode;
             translation = bios_dsk->devices[device].translation;
-            
+
             options  = (translation == GEO_TRANSLATION_NONE ? 0 : 1 << 3);  // chs translation
             options |= (1 << 4);    // lba translation
@@ -489 +493 @@
             options |= (translation == GEO_TRANSLATION_LBA ? 1 : 0 << 9);
             options |= (translation == GEO_TRANSLATION_RECHS ? 3 : 0 << 9);
-            
+
             bios_dsk->dpte.iobase1  = iobase1;
             bios_dsk->dpte.iobase2  = iobase2;
@@ -501 +505 @@
             bios_dsk->dpte.reserved = 0;
             bios_dsk->dpte.revision = 0x11;
-            
+
             checksum = 0;
             for (i = 0; i < 15; ++i)
@@ -517 +521 @@
             iface   = bios_dsk->channels[channel].iface;
             iobase1 = bios_dsk->channels[channel].iobase1;
-            
+
             dpt->size       = 0x42;
             dpt->key        = 0xbedd;
@@ -523 +527 @@
             dpt->reserved1  = 0;
             dpt->reserved2  = 0;
-            
+
             if (iface == ATA_IFACE_ISA) {
                 dpt->host_bus[0] = 'I';
@@ -541 +545 @@
             dpt->iface_type[6] = ' ';
             dpt->iface_type[7] = ' ';
-            
+
             if (iface == ATA_IFACE_ISA) {
                 ((uint16_t __far *)dpt->iface_path)[0] = iobase1;
@@ -553 +557 @@
             ((uint16_t __far *)dpt->device_path)[1] = 0;
             ((uint32_t __far *)dpt->device_path)[1] = 0;
-            
+
             checksum = 0;
             for (i = 30; i < 64; i++)