FDC multi-track commands do not literally access multiple tracks. Limited read/

write data to a single track/cylinder.
This commit is contained in:
SarahW 2020-03-04 21:57:20 +00:00
commit 11904d765a

View file

@ -34,7 +34,6 @@ typedef struct FDC
int format_state; int format_state;
int tc; int tc;
int written; int written;
int in_seek_mt;
int pcjr, ps1; int pcjr, ps1;
@ -860,11 +859,8 @@ void fdc_callback()
discint = 0; discint = 0;
return; return;
case 5: /*Write data*/ case 5: /*Write data*/
if (!fdc.in_seek_mt)
{
readflash_set(READFLASH_FDC, fdc.drive); readflash_set(READFLASH_FDC, fdc.drive);
fdc.sector++; if (fdc.sector == fdc.params[5])
if (fdc.sector > fdc.params[5])
{ {
fdc.sector = 1; fdc.sector = 1;
if (fdc.command & 0x80) if (fdc.command & 0x80)
@ -873,7 +869,7 @@ void fdc_callback()
if (!fdc.head) if (!fdc.head)
{ {
fdc.rw_track++; fdc.rw_track++;
doseek = 1; fdc.tc = 1;
} }
} }
else else
@ -882,6 +878,8 @@ void fdc_callback()
fdc.tc = 1; fdc.tc = 1;
} }
} }
else
fdc.sector++;
if (fdc.tc) if (fdc.tc)
{ {
discint=-2; discint=-2;
@ -896,25 +894,13 @@ void fdc_callback()
paramstogo=7; paramstogo=7;
return; return;
} }
if (doseek)
{
fdd_seek(fdc.drive, 1);
fdc.in_seek_mt = 1;
/*Allow seek to complete before starting next sector write*/
return;
}
}
fdc.in_seek_mt = 0;
disc_writesector(fdc.drive, fdc.sector, fdc.rw_track, fdc.head, fdc.rate, fdc.params[4]); disc_writesector(fdc.drive, fdc.sector, fdc.rw_track, fdc.head, fdc.rate, fdc.params[4]);
// ioc_fiq(IOC_FIQ_DISC_DATA); // ioc_fiq(IOC_FIQ_DISC_DATA);
return; return;
case 6: /*Read data*/ case 6: /*Read data*/
// rpclog("Read data %i\n", fdc.tc); // rpclog("Read data %i\n", fdc.tc);
if (!fdc.in_seek_mt)
{
readflash_set(READFLASH_FDC, fdc.drive); readflash_set(READFLASH_FDC, fdc.drive);
fdc.sector++; if (fdc.sector == fdc.params[5])
if (fdc.sector > fdc.params[5])
{ {
fdc.sector = 1; fdc.sector = 1;
if (fdc.command & 0x80) if (fdc.command & 0x80)
@ -923,7 +909,7 @@ void fdc_callback()
if (!fdc.head) if (!fdc.head)
{ {
fdc.rw_track++; fdc.rw_track++;
doseek = 1; fdc.tc = 1;
} }
} }
else else
@ -932,6 +918,8 @@ void fdc_callback()
fdc.tc = 1; fdc.tc = 1;
} }
} }
else
fdc.sector++;
if (fdc.tc) if (fdc.tc)
{ {
fdc.inread = 0; fdc.inread = 0;
@ -947,15 +935,6 @@ void fdc_callback()
paramstogo=7; paramstogo=7;
return; return;
} }
if (doseek)
{
fdd_seek(fdc.drive, 1);
fdc.in_seek_mt = 1;
/*Allow seek to complete before starting next sector read*/
return;
}
}
fdc.in_seek_mt = 0;
disc_readsector(fdc.drive, fdc.sector, fdc.rw_track, fdc.head, fdc.rate, fdc.params[4]); disc_readsector(fdc.drive, fdc.sector, fdc.rw_track, fdc.head, fdc.rate, fdc.params[4]);
fdc.inread = 1; fdc.inread = 1;
return; return;