From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:60070) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TYi0O-0000nh-7a for qemu-devel@nongnu.org; Wed, 14 Nov 2012 13:48:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TYi0L-0000ZV-3d for qemu-devel@nongnu.org; Wed, 14 Nov 2012 13:48:08 -0500 Received: from mx1.redhat.com ([209.132.183.28]:24623) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TYi0K-0000ZR-R6 for qemu-devel@nongnu.org; Wed, 14 Nov 2012 13:48:05 -0500 From: Kevin Wolf Date: Wed, 14 Nov 2012 19:47:24 +0100 Message-Id: <1352918847-3696-24-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 23/26] fdc: remove last usage of FD_STATE_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 Replace it by directly setting FD_SR0_SEEK if required Signed-off-by: Herv=C3=A9 Poussineau Signed-off-by: Kevin Wolf --- hw/fdc.c | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-) diff --git a/hw/fdc.c b/hw/fdc.c index de8778b..29b5449 100644 --- a/hw/fdc.c +++ b/hw/fdc.c @@ -355,7 +355,6 @@ enum { enum { FD_STATE_MULTI =3D 0x01, /* multi track flag */ FD_STATE_FORMAT =3D 0x02, /* format flag */ - FD_STATE_SEEK =3D 0x04, /* seek flag */ }; =20 enum { @@ -497,7 +496,6 @@ enum { }; =20 #define FD_MULTI_TRACK(state) ((state) & FD_STATE_MULTI) -#define FD_DID_SEEK(state) ((state) & FD_STATE_SEEK) #define FD_FORMAT_CMD(state) ((state) & FD_STATE_FORMAT) =20 struct FDCtrl { @@ -1422,8 +1420,6 @@ static int fdctrl_transfer_handler (void *opaque, i= nt nchan, fdctrl->data_dir =3D=3D FD_DIR_SCANL || fdctrl->data_dir =3D=3D FD_DIR_SCANH) status2 =3D FD_SR2_SEH; - if (FD_DID_SEEK(fdctrl->data_state)) - status0 |=3D FD_SR0_SEEK; fdctrl->data_len -=3D len; fdctrl_stop_transfer(fdctrl, status0, status1, status2); transfer_error: @@ -1517,7 +1513,7 @@ static void fdctrl_format_sector(FDCtrl *fdctrl) fdctrl->fifo[5] =3D ks; return; case 1: - fdctrl->data_state |=3D FD_STATE_SEEK; + fdctrl->status0 |=3D FD_SR0_SEEK; break; default: break; @@ -1531,10 +1527,7 @@ static void fdctrl_format_sector(FDCtrl *fdctrl) if (cur_drv->sect =3D=3D cur_drv->last_sect) { fdctrl->data_state &=3D ~FD_STATE_FORMAT; /* Last sector done */ - if (FD_DID_SEEK(fdctrl->data_state)) - fdctrl_stop_transfer(fdctrl, FD_SR0_SEEK, 0x00, 0x00); - else - fdctrl_stop_transfer(fdctrl, 0x00, 0x00, 0x00); + fdctrl_stop_transfer(fdctrl, 0x00, 0x00, 0x00); } else { /* More to do */ fdctrl->data_pos =3D 0; @@ -1661,7 +1654,6 @@ static void fdctrl_handle_format_track(FDCtrl *fdct= rl, int direction) fdctrl->data_state |=3D FD_STATE_MULTI; else fdctrl->data_state &=3D ~FD_STATE_MULTI; - fdctrl->data_state &=3D ~FD_STATE_SEEK; cur_drv->bps =3D fdctrl->fifo[2] > 7 ? 16384 : 128 << fdctrl->fifo[2]; #if 0 --=20 1.7.6.5