ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fdc: simplify media change handling 

This also (partly) fixes IBM OS/2 Warp 4.0 floppy installation, where
not all floppies have the same format (2x80x18 for the first ones,
2x80x23 for the next ones).

Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Hervé Poussineau 2012-05-05 19:43:28 +02:00 committed by Kevin Wolf
parent 15552c4ad3
commit 21fcf36095
1 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
hw/fdc.c
View File

@ -705,6 +705,15 @@ static void fdctrl_raise_irq(FDCtrl *fdctrl, uint8_t status0)
qemu_set_irq(fdctrl->irq, 1); qemu_set_irq(fdctrl->irq, 1);
fdctrl->sra |= FD_SRA_INTPEND; fdctrl->sra |= FD_SRA_INTPEND;
} }
if (status0 & FD_SR0_SEEK) {
FDrive *cur_drv;
/* A seek clears the disk change line (if a disk is inserted) */
cur_drv = get_cur_drv(fdctrl);
if (cur_drv->max_track) {
cur_drv->media_changed = 0;
}
}
fdctrl->reset_sensei = 0; fdctrl->reset_sensei = 0;
fdctrl->status0 = status0; fdctrl->status0 = status0;
FLOPPY_DPRINTF("Set interrupt status to 0x%02x\n", fdctrl->status0); FLOPPY_DPRINTF("Set interrupt status to 0x%02x\n", fdctrl->status0);
@ -936,23 +945,7 @@ static void fdctrl_write_ccr(FDCtrl *fdctrl, uint32_t value)
static int fdctrl_media_changed(FDrive *drv) static int fdctrl_media_changed(FDrive *drv)
{ {
int ret; return drv->media_changed;
if (!drv->bs)
return 0;
if (drv->media_changed) {
drv->media_changed = 0;
ret = 1;
} else {
ret = bdrv_media_changed(drv->bs);
if (ret < 0) {
ret = 0; /* we don't know, assume no */
}
}
if (ret) {
fd_revalidate(drv);
}
return ret;
} }
/* Digital input register : 0x07 (read-only) */ /* Digital input register : 0x07 (read-only) */
@ -1856,6 +1849,7 @@ static void fdctrl_change_cb(void *opaque, bool load)
FDrive *drive = opaque; FDrive *drive = opaque;
drive->media_changed = 1; drive->media_changed = 1;
fd_revalidate(drive);
} }
static const BlockDevOps fdctrl_block_ops = { static const BlockDevOps fdctrl_block_ops = {
@ -1886,7 +1880,6 @@ static int fdctrl_connect_drives(FDCtrl *fdctrl)
fd_init(drive); fd_init(drive);
fd_revalidate(drive); fd_revalidate(drive);
if (drive->bs) { if (drive->bs) {
drive->media_changed = 1;
bdrv_set_dev_ops(drive->bs, &fdctrl_block_ops, drive); bdrv_set_dev_ops(drive->bs, &fdctrl_block_ops, drive);
} }
} }