Floppy: Properly handle Sense Interrupt Status after FDC Reset
PATCH RESEND 1/1 Floppy: Properly handle Sense Interrupt Status after FDC Reset
Original text below.
Attached is a patch that changes how the emulated floppy controller replies to Sense Interrupt Status commands immediately after a controller reset. The specs state that after a Reset the 82078 goes into polling mode which needs four Sense Interrupt Status commands to be issued afterwards to clear the status of each drive. Currently we always respond to Sense Interrupt Status with a SEEK END instead of POLLING. This causes a problem with the SCO Openserver installer which is expects a POLLING state after reset. This patch returns a POLLING status for four Sense Interrupt Status requests immediately after a controller reset. This approach mirrors the way Bochs handles this situation. With the attached patch applied Openserver gets further when trying to load storage drivers from the floppy disk (blocked by another issue, patch on its way). I have successfully tested the floppy drive on the following OSs after applying this patch: Windows 98, Windows XP SP2, Linux x86 (SysRescCD 1.1.3 and Ubuntu 8.10).
Justin
Changelog:
Properly handle Sense Interrupt Status after FDC Reset
fdc.c (working copy) renamed from fdc.c (revision 6193) +0 -0
@@ -53,8 +53,9 @@
#define SET_CUR_DRV(fdctrl, drive) ((fdctrl)->cur_drv = (drive))
/* Will always be a fixed parameter for us */
-#define FD_SECTOR_LEN 512
-#define FD_SECTOR_SC 2 /* Sector size code */
+#define FD_SECTOR_LEN 512 +#define FD_SECTOR_SC 2 /* Sector size code */ +#define FD_RESET_SENSEI_COUNT 4 /* Number of sense interrupts on RESET */
/* Floppy disk drive emulation */
typedef enum fdisk_type_t {
@@ -506,6 +507,7 @@
int sun4m;
/* Floppy drives */
fdrive_t drives[MAX_FD];+ int reset_sensei;
};
static uint32_t fdctrl_read (void *opaque, uint32_t reg) @@ -763,6 +765,7 @@
qemu_set_irq(fdctrl->irq, 1);
fdctrl->sra |= FD_SRA_INTPEND;
}
+ fdctrl->reset_sensei = 0;
fdctrl->status0 = status0;
FLOPPY_DPRINTF("Set interrupt status to 0x%02x\n", fdctrl->status0);
}
@@ -793,6 +796,7 @@
fdctrl_reset_fifo(fdctrl);
if (do_irq) {
fdctrl_raise_irq(fdctrl, FD_SR0_RDYCHG);
+ fdctrl->reset_sensei = FD_RESET_SENSEI_COUNT;
}
}@@ -1601,16 +1605,18 @@
{
fdrive_t *cur_drv = get_cur_drv(fdctrl);-#if 0
- fdctrl->fifo[0] =
- fdctrl->status0 | (cur_drv->head << 2) | GET_CUR_DRV(fdctrl);
-#else
- /* XXX: status0 handling is broken for read/write
- commands, so we do this hack. It should be suppressed
- ASAP */
- fdctrl->fifo[0] =
- FD_SR0_SEEK | (cur_drv->head << 2) | GET_CUR_DRV(fdctrl);
-#endif
+ if(fdctrl->reset_sensei > 0) {
+ fdctrl->fifo[0] =
+ FD_SR0_RDYCHG + FD_RESET_SENSEI_COUNT - fdctrl->reset_sensei;
+ fdctrl->reset_sensei--;
+ } else {
+ /* XXX: status0 handling is broken for read/write
+ commands, so we do this hack. It should be suppressed
+ ASAP */
+ fdctrl->fifo[0] =
+ FD_SR0_SEEK | (cur_drv->head << 2) | GET_CUR_DRV(fdctrl);
+ }
+
fdctrl->fifo[1] = cur_drv->track;
fdctrl_set_fifo(fdctrl, 2, 0);
fdctrl_reset_irq(fdctrl);Blue Swirl
AppliedQuoted 5 lines · Justin Chevrier
Original text below.
Attached is a patch that changes how the emulated floppy controller replies to Sense Interrupt Status commands immediately after a controller reset. The specs state that after a Reset the 82078 goes into polling mode which needs four Sense Interrupt Status commands to be issued afterwards to clear the status of each drive. Currently we always respond to Sense Interrupt Status with a SEEK END instead of POLLING. This causes a problem with the SCO Openserver installer which is expects a POLLING state after reset. This patch returns a POLLING status for four Sense Interrupt Status requests immediately after a controller reset. This approach mirrors the way Bochs handles this situation. With the attached patch applied Openserver gets further when trying to load storage drivers from the floppy disk (blocked by another issue, patch on its way). I have successfully tested the floppy drive on the following OSs after applying this patch: Windows 98, Windows XP SP2, Linux x86 (SysRescCD 1.1.3 and Ubuntu 8.10).
Quoted 7 lines
Justin
Changelog:
Properly handle Sense Interrupt Status after FDC Reset
Signed-off-by Justin Chevrier <[email protected]>
Thanks, applied.
Quoted 5 lines · Justin Chevrier
Original text below.
Attached is a patch that changes how the emulated floppy controller replies to Sense Interrupt Status commands immediately after a controller reset. The specs state that after a Reset the 82078 goes into polling mode which needs four Sense Interrupt Status commands to be issued afterwards to clear the status of each drive. Currently we always respond to Sense Interrupt Status with a SEEK END instead of POLLING. This causes a problem with the SCO Openserver installer which is expects a POLLING state after reset. This patch returns a POLLING status for four Sense Interrupt Status requests immediately after a controller reset. This approach mirrors the way Bochs handles this situation. With the attached patch applied Openserver gets further when trying to load storage drivers from the floppy disk (blocked by another issue, patch on its way). I have successfully tested the floppy drive on the following OSs after applying this patch: Windows 98, Windows XP SP2, Linux x86 (SysRescCD 1.1.3 and Ubuntu 8.10).
Quoted 8 lines
Justin
Changelog:
Properly handle Sense Interrupt Status after FDC Reset
Signed-off-by Justin Chevrier <[email protected]>
The patch is whitespace damaged.
fdc.c (working copy) line 54
Quoted 7 lines
Index:
hw/fdc.c
===================================================================fdc.c (working copy) renamed from fdc.c (revision 6193) +0
-0@@ -53,8 +53,9 @@ #define SET_CUR_DRV(fdctrl, drive) ((fdctrl)->cur_drv = (drive))
The leading space seems to have gotten stripped. A tool like git-email or attaching if your mailer uses text/plain would ensure this doesn't happen.
Regards,
Anthony Liguori
Quoted 69 lines
fdc.c (working copy) renamed from fdc.c (revision 6193) +18
-12/* Will always be a fixed parameter for us */ -#define FD_SECTOR_LEN 512 -#define FD_SECTOR_SC 2 /* Sector size code */ +#define FD_SECTOR_LEN 512 +#define FD_SECTOR_SC 2 /* Sector size code */ +#define FD_RESET_SENSEI_COUNT 4 /* Number of sense interrupts on RESET */ /* Floppy disk drive emulation */ typedef enum fdisk_type_t {@@ -506,6 +507,7 @@ int sun4m; /* Floppy drives */ fdrive_t drives[MAX_FD]; + int reset_sensei; }; static uint32_t fdctrl_read (void *opaque, uint32_t reg)@@ -763,6 +765,7 @@ qemu_set_irq(fdctrl->irq, 1); fdctrl->sra |= FD_SRA_INTPEND; } + fdctrl->reset_sensei = 0; fdctrl->status0 = status0; FLOPPY_DPRINTF("Set interrupt status to 0x%02x\n", fdctrl->status0); }@@ -793,6 +796,7 @@ fdctrl_reset_fifo(fdctrl); if (do_irq) { fdctrl_raise_irq(fdctrl, FD_SR0_RDYCHG); + fdctrl->reset_sensei = FD_RESET_SENSEI_COUNT; } }@@ -1601,16 +1605,18 @@ { fdrive_t *cur_drv = get_cur_drv(fdctrl); -#if 0 - fdctrl->fifo[0] = - fdctrl->status0 | (cur_drv->head << 2) | GET_CUR_DRV(fdctrl); -#else - /* XXX: status0 handling is broken for read/write - commands, so we do this hack. It should be suppressed - ASAP */ - fdctrl->fifo[0] = - FD_SR0_SEEK | (cur_drv->head << 2) | GET_CUR_DRV(fdctrl); -#endif + if(fdctrl->reset_sensei > 0) { + fdctrl->fifo[0] = + FD_SR0_RDYCHG + FD_RESET_SENSEI_COUNT - fdctrl->reset_sensei; + fdctrl->reset_sensei--; + } else { + /* XXX: status0 handling is broken for read/write + commands, so we do this hack. It should be suppressed + ASAP */ + fdctrl->fifo[0] = + FD_SR0_SEEK | (cur_drv->head << 2) | GET_CUR_DRV(fdctrl); + } + fdctrl->fifo[1] = cur_drv->track; fdctrl_set_fifo(fdctrl, 2, 0); fdctrl_reset_irq(fdctrl);
Thanks for the heads up Anthony.
I will attach future patches.
Justin
Quoted 139 lines · Anthony Liguori
From: Anthony Liguori <[email protected]>
Subject: Re: [Qemu-devel] [PATCH][Resend] Floppy: Properly handle Sense Interrupt Status after FDC Reset
To: [email protected], [email protected]
Date: Monday, January 26, 2009, 12:05 PMQuoted 3 lines · Justin Chevrier
Original text below.
Attached is a patch that changes how the emulated
floppy controller replies to Sense Interrupt Status commands immediately after a controller reset. The specs state that after a Reset the 82078 goes into polling mode which needs four Sense Interrupt Status commands to be issued afterwards to clear the status of each drive. Currently we always respond to Sense Interrupt Status with a SEEK END instead of POLLING. This causes a problem with the SCO Openserver installer which is expects a POLLING state after reset. This patch returns a POLLING status for four Sense Interrupt Status requests immediately after a controller reset. This approach mirrors the way Bochs handles this situation. With the attached patch applied Openserver gets further when trying to load storage drivers from the floppy disk (blocked by another issue, patch on its way). I have successfully tested the floppy drive on the following OSs after applying this patch: Windows 98, Windows XP
Quoted 9 lines
SP2, Linux x86 (SysRescCD 1.1.3 and Ubuntu 8.10).
Justin
Changelog:
Properly handle Sense Interrupt Status after FDC Reset
Signed-off-by Justin ChevrierQuoted 1 line
The patch is whitespace damaged.
Quoted 2 lines
Index:
hw/fdc.c===================================================================
fdc.c (working copy) line 53
Quoted 4 lines
fdc.c (working copy) renamed from fdc.c (revision 6193) +0
-0@@ -53,8 +53,9 @@ #define SET_CUR_DRV(fdctrl, drive)((fdctrl)->cur_drv = (drive))
Quoted 1 line
The leading space seems to have gotten stripped. A tool like git-email
or attaching if your mailer uses text/plain would ensure this doesn't
happen.Regards,
Anthony Liguori
fdc.c (working copy)
Quoted 5 lines
/* Will always be a fixed parameter for us */
fdc.c (working copy) renamed from fdc.c (revision 6193) +2
-2-#define FD_SECTOR_LEN 512 -#define FD_SECTOR_SC 2 /* Sector size code */ +#define FD_SECTOR_LEN 512 +#define FD_SECTOR_SC 2 /* Sector sizecode */
Quoted 1 line
+#define
FD_RESET_SENSEI_COUNT4 /* Number of senseinterrupts on RESET */
Quoted 11 lines
/* Floppy disk drive emulation */
typedef enumfdisk_type_t{fdc.c (working copy) renamed from fdc.c (revision 6193) +1
-0@@ -506,6 +507,7 @@ int sun4m; /* Floppy drives */ fdrive_t drives[MAX_FD]; + int reset_sensei; };static
uint32_tfdctrl_read(void *opaque,uint32_treg)
fdc.c (working copy) line 770
Quoted 7 lines
fdc.c (working copy) renamed from fdc.c (revision 6193) +1
-0@@ -763,6 +765,7 @@ qemu_set_irq(fdctrl->irq, 1); fdctrl->sra |= FD_SRA_INTPEND; } + fdctrl->reset_sensei = 0; fdctrl->status0 = status0; FLOPPY_DPRINTF("Set interrupt status to0x%02x\n",
fdctrl->status0);fdc.c (working copy) line 799
Quoted 6 lines
fdc.c (working copy) renamed from fdc.c (revision 6193) +1
-0}@@ -793,6 +796,7 @@ fdctrl_reset_fifo(fdctrl); if (do_irq) { fdctrl_raise_irq(fdctrl, FD_SR0_RDYCHG); + fdctrl->reset_sensei =
FD_RESET_SENSEI_COUNT;fdc.c (working copy) line 1606
Quoted 10 lines
fdc.c (working copy) renamed from fdc.c (revision 6193) +0
-3} }@@ -1601,16 +1605,18 @@ { fdrive_t *cur_drv = get_cur_drv(fdctrl); -#if 0 - fdctrl->fifo[0] = - fdctrl->status0 | (cur_drv->head<< 2) |
GET_CUR_DRV(fdctrl);fdc.c (working copy) line 1609
Quoted 3 lines
fdc.c (working copy) renamed from fdc.c (revision 6193) +0
-3-#else - /* XXX: status0 handling is broken for read/write - commands, so we do this hack. It should besuppressed
fdc.c (working copy) line 1612
Quoted 3 lines
fdc.c (working copy) renamed from fdc.c (revision 6193) +0
-3- ASAP */ - fdctrl->fifo[0] = - FD_SR0_SEEK | (cur_drv->head << 2) |
GET_CUR_DRV(fdctrl);fdc.c (working copy) line 1610
Quoted 4 lines
fdc.c (working copy) renamed from fdc.c (revision 6193) +3
-1-#endif + if(fdctrl->reset_sensei > 0) { + fdctrl->fifo[0] = + FD_SR0_RDYCHG + FD_RESET_SENSEI_COUNT -
fdctrl->reset_sensei;fdc.c (working copy) line 1613
Quoted 3 lines
fdc.c (working copy) renamed from fdc.c (revision 6193) +3
-0+ fdctrl->reset_sensei--; + } else { + /* XXX: status0 handling is broken forread/write
fdc.c (working copy) line 1614
Quoted 1 line
fdc.c (working copy) renamed from fdc.c (revision 6193) +1
-0+ commands, so we do this hack. It should besuppressed
fdc.c (working copy) line 1617
Quoted 3 lines
fdc.c (working copy) renamed from fdc.c (revision 6193) +3
-0+ ASAP */ + fdctrl->fifo[0] = + FD_SR0_SEEK | (cur_drv->head <<2) |
GET_CUR_DRV(fdctrl);Quoted 12 lines
fdc.c (working copy) renamed from fdc.c (revision 6193) +2
-0+ } + fdctrl->fifo[1] = cur_drv->track; fdctrl_set_fifo(fdctrl, 2, 0); fdctrl_reset_irq(fdctrl);