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

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

diff -u --recursive --new-file v2.1.110/linux/drivers/video/font_sun12x22.c linux/drivers/video/font_sun12x22.c
@@ -1,11 +1,8 @@
-#define FONTDATAMAX 5632
-
-char fontname_sun12x22[] = "SUN12x22";
+#include "font.h"
 
-int  fontheight_sun12x22 = 22;
-int  fontwidth_sun12x22  = 12;
+#define FONTDATAMAX 5632
 
-unsigned short fontdata_sun12x22[FONTDATAMAX] = {
+static unsigned short fontdata_sun12x22[FONTDATAMAX] = {
 
 	/* 0 0x00 '^@' */
 	0x0000, /* 000000000000 */
@@ -6208,3 +6205,16 @@
 
 };
 
+
+struct fbcon_font_desc font_sun_12x22 = {
+	SUN12x22_IDX,
+	"SUN12x22",
+	12,
+	22,
+	fontdata_sun12x22,
+#ifdef __sparc__
+	5
+#else
+	-1
+#endif
+};

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