Re: [Linux-fbdev-devel] new fbdev

[Geert U. <ge...@li...>]

On Sun, 22 Dec 2002, Geert Uytterhoeven wrote:
>   o drivers/video/console/font.h is needed by arch/m68k/kernel/m68k_defs.c
>     (for struct font_desc)

A bit more explanation: on Mac/m68k, head.S uses the fbdev fonts to print
status informtation.

This patch moves the definition of struct font_desc back to <video/font.h>, so
it can be used outside of drivers/video/console.

--- linux-2.5.52/include/video/font.h	Mon Mar 18 12:17:27 2002
+++ linux-m68k-2.5.52/include/video/font.h	Sun Dec 22 13:58:32 2002
@@ -0,0 +1,24 @@
+/*
+ *  font.h -- `Soft' font definitions
+ *
+ *  Created 1995 by Geert Uytterhoeven
+ *
+ *  This file is subject to the terms and conditions of the GNU General Public
+ *  License.  See the file COPYING in the main directory of this archive
+ *  for more details.
+ */
+
+#ifndef _VIDEO_FONT_H
+#define _VIDEO_FONT_H
+
+#include <linux/types.h>
+
+struct font_desc {
+    int idx;
+    char *name;
+    int width, height;
+    void *data;
+    int pref;
+};
+
+#endif /* _VIDEO_FONT_H */
--- linux-2.5.52/drivers/video/console/font.h	Tue Dec 10 13:41:40 2002
+++ linux-m68k-2.5.52/drivers/video/console/font.h	Sun Dec 22 13:58:32 2002
@@ -8,18 +8,10 @@
  *  for more details.
  */
 
-#ifndef _VIDEO_FONT_H
-#define _VIDEO_FONT_H
+#ifndef _VIDEO_CONSOLE_FONT_H
+#define _VIDEO_CONSOLE_FONT_H
 
-#include <linux/types.h>
-
-struct font_desc {
-    int idx;
-    char *name;
-    int width, height;
-    void *data;
-    int pref;
-};
+#include <video/font.h>		/* struct font_desc */
 
 #define VGA8x8_IDX	0
 #define VGA8x16_IDX	1
@@ -50,4 +42,4 @@
 /* Max. length for the name of a predefined font */
 #define MAX_FONT_NAME	32
 
-#endif /* _VIDEO_FONT_H */
+#endif /* _VIDEO_CONSOLE_FONT_H */

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- ge...@li...

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds