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

• Lines: 33
• Date: Tue Jul 21 10:28:24 1998
• Orig file: v2.1.110/linux/drivers/video/font_sun8x16.c
• Orig date: Thu Jul 16 18:09:27 1998

diff -u --recursive --new-file v2.1.110/linux/drivers/video/font_sun8x16.c linux/drivers/video/font_sun8x16.c
@@ -1,11 +1,8 @@
-#define FONTDATAMAX 4096
-
-char fontname_sun8x16[] = "SUN8x16";
+#include "font.h"
 
-int  fontheight_sun8x16 = 16;
-int  fontwidth_sun8x16  = 8;
+#define FONTDATAMAX 4096
 
-unsigned char fontdata_sun8x16[FONTDATAMAX] = {
+static unsigned char fontdata_sun8x16[FONTDATAMAX] = {
 /* */ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
 /* */ 0x00,0x00,0x7e,0x81,0xa5,0x81,0x81,0xbd,0x99,0x81,0x81,0x7e,0x00,0x00,0x00,0x00,
 /* */ 0x00,0x00,0x7e,0xff,0xdb,0xff,0xff,0xc3,0xe7,0xff,0xff,0x7e,0x00,0x00,0x00,0x00,
@@ -262,4 +259,17 @@
 /* */ 0x00,0x70,0xd8,0x30,0x60,0xc8,0xf8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
 /* */ 0x00,0x00,0x00,0x00,0x7c,0x7c,0x7c,0x7c,0x7c,0x7c,0x7c,0x00,0x00,0x00,0x00,0x00,
 /* */ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+};
+
+struct fbcon_font_desc font_sun_8x16 = {
+	SUN8x16_IDX,
+	"SUN8x16",
+	8,
+	16,
+	fontdata_sun8x16,
+#ifdef __sparc__
+	10
+#else
+	-1
+#endif
 };