diff options
author | Jan Beulich <JBeulich@novell.com> | 2005-09-13 04:25:44 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-13 11:22:32 -0400 |
commit | 2f4516dbd048f25eba78e115e8e73e1e8f04e7f9 (patch) | |
tree | e803f2b6c128aee352f00455547417752e9f9114 /include/linux/font.h | |
parent | e703ecc3bfbe10f478500798c0c5826d00ad9fe3 (diff) |
[PATCH] fbcon: constify font data
const-ify the font control structures and data, to make somewhat better
guarantees that these are not modified anywhere in the kernel.
Specifically for a kernel debugger to share this information from the
normal kernel code, such a guarantee seems rather desirable.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Cc: "Antonino A. Daplas" <adaplas@hotpop.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux/font.h')
-rw-r--r-- | include/linux/font.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/font.h b/include/linux/font.h index 8fc80a7d78ac..53b129f07f6f 100644 --- a/include/linux/font.h +++ b/include/linux/font.h | |||
@@ -15,9 +15,9 @@ | |||
15 | 15 | ||
16 | struct font_desc { | 16 | struct font_desc { |
17 | int idx; | 17 | int idx; |
18 | char *name; | 18 | const char *name; |
19 | int width, height; | 19 | int width, height; |
20 | void *data; | 20 | const void *data; |
21 | int pref; | 21 | int pref; |
22 | }; | 22 | }; |
23 | 23 | ||
@@ -32,7 +32,7 @@ struct font_desc { | |||
32 | #define ACORN8x8_IDX 8 | 32 | #define ACORN8x8_IDX 8 |
33 | #define MINI4x6_IDX 9 | 33 | #define MINI4x6_IDX 9 |
34 | 34 | ||
35 | extern struct font_desc font_vga_8x8, | 35 | extern const struct font_desc font_vga_8x8, |
36 | font_vga_8x16, | 36 | font_vga_8x16, |
37 | font_pearl_8x8, | 37 | font_pearl_8x8, |
38 | font_vga_6x11, | 38 | font_vga_6x11, |
@@ -45,11 +45,11 @@ extern struct font_desc font_vga_8x8, | |||
45 | 45 | ||
46 | /* Find a font with a specific name */ | 46 | /* Find a font with a specific name */ |
47 | 47 | ||
48 | extern struct font_desc *find_font(char *name); | 48 | extern const struct font_desc *find_font(const char *name); |
49 | 49 | ||
50 | /* Get the default font for a specific screen size */ | 50 | /* Get the default font for a specific screen size */ |
51 | 51 | ||
52 | extern struct font_desc *get_default_font(int xres, int yres); | 52 | extern const struct font_desc *get_default_font(int xres, int yres); |
53 | 53 | ||
54 | /* Max. length for the name of a predefined font */ | 54 | /* Max. length for the name of a predefined font */ |
55 | #define MAX_FONT_NAME 32 | 55 | #define MAX_FONT_NAME 32 |