patch-2.1.111 linux/drivers/video/font_8x8.c

Next file: linux/drivers/video/font_acorn_8x8.c
Previous file: linux/drivers/video/font_8x16.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.110/linux/drivers/video/font_8x8.c linux/drivers/video/font_8x8.c
@@ -4,14 +4,11 @@
 /*                                            */
 /**********************************************/
 
-#define FONTDATAMAX 2048
-
-char fontname_8x8[] = "VGA8x8";
+#include "font.h"
 
-int  fontheight_8x8 = 8;
-int  fontwidth_8x8  = 8;
+#define FONTDATAMAX 2048
 
-unsigned char fontdata_8x8[FONTDATAMAX] = {
+static unsigned char fontdata_8x8[FONTDATAMAX] = {
 
 	/* 0 0x00 '^@' */
 	0x00, /* 00000000 */
@@ -2575,3 +2572,12 @@
 
 };
 
+
+struct fbcon_font_desc font_vga_8x8 = {
+	VGA8x8_IDX,
+	"VGA8x8",
+	8,
+	8,
+	fontdata_8x8,
+	0
+};

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov