patch-2.1.73 linux/arch/m68k/console/fonts.c

Next file: linux/arch/m68k/console/pearl_8x8.c
Previous file: linux/arch/m68k/console/font_8x8.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.72/linux/arch/m68k/console/fonts.c linux/arch/m68k/console/fonts.c
@@ -1,108 +0,0 @@
-
-/*
- * arch/m68k/console/fonts.c -- `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.
- */
-
-
-#include <linux/types.h>
-#include <linux/string.h>
-#include <asm/setup.h>
-#include <asm/font.h>
-
-
-   /*
-    *    External Font Definitions
-    */
-
-/* VGA8x8 */
-extern char fontname_8x8[];
-extern int fontwidth_8x8, fontheight_8x8;
-extern u_char fontdata_8x8[];
-
-/* VGA8x16 */
-extern char fontname_8x16[];
-extern int fontwidth_8x16, fontheight_8x16;
-extern u_char fontdata_8x16[];
-
-/* PEARL8x8 */
-extern char fontname_pearl8x8[];
-extern int fontwidth_pearl8x8, fontheight_pearl8x8;
-extern u_char fontdata_pearl8x8[];
-
-
-   /*
-    *    Font Descriptor Array
-    */
-
-struct softfontdesc {
-   char *name;
-   int *width;
-   int *height;
-   u_char *data;
-};
-
-#define VGA8x8_IDX	0
-#define VGA8x16_IDX	1
-#define PEARL8x8_IDX	2
-
-static struct softfontdesc softfonts[] = {
-   { fontname_8x8, &fontwidth_8x8, &fontheight_8x8, fontdata_8x8 },
-   { fontname_8x16, &fontwidth_8x16, &fontheight_8x16, fontdata_8x16 },
-   { fontname_pearl8x8, &fontwidth_pearl8x8, &fontheight_pearl8x8,
-     fontdata_pearl8x8 },
-};
-
-static u_long numsoftfonts = sizeof(softfonts)/sizeof(*softfonts);
-
-
-   /*
-    *    Find a font with a specific name
-    */
-
-int findsoftfont(char *name, int *width, int *height, u_char *data[])
-{
-   int i;
-
-   for (i = 0; i < numsoftfonts; i++)
-      if (!strcmp(softfonts[i].name, name)) {
-         if (width)
-            *width = *softfonts[i].width;
-         if (height)
-            *height = *softfonts[i].height;
-         if (data)
-            *data = softfonts[i].data;
-			return(1);
-      }
-	return(0);
-}
-
-
-   /*
-    *    Get the default font for a specific screen size
-    */
-
-void getdefaultfont(int xres, int yres, char *name[], int *width, int *height,
-                    u_char *data[])
-{
-    int i;
-    
-    if (yres < 400)
-	i = MACH_IS_AMIGA ? PEARL8x8_IDX : VGA8x8_IDX;
-    else
-	i = VGA8x16_IDX;
-
-    if (name)
-	*name = softfonts[i].name;
-    if (width)
-	*width = *softfonts[i].width;
-    if (height)
-	*height = *softfonts[i].height;
-    if (data)
-	*data = softfonts[i].data;
-}

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