From af0282f91f476408c685ccccfa3ba8df3b801159 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Mon, 10 Oct 2016 07:18:12 +0200 Subject: [PATCH] Make US-english the default KDL keymap again. --- build/config_headers/kernel_debugger_config.h | 17 ++++++----------- headers/private/kernel/debugger_keymaps.h | 6 +++++- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/build/config_headers/kernel_debugger_config.h b/build/config_headers/kernel_debugger_config.h index 91d6ade102..b4e9c95406 100644 --- a/build/config_headers/kernel_debugger_config.h +++ b/build/config_headers/kernel_debugger_config.h @@ -2,19 +2,14 @@ #define KERNEL_DEBUGGER_CONFIG_H // Available keymaps: -// 'dv' dvorak keymap -// 'fr' french keymap -// 'it' italian keymap -// 'sg' swiss-german keymap -// 'us' default US keymap +// KDL_KEYMAP_DV: dvorak +// KDL_KEYMAP_FR french azerty +// KDL_KEYMAP_IT italian +// KDL_KEYMAP_SG swiss-german +// KDL_KEYMAP_US US-english (default) -#define KDL_KEYMAP_DV 1 -#define KDL_KEYMAP_FR 2 -#define KDL_KEYMAP_IT 3 -#define KDL_KEYMAP_SG 4 -#define KDL_KEYMAP_US 5 -#define KDL_KEYMAP KDL_KEYMAP_FR +#define KDL_KEYMAP KDL_KEYMAP_US #endif // KERNEL_DEBUGGER_CONFIG_H diff --git a/headers/private/kernel/debugger_keymaps.h b/headers/private/kernel/debugger_keymaps.h index 82c9772d11..8b375e644c 100644 --- a/headers/private/kernel/debugger_keymaps.h +++ b/headers/private/kernel/debugger_keymaps.h @@ -10,6 +10,11 @@ #ifndef DEBUGGER_KEYMAPS_H #define DEBUGGER_KEYMAPS_H +#define KDL_KEYMAP_DV 1 +#define KDL_KEYMAP_FR 2 +#define KDL_KEYMAP_IT 3 +#define KDL_KEYMAP_SG 4 +#define KDL_KEYMAP_US 5 #include "kernel_debugger_config.h" @@ -155,7 +160,6 @@ static const char kAltedKeymap[128] = { #else // default US keymap -#error "use default keymap" static const char kUnshiftedKeymap[128] = { 0, 27, '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '-', '=', 8, '\t', 'q', 'w', 'e', 'r', 't', 'y', 'u', 'i', 'o', 'p', '[', ']', '\n', 0, 'a', 's',