From: Kevin Wolf <kwolf@redhat.com>
To: anthony@codemonkey.ws
Cc: kwolf@redhat.com, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH 05/27] fdc: add CCR (Configuration Control Register) write register
Date: Wed, 29 Feb 2012 16:17:46 +0100 [thread overview]
Message-ID: <1330528688-21996-6-git-send-email-kwolf@redhat.com> (raw)
In-Reply-To: <1330528688-21996-1-git-send-email-kwolf@redhat.com>
From: Hervé Poussineau <hpoussin@reactos.org>
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é Poussineau <hpoussin@reactos.org>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
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);
enum {
FD_DIR_WRITE = 0,
@@ -248,6 +249,7 @@ enum {
FD_REG_DSR = 0x04,
FD_REG_FIFO = 0x05,
FD_REG_DIR = 0x07,
+ FD_REG_CCR = 0x07,
};
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 = value;
}
+/* 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", value);
+
+ /* Only the rate selection bits used in AT mode, and we
+ * store those in the DSR.
+ */
+ fdctrl->dsr = (fdctrl->dsr & ~FD_DSR_DRATEMASK) |
+ (value & FD_DSR_DRATEMASK);
+}
+
static int fdctrl_media_changed(FDrive *drv)
{
int ret;
--
1.7.6.5
next prev parent reply other threads:[~2012-02-29 15:15 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-29 15:17 [Qemu-devel] [PULL 00/27] Block patches Kevin Wolf
2012-02-29 15:17 ` [Qemu-devel] [PATCH 01/27] fdc: take side count into account Kevin Wolf
2012-02-29 15:17 ` [Qemu-devel] [PATCH 02/27] fdc: set busy bit when starting a command Kevin Wolf
2012-02-29 15:17 ` [Qemu-devel] [PATCH 03/27] fdc: most control commands do not generate interrupts Kevin Wolf
2012-02-29 15:17 ` [Qemu-devel] [PATCH 04/27] fdc: handle read-only floppies (abort early on write commands) Kevin Wolf
2012-02-29 15:17 ` Kevin Wolf [this message]
2012-02-29 15:17 ` [Qemu-devel] [PATCH 06/27] block: add a transfer rate for floppy types Kevin Wolf
2012-02-29 15:17 ` [Qemu-devel] [PATCH 07/27] fdc: add a 'check media rate' property. Not used yet Kevin Wolf
2012-02-29 15:17 ` [Qemu-devel] [PATCH 08/27] fdc: check if media rate is correct before doing any transfer Kevin Wolf
2012-02-29 15:17 ` [Qemu-devel] [PATCH 09/27] fdc: fix seek command, which shouldn't check tracks Kevin Wolf
2012-02-29 15:17 ` [Qemu-devel] [PATCH 10/27] fdc: DIR (Digital Input Register) should return status of current drive Kevin Wolf
2012-02-29 15:17 ` [Qemu-devel] [PATCH 11/27] ide: fail I/O to empty disk Kevin Wolf
2012-02-29 15:17 ` [Qemu-devel] [PATCH 12/27] qcow2: Fix build with DEBUG_EXT enabled Kevin Wolf
2012-02-29 15:17 ` [Qemu-devel] [PATCH 13/27] block: remove unused fields in BlockDriverState Kevin Wolf
2012-02-29 15:17 ` [Qemu-devel] [PATCH 14/27] block: drop aio_multiwrite in BlockDriver Kevin Wolf
2012-02-29 15:17 ` [Qemu-devel] [PATCH 15/27] qcow2: Fix offset in qcow2_read_extensions Kevin Wolf
2012-02-29 15:17 ` [Qemu-devel] [PATCH 16/27] qcow2: Reject too large header extensions Kevin Wolf
2012-02-29 15:17 ` [Qemu-devel] [PATCH 17/27] qapi: Introduce blockdev-group-snapshot-sync command Kevin Wolf
2012-02-29 15:17 ` [Qemu-devel] [PATCH 18/27] QMP: Add qmp command for blockdev-group-snapshot-sync Kevin Wolf
2012-02-29 15:18 ` [Qemu-devel] [PATCH 19/27] qemu-iotests: export TEST_DIR for non-bash tests Kevin Wolf
2012-02-29 15:18 ` [Qemu-devel] [PATCH 20/27] qemu-iotests: add iotests Python module Kevin Wolf
2012-02-29 15:18 ` [Qemu-devel] [PATCH 21/27] test: add image streaming tests Kevin Wolf
2012-02-29 15:18 ` [Qemu-devel] [PATCH 22/27] qemu-iotests: Filter out DOS line endings Kevin Wolf
2012-02-29 15:18 ` [Qemu-devel] [PATCH 23/27] qemu-iotests: 026: Reduce output changes for cache=none qcow2 Kevin Wolf
2012-02-29 15:18 ` [Qemu-devel] [PATCH 24/27] qemu-iotests: Test rebase with short backing file Kevin Wolf
2012-02-29 15:18 ` [Qemu-devel] [PATCH 25/27] qemu-tool: revert cpu_get_clock() abort(3) Kevin Wolf
2012-02-29 15:18 ` [Qemu-devel] [PATCH 26/27] qemu-io: fix segment fault when the image format is qed Kevin Wolf
2012-02-29 15:18 ` [Qemu-devel] [PATCH 27/27] qemu-img: " Kevin Wolf
2012-02-29 21:06 ` [Qemu-devel] [PULL 00/27] Block patches Anthony Liguori
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1330528688-21996-6-git-send-email-kwolf@redhat.com \
--to=kwolf@redhat.com \
--cc=anthony@codemonkey.ws \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).