david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdc: Fix floppy port I/O

Browse Source 
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>
This commit is contained in:
Kevin Wolf 2011-10-18 16:41:45 +02:00
parent 4265d620c5
commit a18e67f5f9
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/fdc.c
View File

@ -434,6 +434,7 @@ static uint32_t fdctrl_read (void *opaque, uint32_t reg)
FDCtrl *fdctrl = opaque; FDCtrl *fdctrl = opaque;
uint32_t retval; uint32_t retval;
reg &= 7;
switch (reg) { switch (reg) {
case FD_REG_SRA: case FD_REG_SRA:
retval = fdctrl_read_statusA(fdctrl); 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); FLOPPY_DPRINTF("write reg%d: 0x%02x\n", reg & 7, value);
reg &= 7;
switch (reg) { switch (reg) {
case FD_REG_DOR: case FD_REG_DOR:
fdctrl_write_dor(fdctrl, value); fdctrl_write_dor(fdctrl, value);