aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2018-11-16 11:43:16 +0100
committerGerd Hoffmann <kraxel@redhat.com>2019-01-10 08:55:21 +0100
commit06e7772fbd661c2084be9d70f57acc1f3aab4e9f (patch)
tree688e64b3d25569c9704d3bd55d7d61421c5289b4
parent22571ffa0ca7abb5c7f188ac9cc18fc47e321b05 (diff)
downloadqemu-06e7772fbd661c2084be9d70f57acc1f3aab4e9f.zip
qemu-06e7772fbd661c2084be9d70f57acc1f3aab4e9f.tar.gz
qemu-06e7772fbd661c2084be9d70f57acc1f3aab4e9f.tar.bz2
keymaps: remove modifiers include
"common" is the only file using it, so we can just include it directly. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Message-id: 20181116104319.10329-2-kraxel@redhat.com
-rw-r--r--Makefile2
-rw-r--r--pc-bios/keymaps/common19
-rw-r--r--pc-bios/keymaps/modifiers18
3 files changed, 19 insertions, 20 deletions
diff --git a/Makefile b/Makefile
index dd53965..16cbee2 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 adc56c7..aa844c8 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 d73b7a6..0000000
--- 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