From 61d987e4f2b2dd976875fbde8d59b86fd6f3f949 Mon Sep 17 00:00:00 2001
From: TomW <TomW@localhost>
Date: Fri, 3 Jan 2014 16:16:23 +0000
Subject: [PATCH] Fixed handshaking in XT & Amstrad keyboards - no more stuck
 keys.

---
 src/keyboard_amstrad.c | 10 ++++++----
 src/keyboard_xt.c      | 10 ++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/keyboard_amstrad.c b/src/keyboard_amstrad.c
index b40c019..4d1eb20 100644
--- a/src/keyboard_amstrad.c
+++ b/src/keyboard_amstrad.c
@@ -22,6 +22,7 @@ struct
 {
         int wantirq;
         
+        uint8_t key_waiting;
         uint8_t pa;        
         uint8_t pb;
 } keyboard_amstrad;
@@ -37,13 +38,14 @@ void keyboard_amstrad_poll()
         if (keyboard_amstrad.wantirq)
         {
                 keyboard_amstrad.wantirq = 0;
+                keyboard_amstrad.pa = keyboard_amstrad.key_waiting;
                 picint(2);
                 pclog("keyboard_amstrad : take IRQ\n");
         }
-        if (key_queue_start != key_queue_end)
+        if (key_queue_start != key_queue_end && !keyboard_amstrad.pa)
         {
-                keyboard_amstrad.pa = key_queue[key_queue_start];
-                pclog("Reading %02X from the key queue at %i\n", keyboard_amstrad.pa, key_queue_start);
+                keyboard_amstrad.key_waiting = key_queue[key_queue_start];
+                pclog("Reading %02X from the key queue at %i\n", keyboard_amstrad.key_waiting, key_queue_start);
                 key_queue_start = (key_queue_start + 1) & 0xf;
                 keyboard_amstrad.wantirq = 1;        
         }                
@@ -120,7 +122,7 @@ uint8_t keyboard_amstrad_read(uint16_t port, void *priv)
                         }
                         else
                         {
-                                keyboard_amstrad.pa = key_queue[key_queue_start];
+                                keyboard_amstrad.key_waiting = key_queue[key_queue_start];
                                 key_queue_start = (key_queue_start + 1) & 0xf;
                                 keyboard_amstrad.wantirq = 1;        
                         }
diff --git a/src/keyboard_xt.c b/src/keyboard_xt.c
index cd45d5c..7625f6b 100644
--- a/src/keyboard_xt.c
+++ b/src/keyboard_xt.c
@@ -20,6 +20,7 @@
 struct
 {
         int wantirq;
+        uint8_t key_waiting;
         
         uint8_t pa;        
         uint8_t pb;
@@ -34,13 +35,14 @@ void keyboard_xt_poll()
         if (keyboard_xt.wantirq)
         {
                 keyboard_xt.wantirq = 0;
+                keyboard_xt.pa = keyboard_xt.key_waiting;
                 picint(2);
                 pclog("keyboard_xt : take IRQ\n");
         }
-        if (key_queue_start != key_queue_end)
+        if (key_queue_start != key_queue_end && !keyboard_xt.pa)
         {
-                keyboard_xt.pa = key_queue[key_queue_start];
-                pclog("Reading %02X from the key queue at %i\n", keyboard_xt.pa, key_queue_start);
+                keyboard_xt.key_waiting = key_queue[key_queue_start];
+                pclog("Reading %02X from the key queue at %i\n", keyboard_xt.key_waiting, key_queue_start);
                 key_queue_start = (key_queue_start + 1) & 0xf;
                 keyboard_xt.wantirq = 1;        
         }                
@@ -112,7 +114,7 @@ uint8_t keyboard_xt_read(uint16_t port, void *priv)
                         }
                         else
                         {
-                                keyboard_xt.pa = key_queue[key_queue_start];
+                                keyboard_xt.key_waiting = key_queue[key_queue_start];
                                 key_queue_start = (key_queue_start + 1) & 0xf;
                                 keyboard_xt.wantirq = 1;        
                         }