Fonts: Add charcount field to font_desc

Subsystems are hard-coding the number of characters of our built-in fonts
as 256. Include that information in our kernel font descriptor, `struct
font_desc`.

Signed-off-by: Peilin Ye <yepeilin.cs@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/65952296d1d9486093bd955d1536f7dcd11112c6.1605169912.git.yepeilin.cs@gmail.com

diff --git a/include/linux/font.h b/include/linux/font.h
index 4f50d73..abf1442 100644 (file)
--- a/include/linux/font.h
+++ b/include/linux/font.h
@@ -17,6 +17,7 @@ struct font_desc {
     int idx;
     const char *name;
     unsigned int width, height;
+    unsigned int charcount;
     const void *data;
     int pref;
 };

diff --git a/lib/fonts/font_10x18.c b/lib/fonts/font_10x18.c
index e02f9df..5d940db 100644 (file)
--- a/lib/fonts/font_10x18.c
+++ b/lib/fonts/font_10x18.c
@@ -5137,6 +5137,7 @@ const struct font_desc font_10x18 = {
        .name   = "10x18",
        .width  = 10,
        .height = 18,
+       .charcount = 256,
        .data   = fontdata_10x18.data,
 #ifdef __sparc__
        .pref   = 5,

diff --git a/lib/fonts/font_6x10.c b/lib/fonts/font_6x10.c
index 6e3c4b7..e65df01 100644 (file)
--- a/lib/fonts/font_6x10.c
+++ b/lib/fonts/font_6x10.c
@@ -3083,6 +3083,7 @@ const struct font_desc font_6x10 = {
        .name   = "6x10",
        .width  = 6,
        .height = 10,
+       .charcount = 256,
        .data   = fontdata_6x10.data,
        .pref   = 0,
 };

diff --git a/lib/fonts/font_6x11.c b/lib/fonts/font_6x11.c
index 2d22a24..bd76b3f 100644 (file)
--- a/lib/fonts/font_6x11.c
+++ b/lib/fonts/font_6x11.c
@@ -3346,6 +3346,7 @@ const struct font_desc font_vga_6x11 = {
        .name   = "ProFont6x11",
        .width  = 6,
        .height = 11,
+       .charcount = 256,
        .data   = fontdata_6x11.data,
        /* Try avoiding this font if possible unless on MAC */
        .pref   = -2000,

diff --git a/lib/fonts/font_6x8.c b/lib/fonts/font_6x8.c
index e7442a0..06ace77 100644 (file)
--- a/lib/fonts/font_6x8.c
+++ b/lib/fonts/font_6x8.c
@@ -2571,6 +2571,7 @@ const struct font_desc font_6x8 = {
        .name   = "6x8",
        .width  = 6,
        .height = 8,
+       .charcount = 256,
        .data   = fontdata_6x8.data,
        .pref   = 0,
 };

diff --git a/lib/fonts/font_7x14.c b/lib/fonts/font_7x14.c
index 9cc7ae2..a2f561c 100644 (file)
--- a/lib/fonts/font_7x14.c
+++ b/lib/fonts/font_7x14.c
@@ -4113,6 +4113,7 @@ const struct font_desc font_7x14 = {
        .name   = "7x14",
        .width  = 7,
        .height = 14,
+       .charcount = 256,
        .data   = fontdata_7x14.data,
        .pref   = 0,
 };

diff --git a/lib/fonts/font_8x16.c b/lib/fonts/font_8x16.c
index bab25dc..06ae140 100644 (file)
--- a/lib/fonts/font_8x16.c
+++ b/lib/fonts/font_8x16.c
@@ -4627,6 +4627,7 @@ const struct font_desc font_vga_8x16 = {
        .name   = "VGA8x16",
        .width  = 8,
        .height = 16,
+       .charcount = 256,
        .data   = fontdata_8x16.data,
        .pref   = 0,
 };

diff --git a/lib/fonts/font_8x8.c b/lib/fonts/font_8x8.c
index 109d057..69570b8 100644 (file)
--- a/lib/fonts/font_8x8.c
+++ b/lib/fonts/font_8x8.c
@@ -2578,6 +2578,7 @@ const struct font_desc font_vga_8x8 = {
        .name   = "VGA8x8",
        .width  = 8,
        .height = 8,
+       .charcount = 256,
        .data   = fontdata_8x8.data,
        .pref   = 0,
 };

diff --git a/lib/fonts/font_acorn_8x8.c b/lib/fonts/font_acorn_8x8.c
index fb395f0..18755c3 100644 (file)
--- a/lib/fonts/font_acorn_8x8.c
+++ b/lib/fonts/font_acorn_8x8.c
@@ -270,6 +270,7 @@ const struct font_desc font_acorn_8x8 = {
        .name   = "Acorn8x8",
        .width  = 8,
        .height = 8,
+       .charcount = 256,
        .data   = acorndata_8x8.data,
 #ifdef CONFIG_ARCH_ACORN
        .pref   = 20,

diff --git a/lib/fonts/font_mini_4x6.c b/lib/fonts/font_mini_4x6.c
index 592774a..8d39fd4 100644 (file)
--- a/lib/fonts/font_mini_4x6.c
+++ b/lib/fonts/font_mini_4x6.c
@@ -2152,6 +2152,7 @@ const struct font_desc font_mini_4x6 = {
        .name   = "MINI4x6",
        .width  = 4,
        .height = 6,
+       .charcount = 256,
        .data   = fontdata_mini_4x6.data,
        .pref   = 3,
 };

diff --git a/lib/fonts/font_pearl_8x8.c b/lib/fonts/font_pearl_8x8.c
index a6f95eb..b1678ed 100644 (file)
--- a/lib/fonts/font_pearl_8x8.c
+++ b/lib/fonts/font_pearl_8x8.c
@@ -2582,6 +2582,7 @@ const struct font_desc font_pearl_8x8 = {
        .name   = "PEARL8x8",
        .width  = 8,
        .height = 8,
+       .charcount = 256,
        .data   = fontdata_pearl8x8.data,
        .pref   = 2,
 };

diff --git a/lib/fonts/font_sun12x22.c b/lib/fonts/font_sun12x22.c
index a5b65bd..91daf5a 100644 (file)
--- a/lib/fonts/font_sun12x22.c
+++ b/lib/fonts/font_sun12x22.c
@@ -6156,6 +6156,7 @@ const struct font_desc font_sun_12x22 = {
        .name   = "SUN12x22",
        .width  = 12,
        .height = 22,
+       .charcount = 256,
        .data   = fontdata_sun12x22.data,
 #ifdef __sparc__
        .pref   = 5,

diff --git a/lib/fonts/font_sun8x16.c b/lib/fonts/font_sun8x16.c
index e577e76..81bb4ee 100644 (file)
--- a/lib/fonts/font_sun8x16.c
+++ b/lib/fonts/font_sun8x16.c
@@ -268,6 +268,7 @@ const struct font_desc font_sun_8x16 = {
        .name   = "SUN8x16",
        .width  = 8,
        .height = 16,
+       .charcount = 256,
        .data   = fontdata_sun8x16.data,
 #ifdef __sparc__
        .pref   = 10,

diff --git a/lib/fonts/font_ter16x32.c b/lib/fonts/font_ter16x32.c
index f7c3abb..1955d62 100644 (file)
--- a/lib/fonts/font_ter16x32.c
+++ b/lib/fonts/font_ter16x32.c
@@ -2062,6 +2062,7 @@ const struct font_desc font_ter_16x32 = {
        .name   = "TER16x32",
        .width  = 16,
        .height = 32,
+       .charcount = 256,
        .data   = fontdata_ter16x32.data,
 #ifdef __sparc__
        .pref   = 5,