From: Keith Owens <kaos@ocs.com.au>
To: linux-kernel@vger.kernel.org
Cc: torvalds@transmeta.org
Subject: [patch] 2.5.25 correct inconsistent keyboard maps
Date: Sat, 06 Jul 2002 14:43:52 +1000 [thread overview]
Message-ID: <28252.1025930632@ocs3.intra.ocs.com.au> (raw)
The Makefiles that generate keyboard maps and the shipped files which
are used when loadkeys is not installed are inconsistent. Some
Makefiles remove static, others do not. Some shipped files have static
removed, others do not. Make them consistent.
Index: 25.1/drivers/tc/Makefile
--- 25.1/drivers/tc/Makefile Sat, 06 Jul 2002 13:37:55 +1000 kaos (linux-2.5/o/b/47_Makefile 1.4 444)
+++ 25.1(w)/drivers/tc/Makefile Sat, 06 Jul 2002 14:35:08 +1000 kaos (linux-2.5/o/b/47_Makefile 1.4 444)
@@ -25,6 +25,8 @@ $(obj)/lk201-map.o: $(obj)/lk201-map.c
ifdef GENERATE_KEYMAP
$(obj)/lk201-map.c: $(obj)/%.c: $(src)/%.map
- loadkeys --mktable $< > $@
+ loadkeys --mktable $< > $@.tmp
+ sed -e 's/^static *//' $@.tmp > $@
+ rm $@.tmp
endif
Index: 25.1/drivers/acorn/char/Makefile
--- 25.1/drivers/acorn/char/Makefile Sat, 06 Jul 2002 13:37:55 +1000 kaos (linux-2.5/s/b/17_Makefile 1.4 444)
+++ 25.1(w)/drivers/acorn/char/Makefile Sat, 06 Jul 2002 14:36:15 +1000 kaos (linux-2.5/s/b/17_Makefile 1.4 444)
@@ -30,6 +30,8 @@ $(obj)/defkeymap-acorn.o: $(obj)/defkeym
ifdef GENERATE_KEYMAP
$(obj)/defkeymap-acorn.c: $(obj)/%.c: $(src)/%.map
- loadkeys --mktable $< > $@
+ loadkeys --mktable $< > $@.tmp
+ sed -e 's/^static *//' $@.tmp > $@
+ rm $@.tmp
endif
Index: 25.1/drivers/tc/lk201-map.c_shipped
--- 25.1/drivers/tc/lk201-map.c_shipped Sat, 06 Jul 2002 13:37:55 +1000 kaos (linux-2.5/d/f/24_lk201-map. 1.1 644)
+++ 25.1(w)/drivers/tc/lk201-map.c_shipped Sat, 06 Jul 2002 14:30:43 +1000 kaos (linux-2.5/d/f/24_lk201-map. 1.1 644)
@@ -25,7 +25,7 @@ u_short plain_map[NR_KEYS] = {
0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200,
};
-static u_short shift_map[NR_KEYS] = {
+u_short shift_map[NR_KEYS] = {
0xf200, 0xf100, 0xf101, 0xf102, 0xf103, 0xf104, 0xf105, 0xf106,
0xf107, 0xf108, 0xf109, 0xf10a, 0xf10b, 0xf10c, 0xf10d, 0xf203,
0xf11c, 0xf110, 0xf111, 0xf112, 0xf113, 0xf07e, 0xf021, 0xf040,
@@ -44,7 +44,7 @@ static u_short shift_map[NR_KEYS] = {
0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200,
};
-static u_short altgr_map[NR_KEYS] = {
+u_short altgr_map[NR_KEYS] = {
0xf200, 0xf100, 0xf101, 0xf102, 0xf103, 0xf104, 0xf105, 0xf106,
0xf107, 0xf108, 0xf109, 0xf10a, 0xf10b, 0xf10c, 0xf10d, 0xf202,
0xf11c, 0xf110, 0xf111, 0xf112, 0xf113, 0xf200, 0xf200, 0xf040,
@@ -63,7 +63,7 @@ static u_short altgr_map[NR_KEYS] = {
0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200,
};
-static u_short ctrl_map[NR_KEYS] = {
+u_short ctrl_map[NR_KEYS] = {
0xf200, 0xf100, 0xf101, 0xf102, 0xf103, 0xf104, 0xf105, 0xf106,
0xf107, 0xf108, 0xf109, 0xf10a, 0xf10b, 0xf10c, 0xf10d, 0xf204,
0xf11c, 0xf110, 0xf111, 0xf112, 0xf113, 0xf81b, 0xf200, 0xf000,
@@ -82,7 +82,7 @@ static u_short ctrl_map[NR_KEYS] = {
0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200,
};
-static u_short shift_ctrl_map[NR_KEYS] = {
+u_short shift_ctrl_map[NR_KEYS] = {
0xf200, 0xf100, 0xf101, 0xf102, 0xf103, 0xf104, 0xf105, 0xf106,
0xf107, 0xf108, 0xf109, 0xf10a, 0xf10b, 0xf10c, 0xf10d, 0xf200,
0xf11c, 0xf110, 0xf111, 0xf112, 0xf113, 0xf200, 0xf200, 0xf000,
@@ -101,7 +101,7 @@ static u_short shift_ctrl_map[NR_KEYS] =
0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200,
};
-static u_short alt_map[NR_KEYS] = {
+u_short alt_map[NR_KEYS] = {
0xf200, 0xf500, 0xf501, 0xf502, 0xf503, 0xf504, 0xf505, 0xf506,
0xf507, 0xf508, 0xf509, 0xf50a, 0xf50b, 0xf50c, 0xf50d, 0xf200,
0xf11c, 0xf510, 0xf511, 0xf512, 0xf513, 0xf01b, 0xf831, 0xf832,
@@ -120,7 +120,7 @@ static u_short alt_map[NR_KEYS] = {
0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200,
};
-static u_short ctrl_alt_map[NR_KEYS] = {
+u_short ctrl_alt_map[NR_KEYS] = {
0xf200, 0xf500, 0xf501, 0xf502, 0xf503, 0xf504, 0xf505, 0xf506,
0xf507, 0xf508, 0xf509, 0xf50a, 0xf50b, 0xf50c, 0xf50d, 0xf200,
0xf11c, 0xf510, 0xf511, 0xf512, 0xf513, 0xf200, 0xf200, 0xf200,
next reply other threads:[~2002-07-06 4:41 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2002-07-06 4:43 Keith Owens [this message]
2002-07-21 23:53 ` Kai Germaschewski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=28252.1025930632@ocs3.intra.ocs.com.au \
--to=kaos@ocs.com.au \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@transmeta.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®