folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

AltairZ80: Fix error handling of bad IMD disks and sector size computation

Browse source
This commit is contained in:
Peter Schorn 2020-02-18 11:55:29 +01:00
parent 7e58080fb5
commit 6c84387ec0
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
AltairZ80/altairz80_hdsk.c
View file

@ -449,8 +449,10 @@ static t_stat hdsk_attach(UNIT *uptr, CONST char *cptr) {
hdsk_imd[thisUnitIndex] = diskOpenEx(uptr -> fileref, hdsk_imd[thisUnitIndex] = diskOpenEx(uptr -> fileref,
sim_deb && (hdsk_dev.dctrl & VERBOSE_MSG), sim_deb && (hdsk_dev.dctrl & VERBOSE_MSG),
&hdsk_dev, VERBOSE_MSG, VERBOSE_MSG); &hdsk_dev, VERBOSE_MSG, VERBOSE_MSG);
if (hdsk_imd[thisUnitIndex] == NULL) if (hdsk_imd[thisUnitIndex] == NULL) {
detach_unit(uptr);
return SCPE_IOERR; return SCPE_IOERR;
}
verifyDiskInfo(hdsk_imd[thisUnitIndex], '0' + thisUnitIndex); verifyDiskInfo(hdsk_imd[thisUnitIndex], '0' + thisUnitIndex);
uptr -> HDSK_NUMBER_OF_TRACKS = hdsk_imd[thisUnitIndex] -> ntracks; uptr -> HDSK_NUMBER_OF_TRACKS = hdsk_imd[thisUnitIndex] -> ntracks;
uptr -> HDSK_SECTORS_PER_TRACK = hdsk_imd[thisUnitIndex] -> track[1][0].nsects; uptr -> HDSK_SECTORS_PER_TRACK = hdsk_imd[thisUnitIndex] -> track[1][0].nsects;

2
sim_imd.c
View file

@ -164,7 +164,7 @@ static t_stat diskParse(DISK_INFO *myDisk, uint32 isVerbose)
sim_fread(&imd, 1, 5, myDisk->file); sim_fread(&imd, 1, 5, myDisk->file);
if (feof(myDisk->file)) if (feof(myDisk->file))
break; break;
sectorSize = 128 << imd.sectsize; sectorSize = 128 << (imd.sectsize & 0x1f);
sectorHeadwithFlags = imd.head; /*AGN save the head and flags */ sectorHeadwithFlags = imd.head; /*AGN save the head and flags */
imd.head &= 1 ; /*AGN mask out flag bits to head 0 or 1 */ imd.head &= 1 ; /*AGN mask out flag bits to head 0 or 1 */