From: Hervé Poussineau <hpoussin@reactos.org>
Date: Sun, 19 Aug 2012 20:04:43 +0000 (+0200)
Subject: fdc: remove double affectation of FD_MSR_CMDBUSY flag
X-Git-Tag: v1.3.0-rc0~6^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=27c86e24e9d6b2bbe15c16bc09eba5bd6fa094f2;p=thirdparty%2Fqemu.git

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>
---

diff --git a/hw/fdc.c b/hw/fdc.c
index 3a82ed11fc0..a197c48b975 100644
--- a/hw/fdc.c
+++ b/hw/fdc.c
@@ -1239,7 +1239,7 @@ static void fdctrl_start_transfer(FDCtrl *fdctrl, int direction)
     /* 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