From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59790) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S2lFC-0005dU-Ro for qemu-devel@nongnu.org; Wed, 29 Feb 2012 10:15:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S2lEy-0003Uq-J5 for qemu-devel@nongnu.org; Wed, 29 Feb 2012 10:15:06 -0500 Received: from mx1.redhat.com ([209.132.183.28]:53783) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S2lEy-0003UR-Bk for qemu-devel@nongnu.org; Wed, 29 Feb 2012 10:14:52 -0500 From: Kevin Wolf Date: Wed, 29 Feb 2012 16:17:51 +0100 Message-Id: <1330528688-21996-11-git-send-email-kwolf@redhat.com> In-Reply-To: <1330528688-21996-1-git-send-email-kwolf@redhat.com> References: <1330528688-21996-1-git-send-email-kwolf@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 10/27] fdc: DIR (Digital Input Register) should return status of current drive... List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Herv=C3=A9 Poussineau Signed-off-by: Herv=C3=A9 Poussineau Signed-off-by: Kevin Wolf --- hw/fdc.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/hw/fdc.c b/hw/fdc.c index 7879b70..a0236b7 100644 --- a/hw/fdc.c +++ b/hw/fdc.c @@ -216,6 +216,7 @@ static void fdctrl_reset_fifo(FDCtrl *fdctrl); static int fdctrl_transfer_handler (void *opaque, int nchan, int dma_pos, int dma_len); static void fdctrl_raise_irq(FDCtrl *fdctrl, uint8_t status0); +static FDrive *get_cur_drv(FDCtrl *fdctrl); =20 static uint32_t fdctrl_read_statusA(FDCtrl *fdctrl); static uint32_t fdctrl_read_statusB(FDCtrl *fdctrl); @@ -956,14 +957,9 @@ static uint32_t fdctrl_read_dir(FDCtrl *fdctrl) { uint32_t retval =3D 0; =20 - if (fdctrl_media_changed(drv0(fdctrl)) - || fdctrl_media_changed(drv1(fdctrl)) -#if MAX_FD =3D=3D 4 - || fdctrl_media_changed(drv2(fdctrl)) - || fdctrl_media_changed(drv3(fdctrl)) -#endif - ) + if (fdctrl_media_changed(get_cur_drv(fdctrl))) { retval |=3D FD_DIR_DSKCHG; + } if (retval !=3D 0) { FLOPPY_DPRINTF("Floppy digital input register: 0x%02x\n", retval= ); } --=20 1.7.6.5