From ff908f4f599021a208e5f3f9c4329083740146d4 Mon Sep 17 00:00:00 2001
From: Peter Schorn <peter.schorn@acm.org>
Date: Sat, 25 Apr 2015 14:02:26 +0200
Subject: [PATCH] AltairZ80: Simplified polling for stop CPU on non UNIX
 platform

---
 AltairZ80/altairz80_cpu.c       | 5 +----
 AltairZ80/altairz80_cpu_nommu.c | 5 +----
 AltairZ80/i86_decode.c          | 5 +----
 AltairZ80/m68ksim.c             | 5 +----
 4 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/AltairZ80/altairz80_cpu.c b/AltairZ80/altairz80_cpu.c
index 643afd84..80e69aa0 100644
--- a/AltairZ80/altairz80_cpu.c
+++ b/AltairZ80/altairz80_cpu.c
@@ -2100,10 +2100,7 @@ static t_stat sim_instr_mmu (void) {
         if (sim_interval <= 0) {            /* check clock queue    */
 #if !UNIX_PLATFORM
             /* poll on platforms without reliable signalling */
-            if ((sim_poll_kbd() == SCPE_OK) && stop_cpu) {
-                reason = SCPE_STOP;
-                break;
-            }
+            sim_poll_kbd(); /* following sim_process_event will check for stop */
 #endif
             if ((reason = sim_process_event()))
                 break;
diff --git a/AltairZ80/altairz80_cpu_nommu.c b/AltairZ80/altairz80_cpu_nommu.c
index c1198e00..b8c68769 100644
--- a/AltairZ80/altairz80_cpu_nommu.c
+++ b/AltairZ80/altairz80_cpu_nommu.c
@@ -1017,10 +1017,7 @@ t_stat sim_instr_nommu(void) {
         if (sim_interval <= 0) {                    /* check clock queue    */
 #if !UNIX_PLATFORM
             /* poll on platforms without reliable signalling */
-            if ((sim_poll_kbd() == SCPE_OK) && stop_cpu) {
-                reason = SCPE_STOP;
-                break;
-            }
+            sim_poll_kbd(); /* following sim_process_event will check for stop */
 #endif
             if ((reason = sim_process_event()))
                 break;
diff --git a/AltairZ80/i86_decode.c b/AltairZ80/i86_decode.c
index 74fb2f5a..fe25c5e7 100644
--- a/AltairZ80/i86_decode.c
+++ b/AltairZ80/i86_decode.c
@@ -210,10 +210,7 @@ t_stat sim_instr_8086(void) {
         if (sim_interval <= 0) {                            /* check clock queue    */
 #if !UNIX_PLATFORM
             /* poll on platforms without reliable signalling */
-            if ((sim_poll_kbd() == SCPE_OK) && stop_cpu) {
-                reason = SCPE_STOP;
-                break;
-            }
+            sim_poll_kbd(); /* following sim_process_event will check for stop */
 #endif
             if ( (reason = sim_process_event()) )
                 break;
diff --git a/AltairZ80/m68ksim.c b/AltairZ80/m68ksim.c
index 37e13ef0..76f1853c 100644
--- a/AltairZ80/m68ksim.c
+++ b/AltairZ80/m68ksim.c
@@ -216,10 +216,7 @@ t_stat sim_instr_m68k(void) {
         if (sim_interval <= 0) {                            /* check clock queue    */
 #if !UNIX_PLATFORM
             /* poll on platforms without reliable signalling */
-            if ((sim_poll_kbd() == SCPE_OK) && stop_cpu) {
-                reason = SCPE_STOP;
-                break;
-            }
+            sim_poll_kbd(); /* following sim_process_event will check for stop */
 #endif
             if ((reason = sim_process_event()))
                 break;