From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:52095) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T8pj4-00064z-A3 for qemu-devel@nongnu.org; Tue, 04 Sep 2012 05:47:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T8pit-0004Y1-F5 for qemu-devel@nongnu.org; Tue, 04 Sep 2012 05:47:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41977) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T8pit-0004Xq-75 for qemu-devel@nongnu.org; Tue, 04 Sep 2012 05:47:07 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q849l6F9028232 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 4 Sep 2012 05:47:06 -0400 From: Kevin Wolf Date: Tue, 4 Sep 2012 11:46:55 +0200 Message-Id: <1346752016-3569-3-git-send-email-kwolf@redhat.com> In-Reply-To: <1346752016-3569-1-git-send-email-kwolf@redhat.com> References: <1346752016-3569-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 2/3] fdc: Fix false FD_SR0_SEEK List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, phrdina@redhat.com fdctrl_start/stop_transfer() used to set FD_SR0_SEEK no matter if there actually was a seek or not. This is obviously wrong. fdctrl_start_transfer() has this information because it performs the seek itself. fdctrl_stop_transfer() gets status0 passed and callers already take care of setting FD_SR0_SEEK where appropriate. Signed-off-by: Kevin Wolf --- hw/fdc.c | 5 ++--- tests/fdc-test.c | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/hw/fdc.c b/hw/fdc.c index 78ae064..8ea3341 100644 --- a/hw/fdc.c +++ b/hw/fdc.c @@ -1149,8 +1149,7 @@ static void fdctrl_stop_transfer(FDCtrl *fdctrl, uint8_t status0, FDrive *cur_drv; cur_drv = get_cur_drv(fdctrl); - fdctrl->status0 = status0 | FD_SR0_SEEK | (cur_drv->head << 2) | - GET_CUR_DRV(fdctrl); + fdctrl->status0 = status0 | (cur_drv->head << 2) | GET_CUR_DRV(fdctrl); FLOPPY_DPRINTF("transfer status: %02x %02x %02x (%02x)\n", status0, status1, status2, fdctrl->status0); @@ -1284,7 +1283,7 @@ static void fdctrl_start_transfer(FDCtrl *fdctrl, int direction) if (direction != FD_DIR_WRITE) fdctrl->msr |= FD_MSR_DIO; /* IO based transfer: calculate len */ - fdctrl_raise_irq(fdctrl, FD_SR0_SEEK); + fdctrl_raise_irq(fdctrl, did_seek ? FD_SR0_SEEK : 0); return; } diff --git a/tests/fdc-test.c b/tests/fdc-test.c index fa74411..ff96560 100644 --- a/tests/fdc-test.c +++ b/tests/fdc-test.c @@ -152,7 +152,7 @@ static uint8_t send_read_command(void) } st0 = floppy_recv(); - if (st0 != 0x60) { + if (st0 != 0x40) { ret = 1; } -- 1.7.6.5