diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2002-07-25 18:57:51 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2002-07-25 18:57:51 +0000 |
| commit | df4cfe998081e84c31e7e2e2849ec7c18bd52e77 (patch) | |
| tree | b707721cae5bcc47792e9d82412e8773251be06c /sys | |
| parent | c370929af2c2d426cbf1da346a5f885a8026e8b6 (diff) | |
When building kernels with the SMALL_KERNEL option (typically, RAMDISK),
only one wsfont will be included.
Instead of forcing it to be the 8x16 font, choose it depending on the
architecture we are compiling for - this way, sparc* will get the
PROM-like 12x22 font instead.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/wsfont/wsfont.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/sys/dev/wsfont/wsfont.c b/sys/dev/wsfont/wsfont.c index af750b23fdb..60e84a7df2a 100644 --- a/sys/dev/wsfont/wsfont.c +++ b/sys/dev/wsfont/wsfont.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wsfont.c,v 1.4 2002/05/09 08:59:03 maja Exp $ */ +/* $OpenBSD: wsfont.c,v 1.5 2002/07/25 18:57:50 miod Exp $ */ /* $NetBSD: wsfont.c,v 1.17 2001/02/07 13:59:24 ad Exp $ */ /*- @@ -99,12 +99,20 @@ /* Make sure we always have at least one font. */ #ifndef HAVE_FONT #define HAVE_FONT 1 +#if defined(SMALL_KERNEL) +#if defined(__sparc__) || defined(__sparc64__) +#define FONT_GALLANT12x22 +#else +#define FONT_BOLD8x16 1 +#endif +#else /* SMALL_KERNEL */ #define FONT_BOLD8x16 1 /* Add the gallant 12x22 font for high screen resolutions */ -#if !defined(SMALL_KERNEL) && !defined(FONT_GALLANT12x22) +#if !defined(FONT_GALLANT12x22) #define FONT_GALLANT12x22 #endif -#endif +#endif /* SMALL_KERNEL */ +#endif /* HAVE_FONT */ #ifdef FONT_BOLD8x16 #include <dev/wsfont/bold8x16.h> |