[src/trunk]: src/sys/arch Panic if rasops_init() fails us (should never be th...

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

details:   https://anonhg.NetBSD.org/src/rev/c6966cf39cdd
branches:  trunk
changeset: 472981:c6966cf39cdd
user:      ad <ad%NetBSD.org@localhost>
date:      Sat May 15 13:04:03 1999 +0000

description:
Panic if rasops_init() fails us (should never be the case).

diffstat:

 sys/arch/pmax/dev/rcons.c |  7 ++++---
 sys/arch/sparc/dev/fb.c   |  6 ++++--
 sys/arch/sparc64/dev/fb.c |  6 ++++--
 3 files changed, 12 insertions(+), 7 deletions(-)

diffs (64 lines):

diff -r 09bc27f4159c -r c6966cf39cdd sys/arch/pmax/dev/rcons.c
--- a/sys/arch/pmax/dev/rcons.c Sat May 15 12:56:46 1999 +0000
+++ b/sys/arch/pmax/dev/rcons.c Sat May 15 13:04:03 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rcons.c,v 1.26 1999/04/26 04:34:00 ad Exp $    */
+/*     $NetBSD: rcons.c,v 1.27 1999/05/15 13:04:03 ad Exp $    */
 
 /*
  * Copyright (c) 1995
@@ -134,11 +134,12 @@
        wsfont_init();
 
        /* Choose 'Gallant' font if this is an 8-bit display */
-       if (ri.ri_depth == 8 && (cookie = wsfont_find("Gallant", 0, 0, 0)) >= 0)
+       if (ri.ri_depth == 8 && (cookie = wsfont_find("Gallant", 0, 0, 0)) > 0)
                wsfont_lock(cookie, &ri.ri_font, WSFONT_L2R, WSFONT_L2R);
 
        /* Get operations set and set framebugger colormap */
-       rasops_init(&ri, 0, 80, 1, 0);
+       if (rasops_init(&ri, 0, 80, 1, 0))
+               panic("rcons_connect: rasops_init failed");
 
        if (ri.ri_depth == 8 && info->fi_type.fb_boardtype != PMAX_FBTYPE_MFB)
                info->fi_driver->fbd_putcmap(info, rasops_cmap, 0, 256);
diff -r 09bc27f4159c -r c6966cf39cdd sys/arch/sparc/dev/fb.c
--- a/sys/arch/sparc/dev/fb.c   Sat May 15 12:56:46 1999 +0000
+++ b/sys/arch/sparc/dev/fb.c   Sat May 15 13:04:03 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fb.c,v 1.29 1999/05/15 12:52:22 ad Exp $ */
+/*     $NetBSD: fb.c,v 1.30 1999/05/15 13:04:03 ad Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -413,7 +413,9 @@
        ri->ri_forcemono = 1;
 
        /* Get operations set and connect to rcons */
-       rasops_init(ri, maxrow, maxcol, 1, 0);
+       if (rasops_init(ri, maxrow, maxcol, 1, 0))
+               panic("fbrcons_init: rasops_init failed!");
+       
        rc->rc_ops = &ri->ri_ops;
        rc->rc_cookie = &ri;
        rc->rc_bell = fb_bell;
diff -r 09bc27f4159c -r c6966cf39cdd sys/arch/sparc64/dev/fb.c
--- a/sys/arch/sparc64/dev/fb.c Sat May 15 12:56:46 1999 +0000
+++ b/sys/arch/sparc64/dev/fb.c Sat May 15 13:04:03 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fb.c,v 1.7 1999/05/15 12:52:22 ad Exp $ */
+/*     $NetBSD: fb.c,v 1.8 1999/05/15 13:04:03 ad Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -289,7 +289,9 @@
        ri->ri_forcemono = 1;
 
        /* Get operations set and connect to rcons */
-       rasops_init(ri, maxrow, maxcol, 1, 0);
+       if (rasops_init(ri, maxrow, maxcol, 1, 0))
+               panic("fbrcons_init: rasops_init failed!");
+       
        rc->rc_ops = &ri->ri_ops;
        rc->rc_cookie = &ri;
        rc->rc_bell = fb_bell;