Changeset 48081 in vbox for trunk/src/VBox

Timestamp:

Aug 27, 2013 1:03:34 PM (11 years ago)

Author:

vboxsync

Message:

DevFdc: Allow reformatting a floppy.

File:

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

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

@@ -177 +177 @@
     uint8_t track;
     uint8_t sect;
+    uint8_t ltrk;             /* Logical track */
     /* Media */
     fdrive_flags_t flags;
@@ -287 +288 @@
         drv->sect = sect;
     }
+    drv->ltrk = drv->track;
 
     return ret;
@@ -297 +299 @@
     drv->head = 0;
     drv->track = 0;
+    drv->ltrk = 0;
     drv->sect = 1;
 }
@@ -535 +538 @@
     FD_DIR_SCANE   = 2,
     FD_DIR_SCANL   = 3,
-    FD_DIR_SCANH   = 4
+    FD_DIR_SCANH   = 4,
+    FD_DIR_FORMAT  = 5
 };
 
@@ -1165 +1169 @@
             } else {
                 cur_drv->head = 0;
-                cur_drv->track++;
+                cur_drv->ltrk++;
                 if ((cur_drv->flags & FDISK_DBL_SIDES) == 0)
                     return 0;
             }
         } else {
-            cur_drv->track++;
+            cur_drv->ltrk++;
             return 0;
         }
@@ -1195 +1199 @@
     fdctrl->fifo[1] = status1;
     fdctrl->fifo[2] = status2;
-    fdctrl->fifo[3] = cur_drv->track;
+    fdctrl->fifo[3] = cur_drv->ltrk;
     fdctrl->fifo[4] = cur_drv->head;
     fdctrl->fifo[5] = cur_drv->sect;
@@ -1316 +1320 @@
               direction == FD_DIR_SCANH) && dma_mode == 0) ||
             (direction == FD_DIR_WRITE && dma_mode == 2) ||
-            (direction == FD_DIR_READ && dma_mode == 1)) {
+            (direction == FD_DIR_READ && (dma_mode == 1 || dma_mode == 0))) {
             /* No access is allowed until DMA transfer has completed */
             fdctrl->msr &= ~FD_MSR_RQM;
@@ -1344 +1348 @@
 }
 
+/* Prepare a format data transfer (either DMA or FIFO) */
+static void fdctrl_start_format(fdctrl_t *fdctrl)
+{
+    fdrive_t *cur_drv;
+    uint8_t ns, dp, kh, kt, ks;
+
+    SET_CUR_DRV(fdctrl, fdctrl->fifo[1] & FD_DOR_SELMASK);
+    cur_drv = get_cur_drv(fdctrl);
+    kt = cur_drv->track;
+    kh = (fdctrl->fifo[1] & 0x04) >> 2;
+    ns = fdctrl->fifo[3];
+    dp = fdctrl->fifo[5];
+    ks = 1;
+    FLOPPY_DPRINTF("Start format at %d %d %02x, %d sect, pat %02x (%d)\n",
+                   GET_CUR_DRV(fdctrl), kh, kt, ns, dp,
+                   fd_sector_calc(kh, kt, ks, cur_drv->last_sect, NUM_SIDES(cur_drv)));
+    switch (fd_seek(cur_drv, kh, kt, ks, false)) {
+    case 2:
+        /* sect too big */
+        fdctrl_stop_transfer(fdctrl, FD_SR0_ABNTERM, 0x00, 0x00);
+        fdctrl->fifo[3] = kt;
+        fdctrl->fifo[4] = kh;
+        fdctrl->fifo[5] = ks;
+        return;
+    case 3:
+        /* track too big */
+        fdctrl_stop_transfer(fdctrl, FD_SR0_ABNTERM, FD_SR1_EC, 0x00);
+        fdctrl->fifo[3] = kt;
+        fdctrl->fifo[4] = kh;
+        fdctrl->fifo[5] = ks;
+        return;
+    case 4:
+        /* No seek enabled */
+        fdctrl_stop_transfer(fdctrl, FD_SR0_ABNTERM, 0x00, 0x00);
+        fdctrl->fifo[3] = kt;
+        fdctrl->fifo[4] = kh;
+        fdctrl->fifo[5] = ks;
+        return;
+    case 1:
+        break;
+    default:
+        break;
+    }
+    /* It's not clear what should happen if the data rate does not match. */
+#if 0
+    /* Check the data rate. If the programmed data rate does not match
+     * the currently inserted medium, the operation has to fail.
+     */
+    if ((fdctrl->dsr & FD_DSR_DRATEMASK) != cur_drv->media_rate) {
+        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, FD_SR2_MD);
+        fdctrl->fifo[3] = kt;
+        fdctrl->fifo[4] = kh;
+        fdctrl->fifo[5] = ks;
+        return;
+    }
+#endif
+    /* Set the FIFO state */
+    fdctrl->data_dir = FD_DIR_FORMAT;
+    fdctrl->data_pos = 0;
+    fdctrl->msr |= FD_MSR_CMDBUSY;
+    fdctrl->data_state &= ~(FD_STATE_MULTI | FD_STATE_SEEK);
+    fdctrl->data_len = ns * 4;
+    fdctrl->eot = ns;
+    if (fdctrl->dor & FD_DOR_DMAEN) {
+        int dma_mode;
+        /* DMA transfer are enabled. Check if DMA channel is well programmed */
+#ifndef VBOX
+        dma_mode = DMA_get_channel_mode(fdctrl->dma_chann);
+#else
+        dma_mode = PDMDevHlpDMAGetChannelMode (fdctrl->pDevIns, fdctrl->dma_chann);
+#endif
+        dma_mode = (dma_mode >> 2) & 3;
+        FLOPPY_DPRINTF("dma_mode=%d direction=%d (%d - %d)\n",
+                       dma_mode, fdctrl->data_dir,
+                       (128 << fdctrl->fifo[2]) *
+                       (cur_drv->last_sect + 1), fdctrl->data_len);
+        if (fdctrl->data_dir == FD_DIR_FORMAT && dma_mode == 2) {
+            /* No access is allowed until DMA transfer has completed */
+            fdctrl->msr &= ~FD_MSR_RQM;
+            /* Now, we just have to wait for the DMA controller to
+             * recall us...
+             */
+#ifndef VBOX
+            DMA_hold_DREQ(fdctrl->dma_chann);
+            DMA_schedule(fdctrl->dma_chann);
+#else
+            PDMDevHlpDMASetDREQ (fdctrl->pDevIns, fdctrl->dma_chann, 1);
+            PDMDevHlpDMASchedule (fdctrl->pDevIns);
+#endif
+            return;
+        } else {
+            FLOPPY_ERROR("dma_mode=%d direction=%d\n", dma_mode, fdctrl->data_dir);
+        }
+    }
+    FLOPPY_DPRINTF("start non-DMA format\n");
+    fdctrl->msr |= FD_MSR_NONDMA;
+    /* IO based transfer: calculate len */
+    fdctrl_raise_irq(fdctrl, 0x00);
+
+    return;
+}
+
 /* Prepare a transfer of deleted data */
 static void fdctrl_start_transfer_del(fdctrl_t *fdctrl, int direction)
@@ -1439 +1547 @@
         goto transfer_error;
     }
+
+#ifdef VBOX
+        if (cur_drv->ro)
+        {
+            if (fdctrl->data_dir == FD_DIR_WRITE || fdctrl->data_dir == FD_DIR_FORMAT)
+            {
+                /* Handle readonly medium early, no need to do DMA, touch the
+                 * LED or attempt any writes. A real floppy doesn't attempt
+                 * to write to readonly media either. */
+                fdctrl_stop_transfer(fdctrl, FD_SR0_ABNTERM | FD_SR0_SEEK, FD_SR1_NW,
+                                     0x00);
+                goto transfer_error;
+            }
+        }
+#endif
+
+
     rel_pos = fdctrl->data_pos % FD_SECTOR_LEN;
     for (start_pos = fdctrl->data_pos; fdctrl->data_pos < dma_len;) {
@@ -1449 +1574 @@
                        cur_drv->track, cur_drv->sect, fd_sector(cur_drv),
                        fd_sector(cur_drv) * FD_SECTOR_LEN);
-        if (fdctrl->data_dir != FD_DIR_WRITE ||
-            len < FD_SECTOR_LEN || rel_pos != 0) {
+        if (fdctrl->data_dir != FD_DIR_FORMAT &&
+            (fdctrl->data_dir != FD_DIR_WRITE ||
+            len < FD_SECTOR_LEN || rel_pos != 0)) {
             /* READ & SCAN commands and realign to a sector for WRITE */
 #ifdef VBOX
@@ -1488 +1614 @@
             /* WRITE commands */
 #ifdef VBOX
-            if (cur_drv->ro)
-            {
-                /* Handle readonly medium early, no need to do DMA, touch the
-                 * LED or attempt any writes. A real floppy doesn't attempt
-                 * to write to readonly media either. */
-                fdctrl_stop_transfer(fdctrl, FD_SR0_ABNTERM | FD_SR0_SEEK, FD_SR1_NW,
-                                     0x00);
-                goto transfer_error;
-            }
-
             {
                 uint32_t written;
@@ -1521 +1637 @@
             }
             break;
+#ifdef VBOX
+        case FD_DIR_FORMAT:
+            /* FORMAT command */
+            {
+                uint8_t  eot    = fdctrl->fifo[3];
+                uint8_t  filler = fdctrl->fifo[5];
+                uint32_t written;
+                int      sct;
+                int rc2 = PDMDevHlpDMAReadMemory(fdctrl->pDevIns, nchan,
+                                                 fdctrl->fifo + rel_pos,
+                                                 fdctrl->data_pos,
+                                                 len, &written);
+                AssertMsgRC (rc2, ("DMAReadMemory -> %Rrc\n", rc2));
+
+                /* Fill the entire track with desired data pattern. */
+                FLOPPY_DPRINTF("formatting track: %d sectors, pattern %02x\n",
+                               eot, filler);
+                memset(fdctrl->fifo, filler, FD_SECTOR_LEN);
+                for (sct = 0; sct < eot; ++sct)
+                {
+                    rc = blk_write(cur_drv, fd_sector(cur_drv), fdctrl->fifo, 1);
+                    if (RT_FAILURE(rc))
+                    {
+                        FLOPPY_ERROR("formatting sector %d\n", fd_sector(cur_drv));
+                        fdctrl_stop_transfer(fdctrl, FD_SR0_ABNTERM | FD_SR0_SEEK, 0x00, 0x00);
+                        goto transfer_error;
+                    }
+                    fdctrl_seek_to_next_sect(fdctrl, cur_drv);
+                }
+            }
+            break;
+#endif
         default:
             /* SCAN commands */
@@ -1826 +1974 @@
     fdrive_t *cur_drv;
     uint8_t ns, dp;
-    int did_seek = 0;
 
     SET_CUR_DRV(fdctrl, fdctrl->fifo[1] & FD_DOR_SELMASK);
     cur_drv = get_cur_drv(fdctrl);
+    fdctrl->data_state &= ~(FD_STATE_MULTI | FD_STATE_SEEK);
     ns = fdctrl->fifo[3];
     dp = fdctrl->fifo[5];
@@ -1839 +1987 @@
                    fdctrl->fifo[3], fdctrl->fifo[4], fdctrl->fifo[5]);
 
-    fdctrl->data_state |= FD_STATE_FORMAT;
-    if (fdctrl->fifo[0] & 0x80)
-        fdctrl->data_state |= FD_STATE_MULTI;
+    /* Since we cannot actually format anything, we have to make sure that
+     * whatever new format the guest is trying to establish matches the
+     * existing format of the medium.
+     */
+    if (cur_drv->last_sect != ns || fdctrl->fifo[2] != 2)
+        fdctrl_stop_transfer(fdctrl, FD_SR0_ABNTERM, FD_SR1_NW, 0);
     else
-        fdctrl->data_state &= ~FD_STATE_MULTI;
-    fdctrl->data_state &= ~FD_STATE_SEEK;
-    cur_drv->bps =
-        fdctrl->fifo[2] > 7 ? 16384 : 128 << fdctrl->fifo[2];
-#if 0
-    cur_drv->last_sect =
-        cur_drv->flags & FDISK_DBL_SIDES ? fdctrl->fifo[3] :
-        fdctrl->fifo[3] / 2;
-#else
-    cur_drv->last_sect = fdctrl->fifo[3];
-#endif
-    /* TODO: implement format using DMA expected by the Bochs BIOS
-     * and Linux fdformat (read 3 bytes per sector via DMA and fill
-     * the sector with the specified fill byte
-     */
-    fdctrl->data_state &= ~FD_STATE_FORMAT;
-    fdctrl_stop_transfer(fdctrl, 0x00, 0x00, 0x00);
+    {
+        cur_drv->bps = fdctrl->fifo[2] > 7 ? 16384 : 128 << fdctrl->fifo[2];
+        cur_drv->last_sect = ns;
+    
+        fdctrl_start_format(fdctrl);
+    }
 }
 
@@ -1948 +2088 @@
      */
     cur_drv->track = fdctrl->fifo[2];
+    cur_drv->ltrk = cur_drv->track;
     /* Raise Interrupt */
     fdctrl_raise_irq(fdctrl, FD_SR0_SEEK | GET_CUR_DRV(fdctrl));
@@ -2174 +2315 @@
         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 | FD_SR1_ND, FD_SR2_MD);
+    } else if (cur_drv->track >= cur_drv->max_track) {
+        FLOPPY_DPRINTF("read id past last track (%d >= %d)\n",
+                       cur_drv->track, cur_drv->max_track);
+        cur_drv->ltrk = 0;
         fdctrl_stop_transfer(fdctrl, FD_SR0_ABNTERM, FD_SR1_MA | FD_SR1_ND, FD_SR2_MD);
     }