]> rtime.felk.cvut.cz Git - lisovros/qemu_apohw.git/commitdiff
fdc: handle read-only floppies (abort early on write commands)
authorHervé Poussineau <hpoussin@reactos.org>
Mon, 6 Feb 2012 21:29:05 +0000 (22:29 +0100)
committerKevin Wolf <kwolf@redhat.com>
Wed, 29 Feb 2012 11:48:46 +0000 (12:48 +0100)
A real floppy doesn't attempt to write to read-only media either.

Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
hw/fdc.c

index 9d1f5b37a381e68d36fc6b97a533a3fa404de7a5..3d4bb116cb526176d0ffab9f9577ba81d90ecef1 100644 (file)
--- a/hw/fdc.c
+++ b/hw/fdc.c
@@ -300,6 +300,7 @@ enum {
 };
 
 enum {
+    FD_SR1_NW       = 0x02, /* Not writable */
     FD_SR1_EC       = 0x80, /* End of cylinder */
 };
 
@@ -1179,6 +1180,16 @@ static int fdctrl_transfer_handler (void *opaque, int nchan,
             break;
         case FD_DIR_WRITE:
             /* WRITE commands */
+            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;
+            }
+
             DMA_read_memory (nchan, fdctrl->fifo + rel_pos,
                              fdctrl->data_pos, len);
             if (bdrv_write(cur_drv->bs, fd_sector(cur_drv),