[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 4/8] keymaps: remove modifiers include
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 4/8] keymaps: remove modifiers include |
Date: |
Thu, 10 Jan 2019 09:47:48 +0100 |
"common" is the only file using it, so we can just include it directly.
Signed-off-by: Gerd Hoffmann <address@hidden>
Message-id: address@hidden
---
Makefile | 2 +-
pc-bios/keymaps/common | 19 ++++++++++++++++++-
pc-bios/keymaps/modifiers | 18 ------------------
3 files changed, 19 insertions(+), 20 deletions(-)
delete mode 100644 pc-bios/keymaps/modifiers
diff --git a/Makefile b/Makefile
index dd53965f77..16cbee2c5f 100644
--- a/Makefile
+++ b/Makefile
@@ -651,7 +651,7 @@ distclean: clean
rm -Rf .sdk
if test -f dtc/version_gen.h; then $(MAKE) $(DTC_MAKE_ARGS) clean; fi
-KEYMAPS=da en-gb et fr fr-ch is lt modifiers no pt-br sv \
+KEYMAPS=da en-gb et fr fr-ch is lt no pt-br sv \
ar de en-us fi fr-be hr it lv nl pl ru th \
common de-ch es fo fr-ca hu ja mk nl-be pt sl tr \
bepo cz
diff --git a/pc-bios/keymaps/common b/pc-bios/keymaps/common
index adc56c77d2..aa844c82ed 100644
--- a/pc-bios/keymaps/common
+++ b/pc-bios/keymaps/common
@@ -1,4 +1,21 @@
-include modifiers
+Shift_R 0x36
+Shift_L 0x2a
+
+Alt_R 0xb8
+Mode_switch 0xb8
+ISO_Level3_Shift 0xb8
+Alt_L 0x38
+
+Control_R 0x9d
+Control_L 0x1d
+
+# Translate Super to Windows keys.
+# This is hardcoded. See documentation for details.
+Super_R 0xdc
+Super_L 0xdb
+
+# Translate Menu to the Windows Application key.
+Menu 0xdd
#
# Top row
diff --git a/pc-bios/keymaps/modifiers b/pc-bios/keymaps/modifiers
deleted file mode 100644
index d73b7a6637..0000000000
--- a/pc-bios/keymaps/modifiers
+++ /dev/null
@@ -1,18 +0,0 @@
-Shift_R 0x36
-Shift_L 0x2a
-
-Alt_R 0xb8
-Mode_switch 0xb8
-ISO_Level3_Shift 0xb8
-Alt_L 0x38
-
-Control_R 0x9d
-Control_L 0x1d
-
-# Translate Super to Windows keys.
-# This is hardcoded. See documentation for details.
-Super_R 0xdc
-Super_L 0xdb
-
-# Translate Menu to the Windows Application key.
-Menu 0xdd
--
2.9.3
- [Qemu-devel] [PULL 0/8] Ui 20190110 patches, Gerd Hoffmann, 2019/01/10
- [Qemu-devel] [PULL 8/8] spice: Remove unused include, Gerd Hoffmann, 2019/01/10
- [Qemu-devel] [PULL 5/8] keymaps: drop nl-be map, Gerd Hoffmann, 2019/01/10
- [Qemu-devel] [PULL 2/8] configure: bump spice-server required version to 0.12.5, Gerd Hoffmann, 2019/01/10
- [Qemu-devel] [PULL 6/8] keymaps: remove common include, Gerd Hoffmann, 2019/01/10
- [Qemu-devel] [PULL 1/8] egl-headless: add egl_create_context, Gerd Hoffmann, 2019/01/10
- [Qemu-devel] [PULL 7/8] keymaps: drop support for include files, Gerd Hoffmann, 2019/01/10
- [Qemu-devel] [PULL 4/8] keymaps: remove modifiers include,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 3/8] ui/console: Remove qemu_create_display_surface_guestmem(), Gerd Hoffmann, 2019/01/10
- Re: [Qemu-devel] [PULL 0/8] Ui 20190110 patches, Peter Maydell, 2019/01/10