patch-2.1.111 linux/drivers/video/font.h

• Lines: 49
• Date: Tue Jul 21 10:28:24 1998
• Orig file: v2.1.110/linux/drivers/video/font.h
• Orig date: Tue Jul 21 00:15:32 1998

diff -u --recursive --new-file v2.1.110/linux/drivers/video/font.h linux/drivers/video/font.h
@@ -13,21 +13,37 @@
 
 #include <linux/types.h>
 
+struct fbcon_font_desc {
+    int idx;
+    char *name;
+    int width, height;
+    void *data;
+    int pref;
+};
+
+#define VGA8x8_IDX	0
+#define VGA8x16_IDX	1
+#define PEARL8x8_IDX	2
+#define VGA6x11_IDX	3
+#define SUN8x16_IDX	4
+#define SUN12x22_IDX	5
+#define ACORN8x8_IDX	6
+
+extern struct fbcon_font_desc	font_vga_8x8,
+				font_vga_8x16,
+				font_pearl_8x8,
+				font_vga_6x11,
+				font_sun_8x16,
+				font_sun_12x22,
+				font_acorn_8x8;
 
-   /*
-    *    Find a font with a specific name
-    */
+/* Find a font with a specific name */
 
-extern int findsoftfont(char *name, unsigned short *width, unsigned short *height, u_char *data[]);
+extern struct fbcon_font_desc *fbcon_find_font(char *name);
 
+/* Get the default font for a specific screen size */
 
-   /*
-    *    Get the default font for a specific screen size
-    */
-
-extern void getdefaultfont(int xres, int yres, char *name[], unsigned short *width,
-                           unsigned short *height, u_char *data[]);
-
+extern struct fbcon_font_desc *fbcon_get_default_font(int xres, int yres);
 
 /* Max. length for the name of a predefined font */
 #define MAX_FONT_NAME	32