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

PDP11: Fix RL, HK and TQ I/O Error path to properly clear observed errors

Browse source
This commit is contained in:
Mark Pizzolato 2019-03-08 12:28:07 -08:00
parent c408d0a8fa
commit 72451ba202
3 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
PDP11/pdp11_hk.c
View file

@ -1231,7 +1231,7 @@ switch (fnc) { /* case on function */
if (err != 0) { /* error? */ if (err != 0) { /* error? */
hk_err (CS1_ERR|CS1_DONE, 0, ER_PAR, drv); /* set drive error */ hk_err (CS1_ERR|CS1_DONE, 0, ER_PAR, drv); /* set drive error */
sim_perror ("HK I/O error"); sim_perror ("HK I/O error");
clearerr (uptr->fileref); sim_disk_clearerr (uptr);
return SCPE_IOERR; return SCPE_IOERR;
} }

2
PDP11/pdp11_rl.c
View file

@ -970,7 +970,7 @@ rl_set_done (0);
if (err != 0) { /* error? */ if (err != 0) { /* error? */
sim_perror ("RL I/O error"); sim_perror ("RL I/O error");
clearerr (uptr->fileref); sim_disk_clearerr (uptr);
return SCPE_IOERR; return SCPE_IOERR;
} }
return SCPE_OK; return SCPE_OK;

2
PDP11/pdp11_tq.c
View file

@ -1503,8 +1503,6 @@ t_stat tq_mot_err (UNIT *uptr, uint32 rsiz)
uptr->flags = (uptr->flags | UNIT_SXC) & ~UNIT_TMK; /* serious exception */ uptr->flags = (uptr->flags | UNIT_SXC) & ~UNIT_TMK; /* serious exception */
if (tq_dte (uptr, ST_DRV)) /* post err log */ if (tq_dte (uptr, ST_DRV)) /* post err log */
tq_mot_end (uptr, EF_LOG, ST_DRV, rsiz); /* if ok, report err */ tq_mot_end (uptr, EF_LOG, ST_DRV, rsiz); /* if ok, report err */
sim_perror ("TQ I/O error");
clearerr (uptr->fileref);
return SCPE_IOERR; return SCPE_IOERR;
} }