Changeset 62301 in vbox for trunk/src/VBox

Timestamp:

Jul 18, 2016 1:41:02 PM (9 years ago)

Author:

vboxsync

Message:

BIOS: Mark floppy media as unknown if operation fails.

File:

• trunk/src/VBox/Devices/PC/BIOS/floppy.c (modified) (14 diffs)

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

@@ -122 +122 @@
 #endif /* !VBOX_WITH_FLOPPY_IRQ_POLLING */
 
-void floppy_reset_controller(void)
+void floppy_reset_controller(uint16_t drive)
 {
     uint8_t     val8;
@@ -135 +135 @@
         val8 = inb(0x3f4);
     } while ( (val8 & 0xc0) != 0x80 );
+
+    // Mark media in drive as unknown
+    val8 = read_byte(0x0040, 0x0090 + drive);
+    val8 &= ~0x10;
+    write_byte(0x0040, 0x90 + drive, val8);
+
 }
 
@@ -523 +529 @@
         // see if drive exists
         if (floppy_drive_exists(drive) == 0) {
+            BX_DEBUG_INT13_FL("failed (not ready)\n");
             SET_AH(0x80); // not responding
             set_diskette_ret_status(0x80);
@@ -533 +540 @@
         if (floppy_media_known(drive) == 0) {
             if (floppy_media_sense(drive) == 0) {
+                BX_DEBUG_INT13_FL("media not found\n");
                 SET_AH(0x0C); // Media type not found
                 set_diskette_ret_status(0x0C);
@@ -584 +592 @@
             outb(0x0005, base_count>>8);
             BX_DEBUG_INT13_FL("xfer buf %x bytes at %x:%x\n",
-                              base_count, page, base_address);
+                              base_count + 1, page, base_address);
 
             // port 0b: DMA-1 Mode Register
@@ -614 +622 @@
             outb(0x03f5, 0); // Gap length
             outb(0x03f5, 0xff); // Gap length
+            BX_DEBUG_INT13_FL("read initiated\n");
 
 #ifdef VBOX_WITH_FLOPPY_IRQ_POLLING
@@ -623 +632 @@
                 val8 = read_byte(0x0040, 0x0040);
                 if (val8 == 0) {
-                    floppy_reset_controller();
+                    BX_DEBUG_INT13_FL("failed (not ready)\n");
+                    floppy_reset_controller(drive);
                     SET_AH(0x80); // drive not ready (timeout)
                     set_diskette_ret_status(0x80);
@@ -645 +655 @@
             val8 = floppy_wait_for_interrupt_or_timeout();
             if (val8 == 0) { /* Note! Interrupts enabled in this branch. */
-                floppy_reset_controller();
+                BX_DEBUG_INT13_FL("failed (not ready)\n");
+                floppy_reset_controller(drive);
                 SET_AH(0x80); // drive not ready (timeout)
                 set_diskette_ret_status(0x80);
@@ -666 +677 @@
 
             if ( (return_status[0] & 0xc0) != 0 ) {
+                BX_DEBUG_INT13_FL("failed (FDC failure)\n");
+                floppy_reset_controller(drive);
                 SET_AH(0x20);
                 set_diskette_ret_status(0x20);
@@ -676 +689 @@
             rep_movsw(ES :> BX, ES :> BX, num_sectors * 512 / 2);
 #endif
+            BX_DEBUG_INT13_FL("success!\n");
             // ??? should track be new val from return_status[3] ?
             set_diskette_current_cyl(drive, track);
@@ -760 +774 @@
                 val8 = read_byte(0x0040, 0x0040);
                 if (val8 == 0) {
-                    floppy_reset_controller();
+                    floppy_reset_controller(drive);
                     SET_AH(0x80); // drive not ready (timeout)
                     set_diskette_ret_status(0x80);
@@ -781 +795 @@
             val8 = floppy_wait_for_interrupt_or_timeout();
             if (val8 == 0) { /* Note! Interrupts enabled in this branch. */
-                floppy_reset_controller();
+                floppy_reset_controller(drive);
                 SET_AH(0x80); // drive not ready (timeout)
                 set_diskette_ret_status(0x80);
@@ -927 +941 @@
             val8 = read_byte(0x0040, 0x0040);
             if (val8 == 0) {
-                floppy_reset_controller();
+                floppy_reset_controller(drive);
                 SET_AH(0x80); // drive not ready (timeout)
                 set_diskette_ret_status(0x80);
@@ -947 +961 @@
         val8 = floppy_wait_for_interrupt_or_timeout();
         if (val8 == 0) { /* Note! Interrupts enabled in this branch. */
-            floppy_reset_controller();
+            floppy_reset_controller(drive);
             SET_AH(0x80); // drive not ready (timeout)
             set_diskette_ret_status(0x80);