Fix ctrl and shift sending NUL bytes on various platforms

Signed-off-by: Tormod Volden <debian.tormod@gmail.com>

diff --git a/Kernel/platform-atarist/devtty.c b/Kernel/platform-atarist/devtty.c
index 81e9c6b..0fc44e3 100644 (file)
--- a/Kernel/platform-atarist/devtty.c
+++ b/Kernel/platform-atarist/devtty.c
@@ -127,11 +127,12 @@ static void keyproc(void)
                                                keysdown--;
                                }
                                if ((key & m) && !(keymap[i] & m)) {
-                                       if (!(shiftmask[i] & m))
+                                       if (!(shiftmask[i] & m)) {
                                                keysdown++;
-                                       keybyte = i;
-                                       keybit = n;
-                                       newkey = 1;
+                                               newkey = 1;
+                                               keybyte = i;
+                                               keybit = n;
+                                       }
                                }
                                m += m;
                        }

diff --git a/Kernel/platform-dragon/devtty.c b/Kernel/platform-dragon/devtty.c
index 9419151..347d8e0 100644 (file)
--- a/Kernel/platform-dragon/devtty.c
+++ b/Kernel/platform-dragon/devtty.c
@@ -127,11 +127,12 @@ static void keyproc(void)
                                                keysdown--;
                                }
                                if ((key & m) && !(keymap[i] & m)) {
-                                       if (!(shiftmask[i] & m))
+                                       if (!(shiftmask[i] & m)) {
                                                keysdown++;
-                                       keybyte = i;
-                                       keybit = n;
-                                       newkey = 1;
+                                               newkey = 1;
+                                               keybyte = i;
+                                               keybit = n;
+                                       }
                                }
                                m += m;
                        }

diff --git a/Kernel/platform-msx1/devtty.c b/Kernel/platform-msx1/devtty.c
index cd8e4ff..522558f 100644 (file)
--- a/Kernel/platform-msx1/devtty.c
+++ b/Kernel/platform-msx1/devtty.c
@@ -91,11 +91,12 @@ static void keyproc(void)
                                                keysdown--;
                                }
                                if ((key & m) && !(keymap[i] & m)) {
-                                       if (!(shiftmask[i] & m))
+                                       if (!(shiftmask[i] & m)) {
                                                keysdown++;
-                                       keybyte = i;
-                                       keybit = n;
-                                       newkey = 1;
+                                               newkey = 1;
+                                               keybyte = i;
+                                               keybit = n;
+                                       }
                                }
 
                        }

diff --git a/Kernel/platform-msx2/devtty.c b/Kernel/platform-msx2/devtty.c
index 11b801a..2aefa92 100644 (file)
--- a/Kernel/platform-msx2/devtty.c
+++ b/Kernel/platform-msx2/devtty.c
@@ -93,11 +93,12 @@ static void keyproc(void)
                                                keysdown--;
                                }
                                if ((key & m) && !(keymap[i] & m)) {
-                                       if (!(shiftmask[i] & m))
+                                       if (!(shiftmask[i] & m)) {
                                                keysdown++;
-                                       keybyte = i;
-                                       keybit = n;
-                                       newkey = 1;
+                                               newkey = 1;
+                                               keybyte = i;
+                                               keybit = n;
+                                       }
                                }
                                m += m;
                        }

diff --git a/Kernel/platform-mtx/devtty.c b/Kernel/platform-mtx/devtty.c
index 04213b1..78c6703 100644 (file)
--- a/Kernel/platform-mtx/devtty.c
+++ b/Kernel/platform-mtx/devtty.c
@@ -204,11 +204,12 @@ static void keyproc(void)
                                                keysdown--;
                                }
                                if ((key & m) && !(keymap[i] & m)) {
-                                       if (!(shiftmask[i] & m))
+                                       if (!(shiftmask[i] & m)) {
                                                keysdown++;
-                                       keybyte = i;
-                                       keybit = n;
-                                       newkey = 1;
+                                               newkey = 1;
+                                               keybyte = i;
+                                               keybit = n;
+                                       }
                                }
                                m += m;
 

diff --git a/Kernel/platform-nc100/devtty.c b/Kernel/platform-nc100/devtty.c
index f3e92d8..535a2f2 100644 (file)
--- a/Kernel/platform-nc100/devtty.c
+++ b/Kernel/platform-nc100/devtty.c
@@ -179,11 +179,12 @@ static void keyproc(void)
                                                keysdown--;
                                }
                                if ((key & m) && !(keymap[i] & m)) {
-                                       if (!(shiftmask[i] & m))
+                                       if (!(shiftmask[i] & m)) {
                                                keysdown++;
-                                       keybyte = i;
-                                       keybit = n;
-                                       newkey = 1;
+                                               newkey = 1;
+                                               keybyte = i;
+                                               keybit = n;
+                                       }
                                }
                                m >>= 1;
                        }

diff --git a/Kernel/platform-pcw8256/devtty.c b/Kernel/platform-pcw8256/devtty.c
index a7a8f7b..8b9a2a6 100644 (file)
--- a/Kernel/platform-pcw8256/devtty.c
+++ b/Kernel/platform-pcw8256/devtty.c
@@ -180,11 +180,12 @@ static void keyproc(void)
                                                keysdown--;
                                }
                                if ((key & m) && !(keymap[i] & m)) {
-                                       if (!(shiftmask[i] & m))
+                                       if (!(shiftmask[i] & m)) {
                                                keysdown++;
-                                       keybyte = i;
-                                       keybit = n;
-                                       newkey = 1;
+                                               newkey = 1;
+                                               keybyte = i;
+                                               keybit = n;
+                                       }
                                }
                                m >>= 1;
                        }

diff --git a/Kernel/platform-plus3/devtty.c b/Kernel/platform-plus3/devtty.c
index d50893d..b75254d 100644 (file)
--- a/Kernel/platform-plus3/devtty.c
+++ b/Kernel/platform-plus3/devtty.c
@@ -128,11 +128,12 @@ void tty_pollirq(void)
                                                keysdown--;
 
                                if ((key & m) && !(keymap[i] & m)) {
-                                       if (!(shiftmask[i] & m))
+                                       if (!(shiftmask[i] & m)) {
                                                keysdown++;
-                                       keybyte = i;
-                                       keybit = n;
-                                       newkey = 1;
+                                               newkey = 1;
+                                               keybyte = i;
+                                               keybit = n;
+                                       }
                                }
                                m >>= 1;
                        }

diff --git a/Kernel/platform-trs80/devtty.c b/Kernel/platform-trs80/devtty.c
index 6eaa858..5d68aa5 100644 (file)
--- a/Kernel/platform-trs80/devtty.c
+++ b/Kernel/platform-trs80/devtty.c
@@ -137,11 +137,12 @@ static void keyproc(void)
                                                keysdown--;
                                }
                                if ((key & m) && !(keymap[i] & m)) {
-                                       if (!(shiftmask[i] & m))
+                                       if (!(shiftmask[i] & m)) {
                                                keysdown++;
-                                       keybyte = i;
-                                       keybit = n;
-                                       newkey = 1;
+                                               newkey = 1;
+                                               keybyte = i;
+                                               keybit = n;
+                                       }
                                }
                                m += m;
 

diff --git a/Kernel/platform-ubee/devtty.c b/Kernel/platform-ubee/devtty.c
index a9bcc28..5ad5d60 100644 (file)
--- a/Kernel/platform-ubee/devtty.c
+++ b/Kernel/platform-ubee/devtty.c
@@ -86,11 +86,12 @@ static void keyproc(void)
                                                keysdown--;
                                }
                                if ((key & m) && !(keymap[i] & m)) {
-                                       if (!(shiftmask[i] & m))
+                                       if (!(shiftmask[i] & m)) {
                                                keysdown++;
-                                       keybyte = i;
-                                       keybit = n;
-                                       newkey = 1;
+                                               newkey = 1;
+                                               keybyte = i;
+                                               keybit = n;
+                                       }
                                }
                                m += m;
 

diff --git a/Kernel/platform-zx128/devtty.c b/Kernel/platform-zx128/devtty.c
index d50893d..b75254d 100644 (file)
--- a/Kernel/platform-zx128/devtty.c
+++ b/Kernel/platform-zx128/devtty.c
@@ -128,11 +128,12 @@ void tty_pollirq(void)
                                                keysdown--;
 
                                if ((key & m) && !(keymap[i] & m)) {
-                                       if (!(shiftmask[i] & m))
+                                       if (!(shiftmask[i] & m)) {
                                                keysdown++;
-                                       keybyte = i;
-                                       keybit = n;
-                                       newkey = 1;
+                                               newkey = 1;
+                                               keybyte = i;
+                                               keybit = n;
+                                       }
                                }
                                m >>= 1;
                        }