From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59892) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S2lFK-00060w-0R for qemu-devel@nongnu.org; Wed, 29 Feb 2012 10:15:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S2lEs-0003Sv-Un for qemu-devel@nongnu.org; Wed, 29 Feb 2012 10:15:13 -0500 Received: from mx1.redhat.com ([209.132.183.28]:2029) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S2lEs-0003SI-NO for qemu-devel@nongnu.org; Wed, 29 Feb 2012 10:14:46 -0500 From: Kevin Wolf Date: Wed, 29 Feb 2012 16:17:46 +0100 Message-Id: <1330528688-21996-6-git-send-email-kwolf@redhat.com> In-Reply-To: <1330528688-21996-1-git-send-email-kwolf@redhat.com> References: <1330528688-21996-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 05/27] fdc: add CCR (Configuration Control Register) write register 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 DIR and CCR registers share the same address ; DIR is read-only while CCR is write-only CCR register is used to change media transfer rate, which will be checked in following changes. Signed-off-by: Herv=C3=A9 Poussineau Signed-off-by: Kevin Wolf --- hw/fdc.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/hw/fdc.c b/hw/fdc.c index 3d4bb11..02ced22 100644 --- a/hw/fdc.c +++ b/hw/fdc.c @@ -224,6 +224,7 @@ static void fdctrl_write_rate(FDCtrl *fdctrl, uint32_= t value); static uint32_t fdctrl_read_data(FDCtrl *fdctrl); static void fdctrl_write_data(FDCtrl *fdctrl, uint32_t value); static uint32_t fdctrl_read_dir(FDCtrl *fdctrl); +static void fdctrl_write_ccr(FDCtrl *fdctrl, uint32_t value); =20 enum { FD_DIR_WRITE =3D 0, @@ -248,6 +249,7 @@ enum { FD_REG_DSR =3D 0x04, FD_REG_FIFO =3D 0x05, FD_REG_DIR =3D 0x07, + FD_REG_CCR =3D 0x07, }; =20 enum { @@ -491,6 +493,9 @@ static void fdctrl_write (void *opaque, uint32_t reg,= uint32_t value) case FD_REG_FIFO: fdctrl_write_data(fdctrl, value); break; + case FD_REG_CCR: + fdctrl_write_ccr(fdctrl, value); + break; default: break; } @@ -881,6 +886,23 @@ static void fdctrl_write_rate(FDCtrl *fdctrl, uint32= _t value) fdctrl->dsr =3D value; } =20 +/* Configuration control register: 0x07 (write) */ +static void fdctrl_write_ccr(FDCtrl *fdctrl, uint32_t value) +{ + /* Reset mode */ + if (!(fdctrl->dor & FD_DOR_nRESET)) { + FLOPPY_DPRINTF("Floppy controller in RESET state !\n"); + return; + } + FLOPPY_DPRINTF("configuration control register set to 0x%02x\n", val= ue); + + /* Only the rate selection bits used in AT mode, and we + * store those in the DSR. + */ + fdctrl->dsr =3D (fdctrl->dsr & ~FD_DSR_DRATEMASK) | + (value & FD_DSR_DRATEMASK); +} + static int fdctrl_media_changed(FDrive *drv) { int ret; --=20 1.7.6.5