Skip to content

Commit

Permalink
Revert "speakup: Generate speakupmap.h automatically"
Browse files Browse the repository at this point in the history
This reverts commit 6646b95.

Stephen reports that it breaks the build for him so revert it for now.

Cc: Samuel Thibault <[email protected]>
Reported-by: Stephen Rothwell <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Greg Kroah-Hartman <[email protected]>
  • Loading branch information
gregkh committed May 20, 2022
1 parent 9dcff75 commit cafada1
Show file tree
Hide file tree
Showing 6 changed files with 66 additions and 418 deletions.
4 changes: 0 additions & 4 deletions drivers/accessibility/speakup/.gitignore

This file was deleted.

28 changes: 0 additions & 28 deletions drivers/accessibility/speakup/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -30,31 +30,3 @@ speakup-y := \
thread.o \
varhandlers.o
speakup-$(CONFIG_SPEAKUP_SERIALIO) += serialio.o


clean-files := mapdata.h speakupmap.h


# Generate mapdata.h from headers
hostprogs += makemapdata
makemapdata-objs := makemapdata.o

quiet_cmd_mkmap = MKMAP $@
cmd_mkmap = $(obj)/makemapdata > $@

$(obj)/mapdata.h: $(obj)/makemapdata
$(call cmd,mkmap)


# Generate speakupmap.map from mapdata.h
hostprogs += genmap
genmap-objs := genmap.o
$(obj)/genmap.o: $(obj)/mapdata.h

quiet_cmd_genmap = GENMAP $@
cmd_genmap = $(obj)/genmap $< > $@

$(obj)/speakupmap.h: $(obj)/speakupmap.map $(obj)/genmap
$(call cmd,genmap)

$(obj)/main.o: $(obj)/speakupmap.h
162 changes: 0 additions & 162 deletions drivers/accessibility/speakup/genmap.c

This file was deleted.

125 changes: 0 additions & 125 deletions drivers/accessibility/speakup/makemapdata.c

This file was deleted.

66 changes: 66 additions & 0 deletions drivers/accessibility/speakup/speakupmap.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
/* SPDX-License-Identifier: GPL-2.0 */
119, 62, 6,
0, 16, 20, 17, 32, 48, 0,
2, 0, 78, 0, 0, 0, 0,
3, 0, 79, 0, 0, 0, 0,
4, 0, 76, 0, 0, 0, 0,
5, 0, 77, 0, 0, 0, 0,
6, 0, 74, 0, 0, 0, 0,
7, 0, 75, 0, 0, 0, 0,
9, 0, 5, 46, 0, 0, 0,
10, 0, 4, 0, 0, 0, 0,
11, 0, 0, 1, 0, 0, 0,
12, 0, 27, 0, 33, 0, 0,
19, 0, 47, 0, 0, 0, 0,
21, 0, 29, 17, 0, 0, 0,
22, 0, 15, 0, 0, 0, 0,
23, 0, 14, 0, 0, 0, 28,
24, 0, 16, 0, 0, 0, 0,
25, 0, 30, 18, 0, 0, 0,
28, 0, 3, 26, 0, 0, 0,
35, 0, 31, 0, 0, 0, 0,
36, 0, 12, 0, 0, 0, 0,
37, 0, 11, 0, 0, 0, 22,
38, 0, 13, 0, 0, 0, 0,
39, 0, 32, 7, 0, 0, 0,
40, 0, 23, 0, 0, 0, 0,
44, 0, 44, 0, 0, 0, 0,
49, 0, 24, 0, 0, 0, 0,
50, 0, 9, 19, 6, 0, 0,
51, 0, 8, 0, 0, 0, 36,
52, 0, 10, 20, 0, 0, 0,
53, 0, 25, 0, 0, 0, 0,
55, 46, 1, 0, 0, 0, 0,
58, 128, 128, 0, 0, 0, 0,
59, 0, 45, 0, 0, 0, 0,
60, 0, 40, 0, 0, 0, 0,
61, 0, 41, 0, 0, 0, 0,
62, 0, 42, 0, 0, 0, 0,
63, 0, 34, 0, 0, 0, 0,
64, 0, 35, 0, 0, 0, 0,
65, 0, 37, 0, 0, 0, 0,
66, 0, 38, 0, 0, 0, 0,
67, 0, 66, 0, 39, 0, 0,
68, 0, 67, 0, 0, 0, 0,
71, 15, 19, 0, 0, 0, 0,
72, 14, 29, 0, 0, 28, 0,
73, 16, 17, 0, 0, 0, 0,
74, 27, 33, 0, 0, 0, 0,
75, 12, 31, 0, 0, 0, 0,
76, 11, 21, 0, 0, 22, 0,
77, 13, 32, 0, 0, 0, 0,
78, 23, 43, 0, 0, 0, 0,
79, 9, 20, 0, 0, 0, 0,
80, 8, 30, 0, 0, 36, 0,
81, 10, 18, 0, 0, 0, 0,
82, 128, 128, 0, 0, 0, 0,
83, 24, 25, 0, 0, 0, 0,
87, 0, 68, 0, 0, 0, 0,
88, 0, 69, 0, 0, 0, 0,
96, 3, 26, 0, 0, 0, 0,
98, 4, 5, 0, 0, 0, 0,
99, 2, 0, 0, 0, 0, 0,
104, 0, 6, 0, 0, 0, 0,
109, 0, 7, 0, 0, 0, 0,
125, 128, 128, 0, 0, 0, 0,
0, 119
Loading

0 comments on commit cafada1

Please sign in to comment.