falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/block/fdc: Implement tray status 

The tray of an FDD is open iff there is no medium inserted (there are
only two states for an FDD: "medium inserted" or "no medium inserted").

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Max Reitz 2015-10-19 17:53:16 +02:00 committed by Kevin Wolf
parent b4d02820d9
commit 2e1280e8ff
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hw/block/fdc.c
View File

@ -192,6 +192,8 @@ typedef struct FDrive {
uint8_t ro; /* Is read-only */ uint8_t ro; /* Is read-only */
uint8_t media_changed; /* Is media changed */ uint8_t media_changed; /* Is media changed */
uint8_t media_rate; /* Data rate of medium */ uint8_t media_rate; /* Data rate of medium */
bool media_inserted; /* Is there a medium in the tray */
} FDrive; } FDrive;
static void fd_init(FDrive *drv) static void fd_init(FDrive *drv)
@ -261,7 +263,7 @@ static int fd_seek(FDrive *drv, uint8_t head, uint8_t track, uint8_t sect,
#endif #endif
drv->head = head; drv->head = head;
if (drv->track != track) { if (drv->track != track) {
if (drv->blk != NULL && blk_is_inserted(drv->blk)) { if (drv->media_inserted) {
drv->media_changed = 0; drv->media_changed = 0;
} }
ret = 1; ret = 1;
@ -270,7 +272,7 @@ static int fd_seek(FDrive *drv, uint8_t head, uint8_t track, uint8_t sect,
drv->sect = sect; drv->sect = sect;
} }
if (drv->blk == NULL || !blk_is_inserted(drv->blk)) { if (!drv->media_inserted) {
ret = 2; ret = 2;
} }
@ -296,7 +298,7 @@ static void fd_revalidate(FDrive *drv)
ro = blk_is_read_only(drv->blk); ro = blk_is_read_only(drv->blk);
pick_geometry(drv->blk, &nb_heads, &max_track, pick_geometry(drv->blk, &nb_heads, &max_track,
&last_sect, drv->drive, &drive, &rate); &last_sect, drv->drive, &drive, &rate);
if (!blk_is_inserted(drv->blk)) { if (!drv->media_inserted) {
FLOPPY_DPRINTF("No disk in drive\n"); FLOPPY_DPRINTF("No disk in drive\n");
} else { } else {
FLOPPY_DPRINTF("Floppy disk (%d h %d t %d s) %s\n", nb_heads, FLOPPY_DPRINTF("Floppy disk (%d h %d t %d s) %s\n", nb_heads,
@ -692,7 +694,7 @@ static bool fdrive_media_changed_needed(void *opaque)
{ {
FDrive *drive = opaque; FDrive *drive = opaque;
return (drive->blk != NULL && drive->media_changed != 1); return (drive->media_inserted && drive->media_changed != 1);
} }
static const VMStateDescription vmstate_fdrive_media_changed = { static const VMStateDescription vmstate_fdrive_media_changed = {
@ -2184,12 +2186,21 @@ static void fdctrl_change_cb(void *opaque, bool load)
{ {
FDrive *drive = opaque; FDrive *drive = opaque;
drive->media_inserted = load && drive->blk && blk_is_inserted(drive->blk);
drive->media_changed = 1; drive->media_changed = 1;
fd_revalidate(drive); fd_revalidate(drive);
} }
static bool fdctrl_is_tray_open(void *opaque)
{
FDrive *drive = opaque;
return !drive->media_inserted;
}
static const BlockDevOps fdctrl_block_ops = { static const BlockDevOps fdctrl_block_ops = {
.change_media_cb = fdctrl_change_cb, .change_media_cb = fdctrl_change_cb,
.is_tray_open = fdctrl_is_tray_open,
}; };
/* Init functions */ /* Init functions */
@ -2217,6 +2228,7 @@ static void fdctrl_connect_drives(FDCtrl *fdctrl, Error **errp)
fdctrl_change_cb(drive, 0); fdctrl_change_cb(drive, 0);
if (drive->blk) { if (drive->blk) {
blk_set_dev_ops(drive->blk, &fdctrl_block_ops, drive); blk_set_dev_ops(drive->blk, &fdctrl_block_ops, drive);
drive->media_inserted = blk_is_inserted(drive->blk);
} }
} }
} }

4
tests/fdc-test.c
View File

@ -304,9 +304,7 @@ static void test_media_insert(void)
qmp_discard_response("{'execute':'change', 'arguments':{" qmp_discard_response("{'execute':'change', 'arguments':{"
" 'device':'floppy0', 'target': %s, 'arg': 'raw' }}", " 'device':'floppy0', 'target': %s, 'arg': 'raw' }}",
test_image); test_image);
qmp_discard_response(""); /* ignore event qmp_discard_response(""); /* ignore event (open -> close) */
(FIXME open -> open transition?!) */
qmp_discard_response(""); /* ignore event */
dir = inb(FLOPPY_BASE + reg_dir); dir = inb(FLOPPY_BASE + reg_dir);
assert_bit_set(dir, DSKCHG); assert_bit_set(dir, DSKCHG);