From 006253030fd88159ebec3d51567f55af624354b9 Mon Sep 17 00:00:00 2001 From: Tormod Volden Date: Mon, 27 Apr 2015 19:32:14 +0200 Subject: [PATCH] Fix ctrl and shift sending NUL bytes on various platforms Signed-off-by: Tormod Volden --- Kernel/platform-atarist/devtty.c | 9 +++++---- Kernel/platform-dragon/devtty.c | 9 +++++---- Kernel/platform-msx1/devtty.c | 9 +++++---- Kernel/platform-msx2/devtty.c | 9 +++++---- Kernel/platform-mtx/devtty.c | 9 +++++---- Kernel/platform-nc100/devtty.c | 9 +++++---- Kernel/platform-pcw8256/devtty.c | 9 +++++---- Kernel/platform-plus3/devtty.c | 9 +++++---- Kernel/platform-trs80/devtty.c | 9 +++++---- Kernel/platform-ubee/devtty.c | 9 +++++---- Kernel/platform-zx128/devtty.c | 9 +++++---- 11 files changed, 55 insertions(+), 44 deletions(-) diff --git a/Kernel/platform-atarist/devtty.c b/Kernel/platform-atarist/devtty.c index 81e9c6be..0fc44e30 100644 --- 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 9419151b..347d8e01 100644 --- 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 cd8e4ffb..522558f9 100644 --- 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 11b801a0..2aefa925 100644 --- 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 04213b19..78c67038 100644 --- 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 f3e92d82..535a2f22 100644 --- 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 a7a8f7bd..8b9a2a63 100644 --- 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 d50893d6..b75254d2 100644 --- 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 6eaa8588..5d68aa52 100644 --- 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 a9bcc28b..5ad5d605 100644 --- 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 d50893d6..b75254d2 100644 --- 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; } -- 2.34.1