From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:60015) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TYi0G-0000OA-4y for qemu-devel@nongnu.org; Wed, 14 Nov 2012 13:48:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TYi0D-0000Xa-0a for qemu-devel@nongnu.org; Wed, 14 Nov 2012 13:48:00 -0500 Received: from mx1.redhat.com ([209.132.183.28]:59627) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TYi0C-0000XV-OR for qemu-devel@nongnu.org; Wed, 14 Nov 2012 13:47:56 -0500 From: Kevin Wolf Date: Wed, 14 Nov 2012 19:47:18 +0100 Message-Id: <1352918847-3696-18-git-send-email-kwolf@redhat.com> In-Reply-To: <1352918847-3696-1-git-send-email-kwolf@redhat.com> References: <1352918847-3696-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 17/26] fdc: fix false FD_SR0_SEEK 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 Do not always set FD_SR0_SEEK, as callers already set it if needed. Signed-off-by: Herv=C3=A9 Poussineau Signed-off-by: Kevin Wolf --- hw/fdc.c | 10 +++++++--- tests/fdc-test.c | 6 +++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/hw/fdc.c b/hw/fdc.c index a9a2a2a..525ba20 100644 --- a/hw/fdc.c +++ b/hw/fdc.c @@ -1149,10 +1149,14 @@ static void fdctrl_stop_transfer(FDCtrl *fdctrl, = uint8_t status0, uint8_t status1, uint8_t status2) { FDrive *cur_drv; - cur_drv =3D get_cur_drv(fdctrl); - fdctrl->status0 =3D status0 | FD_SR0_SEEK | (cur_drv->head << 2) | - GET_CUR_DRV(fdctrl); + + fdctrl->status0 &=3D ~(FD_SR0_DS0 | FD_SR0_DS1 | FD_SR0_HEAD); + fdctrl->status0 |=3D GET_CUR_DRV(fdctrl); + if (cur_drv->head) { + fdctrl->status0 |=3D FD_SR0_HEAD; + } + fdctrl->status0 |=3D status0; =20 FLOPPY_DPRINTF("transfer status: %02x %02x %02x (%02x)\n", status0, status1, status2, fdctrl->status0); diff --git a/tests/fdc-test.c b/tests/fdc-test.c index 4649e3f..1156112 100644 --- a/tests/fdc-test.c +++ b/tests/fdc-test.c @@ -154,7 +154,7 @@ static uint8_t send_read_command(void) } =20 st0 =3D floppy_recv(); - if (st0 !=3D 0x60) { + if (st0 !=3D 0x40) { ret =3D 1; } =20 @@ -398,7 +398,7 @@ static void test_read_no_dma_1(void) =20 outb(FLOPPY_BASE + reg_dor, inb(FLOPPY_BASE + reg_dor) & ~0x08); send_seek(0); - ret =3D send_read_no_dma_command(1, 0x24); /* FIXME: should be 0x04 = */ + ret =3D send_read_no_dma_command(1, 0x04); g_assert(ret =3D=3D 0); } =20 @@ -408,7 +408,7 @@ static void test_read_no_dma_18(void) =20 outb(FLOPPY_BASE + reg_dor, inb(FLOPPY_BASE + reg_dor) & ~0x08); send_seek(0); - ret =3D send_read_no_dma_command(18, 0x24); /* FIXME: should be 0x04= */ + ret =3D send_read_no_dma_command(18, 0x04); g_assert(ret =3D=3D 0); } =20 --=20 1.7.6.5