[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/10] fdc: DIR (Digital Input Register) should retu
From: |
Hervé Poussineau |
Subject: |
[Qemu-devel] [PATCH 10/10] fdc: DIR (Digital Input Register) should return status of current drive... |
Date: |
Sun, 8 Jan 2012 21:27:48 +0100 |
Signed-off-by: Hervé Poussineau <address@hidden>
---
hw/fdc.c | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/hw/fdc.c b/hw/fdc.c
index 7af0f7e..a23fb1e 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);
@@ -932,13 +933,7 @@ 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 03/10] fdc: most control commands do not generate interrupts, (continued)
- [Qemu-devel] [PATCH 03/10] fdc: most control commands do not generate interrupts, Hervé Poussineau, 2012/01/08
- [Qemu-devel] [PATCH 04/10] fdc: emulate stepping 0, Hervé Poussineau, 2012/01/08
- [Qemu-devel] [PATCH 01/10] fdc: take head count into account, Hervé Poussineau, 2012/01/08
- [Qemu-devel] [PATCH 05/10] fdc: handle read-only floppies (abort early on write commands), Hervé Poussineau, 2012/01/08
- [Qemu-devel] [PATCH 06/10] block: add a transfer rate for floppy types, Hervé Poussineau, 2012/01/08
- [Qemu-devel] [PATCH 07/10] fdc: check if media rate is correct before doing any transfer, Hervé Poussineau, 2012/01/08
- [Qemu-devel] [PATCH 08/10] fdc: add CCR (Configuration Control Register) write register, Hervé Poussineau, 2012/01/08
- [Qemu-devel] [PATCH 10/10] fdc: DIR (Digital Input Register) should return status of current drive...,
Hervé Poussineau <=
- [Qemu-devel] [PATCH 09/10] fdc: fix seek command, which shouldn't check tracks, Hervé Poussineau, 2012/01/08