From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:50463) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RpFc5-0003Ig-HH for qemu-devel@nongnu.org; Mon, 23 Jan 2012 03:50:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RpFbx-0006Z0-Jn for qemu-devel@nongnu.org; Mon, 23 Jan 2012 03:50:53 -0500 Received: from smtp1-g21.free.fr ([212.27.42.1]:34293) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RpFbw-0006YE-TL for qemu-devel@nongnu.org; Mon, 23 Jan 2012 03:50:45 -0500 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Mon, 23 Jan 2012 09:50:40 +0100 Message-Id: <1327308641-14736-10-git-send-email-hpoussin@reactos.org> In-Reply-To: <1327308641-14736-1-git-send-email-hpoussin@reactos.org> References: <1327308641-14736-1-git-send-email-hpoussin@reactos.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v3 9/9] fdc: DIR (Digital Input Register) should return status of current drive... List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?UTF-8?q?Herv=C3=A9=20Poussineau?= Signed-off-by: Herv=C3=A9 Poussineau --- hw/fdc.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/hw/fdc.c b/hw/fdc.c index 3fa7704..79a7190 100644 --- a/hw/fdc.c +++ b/hw/fdc.c @@ -215,6 +215,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); @@ -934,14 +935,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.7.3