[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 5/9] fdc: add CCR (Configuration Control Register
From: |
Hervé Poussineau |
Subject: |
[Qemu-devel] [PATCH v3 5/9] fdc: add CCR (Configuration Control Register) write register |
Date: |
Mon, 23 Jan 2012 09:50:36 +0100 |
DIR and CCR registers share the same address ; DIR is read-only
while CCR is write-only
Signed-off-by: Hervé Poussineau <address@hidden>
---
hw/fdc.c | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/hw/fdc.c b/hw/fdc.c
index 4a363bd..4875291 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
[Qemu-devel] [PATCH v3 2/9] fdc: set busy bit when starting a command, Hervé Poussineau, 2012/01/23
[Qemu-devel] [PATCH v3 3/9] fdc: most control commands do not generate interrupts, Hervé Poussineau, 2012/01/23
[Qemu-devel] [PATCH v3 5/9] fdc: add CCR (Configuration Control Register) write register,
Hervé Poussineau <=
[Qemu-devel] [PATCH v3 4/9] fdc: handle read-only floppies (abort early on write commands), Hervé Poussineau, 2012/01/23
[Qemu-devel] [PATCH v3 7/9] fdc: check if media rate is correct before doing any transfer, Hervé Poussineau, 2012/01/23
[Qemu-devel] [PATCH v3 6/9] block: add a transfer rate for floppy types, Hervé Poussineau, 2012/01/23
[Qemu-devel] [PATCH v3 8/9] fdc: fix seek command, which shouldn't check tracks, Hervé Poussineau, 2012/01/23
[Qemu-devel] [PATCH v3 9/9] fdc: DIR (Digital Input Register) should return status of current drive..., Hervé Poussineau, 2012/01/23