Module Name: src
Committed By: tsutsui
Date: Sat May 29 09:50:04 UTC 2021
Modified Files:
src/sys/arch/atari/stand/keymaps: Makefile.inc
src/sys/arch/atari/stand/keymaps/de: de-kbdmap.c
src/sys/arch/atari/stand/keymaps/fr: fr-kbdmap.c
src/sys/arch/atari/stand/keymaps/uk: uk-kbdmap.c
src/sys/arch/atari/stand/keymaps/us: us-kbdmap.c
Log Message:
Appease compiler warnings derived from ancient HOST files. PR/56187
Also fix misc styles and formats per KNF.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/atari/stand/keymaps/Makefile.inc
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/atari/stand/keymaps/de/de-kbdmap.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/atari/stand/keymaps/fr/fr-kbdmap.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/atari/stand/keymaps/uk/uk-kbdmap.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/atari/stand/keymaps/us/us-kbdmap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/atari/stand/keymaps/Makefile.inc
diff -u src/sys/arch/atari/stand/keymaps/Makefile.inc:1.7 src/sys/arch/atari/stand/keymaps/Makefile.inc:1.8
--- src/sys/arch/atari/stand/keymaps/Makefile.inc:1.7 Sat May 4 21:56:50 2002
+++ src/sys/arch/atari/stand/keymaps/Makefile.inc Sat May 29 09:50:04 2021
@@ -1,4 +1,8 @@
-# $NetBSD: Makefile.inc,v 1.7 2002/05/04 21:56:50 bjh21 Exp $
+# $NetBSD: Makefile.inc,v 1.8 2021/05/29 09:50:04 tsutsui Exp $
+
+.include <bsd.hostinit.mk>
+
+#HOST_CFLAGS+= -Wall -Werror
realall: ${MAP}
Index: src/sys/arch/atari/stand/keymaps/de/de-kbdmap.c
diff -u src/sys/arch/atari/stand/keymaps/de/de-kbdmap.c:1.3 src/sys/arch/atari/stand/keymaps/de/de-kbdmap.c:1.4
--- src/sys/arch/atari/stand/keymaps/de/de-kbdmap.c:1.3 Wed Mar 18 10:22:25 2009
+++ src/sys/arch/atari/stand/keymaps/de/de-kbdmap.c Sat May 29 09:50:04 2021
@@ -1,172 +1,179 @@
-/* $NetBSD: de-kbdmap.c,v 1.3 2009/03/18 10:22:25 cegger Exp $ */
+/* $NetBSD: de-kbdmap.c,v 1.4 2021/05/29 09:50:04 tsutsui Exp $ */
/*
* Contributed by Thomas Gerner
*/
+#if !defined(_KERNEL)
+#include <stdlib.h>
+#include <unistd.h>
+#endif
+
#include "../../../dev/kbdmap.h"
/* mode shortcuts: */
#define S KBD_MODE_STRING
-#define C KBD_MODE_CAPS
-#define K KBD_MODE_KPAD
+#define C KBD_MODE_CAPS
+#define K KBD_MODE_KPAD
struct kbdmap kbdmap;
struct kbdmap ascii_kbdmap = {
/* normal map */
{
-/* 0x00 */ 0, 0, 0, ESC, 0, '1', 0, '2',
-/* 0x04 */ 0, '3', 0, '4', 0, '5', 0, '6',
-/* 0x08 */ 0, '7', 0, '8', 0, '9', 0, '0',
-/* 0x0c */ C, 0xDF, 0, '\'', 0, '\b', 0, '\t',
-/* 0x10 */ C, 'q', C, 'w', C, 'e', C, 'r',
-/* 0x14 */ C, 't', C, 'z', C, 'u', C, 'i',
-/* 0x18 */ C, 'o', C, 'p', C, 0xFC, 0, '+',
-/* 0x1c */ 0, '\r', 0, 0, C, 'a', C, 's',
-/* 0x20 */ C, 'd', C, 'f', C, 'g', C, 'h',
-/* 0x24 */ C, 'j', C, 'k', C, 'l', C, 0xF6,
-/* 0x28 */ C, 0xE4, 0, '#', 0, 0, 0, '~',
-/* 0x2c */ C, 'y', C, 'x', C, 'c', C, 'v',
-/* 0x30 */ C, 'b', C, 'n', C, 'm', 0, ',',
-/* 0x34 */ 0, '.', 0, '-', 0, 0, 0, 0,
-/* 0x38 */ 0, 0, 0, ' ', 0, 0, S, 0x10,
-/* 0x3c */ S, 0x15, S, 0x1A, S, 0x1F, S, 0x24,
-/* 0x40 */ S, 0x29, S, 0x2E, S, 0x33, S, 0x38,
-/* 0x44 */ S, 0x3D, 0, 0, 0, 0, 0, 0,
-/* 0x48 */ S, 0x00, 0, 0, 0, '-', S, 0x0C,
-/* 0x4c */ 0, 0, S, 0x08, 0, '+', 0, 0,
-/* 0x50 */ S, 0x04, 0, 0, 0, 0, 0, DEL,
-/* 0x54 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x58 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x5c */ 0, 0, 0, 0, 0, 0, 0, 0,
+/* 0x00 */ { 0, 0 }, { 0, ESC }, { 0, '1' }, { 0, '2' },
+/* 0x04 */ { 0, '3' }, { 0, '4' }, { 0, '5' }, { 0, '6' },
+/* 0x08 */ { 0, '7' }, { 0, '8' }, { 0, '9' }, { 0, '0' },
+/* 0x0C */ { C, 0xDF }, { 0, '\'' }, { 0, '\b' }, { 0, '\t' },
+/* 0x10 */ { C, 'q' }, { C, 'w' }, { C, 'e' }, { C, 'r' },
+/* 0x14 */ { C, 't' }, { C, 'z' }, { C, 'u' }, { C, 'i' },
+/* 0x18 */ { C, 'o' }, { C, 'p' }, { C, 0xFC }, { 0, '+' },
+/* 0x1C */ { 0, '\r' }, { 0, 0 }, { C, 'a' }, { C, 's' },
+/* 0x20 */ { C, 'd' }, { C, 'f' }, { C, 'g' }, { C, 'h' },
+/* 0x24 */ { C, 'j' }, { C, 'k' }, { C, 'l' }, { C, 0xF6 },
+/* 0x28 */ { C, 0xE4 }, { 0, '#' }, { 0, 0 }, { 0, '~' },
+/* 0x2C */ { C, 'y' }, { C, 'x' }, { C, 'c' }, { C, 'v' },
+/* 0x30 */ { C, 'b' }, { C, 'n' }, { C, 'm' }, { 0, ',' },
+/* 0x34 */ { 0, '.' }, { 0, '-' }, { 0, 0 }, { 0, 0 },
+/* 0x38 */ { 0, 0 }, { 0, ' ' }, { 0, 0 }, { S, 0x10 },
+/* 0x3C */ { S, 0x15 }, { S, 0x1A }, { S, 0x1F }, { S, 0x24 },
+/* 0x40 */ { S, 0x29 }, { S, 0x2E }, { S, 0x33 }, { S, 0x38 },
+/* 0x44 */ { S, 0x3D }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x48 */ { S, 0x00 }, { 0, 0 }, { 0, '-' }, { S, 0x0C },
+/* 0x4C */ { 0, 0 }, { S, 0x08 }, { 0, '+' }, { 0, 0 },
+/* 0x50 */ { S, 0x04 }, { 0, 0 }, { 0, 0 }, { 0, DEL },
+/* 0x54 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x58 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x5C */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
/* 0x60 */
-/* 0x60 */ 0, '<', 0, 0, 0, 0, 0, '(',
-/* 0x64 */ 0, ')', 0, '/', 0, '*', K, '7',
-/* 0x68 */ K, '8', K, '9', K, '4', K, '5',
-/* 0x6c */ K, '6', K, '1', K, '2', K, '3',
-/* 0x70 */ K, '0', K, '.', K, '\r', 0, 0,
-/* 0x74 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x78 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x7c */ 0, 0, 0, 0, 0, 0, 0, 0
+/* 0x60 */ { 0, '<' }, { 0, 0 }, { 0, 0 }, { 0, '(' },
+/* 0x64 */ { 0, ')' }, { 0, '/' }, { 0, '*' }, { K, '7' },
+/* 0x68 */ { K, '8' }, { K, '9' }, { K, '4' }, { K, '5' },
+/* 0x6C */ { K, '6' }, { K, '1' }, { K, '2' }, { K, '3' },
+/* 0x70 */ { K, '0' }, { K, '.' }, { K, '\r' }, { 0, 0 },
+/* 0x74 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x78 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x7C */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }
},
/* shifted map */
{
-/* 0x00 */ 0, 0, 0, ESC, 0, '!', 0, '"',
-/* 0x04 */ 0, 0xA7, 0, '$', 0, '%', 0, '&',
-/* 0x08 */ 0, '/', 0, '(', 0, ')', 0, '=',
-/* 0x0c */ 0, '?', 0, '`', 0, '\b', 0, '\t',
-/* 0x10 */ C, 'Q', C, 'W', C, 'E', C, 'R',
-/* 0x14 */ C, 'T', C, 'Z', C, 'U', C, 'I',
-/* 0x18 */ C, 'O', C, 'P', C, 0xDC, 0, '*',
-/* 0x1c */ 0, '\r', 0, 0, C, 'A', C, 'S',
-/* 0x20 */ C, 'D', C, 'F', C, 'G', C, 'H',
-/* 0x24 */ C, 'J', C, 'K', C, 'L', C, 0xD6,
-/* 0x28 */ C, 0xC4, 0, '^', 0, 0, 0, '|',
-/* 0x2c */ C, 'Y', C, 'X', C, 'C', C, 'V',
-/* 0x30 */ C, 'B', C, 'N', C, 'M', 0, ';',
-/* 0x34 */ 0, ':', 0, '_', 0, 0, 0, 0,
-/* 0x38 */ 0, 0, 0, ' ', 0, 0, S, 0x5d,
-/* 0x3c */ S, 0x63, S, 0x69, S, 0x6F, S, 0x75,
-/* 0x40 */ S, 0x7b, S, 0x81, S, 0x87, S, 0x8d,
-/* 0x44 */ S, 0x93, 0, 0, 0, 0, 0, 0,
-/* 0x48 */ S, 0x47, 0, 0, 0, '-', S, 0x57,
-/* 0x4c */ 0, 0, S, 0x51, 0, '+', 0, 0,
-/* 0x50 */ S, 0x4c, 0, 0, 0, 0, 0, DEL,
-/* 0x54 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x58 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x5c */ 0, 0, 0, 0, 0, 0, 0, 0,
+/* 0x00 */ { 0, 0 }, { 0, ESC }, { 0, '!' }, { 0, '"' },
+/* 0x04 */ { 0, 0xA7 }, { 0, '$' }, { 0, '%' }, { 0, '&' },
+/* 0x08 */ { 0, '/' }, { 0, '(' }, { 0, ')' }, { 0, '=' },
+/* 0x0C */ { 0, '?' }, { 0, '`' }, { 0, '\b' }, { 0, '\t' },
+/* 0x10 */ { C, 'Q' }, { C, 'W' }, { C, 'E' }, { C, 'R' },
+/* 0x14 */ { C, 'T' }, { C, 'Z' }, { C, 'U' }, { C, 'I' },
+/* 0x18 */ { C, 'O' }, { C, 'P' }, { C, 0xDC }, { 0, '*' },
+/* 0x1C */ { 0, '\r' }, { 0, 0 }, { C, 'A' }, { C, 'S' },
+/* 0x20 */ { C, 'D' }, { C, 'F' }, { C, 'G' }, { C, 'H' },
+/* 0x24 */ { C, 'J' }, { C, 'K' }, { C, 'L' }, { C, 0xD6 },
+/* 0x28 */ { C, 0xC4 }, { 0, '^' }, { 0, 0 }, { 0, '|' },
+/* 0x2C */ { C, 'Y' }, { C, 'X' }, { C, 'C' }, { C, 'V' },
+/* 0x30 */ { C, 'B' }, { C, 'N' }, { C, 'M' }, { 0, ';' },
+/* 0x34 */ { 0, ':' }, { 0, '_' }, { 0, 0 }, { 0, 0 },
+/* 0x38 */ { 0, 0 }, { 0, ' ' }, { 0, 0 }, { S, 0x5d },
+/* 0x3C */ { S, 0x63 }, { S, 0x69 }, { S, 0x6F }, { S, 0x75 },
+/* 0x40 */ { S, 0x7b }, { S, 0x81 }, { S, 0x87 }, { S, 0x8d },
+/* 0x44 */ { S, 0x93 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x48 */ { S, 0x47 }, { 0, 0 }, { 0, '-' }, { S, 0x57 },
+/* 0x4C */ { 0, 0 }, { S, 0x51 }, { 0, '+' }, { 0, 0 },
+/* 0x50 */ { S, 0x4c }, { 0, 0 }, { 0, 0 }, { 0, DEL },
+/* 0x54 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x58 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x5C */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
/* 0x60 */
-/* 0x60 */ 0, '>', 0, 0, 0, 0, 0, '(',
-/* 0x64 */ 0, ')', 0, '/', 0, '*', K, '7',
-/* 0x68 */ K, '8', K, '9', K, '4', K, '5',
-/* 0x6c */ K, '6', K, '1', K, '2', K, '3',
-/* 0x70 */ K, '0', K, '.', K, '\r', 0, 0,
-/* 0x74 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x78 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x7c */ 0, 0, 0, 0, 0, 0, 0, 0
+/* 0x60 */ { 0, '>' }, { 0, 0 }, { 0, 0 }, { 0, '(' },
+/* 0x64 */ { 0, ')' }, { 0, '/' }, { 0, '*' }, { K, '7' },
+/* 0x68 */ { K, '8' }, { K, '9' }, { K, '4' }, { K, '5' },
+/* 0x6C */ { K, '6' }, { K, '1' }, { K, '2' }, { K, '3' },
+/* 0x70 */ { K, '0' }, { K, '.' }, { K, '\r' }, { 0, 0 },
+/* 0x74 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x78 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x7C */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }
},
-
+
/* alt map */
{
-/* 0x00 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x04 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x08 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x0c */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x10 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x14 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x18 */ 0, 0, 0, 0, 0, '@', 0, 0,
-/* 0x1c */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x20 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x24 */ 0, 0, 0, 0, 0, 0, 0, '[',
-/* 0x28 */ 0, ']', 0, 0, 0, 0, 0, 0,
-/* 0x2c */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x30 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x34 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x38 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x3c */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x40 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x44 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x48 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x4c */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x50 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x54 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x58 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x5c */ 0, 0, 0, 0, 0, 0, 0, 0,
+/* 0x00 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x04 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x08 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x0C */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x10 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x14 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x18 */ { 0, 0 }, { 0, 0 }, { 0, '@' }, { 0, 0 },
+/* 0x1C */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x20 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x24 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, '[' },
+/* 0x28 */ { 0, ']' }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x2C */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x30 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x34 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x38 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x3C */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x40 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x44 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x48 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x4C */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x50 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x54 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x58 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x5C */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
/* 0x60 */
-/* 0x60 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x64 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x68 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x6c */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x70 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x74 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x78 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x7c */ 0, 0, 0, 0, 0, 0, 0, 0
+/* 0x60 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x64 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x68 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x6C */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x70 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x74 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x78 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x7C */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }
},
/* shift alt map */
{
-/* 0x00 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x04 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x08 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x0c */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x10 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x14 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x18 */ 0, 0, 0, 0, 0, '\\', 0, 0,
-/* 0x1c */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x20 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x24 */ 0, 0, 0, 0, 0, 0, 0, '{',
-/* 0x28 */ 0, '}', 0, 0, 0, 0, 0, 0,
-/* 0x2c */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x30 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x34 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x38 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x3c */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x40 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x44 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x48 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x4c */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x50 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x54 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x58 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x5c */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x60 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x64 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x68 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x6c */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x70 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x74 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x78 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x7c */ 0, 0, 0, 0, 0, 0, 0, 0
+/* 0x00 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x04 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x08 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x0C */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x10 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x14 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x18 */ { 0, 0 }, { 0, 0 }, { 0, '\\' }, { 0, 0 },
+/* 0x1C */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x20 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x24 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, '{' },
+/* 0x28 */ { 0, '}' }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x2C */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x30 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x34 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x38 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x3C */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x40 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x44 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x48 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x4C */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x50 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x54 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x58 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x5C */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x60 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x64 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x68 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x6C */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x70 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x74 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x78 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x7C */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }
},
- {
- /* string table. If there's a better way to get the offsets into the
- above table, please tell me..
-
- NOTE: save yourself and others a lot of grief by *not* using
- CSI == 0x9b, using the two-character sequence gives
- much less trouble, especially in GNU-Emacs.. */
-
+ {
+ /*
+ * string table. If there's a better way to get the offsets into the
+ * above table, please tell me..
+ *
+ * NOTE: save yourself and others a lot of grief by *not* using
+ * CSI == 0x9b, using the two-character sequence gives
+ * much less trouble, especially in GNU-Emacs..
+ */
+
3, ESC, '[', 'A', /* 0x00: CRSR UP */
3, ESC, '[', 'B', /* 0x04: CRSR DOWN */
3, ESC, '[', 'C', /* 0x08: CRSR RIGHT */
@@ -203,8 +210,10 @@ struct kbdmap ascii_kbdmap = {
};
#ifndef _KERNEL
-main(void)
+int
+main(int argc, char *argv[])
{
- exit(write (1, &ascii_kbdmap, sizeof (kbdmap)) == sizeof (kbdmap) ? 0 : 1);
+
+ exit(write(1, &ascii_kbdmap, sizeof(kbdmap)) == sizeof(kbdmap) ? 0 : 1);
}
#endif /* _KERNEL */
Index: src/sys/arch/atari/stand/keymaps/fr/fr-kbdmap.c
diff -u src/sys/arch/atari/stand/keymaps/fr/fr-kbdmap.c:1.3 src/sys/arch/atari/stand/keymaps/fr/fr-kbdmap.c:1.4
--- src/sys/arch/atari/stand/keymaps/fr/fr-kbdmap.c:1.3 Wed Mar 18 10:22:25 2009
+++ src/sys/arch/atari/stand/keymaps/fr/fr-kbdmap.c Sat May 29 09:50:04 2021
@@ -1,9 +1,14 @@
-/* $NetBSD: fr-kbdmap.c,v 1.3 2009/03/18 10:22:25 cegger Exp $ */
+/* $NetBSD: fr-kbdmap.c,v 1.4 2021/05/29 09:50:04 tsutsui Exp $ */
/*
* Contributed by Cedric Moreau
*/
+#if !defined(_KERNEL)
+#include <stdlib.h>
+#include <unistd.h>
+#endif
+
#include "../../../dev/kbdmap.h"
/* mode shortcuts: */
@@ -15,157 +20,159 @@ struct kbdmap kbdmap;
struct kbdmap ascii_kbdmap = {
/* normal map */
{
-/* 0x00 */ 0, 0, 0, ESC, 0, '&', C, 0x82,
-/* 0x04 */ 0, '"', 0, 0x27, 0, '(', 0, 0xDD,
-/* 0x08 */ C, 0x8A, 0, '!', C, 0x87, C, 0x85,
-/* 0x0c */ 0, ')', 0, '-', 0, '\b', 0, '\t',
-/* 0x10 */ C, 'a', C, 'z', C, 'e', C, 'r',
-/* 0x14 */ C, 't', C, 'y', C, 'u', C, 'i',
-/* 0x18 */ C, 'o', C, 'p', 0, '^', 0, '$',
-/* 0x1c */ 0, '\r', 0, 0, C, 'q', C, 's',
-/* 0x20 */ C, 'd', C, 'f', C, 'g', C, 'h',
-/* 0x24 */ C, 'j', C, 'k', C, 'l', C, 'm',
-/* 0x28 */ C, 0x97, 0, '`', 0, 0, 0, '#',
-/* 0x2c */ C, 'w', C, 'x', C, 'c', C, 'v',
-/* 0x30 */ C, 'b', C, 'n', 0, ',', 0, ';',
-/* 0x34 */ 0, ':', 0, '=', 0, 0, 0, 0,
-/* 0x38 */ 0, 0, 0, ' ', 0, 0, S, 0x10,
-/* 0x3c */ S, 0x15, S, 0x1A, S, 0x1F, S, 0x24,
-/* 0x40 */ S, 0x29, S, 0x2E, S, 0x33, S, 0x38,
-/* 0x44 */ S, 0x3D, 0, 0, 0, 0, 0, 0,
-/* 0x48 */ S, 0x00, 0, 0, 0, '-', S, 0x0C,
-/* 0x4c */ 0, 0, S, 0x08, 0, '+', 0, 0,
-/* 0x50 */ S, 0x04, 0, 0, 0, 0, 0, DEL,
-/* 0x54 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x58 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x5c */ 0, 0, 0, 0, 0, 0, 0, 0,
+/* 0x00 */ { 0, 0 }, { 0, ESC }, { 0, '&' }, { C, 0x82 },
+/* 0x04 */ { 0, '"' }, { 0, 0x27 }, { 0, '(' }, { 0, 0xDD },
+/* 0x08 */ { C, 0x8A }, { 0, '!' }, { C, 0x87 }, { C, 0x85 },
+/* 0x0C */ { 0, ')' }, { 0, '-' }, { 0, '\b' }, { 0, '\t' },
+/* 0x10 */ { C, 'a' }, { C, 'z' }, { C, 'e' }, { C, 'r' },
+/* 0x14 */ { C, 't' }, { C, 'y' }, { C, 'u' }, { C, 'i' },
+/* 0x18 */ { C, 'o' }, { C, 'p' }, { 0, '^' }, { 0, '$' },
+/* 0x1C */ { 0, '\r' }, { 0, 0 }, { C, 'q' }, { C, 's' },
+/* 0x20 */ { C, 'd' }, { C, 'f' }, { C, 'g' }, { C, 'h' },
+/* 0x24 */ { C, 'j' }, { C, 'k' }, { C, 'l' }, { C, 'm' },
+/* 0x28 */ { C, 0x97 }, { 0, '`' }, { 0, 0 }, { 0, '#' },
+/* 0x2C */ { C, 'w' }, { C, 'x' }, { C, 'c' }, { C, 'v' },
+/* 0x30 */ { C, 'b' }, { C, 'n' }, { 0, ',' }, { 0, ';' },
+/* 0x34 */ { 0, ':' }, { 0, '=' }, { 0, 0 }, { 0, 0 },
+/* 0x38 */ { 0, 0 }, { 0, ' ' }, { 0, 0 }, { S, 0x10 },
+/* 0x3C */ { S, 0x15 }, { S, 0x1A }, { S, 0x1F }, { S, 0x24 },
+/* 0x40 */ { S, 0x29 }, { S, 0x2E }, { S, 0x33 }, { S, 0x38 },
+/* 0x44 */ { S, 0x3D }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x48 */ { S, 0x00 }, { 0, 0 }, { 0, '-' }, { S, 0x0C },
+/* 0x4C */ { 0, 0 }, { S, 0x08 }, { 0, '+' }, { 0, 0 },
+/* 0x50 */ { S, 0x04 }, { 0, 0 }, { 0, 0 }, { 0, DEL },
+/* 0x54 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x58 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x5C */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
/* 0x60 */
-/* 0x60 */ 0, '<', 0, 0, 0, 0, 0, '(',
-/* 0x64 */ 0, ')', 0, '/', 0, '*', K, '7',
-/* 0x68 */ K, '8', K, '9', K, '4', K, '5',
-/* 0x6c */ K, '6', K, '1', K, '2', K, '3',
-/* 0x70 */ K, '0', K, '.', K, '\r', 0, 0,
-/* 0x74 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x78 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x7c */ 0, 0, 0, 0, 0, 0, 0, 0
+/* 0x60 */ { 0, '<' }, { 0, 0 }, { 0, 0 }, { 0, '(' },
+/* 0x64 */ { 0, ')' }, { 0, '/' }, { 0, '*' }, { K, '7' },
+/* 0x68 */ { K, '8' }, { K, '9' }, { K, '4' }, { K, '5' },
+/* 0x6C */ { K, '6' }, { K, '1' }, { K, '2' }, { K, '3' },
+/* 0x70 */ { K, '0' }, { K, '.' }, { K, '\r' }, { 0, 0 },
+/* 0x74 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x78 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x7C */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }
},
/* shifted map */
{
-/* 0x00 */ 0, 0, 0, ESC, 0, '1', 0, '2',
-/* 0x04 */ 0, '3', 0, '4', 0, '5', 0, '6',
-/* 0x08 */ 0, '7', 0, '8', 0, '9', 0, '0',
-/* 0x0c */ 0, 0xF8, 0, '_', 0, '\b', 0, '\t',
-/* 0x10 */ C, 'A', C, 'Z', C, 'E', C, 'R',
-/* 0x14 */ C, 'T', C, 'Y', C, 'U', C, 'I',
-/* 0x18 */ C, 'O', C, 'P', 0, 0xB9, 0, '*',
-/* 0x1c */ 0, '\r', 0, 0, C, 'Q', C, 'S',
-/* 0x20 */ C, 'D', C, 'F', C, 'G', C, 'H',
-/* 0x24 */ C, 'J', C, 'K', C, 'L', C, 'M',
-/* 0x28 */ 0, '%', 0, '£', 0, 0, 0, '|',
-/* 0x2c */ C, 'W', C, 'X', C, 'C', C, 'V',
-/* 0x30 */ C, 'B', C, 'N', 0, '?', 0, '.',
-/* 0x34 */ 0, '/', 0, '+', 0, 0, 0, 0,
-/* 0x38 */ 0, 0, 0, ' ', 0, 0, S, 0x5d,
-/* 0x3c */ S, 0x63, S, 0x69, S, 0x6F, S, 0x75,
-/* 0x40 */ S, 0x7b, S, 0x81, S, 0x87, S, 0x8d,
-/* 0x44 */ S, 0x93, 0, 0, 0, 0, 0, 0,
-/* 0x48 */ S, 0x47, 0, 0, 0, '-', S, 0x57,
-/* 0x4c */ 0, 0, S, 0x51, 0, '+', 0, 0,
-/* 0x50 */ S, 0x4c, 0, 0, 0, 0, 0, DEL,
-/* 0x54 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x58 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x5c */ 0, 0, 0, 0, 0, 0, 0, 0,
+/* 0x00 */ { 0, 0 }, { 0, ESC }, { 0, '1' }, { 0, '2' },
+/* 0x04 */ { 0, '3' }, { 0, '4' }, { 0, '5' }, { 0, '6' },
+/* 0x08 */ { 0, '7' }, { 0, '8' }, { 0, '9' }, { 0, '0' },
+/* 0x0C */ { 0, 0xF8 }, { 0, '_' }, { 0, '\b' },{ 0, '\t' },
+/* 0x10 */ { C, 'A' }, { C, 'Z' }, { C, 'E' }, { C, 'R' },
+/* 0x14 */ { C, 'T' }, { C, 'Y' }, { C, 'U' }, { C, 'I' },
+/* 0x18 */ { C, 'O' }, { C, 'P' }, { 0, 0xB9 }, { 0, '*' },
+/* 0x1C */ { 0, '\r' }, { 0, 0 }, { C, 'Q' }, { C, 'S' },
+/* 0x20 */ { C, 'D' }, { C, 'F' }, { C, 'G' }, { C, 'H' },
+/* 0x24 */ { C, 'J' }, { C, 'K' }, { C, 'L' }, { C, 'M' },
+/* 0x28 */ { 0, '%' }, { 0, '£' }, { 0, 0 }, { 0, '|' },
+/* 0x2C */ { C, 'W' }, { C, 'X' }, { C, 'C' }, { C, 'V' },
+/* 0x30 */ { C, 'B' }, { C, 'N' }, { 0, '?' }, { 0, '.' },
+/* 0x34 */ { 0, '/' }, { 0, '+' }, { 0, 0 }, { 0, 0 },
+/* 0x38 */ { 0, 0 }, { 0, ' ' }, { 0, 0 }, { S, 0x5d },
+/* 0x3C */ { S, 0x63 }, { S, 0x69 }, { S, 0x6F }, { S, 0x75 },
+/* 0x40 */ { S, 0x7b }, { S, 0x81 }, { S, 0x87 }, { S, 0x8d },
+/* 0x44 */ { S, 0x93 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x48 */ { S, 0x47 }, { 0, 0 }, { 0, '-' }, { S, 0x57 },
+/* 0x4C */ { 0, 0 }, { S, 0x51 }, { 0, '+' }, { 0, 0 },
+/* 0x50 */ { S, 0x4C }, { 0, 0 }, { 0, 0 }, { 0, DEL },
+/* 0x54 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x58 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x5C */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
/* 0x60 */
-/* 0x60 */ 0, '>', 0, 0, 0, 0, 0, '(',
-/* 0x64 */ 0, ')', 0, '/', 0, '*', K, '7',
-/* 0x68 */ K, '8', K, '9', K, '4', K, '5',
-/* 0x6c */ K, '6', K, '1', K, '2', K, '3',
-/* 0x70 */ K, '0', K, '.', K, '\r', 0, 0,
-/* 0x74 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x78 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x7c */ 0, 0, 0, 0, 0, 0, 0, 0
+/* 0x60 */ { 0, '>' }, { 0, 0 }, { 0, 0 }, { 0, '(' },
+/* 0x64 */ { 0, ')' }, { 0, '/' }, { 0, '*' }, { K, '7' },
+/* 0x68 */ { K, '8' }, { K, '9' }, { K, '4' }, { K, '5' },
+/* 0x6C */ { K, '6' }, { K, '1' }, { K, '2' }, { K, '3' },
+/* 0x70 */ { K, '0' }, { K, '.' }, { K, '\r' }, { 0, 0 },
+/* 0x74 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x78 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x7C */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }
},
/* alt map */
{
-/* 0x00 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x04 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x08 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x0c */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x10 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x14 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x18 */ 0, 0, 0, 0, 0, '[', 0, ']',
-/* 0x1c */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x20 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x24 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x28 */ 0, '\'', 0, 0, 0, 0, 0, '@',
-/* 0x2c */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x30 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x34 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x38 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x3c */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x40 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x44 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x48 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x4c */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x50 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x54 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x58 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x5c */ 0, 0, 0, 0, 0, 0, 0, 0,
+/* 0x00 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x04 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x08 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x0C */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x10 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x14 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x18 */ { 0, 0 }, { 0, 0 }, { 0, '[' }, { 0, ']' },
+/* 0x1C */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x20 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x24 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x28 */ { 0, '\'' }, { 0, 0 }, { 0, 0 }, { 0, '@' },
+/* 0x2C */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x30 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x34 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x38 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x3C */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x40 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x44 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x48 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x4C */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x50 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x54 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x58 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x5C */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
/* 0x60 */
-/* 0x60 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x64 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x68 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x6c */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x70 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x74 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x78 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x7c */ 0, 0, 0, 0, 0, 0, 0, 0
+/* 0x60 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x64 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x68 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x6C */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x70 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x74 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x78 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x7C */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }
},
/* shift alt map */
{
-/* 0x00 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x04 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x08 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x0c */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x10 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x14 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x18 */ 0, 0, 0, 0, 0, '{', 0, '}',
-/* 0x1c */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x20 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x24 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x28 */ 0, 0, 0, 0, 0, 0, 0, '~',
-/* 0x2c */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x30 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x34 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x38 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x3c */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x40 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x44 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x48 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x4c */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x50 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x54 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x58 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x5c */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x60 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x64 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x68 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x6c */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x70 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x74 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x78 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x7c */ 0, 0, 0, 0, 0, 0, 0, 0
+/* 0x00 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x04 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x08 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x0C */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x10 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x14 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x18 */ { 0, 0 }, { 0, 0 }, { 0, '{' }, { 0, '}' },
+/* 0x1C */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x20 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x24 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x28 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, '~' },
+/* 0x2C */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x30 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x34 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x38 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x3C */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x40 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x44 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x48 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x4C */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x50 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x54 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x58 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x5C */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x60 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x64 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x68 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x6C */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x70 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x74 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x78 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x7C */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }
},
{
- /* string table. If there's a better way to get the offsets into the
- above table, please tell me..
-
- NOTE: save yourself and others a lot of grief by *not* using
- CSI == 0x9b, using the two-character sequence gives
- much less trouble, especially in GNU-Emacs.. */
+ /*
+ * string table. If there's a better way to get the offsets into the
+ * above table, please tell me..
+ *
+ * NOTE: save yourself and others a lot of grief by *not* using
+ * CSI == 0x9b, using the two-character sequence gives
+ * much less trouble, especially in GNU-Emacs..
+ */
3, ESC, '[', 'A', /* 0x00: CRSR UP */
3, ESC, '[', 'B', /* 0x04: CRSR DOWN */
@@ -203,8 +210,10 @@ struct kbdmap ascii_kbdmap = {
};
#ifndef _KERNEL
-main(void)
+int
+main(int argc, char *argv[])
{
- exit(write (1, &ascii_kbdmap, sizeof (kbdmap)) == sizeof (kbdmap) ? 0 : 1);
+
+ exit(write(1, &ascii_kbdmap, sizeof(kbdmap)) == sizeof(kbdmap) ? 0 : 1);
}
#endif /* _KERNEL */
Index: src/sys/arch/atari/stand/keymaps/uk/uk-kbdmap.c
diff -u src/sys/arch/atari/stand/keymaps/uk/uk-kbdmap.c:1.3 src/sys/arch/atari/stand/keymaps/uk/uk-kbdmap.c:1.4
--- src/sys/arch/atari/stand/keymaps/uk/uk-kbdmap.c:1.3 Wed Mar 18 10:22:25 2009
+++ src/sys/arch/atari/stand/keymaps/uk/uk-kbdmap.c Sat May 29 09:50:04 2021
@@ -1,105 +1,112 @@
-/* $NetBSD: uk-kbdmap.c,v 1.3 2009/03/18 10:22:25 cegger Exp $ */
+/* $NetBSD: uk-kbdmap.c,v 1.4 2021/05/29 09:50:04 tsutsui Exp $ */
+
+#if !defined(_KERNEL)
+#include <stdlib.h>
+#include <unistd.h>
+#endif
#include "../../../dev/kbdmap.h"
/* mode shortcuts: */
#define S KBD_MODE_STRING
-#define C KBD_MODE_CAPS
-#define K KBD_MODE_KPAD
+#define C KBD_MODE_CAPS
+#define K KBD_MODE_KPAD
struct kbdmap kbdmap;
struct kbdmap ascii_kbdmap = {
/* normal map */
{
-/* 0x00 */ 0, 0, 0, ESC, 0, '1', 0, '2',
-/* 0x04 */ 0, '3', 0, '4', 0, '5', 0, '6',
-/* 0x08 */ 0, '7', 0, '8', 0, '9', 0, '0',
-/* 0x0c */ 0, '-', 0, '=', 0, '\b', 0, '\t',
-/* 0x10 */ C, 'q', C, 'w', C, 'e', C, 'r',
-/* 0x14 */ C, 't', C, 'y', C, 'u', C, 'i',
-/* 0x18 */ C, 'o', C, 'p', 0, '[', 0, ']',
-/* 0x1c */ 0, '\r', 0, 0, C, 'a', C, 's',
-/* 0x20 */ C, 'd', C, 'f', C, 'g', C, 'h',
-/* 0x24 */ C, 'j', C, 'k', C, 'l', 0, ';',
-/* 0x28 */ 0, '\'', 0, '`', 0, 0, 0, '#',
-/* 0x2c */ C, 'z', C, 'x', C, 'c', C, 'v',
-/* 0x30 */ C, 'b', C, 'n', C, 'm', 0, ',',
-/* 0x34 */ 0, '.', 0, '/', 0, 0, 0, 0,
-/* 0x38 */ 0, 0, 0, ' ', 0, 0, S, 0x10,
-/* 0x3c */ S, 0x15, S, 0x1A, S, 0x1F, S, 0x24,
-/* 0x40 */ S, 0x29, S, 0x2E, S, 0x33, S, 0x38,
-/* 0x44 */ S, 0x3D, 0, 0, 0, 0, 0, 0,
-/* 0x48 */ S, 0x00, 0, 0, 0, '-', S, 0x0C,
-/* 0x4c */ 0, 0, S, 0x08, 0, '+', 0, 0,
-/* 0x50 */ S, 0x04, 0, 0, 0, 0, 0, DEL,
-/* 0x54 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x58 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x5c */ 0, 0, 0, 0, 0, 0, 0, 0,
+/* 0x00 */ { 0, 0 }, { 0, ESC }, { 0, '1' }, { 0, '2' },
+/* 0x04 */ { 0, '3' }, { 0, '4' }, { 0, '5' }, { 0, '6' },
+/* 0x08 */ { 0, '7' }, { 0, '8' }, { 0, '9' }, { 0, '0' },
+/* 0x0C */ { 0, '-' }, { 0, '=' }, { 0, '\b' },{ 0, '\t' },
+/* 0x10 */ { C, 'q' }, { C, 'w' }, { C, 'e' }, { C, 'r' },
+/* 0x14 */ { C, 't' }, { C, 'y' }, { C, 'u' }, { C, 'i' },
+/* 0x18 */ { C, 'o' }, { C, 'p' }, { 0, '[' }, { 0, ']' },
+/* 0x1C */ { 0, '\r' }, { 0, 0 }, { C, 'a' }, { C, 's' },
+/* 0x20 */ { C, 'd' }, { C, 'f' }, { C, 'g' }, { C, 'h' },
+/* 0x24 */ { C, 'j' }, { C, 'k' }, { C, 'l' }, { 0, ';' },
+/* 0x28 */ { 0, '\'' }, { 0, '`' }, { 0, 0 }, { 0, '#' },
+/* 0x2C */ { C, 'z' }, { C, 'x' }, { C, 'c' }, { C, 'v' },
+/* 0x30 */ { C, 'b' }, { C, 'n' }, { C, 'm' }, { 0, ',' },
+/* 0x34 */ { 0, '.' }, { 0, '/' }, { 0, 0 }, { 0, 0 },
+/* 0x38 */ { 0, 0 }, { 0, ' ' }, { 0, 0 }, { S, 0x10 },
+/* 0x3C */ { S, 0x15 }, { S, 0x1A }, { S, 0x1F }, { S, 0x24 },
+/* 0x40 */ { S, 0x29 }, { S, 0x2E }, { S, 0x33 }, { S, 0x38 },
+/* 0x44 */ { S, 0x3D }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x48 */ { S, 0x00 }, { 0, 0 }, { 0, '-' }, { S, 0x0C },
+/* 0x4C */ { 0, 0 }, { S, 0x08 }, { 0, '+' }, { 0, 0 },
+/* 0x50 */ { S, 0x04 }, { 0, 0 }, { 0, 0 }, { 0, DEL },
+/* 0x54 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x58 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x5C */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
/* 0x60 */
-/* 0x60 */ 0, '\\', 0, 0, 0, 0, 0, '(',
-/* 0x64 */ 0, ')', 0, '/', 0, '*', K, '7',
-/* 0x68 */ K, '8', K, '9', K, '4', K, '5',
-/* 0x6c */ K, '6', K, '1', K, '2', K, '3',
-/* 0x70 */ K, '0', K, '.', K, '\r', 0, 0,
-/* 0x74 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x78 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x7c */ 0, 0, 0, 0, 0, 0, 0, 0
+/* 0x60 */ { 0, '\\' }, { 0, 0 }, { 0, 0 }, { 0, '(' },
+/* 0x64 */ { 0, ')' }, { 0, '/' }, { 0, '*' }, { K, '7' },
+/* 0x68 */ { K, '8' }, { K, '9' }, { K, '4' }, { K, '5' },
+/* 0x6C */ { K, '6' }, { K, '1' }, { K, '2' }, { K, '3' },
+/* 0x70 */ { K, '0' }, { K, '.' }, { K, '\r' }, { 0, 0 },
+/* 0x74 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x78 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x7C */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }
},
/* shifted map */
{
-/* 0x00 */ 0, 0, 0, ESC, 0, '!', 0, '"',
-/* 0x04 */ 0, '#', 0, '$', 0, '%', 0, '^',
-/* 0x08 */ 0, '&', 0, '*', 0, '(', 0, ')',
-/* 0x0c */ 0, '_', 0, '+', 0, '\b', 0, '\t',
-/* 0x10 */ C, 'Q', C, 'W', C, 'E', C, 'R',
-/* 0x14 */ C, 'T', C, 'Y', C, 'U', C, 'I',
-/* 0x18 */ C, 'O', C, 'P', 0, '{', 0, '}',
-/* 0x1c */ 0, '\r', 0, 0, C, 'A', C, 'S',
-/* 0x20 */ C, 'D', C, 'F', C, 'G', C, 'H',
-/* 0x24 */ C, 'J', C, 'K', C, 'L', 0, ':',
-/* 0x28 */ 0, '@', 0, '_', 0, 0, 0, '~',
-/* 0x2c */ C, 'Z', C, 'X', C, 'C', C, 'V',
-/* 0x30 */ C, 'B', C, 'N', C, 'M', 0, '<',
-/* 0x34 */ 0, '>', 0, '?', 0, 0, 0, 0,
-/* 0x38 */ 0, 0, 0, ' ', 0, 0, S, 0x5d,
-/* 0x3c */ S, 0x63, S, 0x69, S, 0x6F, S, 0x75,
-/* 0x40 */ S, 0x7b, S, 0x81, S, 0x87, S, 0x8d,
-/* 0x44 */ S, 0x93, 0, 0, 0, 0, 0, 0,
-/* 0x48 */ S, 0x47, 0, 0, 0, '-', S, 0x57,
-/* 0x4c */ 0, 0, S, 0x51, 0, '+', 0, 0,
-/* 0x50 */ S, 0x4c, 0, 0, 0, 0, 0, DEL,
-/* 0x54 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x58 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x5c */ 0, 0, 0, 0, 0, 0, 0, 0,
+/* 0x00 */ { 0, 0 }, { 0, ESC }, { 0, '!' }, { 0, '"' },
+/* 0x04 */ { 0, '#' }, { 0, '$' }, { 0, '%' }, { 0, '^' },
+/* 0x08 */ { 0, '&' }, { 0, '*' }, { 0, '(' }, { 0, ')' },
+/* 0x0C */ { 0, '_' }, { 0, '+' }, { 0, '\b' }, { 0, '\t' },
+/* 0x10 */ { C, 'Q' }, { C, 'W' }, { C, 'E' }, { C, 'R' },
+/* 0x14 */ { C, 'T' }, { C, 'Y' }, { C, 'U' }, { C, 'I' },
+/* 0x18 */ { C, 'O' }, { C, 'P' }, { 0, '{' }, { 0, '}' },
+/* 0x1C */ { 0, '\r' }, { 0, 0 }, { C, 'A' }, { C, 'S' },
+/* 0x20 */ { C, 'D' }, { C, 'F' }, { C, 'G' }, { C, 'H' },
+/* 0x24 */ { C, 'J' }, { C, 'K' }, { C, 'L' }, { 0, ':' },
+/* 0x28 */ { 0, '@' }, { 0, '_' }, { 0, 0 }, { 0, '~' },
+/* 0x2C */ { C, 'Z' }, { C, 'X' }, { C, 'C' }, { C, 'V' },
+/* 0x30 */ { C, 'B' }, { C, 'N' }, { C, 'M' }, { 0, '<' },
+/* 0x34 */ { 0, '>' }, { 0, '?' }, { 0, 0 }, { 0, 0 },
+/* 0x38 */ { 0, 0 }, { 0, ' ' }, { 0, 0 }, { S, 0x5d },
+/* 0x3C */ { S, 0x63 }, { S, 0x69 }, { S, 0x6F }, { S, 0x75 },
+/* 0x40 */ { S, 0x7b }, { S, 0x81 }, { S, 0x87 }, { S, 0x8d },
+/* 0x44 */ { S, 0x93 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x48 */ { S, 0x47 }, { 0, 0 }, { 0, '-' }, { S, 0x57 },
+/* 0x4C */ { 0, 0 }, { S, 0x51 }, { 0, '+' }, { 0, 0 },
+/* 0x50 */ { S, 0x4c }, { 0, 0 }, { 0, 0 }, { 0, DEL },
+/* 0x54 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x58 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x5C */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
/* 0x60 */
-/* 0x60 */ 0, '|', 0, 0, 0, 0, 0, '(',
-/* 0x64 */ 0, ')', 0, '/', 0, '*', K, '7',
-/* 0x68 */ K, '8', K, '9', K, '4', K, '5',
-/* 0x6c */ K, '6', K, '1', K, '2', K, '3',
-/* 0x70 */ K, '0', K, '.', K, '\r', 0, 0,
-/* 0x74 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x78 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x7c */ 0, 0, 0, 0, 0, 0, 0, 0
+/* 0x60 */ { 0, '|' }, { 0, 0 }, { 0, 0 }, { 0, '(' },
+/* 0x64 */ { 0, ')' }, { 0, '/' }, { 0, '*' }, { K, '7' },
+/* 0x68 */ { K, '8' }, { K, '9' }, { K, '4' }, { K, '5' },
+/* 0x6C */ { K, '6' }, { K, '1' }, { K, '2' }, { K, '3' },
+/* 0x70 */ { K, '0' }, { K, '.' }, { K, '\r' }, { 0, 0 },
+/* 0x74 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x78 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x7C */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }
},
/* alt map FIXME: No altmap yet.. */
{
- 0, 0
+ { 0, 0 }
},
/* shift alt map FIXME: No shift altmap yet... */
{
- 0, 0
+ { 0, 0 }
},
- {
- /* string table. If there's a better way to get the offsets into the
- above table, please tell me..
-
- NOTE: save yourself and others a lot of grief by *not* using
- CSI == 0x9b, using the two-character sequence gives
- much less trouble, especially in GNU-Emacs.. */
-
+ {
+ /*
+ * string table. If there's a better way to get the offsets into the
+ * above table, please tell me..
+ *
+ * NOTE: save yourself and others a lot of grief by *not* using
+ * CSI == 0x9b, using the two-character sequence gives
+ * much less trouble, especially in GNU-Emacs..
+ */
+
3, ESC, '[', 'A', /* 0x00: CRSR UP */
3, ESC, '[', 'B', /* 0x04: CRSR DOWN */
3, ESC, '[', 'C', /* 0x08: CRSR RIGHT */
@@ -136,8 +143,10 @@ struct kbdmap ascii_kbdmap = {
};
#ifndef _KERNEL
-main(void)
+int
+main(int argc, char *argv[])
{
- exit(write (1, &ascii_kbdmap, sizeof (kbdmap)) == sizeof (kbdmap) ? 0 : 1);
+
+ exit(write(1, &ascii_kbdmap, sizeof(kbdmap)) == sizeof(kbdmap) ? 0 : 1);
}
#endif /* _KERNEL */
Index: src/sys/arch/atari/stand/keymaps/us/us-kbdmap.c
diff -u src/sys/arch/atari/stand/keymaps/us/us-kbdmap.c:1.3 src/sys/arch/atari/stand/keymaps/us/us-kbdmap.c:1.4
--- src/sys/arch/atari/stand/keymaps/us/us-kbdmap.c:1.3 Wed Mar 18 10:22:25 2009
+++ src/sys/arch/atari/stand/keymaps/us/us-kbdmap.c Sat May 29 09:50:04 2021
@@ -1,17 +1,21 @@
-/* $NetBSD: us-kbdmap.c,v 1.3 2009/03/18 10:22:25 cegger Exp $ */
+/* $NetBSD: us-kbdmap.c,v 1.4 2021/05/29 09:50:04 tsutsui Exp $ */
+
+#if !defined(_KERNEL)
+#include <stdlib.h>
+#include <unistd.h>
+#endif
#include "../../../dev/kbdmap.h"
/* mode shortcuts: */
#define S KBD_MODE_STRING
-#define C KBD_MODE_CAPS
-#define K KBD_MODE_KPAD
-
+#define C KBD_MODE_CAPS
+#define K KBD_MODE_KPAD
/*
| 20.June.95
| Abdulkareem a...@ccnet.com
-|
+|
| Changes made for the US keyboard
| The pipe symbol '|', the double-quote '"', the at sign, '@', the
| tidle '~', the backslash '\' were incompatible to the built-in
@@ -19,103 +23,104 @@
|
| I've added the loadkmap us-map line in my /etc/rc.local file; don't
| know where else to put it.
-|
+|
*/
-
struct kbdmap kbdmap;
struct kbdmap ascii_kbdmap = {
/* normal map */
{
-/* 0x00 */ 0, 0, 0, ESC, 0, '1', 0, '2',
-/* 0x04 */ 0, '3', 0, '4', 0, '5', 0, '6',
-/* 0x08 */ 0, '7', 0, '8', 0, '9', 0, '0',
-/* 0x0c */ 0, '-', 0, '=', 0, '\b', 0, '\t',
-/* 0x10 */ C, 'q', C, 'w', C, 'e', C, 'r',
-/* 0x14 */ C, 't', C, 'y', C, 'u', C, 'i',
-/* 0x18 */ C, 'o', C, 'p', 0, '[', 0, ']',
-/* 0x1c */ 0, '\r', 0, DEL, C, 'a', C, 's',
-/* 0x20 */ C, 'd', C, 'f', C, 'g', C, 'h',
-/* 0x24 */ C, 'j', C, 'k', C, 'l', 0, ';',
-/* 0x28 */ 0, '\'', 0, '`', 0, 0, 0, '\\',
-/* 0x2c */ C, 'z', C, 'x', C, 'c', C, 'v',
-/* 0x30 */ C, 'b', C, 'n', C, 'm', 0, ',',
-/* 0x34 */ 0, '.', 0, '/', 0, 0, 0, 0,
-/* 0x38 */ 0, 0, 0, ' ', 0, 0, S, 0x10,
-/* 0x3c */ S, 0x15, S, 0x1A, S, 0x1F, S, 0x24,
-/* 0x40 */ S, 0x29, S, 0x2E, S, 0x33, S, 0x38,
-/* 0x44 */ S, 0x3D, 0, 0, 0, 0, 0, 0,
-/* 0x48 */ S, 0x00, 0, 0, 0, '-', S, 0x0C,
-/* 0x4c */ 0, 0, S, 0x08, 0, '+', 0, 0,
-/* 0x50 */ S, 0x04, 0, 0, 0, 0, 0, DEL,
-/* 0x54 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x58 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x5c */ 0, 0, 0, 0, 0, 0, 0, 0,
+/* 0x00 */ { 0, 0 }, { 0, ESC }, { 0, '1' }, { 0, '2' },
+/* 0x04 */ { 0, '3' }, { 0, '4' }, { 0, '5' }, { 0, '6' },
+/* 0x08 */ { 0, '7' }, { 0, '8' }, { 0, '9' }, { 0, '0' },
+/* 0x0C */ { 0, '-' }, { 0, '=' }, { 0, '\b' }, { 0, '\t' },
+/* 0x10 */ { C, 'q' }, { C, 'w' }, { C, 'e' }, { C, 'r' },
+/* 0x14 */ { C, 't' }, { C, 'y' }, { C, 'u' }, { C, 'i' },
+/* 0x18 */ { C, 'o' }, { C, 'p' }, { 0, '[' }, { 0, ']' },
+/* 0x1C */ { 0, '\r' }, { 0, DEL }, { C, 'a' }, { C, 's' },
+/* 0x20 */ { C, 'd' }, { C, 'f' }, { C, 'g' }, { C, 'h' },
+/* 0x24 */ { C, 'j' }, { C, 'k' }, { C, 'l' }, { 0, ';' },
+/* 0x28 */ { 0, '\'' }, { 0, '`' }, { 0, 0 }, { 0, '\\' },
+/* 0x2C */ { C, 'z' }, { C, 'x' }, { C, 'c' }, { C, 'v' },
+/* 0x30 */ { C, 'b' }, { C, 'n' }, { C, 'm' }, { 0, ',' },
+/* 0x34 */ { 0, '.' }, { 0, '/' }, { 0, 0 }, { 0, 0 },
+/* 0x38 */ { 0, 0 }, { 0, ' ' }, { 0, 0 }, { S, 0x10 },
+/* 0x3C */ { S, 0x15 }, { S, 0x1A }, { S, 0x1F }, { S, 0x24 },
+/* 0x40 */ { S, 0x29 }, { S, 0x2E }, { S, 0x33 }, { S, 0x38 },
+/* 0x44 */ { S, 0x3D }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x48 */ { S, 0x00 }, { 0, 0 }, { 0, '-' }, { S, 0x0C },
+/* 0x4C */ { 0, 0 }, { S, 0x08 }, { 0, '+' }, { 0, 0 },
+/* 0x50 */ { S, 0x04 }, { 0, 0 }, { 0, 0 }, { 0, DEL },
+/* 0x54 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x58 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x5C */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
/* 0x60 */
-/* 0x60 */ 0, 0, 0, 0, 0, 0, 0, '(',
-/* 0x64 */ 0, ')', 0, '/', 0, '*', K, '7',
-/* 0x68 */ K, '8', K, '9', K, '4', K, '5',
-/* 0x6c */ K, '6', K, '1', K, '2', K, '3',
-/* 0x70 */ K, '0', K, '.', K, '\r', 0, 0,
-/* 0x74 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x78 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x7c */ 0, 0, 0, 0, 0, 0, 0, 0
+/* 0x60 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, '(' },
+/* 0x64 */ { 0, ')' }, { 0, '/' }, { 0, '*' }, { K, '7' },
+/* 0x68 */ { K, '8' }, { K, '9' }, { K, '4' }, { K, '5' },
+/* 0x6C */ { K, '6' }, { K, '1' }, { K, '2' }, { K, '3' },
+/* 0x70 */ { K, '0' }, { K, '.' }, { K, '\r' }, { 0, 0 },
+/* 0x74 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x78 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x7C */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }
},
/* shifted map */
{
-/* 0x00 */ 0, 0, 0, ESC, 0, '!', 0, '@',
-/* 0x04 */ 0, '#', 0, '$', 0, '%', 0, '^',
-/* 0x08 */ 0, '&', 0, '*', 0, '(', 0, ')',
-/* 0x0c */ 0, '_', 0, '+', 0, '\b', 0, '\t',
-/* 0x10 */ C, 'Q', C, 'W', C, 'E', C, 'R',
-/* 0x14 */ C, 'T', C, 'Y', C, 'U', C, 'I',
-/* 0x18 */ C, 'O', C, 'P', 0, '{', 0, '}',
-/* 0x1c */ 0, '\r', 0, 0, C, 'A', C, 'S',
-/* 0x20 */ C, 'D', C, 'F', C, 'G', C, 'H',
-/* 0x24 */ C, 'J', C, 'K', C, 'L', 0, ':',
-/* 0x28 */ 0, '"', 0, '~', 0, 0, 0, '|',
-/* 0x2c */ C, 'Z', C, 'X', C, 'C', C, 'V',
-/* 0x30 */ C, 'B', C, 'N', C, 'M', 0, '<',
-/* 0x34 */ 0, '>', 0, '?', 0, 0, 0, 0,
-/* 0x38 */ 0, 0, 0, ' ', 0, 0, S, 0x5d,
-/* 0x3c */ S, 0x63, S, 0x69, S, 0x6F, S, 0x75,
-/* 0x40 */ S, 0x7b, S, 0x81, S, 0x87, S, 0x8d,
-/* 0x44 */ S, 0x93, 0, 0, 0, 0, 0, 0,
-/* 0x48 */ S, 0x47, 0, 0, 0, '-', S, 0x57,
-/* 0x4c */ 0, 0, S, 0x51, 0, '+', 0, 0,
-/* 0x50 */ S, 0x4c, 0, 0, 0, 0, 0, DEL,
-/* 0x54 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x58 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x5c */ 0, 0, 0, 0, 0, 0, 0, 0,
+/* 0x00 */ { 0, 0 }, { 0, ESC }, { 0, '!' }, { 0, '@' },
+/* 0x04 */ { 0, '#' }, { 0, '$' }, { 0, '%' }, { 0, '^' },
+/* 0x08 */ { 0, '&' }, { 0, '*' }, { 0, '(' }, { 0, ')' },
+/* 0x0C */ { 0, '_' }, { 0, '+' }, { 0, '\b' }, { 0, '\t' },
+/* 0x10 */ { C, 'Q' }, { C, 'W' }, { C, 'E' }, { C, 'R' },
+/* 0x14 */ { C, 'T' }, { C, 'Y' }, { C, 'U' }, { C, 'I' },
+/* 0x18 */ { C, 'O' }, { C, 'P' }, { 0, '{' }, { 0, '}' },
+/* 0x1C */ { 0, '\r' }, { 0, 0 }, { C, 'A' }, { C, 'S' },
+/* 0x20 */ { C, 'D' }, { C, 'F' }, { C, 'G' }, { C, 'H' },
+/* 0x24 */ { C, 'J' }, { C, 'K' }, { C, 'L' }, { 0, ':' },
+/* 0x28 */ { 0, '"' }, { 0, '~' }, { 0, 0 }, { 0, '|' },
+/* 0x2C */ { C, 'Z' }, { C, 'X' }, { C, 'C' }, { C, 'V' },
+/* 0x30 */ { C, 'B' }, { C, 'N' }, { C, 'M' }, { 0, '<' },
+/* 0x34 */ { 0, '>' }, { 0, '?' }, { 0, 0 }, { 0, 0 },
+/* 0x38 */ { 0, 0 }, { 0, ' ' }, { 0, 0 }, { S, 0x5d },
+/* 0x3C */ { S, 0x63 }, { S, 0x69 }, { S, 0x6F }, { S, 0x75 },
+/* 0x40 */ { S, 0x7b }, { S, 0x81 }, { S, 0x87 }, { S, 0x8d },
+/* 0x44 */ { S, 0x93 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x48 */ { S, 0x47 }, { 0, 0 }, { 0, '-' }, { S, 0x57 },
+/* 0x4C */ { 0, 0 }, { S, 0x51 }, { 0, '+' }, { 0, 0 },
+/* 0x50 */ { S, 0x4c }, { 0, 0 }, { 0, 0 }, { 0, DEL },
+/* 0x54 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x58 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x5C */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
/* 0x60 */
-/* 0x60 */ 0, 0, 0, 0, 0, 0, 0, '(',
-/* 0x64 */ 0, ')', 0, '/', 0, '*', K, '7',
-/* 0x68 */ K, '8', K, '9', K, '4', K, '5',
-/* 0x6c */ K, '6', K, '1', K, '2', K, '3',
-/* 0x70 */ K, '0', K, '.', K, '\r', 0, 0,
-/* 0x74 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x78 */ 0, 0, 0, 0, 0, 0, 0, 0,
-/* 0x7c */ 0, 0, 0, 0, 0, 0, 0, 0
+/* 0x60 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, '(' },
+/* 0x64 */ { 0, ')' }, { 0, '/' }, { 0, '*' }, { K, '7' },
+/* 0x68 */ { K, '8' }, { K, '9' }, { K, '4' }, { K, '5' },
+/* 0x6C */ { K, '6' }, { K, '1' }, { K, '2' }, { K, '3' },
+/* 0x70 */ { K, '0' }, { K, '.' }, { K, '\r' }, { 0, 0 },
+/* 0x74 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x78 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
+/* 0x7C */ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }
},
-
+
/* alt map FIXME: No altmap yet.. */
{
- 0, 0
+ { 0, 0 }
},
/* shift alt map FIXME: No shift altmap yet... */
{
- 0, 0
+ { 0, 0 }
},
- {
- /* string table. If there's a better way to get the offsets into the
- above table, please tell me..
-
- NOTE: save yourself and others a lot of grief by *not* using
- CSI == 0x9b, using the two-character sequence gives
- much less trouble, especially in GNU-Emacs.. */
-
+ {
+ /*
+ * string table. If there's a better way to get the offsets into the
+ * above table, please tell me..
+ *
+ * NOTE: save yourself and others a lot of grief by *not* using
+ * CSI == 0x9b, using the two-character sequence gives
+ * much less trouble, especially in GNU-Emacs..
+ */
+
3, ESC, '[', 'A', /* 0x00: CRSR UP */
3, ESC, '[', 'B', /* 0x04: CRSR DOWN */
3, ESC, '[', 'C', /* 0x08: CRSR RIGHT */
@@ -152,8 +157,10 @@ struct kbdmap ascii_kbdmap = {
};
#ifndef _KERNEL
-main(void)
+int
+main(int argc, char *argv[])
{
- exit(write (1, &ascii_kbdmap, sizeof (kbdmap)) == sizeof (kbdmap) ? 0 : 1);
+
+ exit(write(1, &ascii_kbdmap, sizeof(kbdmap)) == sizeof(kbdmap) ? 0 : 1);
}
#endif /* _KERNEL */
