openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

fonts: Add 6x10 font 

This font is suitable for framebuffer consoles on devices with a
320x240 screen, to get a reasonable number of characters (53x24) that
are still at a readable size.

The font is derived from the existing 6x11 font, but gets 3 extra
lines without sacrificing readability. Also I redesigned a some glyhps
so they are more distinct and better fill the available space.

Signed-off-by: Maarten ter Huurne <maarten@treewalker.org>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
This commit is contained in:
Maarten ter Huurne 2014-09-09 13:46:28 +02:00 committed by Tomi Valkeinen
parent 422b67e0b3
commit 33ac9dba85
5 changed files with 3103 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/font.h
View File

@ -31,6 +31,7 @@ struct font_desc {
#define SUN12x22_IDX 7 #define SUN12x22_IDX 7
#define ACORN8x8_IDX 8 #define ACORN8x8_IDX 8
#define MINI4x6_IDX 9 #define MINI4x6_IDX 9
#define FONT6x10_IDX 10
extern const struct font_desc font_vga_8x8, extern const struct font_desc font_vga_8x8,
font_vga_8x16, font_vga_8x16,
@ -41,7 +42,8 @@ extern const struct font_desc font_vga_8x8,
font_sun_8x16, font_sun_8x16,
font_sun_12x22, font_sun_12x22,
font_acorn_8x8, font_acorn_8x8,
font_mini_4x6; font_mini_4x6,
font_6x10;
/* Find a font with a specific name */ /* Find a font with a specific name */

9
lib/fonts/Kconfig
View File

@ -79,6 +79,14 @@ config FONT_MINI_4x6
bool "Mini 4x6 font" bool "Mini 4x6 font"
depends on !SPARC && FONTS depends on !SPARC && FONTS
config FONT_6x10
bool "Medium-size 6x10 font"
depends on !SPARC && FONTS
help
Medium-size console font. Suitable for framebuffer consoles on
embedded devices with a 320x240 screen, to get a reasonable number
of characters (53x24) that are still at a readable size.
config FONT_SUN8x16 config FONT_SUN8x16
bool "Sparc console 8x16 font" bool "Sparc console 8x16 font"
depends on FRAMEBUFFER_CONSOLE && (!SPARC && FONTS || SPARC) depends on FRAMEBUFFER_CONSOLE && (!SPARC && FONTS || SPARC)
@ -109,6 +117,7 @@ config FONT_AUTOSELECT
depends on !FONT_PEARL_8x8 depends on !FONT_PEARL_8x8
depends on !FONT_ACORN_8x8 depends on !FONT_ACORN_8x8
depends on !FONT_MINI_4x6 depends on !FONT_MINI_4x6
depends on !FONT_6x10
depends on !FONT_SUN8x16 depends on !FONT_SUN8x16
depends on !FONT_SUN12x22 depends on !FONT_SUN12x22
depends on !FONT_10x18 depends on !FONT_10x18

1
lib/fonts/Makefile
View File

@ -12,6 +12,7 @@ font-objs-$(CONFIG_FONT_10x18) += font_10x18.o
font-objs-$(CONFIG_FONT_PEARL_8x8) += font_pearl_8x8.o font-objs-$(CONFIG_FONT_PEARL_8x8) += font_pearl_8x8.o
font-objs-$(CONFIG_FONT_ACORN_8x8) += font_acorn_8x8.o font-objs-$(CONFIG_FONT_ACORN_8x8) += font_acorn_8x8.o
font-objs-$(CONFIG_FONT_MINI_4x6) += font_mini_4x6.o font-objs-$(CONFIG_FONT_MINI_4x6) += font_mini_4x6.o
font-objs-$(CONFIG_FONT_6x10) += font_6x10.o
font-objs += $(font-objs-y) font-objs += $(font-objs-y)

3086
lib/fonts/font_6x10.c Normal file
View File

File diff suppressed because it is too large Load Diff

4
lib/fonts/fonts.c
View File

@ -63,6 +63,10 @@ static const struct font_desc *fonts[] = {
#undef NO_FONTS #undef NO_FONTS
&font_mini_4x6, &font_mini_4x6,
#endif #endif
#ifdef CONFIG_FONT_6x10
#undef NO_FONTS
&font_6x10,
#endif
}; };
#define num_fonts ARRAY_SIZE(fonts) #define num_fonts ARRAY_SIZE(fonts)