[src/trunk]: src/sys/arch Leave font selection to 'rasops' until 'rasops1' ha...

[ad <ad%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5120b2d09b97
branches:  trunk
changeset: 471862:5120b2d09b97
user:      ad <ad%NetBSD.org@localhost>
date:      Tue Apr 13 19:02:38 1999 +0000

description:
Leave font selection to 'rasops' until 'rasops1' has been completed and can
handle non {8,16} pixel wide fonts.

diffstat:

 sys/arch/sparc/dev/fb.c   |  11 +++++++----
 sys/arch/sparc64/dev/fb.c |  11 +++++++----
 2 files changed, 14 insertions(+), 8 deletions(-)

diffs (56 lines):

diff -r 888355d8c766 -r 5120b2d09b97 sys/arch/sparc/dev/fb.c
--- a/sys/arch/sparc/dev/fb.c   Tue Apr 13 19:00:30 1999 +0000
+++ b/sys/arch/sparc/dev/fb.c   Tue Apr 13 19:02:38 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fb.c,v 1.25 1999/04/13 18:45:41 ad Exp $ */
+/*     $NetBSD: fb.c,v 1.26 1999/04/13 19:02:38 ad Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -388,12 +388,15 @@
        /* Pick our default font. There is always a fallback */
        wsfont_init();
        
+       /* XXX leave font init to rasops until rasops1 is fixed */
+       if (ri->ri_depth != 1) 
 #ifdef RASTERCONS_SMALLFONT
-       if ((cookie = wsfont_find("Bold", 0, 0, 0)) >= 0)
+               if ((cookie = wsfont_find("Bold", 0, 0, 0)) >= 0)
 #else
-       if ((cookie = wsfont_find("Gallant", 0, 0, 0)) >= 0)
+               if ((cookie = wsfont_find("Gallant", 0, 0, 0)) >= 0)
 #endif 
-               wsfont_lock(cookie, &ri->ri_font, WSFONT_LITTLE, WSFONT_LITTLE);
+                       wsfont_lock(cookie, &ri->ri_font, WSFONT_LITTLE, 
+                           WSFONT_LITTLE);
 
 #if !defined(RASTERCONS_FULLSCREEN) && !defined(RASTERCONS_SMALLFONT)
 #if defined(SUN4)
diff -r 888355d8c766 -r 5120b2d09b97 sys/arch/sparc64/dev/fb.c
--- a/sys/arch/sparc64/dev/fb.c Tue Apr 13 19:00:30 1999 +0000
+++ b/sys/arch/sparc64/dev/fb.c Tue Apr 13 19:02:38 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fb.c,v 1.4 1999/04/13 18:45:42 ad Exp $ */
+/*     $NetBSD: fb.c,v 1.5 1999/04/13 19:02:38 ad Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -267,12 +267,15 @@
        /* Pick our default font. There is always a fallback */
        wsfont_init();
        
+       /* XXX leave font init to rasops until rasops1 is fixed */
+       if (ri->ri_depth != 1) 
 #ifdef RASTERCONS_SMALLFONT
-       if ((cookie = wsfont_find("Bold", 0, 0, 0)) >= 0)
+               if ((cookie = wsfont_find("Bold", 0, 0, 0)) >= 0)
 #else
-       if ((cookie = wsfont_find("Gallant", 0, 0, 0)) >= 0)
+               if ((cookie = wsfont_find("Gallant", 0, 0, 0)) >= 0)
 #endif 
-               wsfont_lock(cookie, &ri->ri_font, WSFONT_LITTLE, WSFONT_LITTLE);
+                       wsfont_lock(cookie, &ri->ri_font, WSFONT_LITTLE, 
+                           WSFONT_LITTLE);
 
 #if !defined(RASTERCONS_FULLSCREEN) && !defined(RASTERCONS_SMALLFONT)
 #if defined(SUN4)