qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Hervé Poussineau" <hpoussin@reactos.org>
To: qemu-devel@nongnu.org
Cc: "Kevin Wolf" <kwolf@redhat.com>,
	"Hervé Poussineau" <hpoussin@reactos.org>
Subject: [Qemu-devel] [PATCH v2 06/10] fdc: add CCR (Configuration Control Register) write register
Date: Sun, 15 Jan 2012 08:51:50 +0100	[thread overview]
Message-ID: <1326613915-3282-7-git-send-email-hpoussin@reactos.org> (raw)
In-Reply-To: <1326613915-3282-1-git-send-email-hpoussin@reactos.org>

DIR and CCR registers share the same address ; DIR is read-only
while CCR is write-only

Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
---
 hw/fdc.c |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/hw/fdc.c b/hw/fdc.c
index 078ff0c..6726450 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.7.3

  parent reply	other threads:[~2012-01-15  7:51 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-01-15  7:51 [Qemu-devel] [PATCH v2 00/10] Misc fixes for floppy emulation Hervé Poussineau
2012-01-15  7:51 ` [Qemu-devel] [PATCH v2 01/10] fdc: take side count into account Hervé Poussineau
2012-01-15  7:51 ` [Qemu-devel] [PATCH v2 02/10] fdc: set busy bit when starting a command Hervé Poussineau
2012-01-16  9:33   ` Kevin Wolf
2012-01-15  7:51 ` [Qemu-devel] [PATCH v2 03/10] fdc: most control commands do not generate interrupts Hervé Poussineau
2012-01-15  7:51 ` [Qemu-devel] [PATCH v2 04/10] fdc: emulate stepping 0 Hervé Poussineau
2012-01-16  9:54   ` Kevin Wolf
2012-01-23  7:58     ` Hervé Poussineau
2012-01-15  7:51 ` [Qemu-devel] [PATCH v2 05/10] fdc: handle read-only floppies (abort early on write commands) Hervé Poussineau
2012-01-15  7:51 ` Hervé Poussineau [this message]
2012-01-15  7:51 ` [Qemu-devel] [PATCH v2 07/10] block: add a transfer rate for floppy types Hervé Poussineau
2012-01-16 10:18   ` Kevin Wolf
2012-01-21 19:02     ` Blue Swirl
2012-01-23  8:51       ` Kevin Wolf
2012-01-23 16:56         ` Blue Swirl
2012-01-27  8:33         ` Markus Armbruster
2012-01-15  7:51 ` [Qemu-devel] [PATCH v2 08/10] fdc: check if media rate is correct before doing any transfer Hervé Poussineau
2012-01-15  7:51 ` [Qemu-devel] [PATCH v2 09/10] fdc: fix seek command, which shouldn't check tracks Hervé Poussineau
2012-01-16 10:32   ` Kevin Wolf
2012-01-15  7:51 ` [Qemu-devel] [PATCH v2 10/10] fdc: DIR (Digital Input Register) should return status of current drive Hervé Poussineau

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=1326613915-3282-7-git-send-email-hpoussin@reactos.org \
    --to=hpoussin@reactos.org \
    --cc=kwolf@redhat.com \
    --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).