Add "cache" parameter to "-drive" (Laurent Vivier).
[qemu] / hw / fdc.c
index 97ac51c..d689765 100644 (file)
--- a/hw/fdc.c
+++ b/hw/fdc.c
@@ -1,8 +1,8 @@
 /*
- * QEMU Floppy disk emulator
- * 
- * Copyright (c) 2003 Jocelyn Mayer
- * 
+ * QEMU Floppy disk emulator (Intel 82078)
+ *
+ * Copyright (c) 2003, 2007 Jocelyn Mayer
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <inttypes.h>
-
-#include "vl.h"
+/*
+ * The controller is used in Sun4m systems in a slightly different
+ * way. There are changes in DOR register and DMA is not available.
+ */
+#include "hw.h"
+#include "fdc.h"
+#include "block.h"
+#include "qemu-timer.h"
+#include "isa.h"
 
 /********************************************************/
 /* debug Floppy devices */
@@ -67,7 +70,6 @@ typedef enum fdrive_type_t {
 
 typedef enum fdrive_flags_t {
     FDRIVE_MOTOR_ON   = 0x01, /* motor on/off           */
-    FDRIVE_REVALIDATE = 0x02, /* Revalidated            */
 } fdrive_flags_t;
 
 typedef enum fdisk_flags_t {
@@ -88,7 +90,6 @@ typedef struct fdrive_t {
     uint8_t dir;              /* Direction              */
     uint8_t rw;               /* Read/write             */
     /* Media */
-    fdisk_type_t disk;        /* Disk type              */
     fdisk_flags_t flags;
     uint8_t last_sect;        /* Nb sector per track    */
     uint8_t max_track;        /* Nb of tracks           */
@@ -100,20 +101,16 @@ static void fd_init (fdrive_t *drv, BlockDriverState *bs)
 {
     /* Drive */
     drv->bs = bs;
-    if (bs)
-        drv->drive = FDRIVE_DRV_144;
-    else
-        drv->drive = FDRIVE_DRV_NONE;
+    drv->drive = FDRIVE_DRV_NONE;
     drv->drflags = 0;
     drv->perpendicular = 0;
     /* Disk */
-    drv->disk = FDRIVE_DISK_NONE;
     drv->last_sect = 0;
     drv->max_track = 0;
 }
 
 static int _fd_sector (uint8_t head, uint8_t track,
-                        uint8_t sect, uint8_t last_sect)
+                       uint8_t sect, uint8_t last_sect)
 {
     return (((track * 2) + head) * last_sect) + sect - 1;
 }
@@ -131,18 +128,18 @@ static int fd_seek (fdrive_t *drv, uint8_t head, uint8_t track, uint8_t sect,
     int ret;
 
     if (track > drv->max_track ||
-       (head != 0 && (drv->flags & FDISK_DBL_SIDES) == 0)) {
-        FLOPPY_ERROR("try to read %d %02x %02x (max=%d %d %02x %02x)\n",
-                     head, track, sect, 1,
-                    (drv->flags & FDISK_DBL_SIDES) == 0 ? 0 : 1,
-                    drv->max_track, drv->last_sect);
+        (head != 0 && (drv->flags & FDISK_DBL_SIDES) == 0)) {
+        FLOPPY_DPRINTF("try to read %d %02x %02x (max=%d %d %02x %02x)\n",
+                       head, track, sect, 1,
+                       (drv->flags & FDISK_DBL_SIDES) == 0 ? 0 : 1,
+                       drv->max_track, drv->last_sect);
         return 2;
     }
     if (sect > drv->last_sect) {
-        FLOPPY_ERROR("try to read %d %02x %02x (max=%d %d %02x %02x)\n",
-                     head, track, sect, 1,
-                    (drv->flags & FDISK_DBL_SIDES) == 0 ? 0 : 1,
-                    drv->max_track, drv->last_sect);
+        FLOPPY_DPRINTF("try to read %d %02x %02x (max=%d %d %02x %02x)\n",
+                       head, track, sect, 1,
+                       (drv->flags & FDISK_DBL_SIDES) == 0 ? 0 : 1,
+                       drv->max_track, drv->last_sect);
         return 3;
     }
     sector = _fd_sector(head, track, sect, drv->last_sect);
@@ -156,8 +153,8 @@ static int fd_seek (fdrive_t *drv, uint8_t head, uint8_t track, uint8_t sect,
         }
 #endif
         drv->head = head;
-       if (drv->track != track)
-           ret = 1;
+        if (drv->track != track)
+            ret = 1;
         drv->track = track;
         drv->sect = sect;
     }
@@ -176,268 +173,126 @@ static void fd_recalibrate (fdrive_t *drv)
     drv->rw = 0;
 }
 
+/* Recognize floppy formats */
+typedef struct fd_format_t {
+    fdrive_type_t drive;
+    fdisk_type_t  disk;
+    uint8_t last_sect;
+    uint8_t max_track;
+    uint8_t max_head;
+    const char *str;
+} fd_format_t;
+
+static const fd_format_t fd_formats[] = {
+    /* First entry is default format */
+    /* 1.44 MB 3"1/2 floppy disks */
+    { FDRIVE_DRV_144, FDRIVE_DISK_144, 18, 80, 1, "1.44 MB 3\"1/2", },
+    { FDRIVE_DRV_144, FDRIVE_DISK_144, 20, 80, 1,  "1.6 MB 3\"1/2", },
+    { FDRIVE_DRV_144, FDRIVE_DISK_144, 21, 80, 1, "1.68 MB 3\"1/2", },
+    { FDRIVE_DRV_144, FDRIVE_DISK_144, 21, 82, 1, "1.72 MB 3\"1/2", },
+    { FDRIVE_DRV_144, FDRIVE_DISK_144, 21, 83, 1, "1.74 MB 3\"1/2", },
+    { FDRIVE_DRV_144, FDRIVE_DISK_144, 22, 80, 1, "1.76 MB 3\"1/2", },
+    { FDRIVE_DRV_144, FDRIVE_DISK_144, 23, 80, 1, "1.84 MB 3\"1/2", },
+    { FDRIVE_DRV_144, FDRIVE_DISK_144, 24, 80, 1, "1.92 MB 3\"1/2", },
+    /* 2.88 MB 3"1/2 floppy disks */
+    { FDRIVE_DRV_288, FDRIVE_DISK_288, 36, 80, 1, "2.88 MB 3\"1/2", },
+    { FDRIVE_DRV_288, FDRIVE_DISK_288, 39, 80, 1, "3.12 MB 3\"1/2", },
+    { FDRIVE_DRV_288, FDRIVE_DISK_288, 40, 80, 1,  "3.2 MB 3\"1/2", },
+    { FDRIVE_DRV_288, FDRIVE_DISK_288, 44, 80, 1, "3.52 MB 3\"1/2", },
+    { FDRIVE_DRV_288, FDRIVE_DISK_288, 48, 80, 1, "3.84 MB 3\"1/2", },
+    /* 720 kB 3"1/2 floppy disks */
+    { FDRIVE_DRV_144, FDRIVE_DISK_720,  9, 80, 1,  "720 kB 3\"1/2", },
+    { FDRIVE_DRV_144, FDRIVE_DISK_720, 10, 80, 1,  "800 kB 3\"1/2", },
+    { FDRIVE_DRV_144, FDRIVE_DISK_720, 10, 82, 1,  "820 kB 3\"1/2", },
+    { FDRIVE_DRV_144, FDRIVE_DISK_720, 10, 83, 1,  "830 kB 3\"1/2", },
+    { FDRIVE_DRV_144, FDRIVE_DISK_720, 13, 80, 1, "1.04 MB 3\"1/2", },
+    { FDRIVE_DRV_144, FDRIVE_DISK_720, 14, 80, 1, "1.12 MB 3\"1/2", },
+    /* 1.2 MB 5"1/4 floppy disks */
+    { FDRIVE_DRV_120, FDRIVE_DISK_288, 15, 80, 1,  "1.2 kB 5\"1/4", },
+    { FDRIVE_DRV_120, FDRIVE_DISK_288, 18, 80, 1, "1.44 MB 5\"1/4", },
+    { FDRIVE_DRV_120, FDRIVE_DISK_288, 18, 82, 1, "1.48 MB 5\"1/4", },
+    { FDRIVE_DRV_120, FDRIVE_DISK_288, 18, 83, 1, "1.49 MB 5\"1/4", },
+    { FDRIVE_DRV_120, FDRIVE_DISK_288, 20, 80, 1,  "1.6 MB 5\"1/4", },
+    /* 720 kB 5"1/4 floppy disks */
+    { FDRIVE_DRV_120, FDRIVE_DISK_288,  9, 80, 1,  "720 kB 5\"1/4", },
+    { FDRIVE_DRV_120, FDRIVE_DISK_288, 11, 80, 1,  "880 kB 5\"1/4", },
+    /* 360 kB 5"1/4 floppy disks */
+    { FDRIVE_DRV_120, FDRIVE_DISK_288,  9, 40, 1,  "360 kB 5\"1/4", },
+    { FDRIVE_DRV_120, FDRIVE_DISK_288,  9, 40, 0,  "180 kB 5\"1/4", },
+    { FDRIVE_DRV_120, FDRIVE_DISK_288, 10, 41, 1,  "410 kB 5\"1/4", },
+    { FDRIVE_DRV_120, FDRIVE_DISK_288, 10, 42, 1,  "420 kB 5\"1/4", },
+    /* 320 kB 5"1/4 floppy disks */
+    { FDRIVE_DRV_120, FDRIVE_DISK_288,  8, 40, 1,  "320 kB 5\"1/4", },
+    { FDRIVE_DRV_120, FDRIVE_DISK_288,  8, 40, 0,  "160 kB 5\"1/4", },
+    /* 360 kB must match 5"1/4 better than 3"1/2... */
+    { FDRIVE_DRV_144, FDRIVE_DISK_720,  9, 80, 0,  "360 kB 3\"1/2", },
+    /* end */
+    { FDRIVE_DRV_NONE, FDRIVE_DISK_NONE, -1, -1, 0, NULL, },
+};
+
 /* Revalidate a disk drive after a disk change */
 static void fd_revalidate (fdrive_t *drv)
 {
-    int64_t nb_sectors;
+    const fd_format_t *parse;
+    uint64_t nb_sectors, size;
+    int i, first_match, match;
     int nb_heads, max_track, last_sect, ro;
 
     FLOPPY_DPRINTF("revalidate\n");
-    drv->drflags &= ~FDRIVE_REVALIDATE;
-
-    /* if no drive present, cannot do more */
-    if (!drv->bs)
-        return;
-
-    if (bdrv_is_inserted(drv->bs)) {
-       ro = bdrv_is_read_only(drv->bs);
-       bdrv_get_geometry_hint(drv->bs, &max_track, &nb_heads, &last_sect);
-       if (nb_heads != 0 && max_track != 0 && last_sect != 0) {
-           drv->disk = FDRIVE_DISK_USER;
-           printf("User defined disk (%d %d %d)",
-                  nb_heads - 1, max_track, last_sect);
-           if (nb_heads == 1) {
-               drv->flags &= ~FDISK_DBL_SIDES;
-           } else {
-               drv->flags |= FDISK_DBL_SIDES;
-           }
-           drv->max_track = max_track;
-           drv->last_sect = last_sect;
-       } else {
-        bdrv_get_geometry(drv->bs, &nb_sectors);
-           switch (nb_sectors) {
-            /* 2.88 MB 3"1/2 drive disks */
-           case 7680:
-               printf("3.84 Mb 3\"1/2 disk (1 80 48)");
-               drv->drive = FDRIVE_DRV_288;
-               drv->disk = FDRIVE_DISK_288;
-               drv->last_sect = 48;
-               drv->max_track = 80;
-               drv->flags |= FDISK_DBL_SIDES;
-               break;
-           case 7040:
-               printf("3.52 Mb 3\"1/2 disk (1 80 44)");
-               drv->drive = FDRIVE_DRV_288;
-               drv->disk = FDRIVE_DISK_288;
-               drv->last_sect = 44;
-               drv->max_track = 80;
-               drv->flags |= FDISK_DBL_SIDES;
-               break;
-           case 6400:
-               printf("3.2 Mb 3\"1/2 disk (1 80 40)");
-               drv->drive = FDRIVE_DRV_288;
-               drv->disk = FDRIVE_DISK_288;
-               drv->last_sect = 40;
-               drv->max_track = 80;
-               drv->flags |= FDISK_DBL_SIDES;
-               break;
-           case 6240:
-               printf("3.12 Mb 3\"1/2 disk (1 80 39)");
-               drv->drive = FDRIVE_DRV_288;
-               drv->disk = FDRIVE_DISK_288;
-               drv->last_sect = 39;
-               drv->max_track = 80;
-               drv->flags |= FDISK_DBL_SIDES;
-               break;
-           case 5760:
-               printf("2.88 Mb 3\"1/2 disk (1 80 36)");
-               drv->drive = FDRIVE_DRV_288;
-            drv->disk = FDRIVE_DISK_288;
-            drv->last_sect = 36;
-            drv->max_track = 80;
-               drv->flags |= FDISK_DBL_SIDES;
-               break;
-
-            /* 1.44 MB 3"1/2 drive disks */
-           case 3840:
-               printf("1.92 Mb 3\"1/2 disk (1 80 24)");
-               drv->drive = FDRIVE_DRV_144;
-               drv->disk = FDRIVE_DISK_144;
-               drv->last_sect = 24;
-               drv->max_track = 80;
-               drv->flags |= FDISK_DBL_SIDES;
-               break;
-           case 3680:
-               printf("1.84 Mb 3\"1/2 disk (1 80 23)");
-               drv->drive = FDRIVE_DRV_144;
-               drv->disk = FDRIVE_DISK_144;
-               drv->last_sect = 23;
-               drv->max_track = 80;
-               drv->flags |= FDISK_DBL_SIDES;
-               break;
-           case 3520:
-               printf("1.76 Mb 3\"1/2 disk (1 80 22)");
-               drv->drive = FDRIVE_DRV_144;
-               drv->disk = FDRIVE_DISK_144;
-               drv->last_sect = 22;
-               drv->max_track = 80;
-               drv->flags |= FDISK_DBL_SIDES;
-               break;
-           case 3486:
-               printf("1.74 Mb 3\"1/2 disk (1 83 21)");
-               drv->drive = FDRIVE_DRV_144;
-               drv->disk = FDRIVE_DISK_144;
-               drv->last_sect = 21;
-               drv->max_track = 83;
-               drv->flags |= FDISK_DBL_SIDES;
-               break;
-           case 3444:
-               printf("1.72 Mb 3\"1/2 disk (1 82 21)");
-               drv->drive = FDRIVE_DRV_144;
-               drv->disk = FDRIVE_DISK_144;
-               drv->last_sect = 21;
-               drv->max_track = 82;
-               drv->flags |= FDISK_DBL_SIDES;
-               break;
-           case 3360:
-               printf("1.68 Mb 3\"1/2 disk (1 80 21)");
-               drv->drive = FDRIVE_DRV_144;
-               drv->disk = FDRIVE_DISK_144;
-               drv->last_sect = 21;
-               drv->max_track = 80;
-               drv->flags |= FDISK_DBL_SIDES;
-               break;
-           case 3200:
-               printf("1.6 Mb 3\"1/2 disk (1 80 20)");
-               drv->drive = FDRIVE_DRV_144;
-               drv->disk = FDRIVE_DISK_144;
-               drv->last_sect = 20;
-               drv->max_track = 80;
-               drv->flags |= FDISK_DBL_SIDES;
-               break;
-           case 2880:
-           default:
-               printf("1.44 Mb 3\"1/2 disk (1 80 18)");
-               drv->drive = FDRIVE_DRV_144;
-            drv->disk = FDRIVE_DISK_144;
-            drv->last_sect = 18;
-            drv->max_track = 80;
-               drv->flags |= FDISK_DBL_SIDES;
-               break;
-
-            /* 720 kB 3"1/2 drive disks */
-           case 2240:
-               printf("1.12 Mb 3\"1/2 disk (1 80 14)");
-               drv->drive = FDRIVE_DRV_144;
-               drv->disk = FDRIVE_DISK_720;
-               drv->last_sect = 14;
-               drv->max_track = 80;
-               drv->flags |= FDISK_DBL_SIDES;
-               break;
-           case 2080:
-               printf("1.04 Mb 3\"1/2 disk (1 80 13)");
-               drv->drive = FDRIVE_DRV_144;
-               drv->disk = FDRIVE_DISK_720;
-               drv->last_sect = 13;
-               drv->max_track = 80;
-               drv->flags |= FDISK_DBL_SIDES;
-               break;
-           case 1660:
-               printf("830 kb 3\"1/2 disk (1 83 10)");
-               drv->drive = FDRIVE_DRV_144;
-               drv->disk = FDRIVE_DISK_720;
-               drv->last_sect = 10;
-               drv->max_track = 83;
-               drv->flags |= FDISK_DBL_SIDES;
-               break;
-           case 1640:
-               printf("820 kb 3\"1/2 disk (1 82 10)");
-               drv->drive = FDRIVE_DRV_144;
-               drv->disk = FDRIVE_DISK_720;
-               drv->last_sect = 10;
-               drv->max_track = 82;
-               drv->flags |= FDISK_DBL_SIDES;
-               break;
-           case 1600:
-               printf("800 kb 3\"1/2 disk (1 80 10)");
-               drv->drive = FDRIVE_DRV_144;
-               drv->disk = FDRIVE_DISK_720;
-               drv->last_sect = 10;
-               drv->max_track = 80;
-               drv->flags |= FDISK_DBL_SIDES;
-               break;
-           case 1440:
-               printf("720 kb 3\"1/2 disk (1 80 9)");
-               drv->drive = FDRIVE_DRV_144;
-            drv->disk = FDRIVE_DISK_720;
-            drv->last_sect = 9;
-            drv->max_track = 80;
-               drv->flags |= FDISK_DBL_SIDES;
-               break;
-
-           /* 1.2 MB 5"1/4 drive disks */
-           case 2988:
-               printf("1.49 Mb 5\"1/4 disk (1 83 18)");
-               drv->drive = FDRIVE_DRV_120;
-               drv->disk = FDRIVE_DISK_144; /* ? */
-               drv->last_sect = 18;
-               drv->max_track = 83;
-               drv->flags |= FDISK_DBL_SIDES;
-               break;
-           case 2952:
-               printf("1.48 Mb 5\"1/4 disk (1 82 18)");
-               drv->drive = FDRIVE_DRV_120;
-               drv->disk = FDRIVE_DISK_144; /* ? */
-               drv->last_sect = 18;
-               drv->max_track = 82;
-               drv->flags |= FDISK_DBL_SIDES;
-               break;
-           case 2400:
-               printf("1.2 Mb 5\"1/4 disk (1 80 15)");
-               drv->drive = FDRIVE_DRV_120;
-               drv->disk = FDRIVE_DISK_144; /* ? */
-               drv->last_sect = 15;
-               drv->max_track = 80;
-               drv->flags |= FDISK_DBL_SIDES;
-               break;
-
-           case 1760:
-               printf("880 kb 5\"1/4 disk (1 80 11)");
-               drv->drive = FDRIVE_DRV_120;
-               drv->disk = FDRIVE_DISK_144; /* ? */
-               drv->last_sect = 11;
-               drv->max_track = 80;
-               drv->flags |= FDISK_DBL_SIDES;
-               break;
-
-           /* 360 kB 5"1/4 drive disks */
-           case 840:
-               /* 420 kB 5"1/4 disk */
-               printf("420 kb 5\"1/4 disk (1 42 10)");
-               drv->drive = FDRIVE_DRV_120;
-               drv->disk = FDRIVE_DISK_144; /* ? */
-               drv->last_sect = 10;
-               drv->max_track = 42;
-               drv->flags |= FDISK_DBL_SIDES;
-           case 820:
-               /* 410 kB 5"1/4 disk */
-               printf("410 kb 5\"1/4 disk (1 41 10)");
-               drv->drive = FDRIVE_DRV_120;
-               drv->disk = FDRIVE_DISK_144; /* ? */
-               drv->last_sect = 10;
-               drv->max_track = 41;
-               drv->flags |= FDISK_DBL_SIDES;
-           case 720:
-               /* 360 kB 5"1/4 disk */
-               printf("360 kb 5\"1/4 disk (1 40 9)");
-               drv->drive = FDRIVE_DRV_120;
-               drv->disk = FDRIVE_DISK_144; /* ? */
-               drv->last_sect = 9;
-               drv->max_track = 40;
-               drv->flags |= FDISK_DBL_SIDES;
-               break;
+    if (drv->bs != NULL && bdrv_is_inserted(drv->bs)) {
+        ro = bdrv_is_read_only(drv->bs);
+        bdrv_get_geometry_hint(drv->bs, &nb_heads, &max_track, &last_sect);
+        if (nb_heads != 0 && max_track != 0 && last_sect != 0) {
+            FLOPPY_DPRINTF("User defined disk (%d %d %d)",
+                           nb_heads - 1, max_track, last_sect);
+        } else {
+            bdrv_get_geometry(drv->bs, &nb_sectors);
+            match = -1;
+            first_match = -1;
+            for (i = 0;; i++) {
+                parse = &fd_formats[i];
+                if (parse->drive == FDRIVE_DRV_NONE)
+                    break;
+                if (drv->drive == parse->drive ||
+                    drv->drive == FDRIVE_DRV_NONE) {
+                    size = (parse->max_head + 1) * parse->max_track *
+                        parse->last_sect;
+                    if (nb_sectors == size) {
+                        match = i;
+                        break;
+                    }
+                    if (first_match == -1)
+                        first_match = i;
+                }
+            }
+            if (match == -1) {
+                if (first_match == -1)
+                    match = 1;
+                else
+                    match = first_match;
+                parse = &fd_formats[match];
+            }
+            nb_heads = parse->max_head + 1;
+            max_track = parse->max_track;
+            last_sect = parse->last_sect;
+            drv->drive = parse->drive;
+            FLOPPY_DPRINTF("%s floppy disk (%d h %d t %d s) %s\n", parse->str,
+                           nb_heads, max_track, last_sect, ro ? "ro" : "rw");
         }
-           printf(" %s\n", ro == 0 ? "rw" : "ro");
-       }
-       drv->ro = ro;
+        if (nb_heads == 1) {
+            drv->flags &= ~FDISK_DBL_SIDES;
+        } else {
+            drv->flags |= FDISK_DBL_SIDES;
+        }
+        drv->max_track = max_track;
+        drv->last_sect = last_sect;
+        drv->ro = ro;
     } else {
-       printf("No disk in drive\n");
-        drv->disk = FDRIVE_DISK_NONE;
+        FLOPPY_DPRINTF("No disk in drive\n");
         drv->last_sect = 0;
-       drv->max_track = 0;
-       drv->flags &= ~FDISK_DBL_SIDES;
+        drv->max_track = 0;
+        drv->flags &= ~FDISK_DBL_SIDES;
     }
-    drv->drflags |= FDRIVE_REVALIDATE;
 }
 
 /* Motor control */
@@ -459,12 +314,14 @@ static void fd_reset (fdrive_t *drv)
 }
 
 /********************************************************/
-/* Intel 82078 floppy disk controler emulation          */
+/* Intel 82078 floppy disk controller emulation          */
 
 static void fdctrl_reset (fdctrl_t *fdctrl, int do_irq);
 static void fdctrl_reset_fifo (fdctrl_t *fdctrl);
-static int fdctrl_transfer_handler (void *opaque, target_ulong addr, int size);
+static int fdctrl_transfer_handler (void *opaque, int nchan,
+                                    int dma_pos, int dma_len);
 static void fdctrl_raise_irq (fdctrl_t *fdctrl, uint8_t status);
+static void fdctrl_result_timer(void *opaque);
 
 static uint32_t fdctrl_read_statusB (fdctrl_t *fdctrl);
 static uint32_t fdctrl_read_dor (fdctrl_t *fdctrl);
@@ -478,10 +335,10 @@ static void fdctrl_write_data (fdctrl_t *fdctrl, uint32_t value);
 static uint32_t fdctrl_read_dir (fdctrl_t *fdctrl);
 
 enum {
-    FD_CTRL_ACTIVE = 0x01,
+    FD_CTRL_ACTIVE = 0x01, /* XXX: suppress that */
     FD_CTRL_RESET  = 0x02,
-    FD_CTRL_SLEEP  = 0x04,
-    FD_CTRL_BUSY   = 0x08,
+    FD_CTRL_SLEEP  = 0x04, /* XXX: suppress that */
+    FD_CTRL_BUSY   = 0x08, /* dma transfer in progress */
     FD_CTRL_INTR   = 0x10,
 };
 
@@ -512,24 +369,26 @@ do { (state) = ((state) & ~FD_STATE_STATE) | (new_state); } while (0)
 
 struct fdctrl_t {
     fdctrl_t *fdctrl;
-    /* Controler's identification */
+    /* Controller's identification */
     uint8_t version;
     /* HW */
-    int irq_lvl;
+    qemu_irq irq;
     int dma_chann;
-    uint32_t io_base;
-    /* Controler state */
+    target_phys_addr_t io_base;
+    /* Controller state */
+    QEMUTimer *result_timer;
     uint8_t state;
     uint8_t dma_en;
     uint8_t cur_drv;
     uint8_t bootsel;
     /* Command FIFO */
-    uint8_t fifo[FD_SECTOR_LEN];
+    uint8_t *fifo;
     uint32_t data_pos;
     uint32_t data_len;
     uint8_t data_state;
     uint8_t data_dir;
     uint8_t int_status;
+    uint8_t eot; /* last wanted sector */
     /* States kept only to be returned back */
     /* Timers state */
     uint8_t timer0;
@@ -540,6 +399,8 @@ struct fdctrl_t {
     uint8_t lock;
     /* Power down config (also with status regB access mode */
     uint8_t pwrd;
+    /* Sun4m quirks? */
+    int sun4m;
     /* Floppy drives */
     fdrive_t drives[2];
 };
@@ -549,20 +410,38 @@ static uint32_t fdctrl_read (void *opaque, uint32_t reg)
     fdctrl_t *fdctrl = opaque;
     uint32_t retval;
 
-    if (reg == fdctrl->io_base + 0x01)
-       retval = fdctrl_read_statusB(fdctrl);
-    else if (reg == fdctrl->io_base + 0x02)
-       retval = fdctrl_read_dor(fdctrl);
-    else if (reg == fdctrl->io_base + 0x03)
+    switch (reg & 0x07) {
+    case 0x00:
+        if (fdctrl->sun4m) {
+            // Identify to Linux as S82078B
+            retval = fdctrl_read_statusB(fdctrl);
+        } else {
+            retval = (uint32_t)(-1);
+        }
+        break;
+    case 0x01:
+        retval = fdctrl_read_statusB(fdctrl);
+        break;
+    case 0x02:
+        retval = fdctrl_read_dor(fdctrl);
+        break;
+    case 0x03:
         retval = fdctrl_read_tape(fdctrl);
-    else if (reg == fdctrl->io_base + 0x04)
+        break;
+    case 0x04:
         retval = fdctrl_read_main_status(fdctrl);
-    else if (reg == fdctrl->io_base + 0x05)
+        break;
+    case 0x05:
         retval = fdctrl_read_data(fdctrl);
-    else if (reg == fdctrl->io_base + 0x07)
+        break;
+    case 0x07:
         retval = fdctrl_read_dir(fdctrl);
-    else 
-       retval = (uint32_t)(-1);
+        break;
+    default:
+        retval = (uint32_t)(-1);
+        break;
+    }
+    FLOPPY_DPRINTF("read reg%d: 0x%02x\n", reg & 7, retval);
 
     return retval;
 }
@@ -571,47 +450,168 @@ static void fdctrl_write (void *opaque, uint32_t reg, uint32_t value)
 {
     fdctrl_t *fdctrl = opaque;
 
-    if (reg == fdctrl->io_base + 0x02)
-       fdctrl_write_dor(fdctrl, value);
-    else if (reg == fdctrl->io_base + 0x03)
+    FLOPPY_DPRINTF("write reg%d: 0x%02x\n", reg & 7, value);
+
+    switch (reg & 0x07) {
+    case 0x02:
+        fdctrl_write_dor(fdctrl, value);
+        break;
+    case 0x03:
         fdctrl_write_tape(fdctrl, value);
-    else if (reg == fdctrl->io_base + 0x04)
+        break;
+    case 0x04:
         fdctrl_write_rate(fdctrl, value);
-    else if (reg == fdctrl->io_base + 0x05)
+        break;
+    case 0x05:
         fdctrl_write_data(fdctrl, value);
+        break;
+    default:
+        break;
+    }
 }
 
-static void fd_change_cb (void *opaque)
+static uint32_t fdctrl_read_mem (void *opaque, target_phys_addr_t reg)
 {
-    fdrive_t *drv = opaque;
+    return fdctrl_read(opaque, (uint32_t)reg);
+}
 
-    FLOPPY_DPRINTF("disk change\n");
-    /* TODO: use command-line parameters to force geometry */
-    fd_revalidate(drv);
-#if 0
-    fd_recalibrate(drv);
-    fdctrl_reset_fifo(drv->fdctrl);
-    fdctrl_raise_irq(drv->fdctrl, 0x20);
-#endif
+static void fdctrl_write_mem (void *opaque,
+                              target_phys_addr_t reg, uint32_t value)
+{
+    fdctrl_write(opaque, (uint32_t)reg, value);
+}
+
+static CPUReadMemoryFunc *fdctrl_mem_read[3] = {
+    fdctrl_read_mem,
+    fdctrl_read_mem,
+    fdctrl_read_mem,
+};
+
+static CPUWriteMemoryFunc *fdctrl_mem_write[3] = {
+    fdctrl_write_mem,
+    fdctrl_write_mem,
+    fdctrl_write_mem,
+};
+
+static void fd_save (QEMUFile *f, fdrive_t *fd)
+{
+    uint8_t tmp;
+
+    tmp = fd->drflags;
+    qemu_put_8s(f, &tmp);
+    qemu_put_8s(f, &fd->head);
+    qemu_put_8s(f, &fd->track);
+    qemu_put_8s(f, &fd->sect);
+    qemu_put_8s(f, &fd->dir);
+    qemu_put_8s(f, &fd->rw);
+}
+
+static void fdc_save (QEMUFile *f, void *opaque)
+{
+    fdctrl_t *s = opaque;
+
+    qemu_put_8s(f, &s->state);
+    qemu_put_8s(f, &s->dma_en);
+    qemu_put_8s(f, &s->cur_drv);
+    qemu_put_8s(f, &s->bootsel);
+    qemu_put_buffer(f, s->fifo, FD_SECTOR_LEN);
+    qemu_put_be32s(f, &s->data_pos);
+    qemu_put_be32s(f, &s->data_len);
+    qemu_put_8s(f, &s->data_state);
+    qemu_put_8s(f, &s->data_dir);
+    qemu_put_8s(f, &s->int_status);
+    qemu_put_8s(f, &s->eot);
+    qemu_put_8s(f, &s->timer0);
+    qemu_put_8s(f, &s->timer1);
+    qemu_put_8s(f, &s->precomp_trk);
+    qemu_put_8s(f, &s->config);
+    qemu_put_8s(f, &s->lock);
+    qemu_put_8s(f, &s->pwrd);
+    fd_save(f, &s->drives[0]);
+    fd_save(f, &s->drives[1]);
+}
+
+static int fd_load (QEMUFile *f, fdrive_t *fd)
+{
+    uint8_t tmp;
+
+    qemu_get_8s(f, &tmp);
+    fd->drflags = tmp;
+    qemu_get_8s(f, &fd->head);
+    qemu_get_8s(f, &fd->track);
+    qemu_get_8s(f, &fd->sect);
+    qemu_get_8s(f, &fd->dir);
+    qemu_get_8s(f, &fd->rw);
+
+    return 0;
+}
+
+static int fdc_load (QEMUFile *f, void *opaque, int version_id)
+{
+    fdctrl_t *s = opaque;
+    int ret;
+
+    if (version_id != 1)
+        return -EINVAL;
+
+    qemu_get_8s(f, &s->state);
+    qemu_get_8s(f, &s->dma_en);
+    qemu_get_8s(f, &s->cur_drv);
+    qemu_get_8s(f, &s->bootsel);
+    qemu_get_buffer(f, s->fifo, FD_SECTOR_LEN);
+    qemu_get_be32s(f, &s->data_pos);
+    qemu_get_be32s(f, &s->data_len);
+    qemu_get_8s(f, &s->data_state);
+    qemu_get_8s(f, &s->data_dir);
+    qemu_get_8s(f, &s->int_status);
+    qemu_get_8s(f, &s->eot);
+    qemu_get_8s(f, &s->timer0);
+    qemu_get_8s(f, &s->timer1);
+    qemu_get_8s(f, &s->precomp_trk);
+    qemu_get_8s(f, &s->config);
+    qemu_get_8s(f, &s->lock);
+    qemu_get_8s(f, &s->pwrd);
+
+    ret = fd_load(f, &s->drives[0]);
+    if (ret == 0)
+        ret = fd_load(f, &s->drives[1]);
+
+    return ret;
 }
 
-fdctrl_t *fdctrl_init (int irq_lvl, int dma_chann, int mem_mapped, 
-                       uint32_t io_base,
+static void fdctrl_external_reset(void *opaque)
+{
+    fdctrl_t *s = opaque;
+
+    fdctrl_reset(s, 0);
+}
+
+fdctrl_t *fdctrl_init (qemu_irq irq, int dma_chann, int mem_mapped,
+                       target_phys_addr_t io_base,
                        BlockDriverState **fds)
 {
     fdctrl_t *fdctrl;
-//    int io_mem;
+    int io_mem;
     int i;
 
-    FLOPPY_DPRINTF("init controler\n");
+    FLOPPY_DPRINTF("init controller\n");
     fdctrl = qemu_mallocz(sizeof(fdctrl_t));
     if (!fdctrl)
         return NULL;
-    fdctrl->version = 0x90; /* Intel 82078 controler */
-    fdctrl->irq_lvl = irq_lvl;
+    fdctrl->fifo = qemu_memalign(512, FD_SECTOR_LEN);
+    if (fdctrl->fifo == NULL) {
+        qemu_free(fdctrl);
+        return NULL;
+    }
+    fdctrl->result_timer = qemu_new_timer(vm_clock,
+                                          fdctrl_result_timer, fdctrl);
+
+    fdctrl->version = 0x90; /* Intel 82078 controller */
+    fdctrl->irq = irq;
     fdctrl->dma_chann = dma_chann;
     fdctrl->io_base = io_base;
-    fdctrl->config = 0x40; /* Implicit seek, polling & FIFO enabled */
+    fdctrl->config = 0x60; /* Implicit seek, polling & FIFO enabled */
+    fdctrl->sun4m = 0;
     if (fdctrl->dma_chann != -1) {
         fdctrl->dma_en = 1;
         DMA_register_channel(dma_chann, &fdctrl_transfer_handler, fdctrl);
@@ -620,28 +620,40 @@ fdctrl_t *fdctrl_init (int irq_lvl, int dma_chann, int mem_mapped,
     }
     for (i = 0; i < 2; i++) {
         fd_init(&fdctrl->drives[i], fds[i]);
-        if (fds[i]) {
-            bdrv_set_change_cb(fds[i],
-                               &fd_change_cb, &fdctrl->drives[i]);
-        }
     }
     fdctrl_reset(fdctrl, 0);
     fdctrl->state = FD_CTRL_ACTIVE;
     if (mem_mapped) {
-        FLOPPY_ERROR("memory mapped floppy not supported by now !\n");
-#if 0
-        io_mem = cpu_register_io_memory(0, fdctrl_mem_read, fdctrl_mem_write);
-        cpu_register_physical_memory(base, 0x08, io_mem);
-#endif
+        io_mem = cpu_register_io_memory(0, fdctrl_mem_read, fdctrl_mem_write,
+                                        fdctrl);
+        cpu_register_physical_memory(io_base, 0x08, io_mem);
     } else {
-        register_ioport_read(io_base + 0x01, 5, 1, &fdctrl_read, fdctrl);
-        register_ioport_read(io_base + 0x07, 1, 1, &fdctrl_read, fdctrl);
-        register_ioport_write(io_base + 0x01, 5, 1, &fdctrl_write, fdctrl);
-        register_ioport_write(io_base + 0x07, 1, 1, &fdctrl_write, fdctrl);
+        register_ioport_read((uint32_t)io_base + 0x01, 5, 1, &fdctrl_read,
+                             fdctrl);
+        register_ioport_read((uint32_t)io_base + 0x07, 1, 1, &fdctrl_read,
+                             fdctrl);
+        register_ioport_write((uint32_t)io_base + 0x01, 5, 1, &fdctrl_write,
+                              fdctrl);
+        register_ioport_write((uint32_t)io_base + 0x07, 1, 1, &fdctrl_write,
+                              fdctrl);
     }
-    for (i = 0; i < MAX_FD; i++) {
+    register_savevm("fdc", io_base, 1, fdc_save, fdc_load, fdctrl);
+    qemu_register_reset(fdctrl_external_reset, fdctrl);
+    for (i = 0; i < 2; i++) {
         fd_revalidate(&fdctrl->drives[i]);
     }
+
+    return fdctrl;
+}
+
+fdctrl_t *sun4m_fdctrl_init (qemu_irq irq, target_phys_addr_t io_base,
+                             BlockDriverState **fds)
+{
+    fdctrl_t *fdctrl;
+
+    fdctrl = fdctrl_init(irq, 0, 1, io_base, fds);
+    fdctrl->sun4m = 1;
+
     return fdctrl;
 }
 
@@ -654,30 +666,35 @@ int fdctrl_get_drive_type(fdctrl_t *fdctrl, int drive_num)
 /* Change IRQ state */
 static void fdctrl_reset_irq (fdctrl_t *fdctrl)
 {
-    if (fdctrl->state & FD_CTRL_INTR) {
-        pic_set_irq(fdctrl->irq_lvl, 0);
-        fdctrl->state &= ~(FD_CTRL_INTR | FD_CTRL_SLEEP | FD_CTRL_BUSY);
-    }
+    FLOPPY_DPRINTF("Reset interrupt\n");
+    qemu_set_irq(fdctrl->irq, 0);
+    fdctrl->state &= ~FD_CTRL_INTR;
 }
 
 static void fdctrl_raise_irq (fdctrl_t *fdctrl, uint8_t status)
 {
+    // Sparc mutation
+    if (fdctrl->sun4m && !fdctrl->dma_en) {
+        fdctrl->state &= ~FD_CTRL_BUSY;
+        fdctrl->int_status = status;
+        return;
+    }
     if (~(fdctrl->state & FD_CTRL_INTR)) {
-        pic_set_irq(fdctrl->irq_lvl, 1);
+        qemu_set_irq(fdctrl->irq, 1);
         fdctrl->state |= FD_CTRL_INTR;
     }
     FLOPPY_DPRINTF("Set interrupt status to 0x%02x\n", status);
     fdctrl->int_status = status;
 }
 
-/* Reset controler */
+/* Reset controller */
 static void fdctrl_reset (fdctrl_t *fdctrl, int do_irq)
 {
     int i;
 
-    FLOPPY_DPRINTF("reset controler\n");
+    FLOPPY_DPRINTF("reset controller\n");
     fdctrl_reset_irq(fdctrl);
-    /* Initialise controler */
+    /* Initialise controller */
     fdctrl->cur_drv = 0;
     /* FIFO state */
     fdctrl->data_pos = 0;
@@ -688,7 +705,7 @@ static void fdctrl_reset (fdctrl_t *fdctrl, int do_irq)
         fd_reset(&fdctrl->drives[i]);
     fdctrl_reset_fifo(fdctrl);
     if (do_irq)
-        fdctrl_raise_irq(fdctrl, 0x20);
+        fdctrl_raise_irq(fdctrl, 0xc0);
 }
 
 static inline fdrive_t *drv0 (fdctrl_t *fdctrl)
@@ -709,9 +726,7 @@ static fdrive_t *get_cur_drv (fdctrl_t *fdctrl)
 /* Status B register : 0x01 (read-only) */
 static uint32_t fdctrl_read_statusB (fdctrl_t *fdctrl)
 {
-    fdctrl_reset_irq(fdctrl);
     FLOPPY_DPRINTF("status register: 0x00\n");
-
     return 0;
 }
 
@@ -722,9 +737,9 @@ static uint32_t fdctrl_read_dor (fdctrl_t *fdctrl)
 
     /* Drive motors state indicators */
     if (drv0(fdctrl)->drflags & FDRIVE_MOTOR_ON)
-       retval |= 1 << 5;
+        retval |= 1 << 5;
     if (drv1(fdctrl)->drflags & FDRIVE_MOTOR_ON)
-       retval |= 1 << 4;
+        retval |= 1 << 4;
     /* DMA enable */
     retval |= fdctrl->dma_en << 3;
     /* Reset indicator */
@@ -738,11 +753,10 @@ static uint32_t fdctrl_read_dor (fdctrl_t *fdctrl)
 
 static void fdctrl_write_dor (fdctrl_t *fdctrl, uint32_t value)
 {
-    fdctrl_reset_irq(fdctrl);
     /* Reset mode */
     if (fdctrl->state & FD_CTRL_RESET) {
         if (!(value & 0x04)) {
-            FLOPPY_DPRINTF("Floppy controler in RESET state !\n");
+            FLOPPY_DPRINTF("Floppy controller in RESET state !\n");
             return;
         }
     }
@@ -764,13 +778,13 @@ static void fdctrl_write_dor (fdctrl_t *fdctrl, uint32_t value)
     /* Reset */
     if (!(value & 0x04)) {
         if (!(fdctrl->state & FD_CTRL_RESET)) {
-            FLOPPY_DPRINTF("controler enter RESET state\n");
+            FLOPPY_DPRINTF("controller enter RESET state\n");
             fdctrl->state |= FD_CTRL_RESET;
-            fdctrl_reset(fdctrl, 1);
         }
     } else {
         if (fdctrl->state & FD_CTRL_RESET) {
-            FLOPPY_DPRINTF("controler out of RESET state\n");
+            FLOPPY_DPRINTF("controller out of RESET state\n");
+            fdctrl_reset(fdctrl, 1);
             fdctrl->state &= ~(FD_CTRL_RESET | FD_CTRL_SLEEP);
         }
     }
@@ -783,7 +797,6 @@ static uint32_t fdctrl_read_tape (fdctrl_t *fdctrl)
 {
     uint32_t retval = 0;
 
-    fdctrl_reset_irq(fdctrl);
     /* Disk boot selection indicator */
     retval |= fdctrl->bootsel << 2;
     /* Tape indicators: never allowed */
@@ -794,10 +807,9 @@ static uint32_t fdctrl_read_tape (fdctrl_t *fdctrl)
 
 static void fdctrl_write_tape (fdctrl_t *fdctrl, uint32_t value)
 {
-    fdctrl_reset_irq(fdctrl);
     /* Reset mode */
     if (fdctrl->state & FD_CTRL_RESET) {
-        FLOPPY_DPRINTF("Floppy controler in RESET state !\n");
+        FLOPPY_DPRINTF("Floppy controller in RESET state !\n");
         return;
     }
     FLOPPY_DPRINTF("tape drive register set to 0x%02x\n", value);
@@ -811,7 +823,6 @@ static uint32_t fdctrl_read_main_status (fdctrl_t *fdctrl)
 {
     uint32_t retval = 0;
 
-    fdctrl_reset_irq(fdctrl);
     fdctrl->state &= ~(FD_CTRL_SLEEP | FD_CTRL_RESET);
     if (!(fdctrl->state & FD_CTRL_BUSY)) {
         /* Data transfer allowed */
@@ -833,12 +844,11 @@ static uint32_t fdctrl_read_main_status (fdctrl_t *fdctrl)
 /* Data select rate register : 0x04 (write) */
 static void fdctrl_write_rate (fdctrl_t *fdctrl, uint32_t value)
 {
-    fdctrl_reset_irq(fdctrl);
     /* Reset mode */
     if (fdctrl->state & FD_CTRL_RESET) {
-            FLOPPY_DPRINTF("Floppy controler in RESET state !\n");
-            return;
-        }
+        FLOPPY_DPRINTF("Floppy controller in RESET state !\n");
+        return;
+    }
     FLOPPY_DPRINTF("select rate register set to 0x%02x\n", value);
     /* Reset: autoclear */
     if (value & 0x80) {
@@ -853,19 +863,29 @@ static void fdctrl_write_rate (fdctrl_t *fdctrl, uint32_t value)
 //        fdctrl.precomp = (value >> 2) & 0x07;
 }
 
+static int fdctrl_media_changed(fdrive_t *drv)
+{
+    int ret;
+
+    if (!drv->bs)
+        return 0;
+    ret = bdrv_media_changed(drv->bs);
+    if (ret) {
+        fd_revalidate(drv);
+    }
+    return ret;
+}
+
 /* Digital input register : 0x07 (read-only) */
 static uint32_t fdctrl_read_dir (fdctrl_t *fdctrl)
 {
     uint32_t retval = 0;
 
-    fdctrl_reset_irq(fdctrl);
-    if (drv0(fdctrl)->drflags & FDRIVE_REVALIDATE ||
-       drv1(fdctrl)->drflags & FDRIVE_REVALIDATE)
+    if (fdctrl_media_changed(drv0(fdctrl)) ||
+        fdctrl_media_changed(drv1(fdctrl)))
         retval |= 0x80;
     if (retval != 0)
         FLOPPY_DPRINTF("Floppy digital input register: 0x%02x\n", retval);
-    drv0(fdctrl)->drflags &= ~FDRIVE_REVALIDATE;
-    drv1(fdctrl)->drflags &= ~FDRIVE_REVALIDATE;
 
     return retval;
 }
@@ -896,7 +916,7 @@ static void fdctrl_unimplemented (fdctrl_t *fdctrl)
     fdrive_t *cur_drv;
 
     cur_drv = get_cur_drv(fdctrl);
-    fdctrl->fifo[0] = 0x60 | (cur_drv->head << 1) | fdctrl->cur_drv;
+    fdctrl->fifo[0] = 0x60 | (cur_drv->head << 2) | fdctrl->cur_drv;
     fdctrl->fifo[1] = 0x00;
     fdctrl->fifo[2] = 0x00;
     fdctrl_set_fifo(fdctrl, 3, 1);
@@ -909,15 +929,15 @@ static void fdctrl_unimplemented (fdctrl_t *fdctrl)
 
 /* Callback for transfer end (stop or abort) */
 static void fdctrl_stop_transfer (fdctrl_t *fdctrl, uint8_t status0,
-                                 uint8_t status1, uint8_t status2)
+                                  uint8_t status1, uint8_t status2)
 {
     fdrive_t *cur_drv;
 
     cur_drv = get_cur_drv(fdctrl);
     FLOPPY_DPRINTF("transfer status: %02x %02x %02x (%02x)\n",
                    status0, status1, status2,
-                   status0 | (cur_drv->head << 1) | fdctrl->cur_drv);
-    fdctrl->fifo[0] = status0 | (cur_drv->head << 1) | fdctrl->cur_drv;
+                   status0 | (cur_drv->head << 2) | fdctrl->cur_drv);
+    fdctrl->fifo[0] = status0 | (cur_drv->head << 2) | fdctrl->cur_drv;
     fdctrl->fifo[1] = status1;
     fdctrl->fifo[2] = status2;
     fdctrl->fifo[3] = cur_drv->track;
@@ -925,8 +945,10 @@ static void fdctrl_stop_transfer (fdctrl_t *fdctrl, uint8_t status0,
     fdctrl->fifo[5] = cur_drv->sect;
     fdctrl->fifo[6] = FD_SECTOR_SC;
     fdctrl->data_dir = FD_DIR_READ;
-    if (fdctrl->state & FD_CTRL_BUSY)
+    if (fdctrl->state & FD_CTRL_BUSY) {
         DMA_release_DREQ(fdctrl->dma_chann);
+        fdctrl->state &= ~FD_CTRL_BUSY;
+    }
     fdctrl_set_fifo(fdctrl, 7, 1);
 }
 
@@ -942,7 +964,7 @@ static void fdctrl_start_transfer (fdctrl_t *fdctrl, int direction)
     kt = fdctrl->fifo[2];
     kh = fdctrl->fifo[3];
     ks = fdctrl->fifo[4];
-    FLOPPY_DPRINTF("Start tranfert at %d %d %02x %02x (%d)\n",
+    FLOPPY_DPRINTF("Start transfer at %d %d %02x %02x (%d)\n",
                    fdctrl->cur_drv, kh, kt, ks,
                    _fd_sector(kh, kt, ks, cur_drv->last_sect));
     did_seek = 0;
@@ -989,36 +1011,37 @@ static void fdctrl_start_transfer (fdctrl_t *fdctrl, int direction)
     if (fdctrl->fifo[5] == 00) {
         fdctrl->data_len = fdctrl->fifo[8];
     } else {
-       int tmp;
-        fdctrl->data_len = 128 << fdctrl->fifo[5];
+        int tmp;
+        fdctrl->data_len = 128 << (fdctrl->fifo[5] > 7 ? 7 : fdctrl->fifo[5]);
         tmp = (cur_drv->last_sect - ks + 1);
         if (fdctrl->fifo[0] & 0x80)
             tmp += cur_drv->last_sect;
-       fdctrl->data_len *= tmp;
+        fdctrl->data_len *= tmp;
     }
+    fdctrl->eot = fdctrl->fifo[6];
     if (fdctrl->dma_en) {
         int dma_mode;
         /* DMA transfer are enabled. Check if DMA channel is well programmed */
         dma_mode = DMA_get_channel_mode(fdctrl->dma_chann);
         dma_mode = (dma_mode >> 2) & 3;
         FLOPPY_DPRINTF("dma_mode=%d direction=%d (%d - %d)\n",
-                      dma_mode, direction,
+                       dma_mode, direction,
                        (128 << fdctrl->fifo[5]) *
-                      (cur_drv->last_sect - ks + 1), fdctrl->data_len);
+                       (cur_drv->last_sect - ks + 1), fdctrl->data_len);
         if (((direction == FD_DIR_SCANE || direction == FD_DIR_SCANL ||
               direction == FD_DIR_SCANH) && dma_mode == 0) ||
             (direction == FD_DIR_WRITE && dma_mode == 2) ||
             (direction == FD_DIR_READ && dma_mode == 1)) {
             /* No access is allowed until DMA transfer has completed */
             fdctrl->state |= FD_CTRL_BUSY;
-            /* Now, we just have to wait for the DMA controler to
+            /* Now, we just have to wait for the DMA controller to
              * recall us...
              */
             DMA_hold_DREQ(fdctrl->dma_chann);
             DMA_schedule(fdctrl->dma_chann);
             return;
         } else {
-           FLOPPY_ERROR("dma_mode=%d direction=%d\n", dma_mode, direction);
+            FLOPPY_ERROR("dma_mode=%d direction=%d\n", dma_mode, direction);
         }
     }
     FLOPPY_DPRINTF("start non-DMA transfer\n");
@@ -1038,7 +1061,8 @@ static void fdctrl_start_transfer_del (fdctrl_t *fdctrl, int direction)
 }
 
 /* handlers for DMA transfers */
-static int fdctrl_transfer_handler (void *opaque, target_ulong addr, int size)
+static int fdctrl_transfer_handler (void *opaque, int nchan,
+                                    int dma_pos, int dma_len)
 {
     fdctrl_t *fdctrl;
     fdrive_t *cur_drv;
@@ -1046,7 +1070,6 @@ static int fdctrl_transfer_handler (void *opaque, target_ulong addr, int size)
     uint8_t status0 = 0x00, status1 = 0x00, status2 = 0x00;
 
     fdctrl = opaque;
-    fdctrl_reset_irq(fdctrl);
     if (!(fdctrl->state & FD_CTRL_BUSY)) {
         FLOPPY_DPRINTF("Not in DMA transfer mode !\n");
         return 0;
@@ -1055,61 +1078,60 @@ static int fdctrl_transfer_handler (void *opaque, target_ulong addr, int size)
     if (fdctrl->data_dir == FD_DIR_SCANE || fdctrl->data_dir == FD_DIR_SCANL ||
         fdctrl->data_dir == FD_DIR_SCANH)
         status2 = 0x04;
-    if (size > fdctrl->data_len)
-       size = fdctrl->data_len;
-            if (cur_drv->bs == NULL) {
-       if (fdctrl->data_dir == FD_DIR_WRITE)
-           fdctrl_stop_transfer(fdctrl, 0x60, 0x00, 0x00);
-       else
-           fdctrl_stop_transfer(fdctrl, 0x40, 0x00, 0x00);
-       len = 0;
-                goto transfer_error;
-            }
+    if (dma_len > fdctrl->data_len)
+        dma_len = fdctrl->data_len;
+    if (cur_drv->bs == NULL) {
+        if (fdctrl->data_dir == FD_DIR_WRITE)
+            fdctrl_stop_transfer(fdctrl, 0x60, 0x00, 0x00);
+        else
+            fdctrl_stop_transfer(fdctrl, 0x40, 0x00, 0x00);
+        len = 0;
+        goto transfer_error;
+    }
     rel_pos = fdctrl->data_pos % FD_SECTOR_LEN;
-    for (start_pos = fdctrl->data_pos; fdctrl->data_pos < size;) {
-        len = size - fdctrl->data_pos;
+    for (start_pos = fdctrl->data_pos; fdctrl->data_pos < dma_len;) {
+        len = dma_len - fdctrl->data_pos;
         if (len + rel_pos > FD_SECTOR_LEN)
             len = FD_SECTOR_LEN - rel_pos;
-        FLOPPY_DPRINTF("copy %d bytes (%d %d %d) %d pos %d %02x %02x "
-                       "(%d-0x%08x 0x%08x)\n", len, size, fdctrl->data_pos,
+        FLOPPY_DPRINTF("copy %d bytes (%d %d %d) %d pos %d %02x "
+                       "(%d-0x%08x 0x%08x)\n", len, dma_len, fdctrl->data_pos,
                        fdctrl->data_len, fdctrl->cur_drv, cur_drv->head,
                        cur_drv->track, cur_drv->sect, fd_sector(cur_drv),
-                       fd_sector(cur_drv) * 512, addr);
+                       fd_sector(cur_drv) * 512);
         if (fdctrl->data_dir != FD_DIR_WRITE ||
-           len < FD_SECTOR_LEN || rel_pos != 0) {
+            len < FD_SECTOR_LEN || rel_pos != 0) {
             /* READ & SCAN commands and realign to a sector for WRITE */
             if (bdrv_read(cur_drv->bs, fd_sector(cur_drv),
-                         fdctrl->fifo, 1) < 0) {
+                          fdctrl->fifo, 1) < 0) {
                 FLOPPY_DPRINTF("Floppy: error getting sector %d\n",
                                fd_sector(cur_drv));
                 /* Sure, image size is too small... */
                 memset(fdctrl->fifo, 0, FD_SECTOR_LEN);
             }
-                }
-       switch (fdctrl->data_dir) {
-       case FD_DIR_READ:
-           /* READ commands */
-           cpu_physical_memory_write(addr + fdctrl->data_pos,
-                                     fdctrl->fifo + rel_pos, len);
-           break;
-       case FD_DIR_WRITE:
+        }
+        switch (fdctrl->data_dir) {
+        case FD_DIR_READ:
+            /* READ commands */
+            DMA_write_memory (nchan, fdctrl->fifo + rel_pos,
+                              fdctrl->data_pos, len);
+            break;
+        case FD_DIR_WRITE:
             /* WRITE commands */
-            cpu_physical_memory_read(addr + fdctrl->data_pos,
-                                    fdctrl->fifo + rel_pos, len);
+            DMA_read_memory (nchan, fdctrl->fifo + rel_pos,
+                             fdctrl->data_pos, len);
             if (bdrv_write(cur_drv->bs, fd_sector(cur_drv),
-                          fdctrl->fifo, 1) < 0) {
+                           fdctrl->fifo, 1) < 0) {
                 FLOPPY_ERROR("writting sector %d\n", fd_sector(cur_drv));
                 fdctrl_stop_transfer(fdctrl, 0x60, 0x00, 0x00);
                 goto transfer_error;
-                }
-           break;
-       default:
-           /* SCAN commands */
+            }
+            break;
+        default:
+            /* SCAN commands */
             {
-               uint8_t tmpbuf[FD_SECTOR_LEN];
+                uint8_t tmpbuf[FD_SECTOR_LEN];
                 int ret;
-                cpu_physical_memory_read(addr + fdctrl->data_pos,
-                                         tmpbuf, len);
+                DMA_read_memory (nchan, tmpbuf, fdctrl->data_pos, len);
                 ret = memcmp(tmpbuf, fdctrl->fifo + rel_pos, len);
                 if (ret == 0) {
                     status2 = 0x08;
@@ -1121,43 +1143,47 @@ static int fdctrl_transfer_handler (void *opaque, target_ulong addr, int size)
                     goto end_transfer;
                 }
             }
-           break;
+            break;
         }
-       fdctrl->data_pos += len;
-       rel_pos = fdctrl->data_pos % FD_SECTOR_LEN;
+        fdctrl->data_pos += len;
+        rel_pos = fdctrl->data_pos % FD_SECTOR_LEN;
         if (rel_pos == 0) {
             /* Seek to next sector */
-           cur_drv->sect++;
-           FLOPPY_DPRINTF("seek to next sector (%d %02x %02x => %d) (%d)\n",
-                          cur_drv->head, cur_drv->track, cur_drv->sect,
-                          fd_sector(cur_drv),
-                          fdctrl->data_pos - size);
-            if (cur_drv->sect > cur_drv->last_sect) {
-               cur_drv->sect = 1;
-               if (FD_MULTI_TRACK(fdctrl->data_state)) {
-                   if (cur_drv->head == 0 &&
-                       (cur_drv->flags & FDISK_DBL_SIDES) != 0) {      
-                    cur_drv->head = 1;
+            FLOPPY_DPRINTF("seek to next sector (%d %02x %02x => %d) (%d)\n",
+                           cur_drv->head, cur_drv->track, cur_drv->sect,
+                           fd_sector(cur_drv),
+                           fdctrl->data_pos - len);
+            /* XXX: cur_drv->sect >= cur_drv->last_sect should be an
+               error in fact */
+            if (cur_drv->sect >= cur_drv->last_sect ||
+                cur_drv->sect == fdctrl->eot) {
+                cur_drv->sect = 1;
+                if (FD_MULTI_TRACK(fdctrl->data_state)) {
+                    if (cur_drv->head == 0 &&
+                        (cur_drv->flags & FDISK_DBL_SIDES) != 0) {
+                        cur_drv->head = 1;
+                    } else {
+                        cur_drv->head = 0;
+                        cur_drv->track++;
+                        if ((cur_drv->flags & FDISK_DBL_SIDES) == 0)
+                            break;
+                    }
                 } else {
-                    cur_drv->head = 0;
-                       cur_drv->track++;
-                       if ((cur_drv->flags & FDISK_DBL_SIDES) == 0)
-                           break;
+                    cur_drv->track++;
+                    break;
                 }
+                FLOPPY_DPRINTF("seek to next track (%d %02x %02x => %d)\n",
+                               cur_drv->head, cur_drv->track,
+                               cur_drv->sect, fd_sector(cur_drv));
             } else {
-                   cur_drv->track++;
-                   break;
-               }
-               FLOPPY_DPRINTF("seek to next track (%d %02x %02x => %d)\n",
-                              cur_drv->head, cur_drv->track,
-                              cur_drv->sect, fd_sector(cur_drv));
+                cur_drv->sect++;
             }
         }
     }
-end_transfer:
+ end_transfer:
     len = fdctrl->data_pos - start_pos;
     FLOPPY_DPRINTF("end transfer %d %d %d\n",
-                  fdctrl->data_pos, len, fdctrl->data_len);
+                   fdctrl->data_pos, len, fdctrl->data_len);
     if (fdctrl->data_dir == FD_DIR_SCANE ||
         fdctrl->data_dir == FD_DIR_SCANL ||
         fdctrl->data_dir == FD_DIR_SCANH)
@@ -1166,8 +1192,8 @@ end_transfer:
         status0 |= 0x20;
     fdctrl->data_len -= len;
     //    if (fdctrl->data_len == 0)
-       fdctrl_stop_transfer(fdctrl, status0, status1, status2);
-transfer_error:
+    fdctrl_stop_transfer(fdctrl, status0, status1, status2);
+ transfer_error:
 
     return len;
 }
@@ -1179,7 +1205,6 @@ static uint32_t fdctrl_read_data (fdctrl_t *fdctrl)
     uint32_t retval = 0;
     int pos, len;
 
-    fdctrl_reset_irq(fdctrl);
     cur_drv = get_cur_drv(fdctrl);
     fdctrl->state &= ~FD_CTRL_SLEEP;
     if (FD_STATE(fdctrl->data_state) == FD_STATE_CMD) {
@@ -1193,20 +1218,21 @@ static uint32_t fdctrl_read_data (fdctrl_t *fdctrl)
             len = fdctrl->data_len - fdctrl->data_pos;
             if (len > FD_SECTOR_LEN)
                 len = FD_SECTOR_LEN;
-            bdrv_read(cur_drv->bs, fd_sector(cur_drv),
-                      fdctrl->fifo, len);
+            bdrv_read(cur_drv->bs, fd_sector(cur_drv), fdctrl->fifo, 1);
         }
     }
     retval = fdctrl->fifo[pos];
     if (++fdctrl->data_pos == fdctrl->data_len) {
         fdctrl->data_pos = 0;
-        /* Switch from transfert mode to status mode
+        /* Switch from transfer mode to status mode
          * then from status mode to command mode
          */
-        if (FD_STATE(fdctrl->data_state) == FD_STATE_DATA)
+        if (FD_STATE(fdctrl->data_state) == FD_STATE_DATA) {
             fdctrl_stop_transfer(fdctrl, 0x20, 0x00, 0x00);
-        else
+        } else {
             fdctrl_reset_fifo(fdctrl);
+            fdctrl_reset_irq(fdctrl);
+        }
     }
     FLOPPY_DPRINTF("data register: 0x%02x\n", retval);
 
@@ -1260,21 +1286,21 @@ static void fdctrl_format_sector (fdctrl_t *fdctrl)
     memset(fdctrl->fifo, 0, FD_SECTOR_LEN);
     if (cur_drv->bs == NULL ||
         bdrv_write(cur_drv->bs, fd_sector(cur_drv), fdctrl->fifo, 1) < 0) {
-        FLOPPY_ERROR("formating sector %d\n", fd_sector(cur_drv));
+        FLOPPY_ERROR("formatting sector %d\n", fd_sector(cur_drv));
         fdctrl_stop_transfer(fdctrl, 0x60, 0x00, 0x00);
     } else {
-       if (cur_drv->sect == cur_drv->last_sect) {
-           fdctrl->data_state &= ~FD_STATE_FORMAT;
-           /* Last sector done */
-           if (FD_DID_SEEK(fdctrl->data_state))
-               fdctrl_stop_transfer(fdctrl, 0x20, 0x00, 0x00);
-           else
-               fdctrl_stop_transfer(fdctrl, 0x00, 0x00, 0x00);
-       } else {
-           /* More to do */
-           fdctrl->data_pos = 0;
-           fdctrl->data_len = 4;
-       }
+        if (cur_drv->sect == cur_drv->last_sect) {
+            fdctrl->data_state &= ~FD_STATE_FORMAT;
+            /* Last sector done */
+            if (FD_DID_SEEK(fdctrl->data_state))
+                fdctrl_stop_transfer(fdctrl, 0x20, 0x00, 0x00);
+            else
+                fdctrl_stop_transfer(fdctrl, 0x00, 0x00, 0x00);
+        } else {
+            /* More to do */
+            fdctrl->data_pos = 0;
+            fdctrl->data_len = 4;
+        }
     }
 }
 
@@ -1282,11 +1308,10 @@ static void fdctrl_write_data (fdctrl_t *fdctrl, uint32_t value)
 {
     fdrive_t *cur_drv;
 
-    fdctrl_reset_irq(fdctrl);
     cur_drv = get_cur_drv(fdctrl);
     /* Reset mode */
     if (fdctrl->state & FD_CTRL_RESET) {
-        FLOPPY_DPRINTF("Floppy controler in RESET state !\n");
+        FLOPPY_DPRINTF("Floppy controller in RESET state !\n");
         return;
     }
     fdctrl->state &= ~FD_CTRL_SLEEP;
@@ -1300,10 +1325,9 @@ static void fdctrl_write_data (fdctrl_t *fdctrl, uint32_t value)
         fdctrl->fifo[fdctrl->data_pos++] = value;
         if (fdctrl->data_pos % FD_SECTOR_LEN == (FD_SECTOR_LEN - 1) ||
             fdctrl->data_pos == fdctrl->data_len) {
-            bdrv_write(cur_drv->bs, fd_sector(cur_drv),
-                       fdctrl->fifo, FD_SECTOR_LEN);
+            bdrv_write(cur_drv->bs, fd_sector(cur_drv), fdctrl->fifo, 1);
         }
-        /* Switch from transfert mode to status mode
+        /* Switch from transfer mode to status mode
          * then from status mode to command mode
          */
         if (FD_STATE(fdctrl->data_state) == FD_STATE_DATA)
@@ -1392,12 +1416,20 @@ static void fdctrl_write_data (fdctrl_t *fdctrl, uint32_t value)
             FLOPPY_DPRINTF("SENSE_INTERRUPT_STATUS command (%02x)\n",
                            fdctrl->int_status);
             /* No parameters cmd: returns status if no interrupt */
+#if 0
             fdctrl->fifo[0] =
                 fdctrl->int_status | (cur_drv->head << 2) | fdctrl->cur_drv;
+#else
+            /* XXX: int_status handling is broken for read/write
+               commands, so we do this hack. It should be suppressed
+               ASAP */
+            fdctrl->fifo[0] =
+                0x20 | (cur_drv->head << 2) | fdctrl->cur_drv;
+#endif
             fdctrl->fifo[1] = cur_drv->track;
             fdctrl_set_fifo(fdctrl, 2, 0);
-           fdctrl_reset_irq(fdctrl);
-           fdctrl->int_status = 0xC0;
+            fdctrl_reset_irq(fdctrl);
+            fdctrl->int_status = 0xC0;
             return;
         case 0x0E:
             /* DUMPREG */
@@ -1412,7 +1444,7 @@ static void fdctrl_write_data (fdctrl_t *fdctrl, uint32_t value)
             fdctrl->fifo[5] = (fdctrl->timer1 << 1) | fdctrl->dma_en;
             fdctrl->fifo[6] = cur_drv->last_sect;
             fdctrl->fifo[7] = (fdctrl->lock << 7) |
-                    (cur_drv->perpendicular << 2);
+                (cur_drv->perpendicular << 2);
             fdctrl->fifo[8] = fdctrl->config;
             fdctrl->fifo[9] = fdctrl->precomp_trk;
             fdctrl_set_fifo(fdctrl, 10, 0);
@@ -1427,7 +1459,7 @@ static void fdctrl_write_data (fdctrl_t *fdctrl, uint32_t value)
             /* VERSION */
             FLOPPY_DPRINTF("VERSION command\n");
             /* No parameters cmd */
-            /* Controler's version */
+            /* Controller's version */
             fdctrl->fifo[0] = fdctrl->version;
             fdctrl_set_fifo(fdctrl, 1, 1);
             return;
@@ -1480,7 +1512,7 @@ static void fdctrl_write_data (fdctrl_t *fdctrl, uint32_t value)
             fdctrl->fifo[7] = fdctrl->timer1;
             fdctrl->fifo[8] = cur_drv->last_sect;
             fdctrl->fifo[9] = (fdctrl->lock << 7) |
-                    (cur_drv->perpendicular << 2);
+                (cur_drv->perpendicular << 2);
             fdctrl->fifo[10] = fdctrl->config;
             fdctrl->fifo[11] = fdctrl->precomp_trk;
             fdctrl->fifo[12] = fdctrl->pwrd;
@@ -1557,25 +1589,25 @@ static void fdctrl_write_data (fdctrl_t *fdctrl, uint32_t value)
             return;
         }
     }
-enqueue:
+ enqueue:
     FLOPPY_DPRINTF("%s: %02x\n", __func__, value);
     fdctrl->fifo[fdctrl->data_pos] = value;
     if (++fdctrl->data_pos == fdctrl->data_len) {
         /* We now have all parameters
          * and will be able to treat the command
          */
-       if (fdctrl->data_state & FD_STATE_FORMAT) {
-           fdctrl_format_sector(fdctrl);
-           return;
-       }
-        switch (fdctrl->fifo[0] & 0x1F) {
-        case 0x06:
-        {
-            /* READ variants */
-            FLOPPY_DPRINTF("treat READ command\n");
-            fdctrl_start_transfer(fdctrl, FD_DIR_READ);
+        if (fdctrl->data_state & FD_STATE_FORMAT) {
+            fdctrl_format_sector(fdctrl);
             return;
         }
+        switch (fdctrl->fifo[0] & 0x1F) {
+        case 0x06:
+            {
+                /* READ variants */
+                FLOPPY_DPRINTF("treat READ command\n");
+                fdctrl_start_transfer(fdctrl, FD_DIR_READ);
+                return;
+            }
         case 0x0C:
             /* READ_DELETED variants */
 //            FLOPPY_DPRINTF("treat READ_DELETED command\n");
@@ -1629,8 +1661,8 @@ enqueue:
             /* SPECIFY */
             FLOPPY_DPRINTF("treat SPECIFY command\n");
             fdctrl->timer0 = (fdctrl->fifo[1] >> 4) & 0xF;
-            fdctrl->timer1 = fdctrl->fifo[1] >> 1;
-           fdctrl->dma_en = 1 - (fdctrl->fifo[2] & 1) ;
+            fdctrl->timer1 = fdctrl->fifo[2] >> 1;
+            fdctrl->dma_en = 1 - (fdctrl->fifo[2] & 1) ;
             /* No result back */
             fdctrl_reset_fifo(fdctrl);
             break;
@@ -1638,35 +1670,37 @@ enqueue:
             /* SENSE_DRIVE_STATUS */
             FLOPPY_DPRINTF("treat SENSE_DRIVE_STATUS command\n");
             fdctrl->cur_drv = fdctrl->fifo[1] & 1;
-           cur_drv = get_cur_drv(fdctrl);
+            cur_drv = get_cur_drv(fdctrl);
             cur_drv->head = (fdctrl->fifo[1] >> 2) & 1;
             /* 1 Byte status back */
             fdctrl->fifo[0] = (cur_drv->ro << 6) |
                 (cur_drv->track == 0 ? 0x10 : 0x00) |
-                fdctrl->cur_drv;
+                (cur_drv->head << 2) |
+                fdctrl->cur_drv |
+                0x28;
             fdctrl_set_fifo(fdctrl, 1, 0);
             break;
         case 0x07:
             /* RECALIBRATE */
             FLOPPY_DPRINTF("treat RECALIBRATE command\n");
             fdctrl->cur_drv = fdctrl->fifo[1] & 1;
-           cur_drv = get_cur_drv(fdctrl);
+            cur_drv = get_cur_drv(fdctrl);
             fd_recalibrate(cur_drv);
-           fdctrl_reset_fifo(fdctrl);
+            fdctrl_reset_fifo(fdctrl);
             /* Raise Interrupt */
-           fdctrl_raise_irq(fdctrl, 0x20);
+            fdctrl_raise_irq(fdctrl, 0x20);
             break;
         case 0x0F:
             /* SEEK */
             FLOPPY_DPRINTF("treat SEEK command\n");
             fdctrl->cur_drv = fdctrl->fifo[1] & 1;
-           cur_drv = get_cur_drv(fdctrl);
-           fd_start(cur_drv);
+            cur_drv = get_cur_drv(fdctrl);
+            fd_start(cur_drv);
             if (fdctrl->fifo[2] <= cur_drv->track)
                 cur_drv->dir = 1;
             else
                 cur_drv->dir = 0;
-           fdctrl_reset_fifo(fdctrl);
+            fdctrl_reset_fifo(fdctrl);
             if (fdctrl->fifo[2] > cur_drv->max_track) {
                 fdctrl_raise_irq(fdctrl, 0x60);
             } else {
@@ -1711,9 +1745,12 @@ enqueue:
             fdctrl_start_transfer(fdctrl, FD_DIR_READ);
             break;
         case 0x4A:
-                /* READ_ID */
+            /* READ_ID */
             FLOPPY_DPRINTF("treat READ_ID command\n");
-            fdctrl_stop_transfer(fdctrl, 0x00, 0x00, 0x00);
+            /* XXX: should set main status register to busy */
+            cur_drv->head = (fdctrl->fifo[1] >> 2) & 1;
+            qemu_mod_timer(fdctrl->result_timer,
+                           qemu_get_clock(vm_clock) + (ticks_per_sec / 50));
             break;
         case 0x4C:
             /* RESTORE */
@@ -1734,29 +1771,30 @@ enqueue:
             break;
         case 0x4D:
             /* FORMAT_TRACK */
-           FLOPPY_DPRINTF("treat FORMAT_TRACK command\n");
-           fdctrl->cur_drv = fdctrl->fifo[1] & 1;
-           cur_drv = get_cur_drv(fdctrl);
-           fdctrl->data_state |= FD_STATE_FORMAT;
-           if (fdctrl->fifo[0] & 0x80)
-               fdctrl->data_state |= FD_STATE_MULTI;
-           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];
+            FLOPPY_DPRINTF("treat FORMAT_TRACK command\n");
+            fdctrl->cur_drv = fdctrl->fifo[1] & 1;
+            cur_drv = get_cur_drv(fdctrl);
+            fdctrl->data_state |= FD_STATE_FORMAT;
+            if (fdctrl->fifo[0] & 0x80)
+                fdctrl->data_state |= FD_STATE_MULTI;
+            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;
+            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];
+            cur_drv->last_sect = fdctrl->fifo[3];
 #endif
-           /* Bochs BIOS is buggy and don't send format informations
-            * for each sector. So, pretend all's done right now...
-            */
-           fdctrl->data_state &= ~FD_STATE_FORMAT;
-           fdctrl_stop_transfer(fdctrl, 0x00, 0x00, 0x00);
+            /* 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);
             break;
         case 0x8E:
             /* DRIVE_SPECIFICATION_COMMAND */
@@ -1782,16 +1820,16 @@ enqueue:
             /* RELATIVE_SEEK_OUT */
             FLOPPY_DPRINTF("treat RELATIVE_SEEK_OUT command\n");
             fdctrl->cur_drv = fdctrl->fifo[1] & 1;
-           cur_drv = get_cur_drv(fdctrl);
-           fd_start(cur_drv);
-                cur_drv->dir = 0;
+            cur_drv = get_cur_drv(fdctrl);
+            fd_start(cur_drv);
+            cur_drv->dir = 0;
             if (fdctrl->fifo[2] + cur_drv->track >= cur_drv->max_track) {
-               cur_drv->track = cur_drv->max_track - 1;
+                cur_drv->track = cur_drv->max_track - 1;
             } else {
                 cur_drv->track += fdctrl->fifo[2];
             }
-           fdctrl_reset_fifo(fdctrl);
-           fdctrl_raise_irq(fdctrl, 0x20);
+            fdctrl_reset_fifo(fdctrl);
+            fdctrl_raise_irq(fdctrl, 0x20);
             break;
         case 0xCD:
             /* FORMAT_AND_WRITE */
@@ -1800,21 +1838,36 @@ enqueue:
             fdctrl_unimplemented(fdctrl);
             break;
         case 0xCF:
-                /* RELATIVE_SEEK_IN */
+            /* RELATIVE_SEEK_IN */
             FLOPPY_DPRINTF("treat RELATIVE_SEEK_IN command\n");
             fdctrl->cur_drv = fdctrl->fifo[1] & 1;
-           cur_drv = get_cur_drv(fdctrl);
-           fd_start(cur_drv);
-                cur_drv->dir = 1;
+            cur_drv = get_cur_drv(fdctrl);
+            fd_start(cur_drv);
+            cur_drv->dir = 1;
             if (fdctrl->fifo[2] > cur_drv->track) {
-               cur_drv->track = 0;
+                cur_drv->track = 0;
             } else {
                 cur_drv->track -= fdctrl->fifo[2];
             }
-           fdctrl_reset_fifo(fdctrl);
-           /* Raise Interrupt */
-           fdctrl_raise_irq(fdctrl, 0x20);
+            fdctrl_reset_fifo(fdctrl);
+            /* Raise Interrupt */
+            fdctrl_raise_irq(fdctrl, 0x20);
             break;
         }
     }
 }
+
+static void fdctrl_result_timer(void *opaque)
+{
+    fdctrl_t *fdctrl = opaque;
+    fdrive_t *cur_drv = get_cur_drv(fdctrl);
+
+    /* Pretend we are spinning.
+     * This is needed for Coherent, which uses READ ID to check for
+     * sector interleaving.
+     */
+    if (cur_drv->last_sect != 0) {
+        cur_drv->sect = (cur_drv->sect % cur_drv->last_sect) + 1;
+    }
+    fdctrl_stop_transfer(fdctrl, 0x00, 0x00, 0x00);
+}