Menu
▾
▴
[cadcdev-svn-commits] [SCM] branch master updated. v2.0.0-162-g5f37d40
|
From: Christian G. <sa...@us...> - 2015-04-24 13:26:29
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "A pseudo Operating System for the Dreamcast.".
The branch, master has been updated
via 5f37d4081066335bbdd7e87ce07c299644b6d65a (commit)
from 9f832a900ccb4f150f0264da806bb6b072de01ce (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 5f37d4081066335bbdd7e87ce07c299644b6d65a
Author: Christian Groessler <ch...@gr...>
Date: Fri Apr 24 15:25:52 2015 +0200
add support for UK keyboards
-----------------------------------------------------------------------
Summary of changes:
doc/CHANGELOG | 2 +-
kernel/arch/dreamcast/hardware/maple/keyboard.c | 48 +++++++++++++++--------
2 files changed, 32 insertions(+), 18 deletions(-)
diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index ff87cd9..31028b3 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -5,7 +5,7 @@ versions (where they are missing from early versions, assume that they
should be attributed to Dan Potter).
KallistiOS version 2.0.1 -----------------------------------------------
-- DC Add support for German keyboards [CG]
+- DC Add support for German (DE) and UK keyboards [Christian Groessler == CG]
- *** Cleaned up generated stubs files on a make clean [Lawrence Sebald = LS]
- DC Added a function to detect if the program is being run on a retail
Dreamcast or a Set5.xx device [LS]
diff --git a/kernel/arch/dreamcast/hardware/maple/keyboard.c b/kernel/arch/dreamcast/hardware/maple/keyboard.c
index c98ea51..e73f384 100644
--- a/kernel/arch/dreamcast/hardware/maple/keyboard.c
+++ b/kernel/arch/dreamcast/hardware/maple/keyboard.c
@@ -114,43 +114,57 @@ static kbd_keymap_t keymaps[KBD_NUM_KEYMAPS] = {
}
},
{
- /* probably UK keyboard (empty entry, will return scan codes for now ...) */
+ /* UK/QWERTY keyboard */
{
/* Base values */
- 0, 0, 0, 0, 0, 0, 0, 0, /* 0x00 - 0x07 */
- 0, 0, 0, 0, 0, 0, 0, 0, /* 0x08 - 0x0F */
- 0, 0, 0, 0, 0, 0, 0, 0, /* 0x10 - 0x17 */
- 0, 0, 0, 0, 0, 0, 0, 0, /* 0x18 - 0x1F */
- 0, 0, 0, 0, 0, 0, 0, 0, /* 0x20 - 0x27 */
- 0, 0, 0, 0, 0, 0, 0, 0, /* 0x28 - 0x2F */
- 0, 0, 0, 0, 0, 0, 0, 0, /* 0x30 - 0x37 */
- 0, 0, 0, 0, 0, 0, 0, 0, /* 0x38 - 0x3F */
+ 0, 0, 0, 0, 'a', 'b', 'c', 'd', /* 0x00 - 0x07 */
+ 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', /* 0x08 - 0x0F */
+ 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', /* 0x10 - 0x17 */
+ 'u', 'v', 'w', 'x', 'y', 'z', '1', '2', /* 0x18 - 0x1F */
+ '3', '4', '5', '6', '7', '8', '9', '0', /* 0x20 - 0x27 */
+ 10, 27, 8, 9, ' ', '-', '=', '[', /* 0x28 - 0x2F */
+ ']', '\\', '#', ';', '\'', '`', ',', '.', /* 0x30 - 0x37 */
+ '/', 0, 0, 0, 0, 0, 0, 0, /* 0x38 - 0x3F */
0, 0, 0, 0, 0, 0, 0, 0, /* 0x40 - 0x47 */
0, 0, 0, 0, 0, 0, 0, 0, /* 0x48 - 0x4F */
- 0, 0, 0, 0, 0, 0, 0, 0, /* 0x50 - 0x57 */
- 0, 0, 0, 0, 0, 0, 0, 0, /* 0x58 - 0x5F */
- 0, 0, 0, 0, 0, 0, 0, 0, /* 0x60 - 0x65 */
+ 0, 0, 0, 0, '/', '*', '-', '+', /* 0x50 - 0x57 */
+ 13, '1', '2', '3', '4', '5', '6', '7', /* 0x58 - 0x5F */
+ '8', '9', '0', '.', '\\', 0 /* 0x60 - 0x65 */
/* All the rest are unused, and will be 0. */
},
{
/* Shifted values */
+ 0, 0, 0, 0, 'A', 'B', 'C', 'D', /* 0x00 - 0x07 */
+ 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', /* 0x08 - 0x0F */
+ 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', /* 0x10 - 0x17 */
+ 'U', 'V', 'W', 'X', 'Y', 'Z', '!', '"', /* 0x18 - 0x1F */
+ 0xa3, '$', '%', '^', '&', '*', '(', ')', /* 0x20 - 0x27 */
+ 10, 27, 8, 9, ' ', '_', '+', '{', /* 0x28 - 0x2F */
+ '}', '|', '~', ':', '@', '|', '<', '>', /* 0x30 - 0x37 */
+ '?', 0, 0, 0, 0, 0, 0, 0, /* 0x38 - 0x3F */
+ 0, 0, 0, 0, 0, 0, 0, 0, /* 0x40 - 0x47 */
+ 0, 0, 0, 0, 0, 0, 0, 0, /* 0x48 - 0x4F */
+ 0, 0, 0, 0, '/', '*', '-', '+', /* 0x50 - 0x57 */
+ 13, '1', '2', '3', '4', '5', '6', '7', /* 0x58 - 0x5F */
+ '8', '9', '0', '.', '|', 0 /* 0x60 - 0x65 */
+ /* All the rest are unused, and will be 0. */
+ },
+ {
+ /* "Alt" shifted values */
0, 0, 0, 0, 0, 0, 0, 0, /* 0x00 - 0x07 */
0, 0, 0, 0, 0, 0, 0, 0, /* 0x08 - 0x0F */
0, 0, 0, 0, 0, 0, 0, 0, /* 0x10 - 0x17 */
0, 0, 0, 0, 0, 0, 0, 0, /* 0x18 - 0x1F */
0, 0, 0, 0, 0, 0, 0, 0, /* 0x20 - 0x27 */
0, 0, 0, 0, 0, 0, 0, 0, /* 0x28 - 0x2F */
- 0, 0, 0, 0, 0, 0, 0, 0, /* 0x30 - 0x37 */
+ 0, 0, 0, 0, 0, '|', 0, 0, /* 0x30 - 0x37 */
0, 0, 0, 0, 0, 0, 0, 0, /* 0x38 - 0x3F */
0, 0, 0, 0, 0, 0, 0, 0, /* 0x40 - 0x47 */
0, 0, 0, 0, 0, 0, 0, 0, /* 0x48 - 0x4F */
0, 0, 0, 0, 0, 0, 0, 0, /* 0x50 - 0x57 */
0, 0, 0, 0, 0, 0, 0, 0, /* 0x58 - 0x5F */
- 0, 0, 0, 0, 0, 0, 0, 0, /* 0x60 - 0x65 */
+ 0, 0, 0, 0, '|', 0, 0, 0, /* 0x60 - 0x65 */
/* All the rest are unused, and will be 0. */
- },
- {
- /* no "Alt" shifted values */
}
},
{
hooks/post-receive
--
A pseudo Operating System for the Dreamcast.
|
