From 72451ba202cfffc4028dd31359fa977c09be1c45 Mon Sep 17 00:00:00 2001
From: Mark Pizzolato <mark@infocomm.com>
Date: Fri, 8 Mar 2019 12:28:07 -0800
Subject: [PATCH] PDP11: Fix RL, HK and TQ I/O Error path to properly clear
 observed errors

---
 PDP11/pdp11_hk.c | 2 +-
 PDP11/pdp11_rl.c | 2 +-
 PDP11/pdp11_tq.c | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/PDP11/pdp11_hk.c b/PDP11/pdp11_hk.c
index 4fab2a72..7c9686e5 100644
--- a/PDP11/pdp11_hk.c
+++ b/PDP11/pdp11_hk.c
@@ -1231,7 +1231,7 @@ switch (fnc) {                                          /* case on function */
         if (err != 0) {                                 /* error? */
             hk_err (CS1_ERR|CS1_DONE, 0, ER_PAR, drv);  /* set drive error */
             sim_perror ("HK I/O error");
-            clearerr (uptr->fileref);
+            sim_disk_clearerr (uptr);
             return SCPE_IOERR;
             }
 
diff --git a/PDP11/pdp11_rl.c b/PDP11/pdp11_rl.c
index 455ae699..e78df7c1 100644
--- a/PDP11/pdp11_rl.c
+++ b/PDP11/pdp11_rl.c
@@ -970,7 +970,7 @@ rl_set_done (0);
 
 if (err != 0) {                                         /* error? */
     sim_perror ("RL I/O error");
-    clearerr (uptr->fileref);
+    sim_disk_clearerr (uptr);
     return SCPE_IOERR;
     }
 return SCPE_OK;
diff --git a/PDP11/pdp11_tq.c b/PDP11/pdp11_tq.c
index e063b0e6..cae0a228 100644
--- a/PDP11/pdp11_tq.c
+++ b/PDP11/pdp11_tq.c
@@ -1503,8 +1503,6 @@ t_stat tq_mot_err (UNIT *uptr, uint32 rsiz)
 uptr->flags = (uptr->flags | UNIT_SXC) & ~UNIT_TMK;     /* serious exception */
 if (tq_dte (uptr, ST_DRV))                              /* post err log */
     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;
 }