diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2011-10-18 16:41:45 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2011-10-21 17:34:13 +0200 |
| commit | a18e67f5f9dc1e5e9a293a946666e2e74daa1c91 (patch) | |
| tree | cddf0dbb0654c2cb2dcfd36ca1de5db826993486 /hw/fdc.c | |
| parent | 4265d620c5a91b58c757ce76fa2b0fff86fa1df1 (diff) | |
| download | focaccia-qemu-a18e67f5f9dc1e5e9a293a946666e2e74daa1c91.tar.gz focaccia-qemu-a18e67f5f9dc1e5e9a293a946666e2e74daa1c91.zip | |
fdc: Fix floppy port I/O
The floppy device was broken by commit 212ec7ba (fdc: Convert to isa_register_portio_list). While the old interface provided the port number relative to the floppy drive's io_base, the new one provides the real port number, so we need to apply a bitmask now to get the register number. Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'hw/fdc.c')
| -rw-r--r-- | hw/fdc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/hw/fdc.c b/hw/fdc.c index 4b06e049e8..f8af2de2ce 100644 --- a/hw/fdc.c +++ b/hw/fdc.c @@ -434,6 +434,7 @@ static uint32_t fdctrl_read (void *opaque, uint32_t reg) FDCtrl *fdctrl = opaque; uint32_t retval; + reg &= 7; switch (reg) { case FD_REG_SRA: retval = fdctrl_read_statusA(fdctrl); @@ -471,6 +472,7 @@ static void fdctrl_write (void *opaque, uint32_t reg, uint32_t value) FLOPPY_DPRINTF("write reg%d: 0x%02x\n", reg & 7, value); + reg &= 7; switch (reg) { case FD_REG_DOR: fdctrl_write_dor(fdctrl, value); |