commit 27c86e24e9d6b2bbe15c16bc09eba5bd6fa094f2
author Hervé Poussineau <hpoussin@reactos.org> Sun Aug 19 22:04:43 2012 +0200
committer Kevin Wolf <kwolf@redhat.com> Wed Nov 14 18:19:22 2012 +0100
tree 8d21bf32d47fb31234f166fcf8bcd0ea8b63c411
parent 6f442fe83821a06c5408056c7879e83a74f2ff32

fdc: remove double affectation of FD_MSR_CMDBUSY flag

FD_MSR_CMDBUSY flag is already set in fdctrl_write_data(), just
before calling the command handler (fdctrl_start_transfer() here).

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

hw/fdc.c

diff --git a/hw/fdc.c b/hw/fdc.c
index 3a82ed1..a197c48 100644
--- a/hw/fdc.c
+++ b/hw/fdc.c
@@ -1239,7 +1239,7 @@
     /* Set the FIFO state */
     fdctrl->data_dir = direction;
     fdctrl->data_pos = 0;
-    fdctrl->msr |= FD_MSR_CMDBUSY;
+    assert(fdctrl->msr & FD_MSR_CMDBUSY);
     if (fdctrl->fifo[0] & 0x80)
         fdctrl->data_state |= FD_STATE_MULTI;
     else