M devices/clock.c → devices/clock.c

@@ -218,14 +218,3 @@ clock_timer_elapsed_pending = 0;
         }
     }
 }
-
-int clock_check_elapsed(void)
-{
-    clock_get_timer_value(); // triggers pending flag if target time has passed
-    if (clock_timer_elapsed_pending)
-    {
-        clock_timer_elapsed_pending = 0;
-        return 1;
-    }
-    return 0;
-}

M devices/clock.h → devices/clock.h

@@ -3,4 +3,3 @@ 
 void clock_setup(xyw_byte *data);
 xyw_byte clock_input(xyw_byte *data, xyw_byte addr, xyw_byte *error);
 void clock_output(xyw_byte *data, xyw_byte addr, xyw_byte *error);
-int clock_check_elapsed(void);

M xywrun.c → xywrun.c

@@ -708,7 +708,7 @@ 
         if (on_timer_handler)
         {
             int elapsed = on_keypress_handler
-                ? clock_check_elapsed()          // non-blocking: keypress handler also armed
+                ? (readw(CLOCK_TIMER) == 0 && readb(CLOCK_ON_TIMER_ELAPSED))
                 : readb(CLOCK_ON_TIMER_ELAPSED); // blocking: timer-only program
             if (elapsed)
             {