aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJurriaan <thunder7@xs4all.nl>2005-06-21 17:17:06 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-21 19:07:41 -0700
commit303b86d9913eca0cbfc3c5cb41e7006f6e13b755 (patch)
tree9e6839b9606901e796e1d5a255cb63c0d0d3e85f /include
parentd5881eb4883ef7dd28a4dcea237714817c4b2f8e (diff)
[PATCH] New framebuffer fonts + updated 12x22 font available
Improve the fonts for use with the framebuffer. I've added all the characters marked 'FIXME' in the sun12x22 font and created a 10x18 font (based on the sun12x22 font) and a 7x14 font (based on the vga8x16 font). This patch is non-intrusive, no options are enabled by default so most users won't notice a thing. I am placing my changes under the GPL, however, I've not seen any copyright notices on the sun12x22 font and the vga8x16 font which I derived my new fonts from so I don't know what the copyright status is. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/font.h26
1 files changed, 15 insertions, 11 deletions
diff --git a/include/linux/font.h b/include/linux/font.h
index fc2d690c9d5..8fc80a7d78a 100644
--- a/include/linux/font.h
+++ b/include/linux/font.h
@@ -25,19 +25,23 @@ struct font_desc {
#define VGA8x16_IDX 1
#define PEARL8x8_IDX 2
#define VGA6x11_IDX 3
-#define SUN8x16_IDX 4
-#define SUN12x22_IDX 5
-#define ACORN8x8_IDX 6
-#define MINI4x6_IDX 7
+#define FONT7x14_IDX 4
+#define FONT10x18_IDX 5
+#define SUN8x16_IDX 6
+#define SUN12x22_IDX 7
+#define ACORN8x8_IDX 8
+#define MINI4x6_IDX 9
extern struct font_desc font_vga_8x8,
- font_vga_8x16,
- font_pearl_8x8,
- font_vga_6x11,
- font_sun_8x16,
- font_sun_12x22,
- font_acorn_8x8,
- font_mini_4x6;
+ font_vga_8x16,
+ font_pearl_8x8,
+ font_vga_6x11,
+ font_7x14,
+ font_10x18,
+ font_sun_8x16,
+ font_sun_12x22,
+ font_acorn_8x8,
+ font_mini_4x6;
/* Find a font with a specific name */