From 51af094f5a7b4ab7811a5f249f9689637ac813b3 Mon Sep 17 00:00:00 2001
From: Patrick McDermott <patrick.mcdermott@libiquity.com>
Date: Thu, 18 Jul 2019 20:08:22 -0400
Subject: lib/fonts/*.c: Add fonts from upstream Linux

The macros, declarations, and array are all sorted according to the
array in Linux's lib/fonts/fonts.c, since that affects picking a default
font and finding a font by name (if there were conflicts, which there
aren't).
---
(limited to 'include/linux/font.h')

diff --git a/include/linux/font.h b/include/linux/font.h
index c496252..b49f44f 100644
--- a/include/linux/font.h
+++ b/include/linux/font.h
@@ -31,11 +31,33 @@ struct font_desc {
 	int                  pref;
 };
 
-#define MPLUS_1MN_MEDIUM_10x14_IDX  0
-#define MPLUS_1MN_REGULAR_12x17_IDX 1
-#define MPLUS_1MN_REGULAR_14x19_IDX 2
-#define MPLUS_1MN_REGULAR_16x22_IDX 3
+#define VGA8x8_IDX                   0
+#define VGA8x16_IDX                  1
+#define VGA6x11_IDX                  2
+#define FONT7x14_IDX                 3
+#define SUN8x16_IDX                  4
+#define SUN12x22_IDX                 5
+#define FONT10x18_IDX                6
+#define ACORN8x8_IDX                 7
+#define PEARL8x8_IDX                 8
+#define MINI4x6_IDX                  9
+#define FONT6x10_IDX                10
+#define MPLUS_1MN_MEDIUM_10x14_IDX  11
+#define MPLUS_1MN_REGULAR_12x17_IDX 12
+#define MPLUS_1MN_REGULAR_14x19_IDX 13
+#define MPLUS_1MN_REGULAR_16x22_IDX 14
 
+extern const struct font_desc font_vga_8x8;
+extern const struct font_desc font_vga_8x16;
+extern const struct font_desc font_vga_6x11;
+extern const struct font_desc font_7x14;
+extern const struct font_desc font_sun_8x16;
+extern const struct font_desc font_sun_12x22;
+extern const struct font_desc font_10x18;
+extern const struct font_desc font_acorn_8x8;
+extern const struct font_desc font_pearl_8x8;
+extern const struct font_desc font_mini_4x6;
+extern const struct font_desc font_6x10;
 extern const struct font_desc font_mplus_1mn_medium_10x14;
 extern const struct font_desc font_mplus_1mn_regular_12x17;
 extern const struct font_desc font_mplus_1mn_regular_14x19;
--
cgit v0.9.1