vt: keyboard, defkeymap.c_shipped, approach the unicode table

Commit 5ce2087ed0eb (Fix default compose table initialization) fixed
unicode table so that the values are not sign extended. The upstream
(kbd package) chose a different approach. They use hexadecimal values.
So use the same, so that the output of loadkeys and our shipped file
correspond more to each other.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20210105120239.28031-4-jslaby@suse.cz
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/vt/defkeymap.c_shipped b/drivers/tty/vt/defkeymap.c_shipped
index cac1fcbd55c71abd684fc3bdf3e62b73a14525c9..094d95bf0005582267b8c0aee9e530f2dd00e3d3 100644 (file)
--- a/drivers/tty/vt/defkeymap.c_shipped
+++ b/drivers/tty/vt/defkeymap.c_shipped
@@ -224,40 +224,40 @@ char *func_table[MAX_NR_FUNC] = {
 };
 
 struct kbdiacruc accent_table[MAX_DIACR] = {
-       {'`', 'A', 0300},       {'`', 'a', 0340},
-       {'\'', 'A', 0301},      {'\'', 'a', 0341},
-       {'^', 'A', 0302},       {'^', 'a', 0342},
-       {'~', 'A', 0303},       {'~', 'a', 0343},
-       {'"', 'A', 0304},       {'"', 'a', 0344},
-       {'O', 'A', 0305},       {'o', 'a', 0345},
-       {'0', 'A', 0305},       {'0', 'a', 0345},
-       {'A', 'A', 0305},       {'a', 'a', 0345},
-       {'A', 'E', 0306},       {'a', 'e', 0346},
-       {',', 'C', 0307},       {',', 'c', 0347},
-       {'`', 'E', 0310},       {'`', 'e', 0350},
-       {'\'', 'E', 0311},      {'\'', 'e', 0351},
-       {'^', 'E', 0312},       {'^', 'e', 0352},
-       {'"', 'E', 0313},       {'"', 'e', 0353},
-       {'`', 'I', 0314},       {'`', 'i', 0354},
-       {'\'', 'I', 0315},      {'\'', 'i', 0355},
-       {'^', 'I', 0316},       {'^', 'i', 0356},
-       {'"', 'I', 0317},       {'"', 'i', 0357},
-       {'-', 'D', 0320},       {'-', 'd', 0360},
-       {'~', 'N', 0321},       {'~', 'n', 0361},
-       {'`', 'O', 0322},       {'`', 'o', 0362},
-       {'\'', 'O', 0323},      {'\'', 'o', 0363},
-       {'^', 'O', 0324},       {'^', 'o', 0364},
-       {'~', 'O', 0325},       {'~', 'o', 0365},
-       {'"', 'O', 0326},       {'"', 'o', 0366},
-       {'/', 'O', 0330},       {'/', 'o', 0370},
-       {'`', 'U', 0331},       {'`', 'u', 0371},
-       {'\'', 'U', 0332},      {'\'', 'u', 0372},
-       {'^', 'U', 0333},       {'^', 'u', 0373},
-       {'"', 'U', 0334},       {'"', 'u', 0374},
-       {'\'', 'Y', 0335},      {'\'', 'y', 0375},
-       {'T', 'H', 0336},       {'t', 'h', 0376},
-       {'s', 's', 0337},       {'"', 'y', 0377},
-       {'s', 'z', 0337},       {'i', 'j', 0377},
+       {'`', 'A', 0x00c0},     {'`', 'a', 0x00e0},
+       {'\'', 'A', 0x00c1},    {'\'', 'a', 0x00e1},
+       {'^', 'A', 0x00c2},     {'^', 'a', 0x00e2},
+       {'~', 'A', 0x00c3},     {'~', 'a', 0x00e3},
+       {'"', 'A', 0x00c4},     {'"', 'a', 0x00e4},
+       {'O', 'A', 0x00c5},     {'o', 'a', 0x00e5},
+       {'0', 'A', 0x00c5},     {'0', 'a', 0x00e5},
+       {'A', 'A', 0x00c5},     {'a', 'a', 0x00e5},
+       {'A', 'E', 0x00c6},     {'a', 'e', 0x00e6},
+       {',', 'C', 0x00c7},     {',', 'c', 0x00e7},
+       {'`', 'E', 0x00c8},     {'`', 'e', 0x00e8},
+       {'\'', 'E', 0x00c9},    {'\'', 'e', 0x00e9},
+       {'^', 'E', 0x00ca},     {'^', 'e', 0x00ea},
+       {'"', 'E', 0x00cb},     {'"', 'e', 0x00eb},
+       {'`', 'I', 0x00cc},     {'`', 'i', 0x00ec},
+       {'\'', 'I', 0x00cd},    {'\'', 'i', 0x00ed},
+       {'^', 'I', 0x00ce},     {'^', 'i', 0x00ee},
+       {'"', 'I', 0x00cf},     {'"', 'i', 0x00ef},
+       {'-', 'D', 0x00d0},     {'-', 'd', 0x00f0},
+       {'~', 'N', 0x00d1},     {'~', 'n', 0x00f1},
+       {'`', 'O', 0x00d2},     {'`', 'o', 0x00f2},
+       {'\'', 'O', 0x00d3},    {'\'', 'o', 0x00f3},
+       {'^', 'O', 0x00d4},     {'^', 'o', 0x00f4},
+       {'~', 'O', 0x00d5},     {'~', 'o', 0x00f5},
+       {'"', 'O', 0x00d6},     {'"', 'o', 0x00f6},
+       {'/', 'O', 0x00d8},     {'/', 'o', 0x00f8},
+       {'`', 'U', 0x00d9},     {'`', 'u', 0x00f9},
+       {'\'', 'U', 0x00da},    {'\'', 'u', 0x00fa},
+       {'^', 'U', 0x00db},     {'^', 'u', 0x00fb},
+       {'"', 'U', 0x00dc},     {'"', 'u', 0x00fc},
+       {'\'', 'Y', 0x00dd},    {'\'', 'y', 0x00fd},
+       {'T', 'H', 0x00de},     {'t', 'h', 0x00fe},
+       {'s', 's', 0x00df},     {'"', 'y', 0x00ff},
+       {'s', 'z', 0x00df},     {'i', 'j', 0x00ff},
 };
 
 unsigned int accent_table_size = 68;