diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2005-05-05 23:32:49 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2005-05-05 23:32:49 +0000 |
| commit | 9b00d653e584c7c2291c166d721ed904af4c6370 (patch) | |
| tree | 305607c2d286643fad73dc73c6bcc8ffee3177e0 /sys/dev | |
| parent | ab4a075811b7f1afbb52008172633161981c2745 (diff) | |
Provide both 8x16 and 12x22 fonts on sparc64 even if SMALL_KERNEL, as
vigra and some cgthree clones might need tho 8x16 font. Fits the floppies,
other architectures unaffected.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/wsfont/wsfont.c | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/sys/dev/wsfont/wsfont.c b/sys/dev/wsfont/wsfont.c index db69365f0cb..2dfafcf1a81 100644 --- a/sys/dev/wsfont/wsfont.c +++ b/sys/dev/wsfont/wsfont.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wsfont.c,v 1.12 2005/04/30 23:13:47 pascoe Exp $ */ +/* $OpenBSD: wsfont.c,v 1.13 2005/05/05 23:32:48 miod Exp $ */ /* $NetBSD: wsfont.c,v 1.17 2001/02/07 13:59:24 ad Exp $ */ /*- @@ -100,22 +100,25 @@ #define HAVE_FONT 1 #endif -/* Make sure we always have at least one font. */ +/* + * Make sure we always have at least one font. + * Sparc and sparc64 always provide a specific set of fonts. + * Other platforms provide a 8x16 font and a larger 12x22 fonts, which is + * omitted if option SMALL_KERNEL. + */ #ifndef HAVE_FONT #define HAVE_FONT 1 -#if defined(SMALL_KERNEL) && !defined(__sparc__) -#if defined(__sparc64__) -#define FONT_GALLANT12x22 + +#if defined(__sparc__) || defined(__sparc64__) +#define FONT_BOLD8x16_ISO1 +#define FONT_GALLANT12x22 #else -#define FONT_BOLD8x16_ISO1 1 +#define FONT_BOLD8x16_ISO1 +#if !defined(SMALL_KERNEL) +#define FONT_GALLANT12x22 #endif -#else /* SMALL_KERNEL */ -#define FONT_BOLD8x16_ISO1 1 -/* Add the gallant 12x22 font for high screen resolutions */ -#if !defined(FONT_GALLANT12x22) -#define FONT_GALLANT12x22 #endif -#endif /* SMALL_KERNEL */ + #endif /* HAVE_FONT */ #ifdef FONT_BOLD8x16_ISO1 |