From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:35507) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RmKsl-0002Qp-JK for qemu-devel@nongnu.org; Sun, 15 Jan 2012 02:52:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RmKsg-000179-P0 for qemu-devel@nongnu.org; Sun, 15 Jan 2012 02:52:03 -0500 Received: from smtp1-g21.free.fr ([212.27.42.1]:56316) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RmKsf-00016t-VL for qemu-devel@nongnu.org; Sun, 15 Jan 2012 02:51:58 -0500 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Sun, 15 Jan 2012 08:51:52 +0100 Message-Id: <1326613915-3282-9-git-send-email-hpoussin@reactos.org> In-Reply-To: <1326613915-3282-1-git-send-email-hpoussin@reactos.org> References: <1326613915-3282-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 v2 08/10] fdc: check if media rate is correct before doing any transfer 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?= The programmed rate has to be the same as the required rate for the floppy format ; if that's not the case, the transfer should abort. Revalidate floppy after migration, so media_rate field doesn't have to be saved/restored. Signed-off-by: Herv=C3=A9 Poussineau --- hw/fdc.c | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) diff --git a/hw/fdc.c b/hw/fdc.c index 629408f..685ea88 100644 --- a/hw/fdc.c +++ b/hw/fdc.c @@ -83,6 +83,7 @@ typedef struct FDrive { uint16_t bps; /* Bytes per sector */ uint8_t ro; /* Is read-only */ uint8_t media_changed; /* Is media changed */ + uint8_t media_rate; /* Data rate of medium */ } FDrive; =20 static void fd_init(FDrive *drv) @@ -195,6 +196,7 @@ static void fd_revalidate(FDrive *drv) drv->last_sect =3D last_sect; drv->ro =3D ro; drv->drive =3D drive; + drv->media_rate =3D rate; } else { FLOPPY_DPRINTF("No disk in drive\n"); drv->last_sect =3D 0; @@ -303,6 +305,7 @@ enum { }; =20 enum { + FD_SR1_MA =3D 0x01, /* Missing address mark */ FD_SR1_NW =3D 0x02, /* Not writable */ FD_SR1_EC =3D 0x80, /* End of cylinder */ }; @@ -582,6 +585,7 @@ static int fdc_post_load(void *opaque, int version_id= ) =20 SET_CUR_DRV(s, s->dor_vmstate & FD_DOR_SELMASK); s->dor =3D s->dor_vmstate & ~FD_DOR_SELMASK; + fd_revalidate(get_cur_drv(s)); return 0; } =20 @@ -1077,6 +1081,18 @@ static void fdctrl_start_transfer(FDCtrl *fdctrl, = int direction) break; } =20 + /* Check the data rate. If the programmed data rate does not match + * the currently inserted medium, the operation has to fail. */ + if ((fdctrl->dsr & FD_DSR_DRATEMASK) !=3D cur_drv->media_rate) { + FLOPPY_DPRINTF("data rate mismatch (fdc=3D%d, media=3D%d)\n", + fdctrl->dsr & FD_DSR_DRATEMASK, cur_drv->media_ra= te); + fdctrl_stop_transfer(fdctrl, FD_SR0_ABNTERM, FD_SR1_MA, 0x00); + fdctrl->fifo[3] =3D kt; + fdctrl->fifo[4] =3D kh; + fdctrl->fifo[5] =3D ks; + return; + } + /* Set the FIFO state */ fdctrl->data_dir =3D direction; fdctrl->data_pos =3D 0; @@ -1799,7 +1815,14 @@ static void fdctrl_result_timer(void *opaque) if (cur_drv->last_sect !=3D 0) { cur_drv->sect =3D (cur_drv->sect % cur_drv->last_sect) + 1; } - fdctrl_stop_transfer(fdctrl, 0x00, 0x00, 0x00); + /* READ_ID can't automatically succeed! */ + if ((fdctrl->dsr & FD_DSR_DRATEMASK) !=3D cur_drv->media_rate) { + FLOPPY_DPRINTF("read id rate mismatch (fdc=3D%d, media=3D%d)\n", + fdctrl->dsr & FD_DSR_DRATEMASK, cur_drv->media_ra= te); + fdctrl_stop_transfer(fdctrl, FD_SR0_ABNTERM, FD_SR1_MA, 0x00); + } else { + fdctrl_stop_transfer(fdctrl, 0x00, 0x00, 0x00); + } } =20 static void fdctrl_change_cb(void *opaque, bool load) --=20 1.7.7.3