[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 9/9] fdc: DIR (Digital Input Register) should ret
From: |
Hervé Poussineau |
Subject: |
[Qemu-devel] [PATCH v3 9/9] fdc: DIR (Digital Input Register) should return status of current drive... |
Date: |
Mon, 23 Jan 2012 09:50:40 +0100 |
Signed-off-by: Hervé Poussineau <address@hidden>
---
hw/fdc.c | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/hw/fdc.c b/hw/fdc.c
index 3fa7704..79a7190 100644
--- a/hw/fdc.c
+++ b/hw/fdc.c
@@ -215,6 +215,7 @@ static void fdctrl_reset_fifo(FDCtrl *fdctrl);
static int fdctrl_transfer_handler (void *opaque, int nchan,
int dma_pos, int dma_len);
static void fdctrl_raise_irq(FDCtrl *fdctrl, uint8_t status0);
+static FDrive *get_cur_drv(FDCtrl *fdctrl);
static uint32_t fdctrl_read_statusA(FDCtrl *fdctrl);
static uint32_t fdctrl_read_statusB(FDCtrl *fdctrl);
@@ -934,14 +935,9 @@ static uint32_t fdctrl_read_dir(FDCtrl *fdctrl)
{
uint32_t retval = 0;
- if (fdctrl_media_changed(drv0(fdctrl))
- || fdctrl_media_changed(drv1(fdctrl))
-#if MAX_FD == 4
- || fdctrl_media_changed(drv2(fdctrl))
- || fdctrl_media_changed(drv3(fdctrl))
-#endif
- )
+ if (fdctrl_media_changed(get_cur_drv(fdctrl))) {
retval |= FD_DIR_DSKCHG;
+ }
if (retval != 0) {
FLOPPY_DPRINTF("Floppy digital input register: 0x%02x\n", retval);
}
--
1.7.7.3
- [Qemu-devel] [PATCH v3 5/9] fdc: add CCR (Configuration Control Register) write register, (continued)
[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 <=
Re: [Qemu-devel] [PATCH v3 0/9] Misc fixes for floppy emulation, Markus Armbruster, 2012/01/31