From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:60009) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TYi0F-0000Kl-22 for qemu-devel@nongnu.org; Wed, 14 Nov 2012 13:48:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TYi0B-0000XL-Uk for qemu-devel@nongnu.org; Wed, 14 Nov 2012 13:47:58 -0500 Received: from mx1.redhat.com ([209.132.183.28]:15670) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TYi0B-0000X4-LJ for qemu-devel@nongnu.org; Wed, 14 Nov 2012 13:47:55 -0500 From: Kevin Wolf Date: Wed, 14 Nov 2012 19:47:17 +0100 Message-Id: <1352918847-3696-17-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 16/26] fdc: fix FD_SR0_SEEK for initial seek on DMA transfers 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 fdctrl_start_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 initial seek itself. Signed-off-by: Herv=C3=A9 Poussineau Signed-off-by: Kevin Wolf --- hw/fdc.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/hw/fdc.c b/hw/fdc.c index e47050f..a9a2a2a 100644 --- a/hw/fdc.c +++ b/hw/fdc.c @@ -1179,7 +1179,6 @@ static void fdctrl_start_transfer(FDCtrl *fdctrl, i= nt direction) { FDrive *cur_drv; uint8_t kh, kt, ks; - int did_seek =3D 0; =20 SET_CUR_DRV(fdctrl, fdctrl->fifo[1] & FD_DOR_SELMASK); cur_drv =3D get_cur_drv(fdctrl); @@ -1213,7 +1212,7 @@ static void fdctrl_start_transfer(FDCtrl *fdctrl, i= nt direction) fdctrl->fifo[5] =3D ks; return; case 1: - did_seek =3D 1; + fdctrl->status0 |=3D FD_SR0_SEEK; break; default: break; @@ -1240,10 +1239,6 @@ static void fdctrl_start_transfer(FDCtrl *fdctrl, = int direction) fdctrl->data_state |=3D FD_STATE_MULTI; else fdctrl->data_state &=3D ~FD_STATE_MULTI; - if (did_seek) - fdctrl->data_state |=3D FD_STATE_SEEK; - else - fdctrl->data_state &=3D ~FD_STATE_SEEK; if (fdctrl->fifo[5] =3D=3D 00) { fdctrl->data_len =3D fdctrl->fifo[8]; } else { @@ -1286,7 +1281,6 @@ static void fdctrl_start_transfer(FDCtrl *fdctrl, i= nt direction) if (direction !=3D FD_DIR_WRITE) fdctrl->msr |=3D FD_MSR_DIO; /* IO based transfer: calculate len */ - fdctrl->status0 |=3D FD_SR0_SEEK; fdctrl_raise_irq(fdctrl); } =20 --=20 1.7.6.5