Changeset 47711 in vbox

Timestamp:

Aug 13, 2013 7:45:10 PM (11 years ago)

Author:

vboxsync

Message:

DevFdc: Improve error reporting.

File:

• trunk/src/VBox/Devices/Storage/DevFdc.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/Storage/DevFdc.cpp

@@ -608 +608 @@
     FD_SR1_MA       = 0x01, /* Missing address mark */
     FD_SR1_NW       = 0x02, /* Not writable */
+    FD_SR1_ND       = 0x04, /* No data */
     FD_SR1_EC       = 0x80  /* End of cylinder */
 };
 
 enum {
+    FD_SR2_MD       = 0x01, /* Missing data address mark */
     FD_SR2_SNS      = 0x04, /* Scan not satisfied */
     FD_SR2_SEH      = 0x08  /* Scan equal hit */
@@ -1260 +1262 @@
         FLOPPY_DPRINTF("data rate mismatch (fdc=%d, media=%d)\n",
                        fdctrl->dsr & FD_DSR_DRATEMASK, cur_drv->media_rate);
-        fdctrl_stop_transfer(fdctrl, FD_SR0_ABNTERM, FD_SR1_MA, 0x00);
+        fdctrl_stop_transfer(fdctrl, FD_SR0_ABNTERM, FD_SR1_MA, FD_SR2_MD);
         fdctrl->fifo[3] = kt;
         fdctrl->fifo[4] = kh;
@@ -2142 +2144 @@
     if (!cur_drv->max_track) {
         FLOPPY_DPRINTF("read id when no disk in drive\n");
-        fdctrl_stop_transfer(fdctrl, FD_SR0_ABNTERM, FD_SR1_MA, 0x00);
+        fdctrl_stop_transfer(fdctrl, FD_SR0_ABNTERM, FD_SR1_MA | FD_SR1_ND, FD_SR2_MD);
     } else if ((fdctrl->dsr & FD_DSR_DRATEMASK) != cur_drv->media_rate) {
         FLOPPY_DPRINTF("read id rate mismatch (fdc=%d, media=%d)\n",
                        fdctrl->dsr & FD_DSR_DRATEMASK, cur_drv->media_rate);
-        fdctrl_stop_transfer(fdctrl, FD_SR0_ABNTERM, FD_SR1_MA, 0x00);
+        fdctrl_stop_transfer(fdctrl, FD_SR0_ABNTERM, FD_SR1_MA | FD_SR1_ND, FD_SR2_MD);
     }
     else