[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 11/11] fdc: DIR (Digital Input Register) should r
From: |
Hervé Poussineau |
Subject: |
[Qemu-devel] [PATCH v4 11/11] fdc: DIR (Digital Input Register) should return status of current drive... |
Date: |
Mon, 6 Feb 2012 22:29:12 +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 1928284..cc2813f 100644
--- a/hw/fdc.c
+++ b/hw/fdc.c
@@ -216,6 +216,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);
@@ -956,14 +957,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.8.3
- [Qemu-devel] [PATCH v4 00/11] Misc fixes for floppy emulation, Hervé Poussineau, 2012/02/06
- [Qemu-devel] [PATCH v4 01/11] fdc: take side count into account, Hervé Poussineau, 2012/02/06
- [Qemu-devel] [PATCH v4 02/11] fdc: set busy bit when starting a command, Hervé Poussineau, 2012/02/06
- [Qemu-devel] [PATCH v4 03/11] fdc: most control commands do not generate interrupts, Hervé Poussineau, 2012/02/06
- [Qemu-devel] [PATCH v4 04/11] fdc: handle read-only floppies (abort early on write commands), Hervé Poussineau, 2012/02/06
- [Qemu-devel] [PATCH v4 05/11] fdc: add CCR (Configuration Control Register) write register, Hervé Poussineau, 2012/02/06
- [Qemu-devel] [PATCH v4 10/11] fdc: fix seek command, which shouldn't check tracks, Hervé Poussineau, 2012/02/06
- [Qemu-devel] [PATCH v4 11/11] fdc: DIR (Digital Input Register) should return status of current drive...,
Hervé Poussineau <=
- [Qemu-devel] [PATCH v4 06/11] block: add a transfer rate for floppy types, Hervé Poussineau, 2012/02/06
- [Qemu-devel] [PATCH v4 07/11] pc: add 1.1 machine type, Hervé Poussineau, 2012/02/06
- [Qemu-devel] [PATCH v4 09/11] fdc: check if media rate is correct before doing any transfer, Hervé Poussineau, 2012/02/06
- [Qemu-devel] [PATCH v4 08/11] fdc: add a 'check media rate' property. Not used yet, Hervé Poussineau, 2012/02/06
- Re: [Qemu-devel] [PATCH v4 00/11] Misc fixes for floppy emulation, Hervé Poussineau, 2012/02/14
- Re: [Qemu-devel] [PATCH v4 00/11] Misc fixes for floppy emulation, Kevin Wolf, 2012/02/14