80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

AT MFM/RLL: The SET DRIVE PARAMETERS and RESTORE commands no longer finish instantly, fixes MFM/RLL drives on the Arche AMA-2010.

Browse Source
This commit is contained in:
OBattler
2024-04-18 04:21:01 +02:00
parent 1e5800d548
commit ae834c1a2d
1 changed files with 48 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
src/disk/hdc_st506_at.c
View File

@@ -277,13 +277,9 @@ mfm_cmd(mfm_t *mfm, uint8_t val)
switch (val & 0xf0) { switch (val & 0xf0) {
case CMD_RESTORE: case CMD_RESTORE:
drive->steprate = (val & 0x0f); drive->steprate = (val & 0x0f);
st506_at_log("WD1003(%d) restore, step=%d\n",
mfm->drvsel, drive->steprate);
drive->curcyl = 0;
mfm->cylinder = 0;
mfm->status = STAT_READY | STAT_DSC;
mfm->command &= 0xf0; mfm->command &= 0xf0;
irq_raise(mfm); mfm->status = STAT_BUSY;
timer_set_delay_u64(&mfm->callback_timer, 200 * MFM_TIME);
break; break;
case CMD_SEEK: case CMD_SEEK:
@@ -340,38 +336,8 @@ mfm_cmd(mfm_t *mfm, uint8_t val)
break; break;
case CMD_SET_PARAMETERS: case CMD_SET_PARAMETERS:
/* mfm->status = STAT_BUSY;
* NOTE: timer_set_delay_u64(&mfm->callback_timer, 200 * MFM_TIME);
*
* We currently just set these parameters, and
* never bother to check if they "fit within"
* the actual parameters, as determined by the
* image loader.
*
* The difference in parameters is OK, and
* occurs when the BIOS or operating system
* decides to use a different translation
* scheme, but either way, it SHOULD always
* fit within the actual parameters!
*
* We SHOULD check that here!! --FvK
*/
if (drive->cfg_spt == 0) {
/* Only accept after RESET or DIAG. */
drive->cfg_spt = mfm->secount;
drive->cfg_hpc = mfm->head + 1;
st506_at_log("WD1003(%d) parameters: tracks=%d, spt=%i, hpc=%i\n",
mfm->drvsel, drive->tracks,
drive->cfg_spt, drive->cfg_hpc);
} else {
st506_at_log("WD1003(%d) parameters: tracks=%d,spt=%i,hpc=%i (IGNORED)\n",
mfm->drvsel, drive->tracks,
drive->cfg_spt, drive->cfg_hpc);
}
mfm->command = 0x00;
mfm->status = STAT_READY | STAT_DSC;
mfm->error = 1;
irq_raise(mfm);
break; break;
default: default:
@@ -596,6 +562,15 @@ do_callback(void *priv)
} }
switch (mfm->command) { switch (mfm->command) {
case CMD_RESTORE:
st506_at_log("WD1003(%d) restore, step=%d\n",
mfm->drvsel, drive->steprate);
drive->curcyl = 0;
mfm->cylinder = 0;
mfm->status = STAT_READY | STAT_DSC;
irq_raise(mfm);
break;
case CMD_SEEK: case CMD_SEEK:
st506_at_log("WD1003(%d) seek, step=%d\n", st506_at_log("WD1003(%d) seek, step=%d\n",
mfm->drvsel, drive->steprate); mfm->drvsel, drive->steprate);
@@ -691,6 +666,41 @@ do_callback(void *priv)
irq_raise(mfm); irq_raise(mfm);
break; break;
case CMD_SET_PARAMETERS:
/*
* NOTE:
*
* We currently just set these parameters, and
* never bother to check if they "fit within"
* the actual parameters, as determined by the
* image loader.
*
* The difference in parameters is OK, and
* occurs when the BIOS or operating system
* decides to use a different translation
* scheme, but either way, it SHOULD always
* fit within the actual parameters!
*
* We SHOULD check that here!! --FvK
*/
if (drive->cfg_spt == 0) {
/* Only accept after RESET or DIAG. */
drive->cfg_spt = mfm->secount;
drive->cfg_hpc = mfm->head + 1;
st506_at_log("WD1003(%d) parameters: tracks=%d, spt=%i, hpc=%i\n",
mfm->drvsel, drive->tracks,
drive->cfg_spt, drive->cfg_hpc);
} else {
st506_at_log("WD1003(%d) parameters: tracks=%d,spt=%i,hpc=%i (IGNORED)\n",
mfm->drvsel, drive->tracks,
drive->cfg_spt, drive->cfg_hpc);
}
mfm->command = 0x00;
mfm->status = STAT_READY | STAT_DSC;
mfm->error = 1;
irq_raise(mfm);
break;
default: default:
st506_at_log("WD1003(%d) callback on unknown command %02x\n", st506_at_log("WD1003(%d) callback on unknown command %02x\n",
mfm->drvsel, mfm->command); mfm->drvsel, mfm->command);