[src/netbsd-1-4]: src/sys/arch/pmax/dev pullup 1.22->1.25 (andy doran and sim...

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

details:   https://anonhg.NetBSD.org/src/rev/b31fe82f9d53
branches:  netbsd-1-4
changeset: 468581:b31fe82f9d53
user:      perry <perry%NetBSD.org@localhost>
date:      Fri Apr 30 16:11:43 1999 +0000

description:
pullup 1.22->1.25 (andy doran and simonb)

diffstat:

 sys/arch/pmax/dev/fb.c |  33 ++++++++++++++++++---------------
 1 files changed, 18 insertions(+), 15 deletions(-)

diffs (104 lines):

diff -r 85960569641f -r b31fe82f9d53 sys/arch/pmax/dev/fb.c
--- a/sys/arch/pmax/dev/fb.c    Fri Apr 30 15:51:42 1999 +0000
+++ b/sys/arch/pmax/dev/fb.c    Fri Apr 30 16:11:43 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fb.c,v 1.22 1999/01/27 03:03:51 simonb Exp $   */
+/*     $NetBSD: fb.c,v 1.22.2.1 1999/04/30 16:11:43 perry Exp $        */
 
 /*-
  * Copyright (c) 1992, 1993
@@ -38,7 +38,7 @@
  *     @(#)fb.c        8.1 (Berkeley) 6/10/93
  */
 
-/* 
+/*
  *  devGraphics.c --
  *
  *             This file contains machine-dependent routines for the graphics device.
@@ -46,7 +46,7 @@
  *     Copyright (C) 1989 Digital Equipment Corporation.
  *     Permission to use, copy, modify, and distribute this software and
  *     its documentation for any purpose and without fee is hereby granted,
- *     provided that the above copyright notice appears in all copies.  
+ *     provided that the above copyright notice appears in all copies.
  *     Digital Equipment Corporation makes no representations about the
  *     suitability of this software for any purpose.  It is provided "as is"
  *     without express or implied warranty.
@@ -110,7 +110,7 @@
  * are the handlers for user-level requests (open/ioctl/close).
  *
  * Hardware dependencies are handled by calls through the "fbdriver"
- * method table, which the subdriver 
+ * method table, which the subdriver
  */
 
 /* qvss/pm compatible and old 4.4bsd/pmax driver functions */
@@ -133,7 +133,7 @@
 #endif
 
 /*
- * LK-201 and successor keycode mapping 
+ * LK-201 and successor keycode mapping
 */
 #include <pmax/dev/lk201var.h>
 
@@ -149,7 +149,7 @@
 /*
  * The default cursor.
  */
-u_short defCursor[32] = { 
+u_short defCursor[32] = {
 /* plane A */ 0x00FF, 0x00FF, 0x00FF, 0x00FF, 0x00FF, 0x00FF, 0x00FF, 0x00FF,
              0x00FF, 0x00FF, 0x00FF, 0x00FF, 0x00FF, 0x00FF, 0x00FF, 0x00FF,
 /* plane B */ 0x00FF, 0x00FF, 0x00FF, 0x00FF, 0x00FF, 0x00FF, 0x00FF, 0x00FF,
@@ -157,7 +157,7 @@
 
 };
 
- 
+
 /*
  * Pro-tem framebuffer pseudo-device driver
  */
@@ -186,7 +186,7 @@
 }
 
 /*
- * Connect a framebuffer, described by a struct fbinfo, to the 
+ * Connect a framebuffer, described by a struct fbinfo, to the
  * raster-console pseudo-device subsystem. )This would be done
  * with BStreams, if only we had them.)
  */
@@ -210,13 +210,16 @@
                    && fbcd.cd_devs [fbix]->fi_unit == info -> fi_unit)
                        break;
 
-       if (fbcd.cd_ndevs >= NFB) {
-               printf ("fb: more frame buffers probed than configured!\n");
-               return;
-       }
+       if (fbix >= fbcd.cd_ndevs) {
+               if (fbcd.cd_ndevs >= NFB) {
+                       printf("fb: more frame buffers probed than configured!\n");
+                       return;
+               }
 
-       fbix = fbcd.cd_ndevs++;
-       fbcd.cd_devs [fbix] = info;
+               fbix = fbcd.cd_ndevs++;
+               fbcd.cd_devs [fbix] = info;
+       } else
+               info = fbcd.cd_devs [fbix];
 #endif /* FBDRIVER_DOES_ATTACH */
 
        /*
@@ -235,7 +238,7 @@
        }
 
        if (!silent)
-               printf (" (%dx%dx%d)%s",
+               printf (": (%dx%dx%d)%s",
                        info -> fi_type.fb_width,
                        info -> fi_type.fb_height,
                        info -> fi_type.fb_depth,