[src/trunk]: src/sys/arch/hpcmips/conf sync with fb->hpcfb, btnmgr changes.

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

details:   https://anonhg.NetBSD.org/src/rev/65881cff2fc8
branches:  trunk
changeset: 483618:65881cff2fc8
user:      uch <uch%NetBSD.org@localhost>
date:      Tue Mar 14 08:31:07 2000 +0000

description:
sync with fb->hpcfb, btnmgr changes.

diffstat:

 sys/arch/hpcmips/conf/GENERIC  |   6 ++----
 sys/arch/hpcmips/conf/MURUROA  |  11 ++++++-----
 sys/arch/hpcmips/conf/NULLCONF |   7 ++++---
 3 files changed, 12 insertions(+), 12 deletions(-)

diffs (89 lines):

diff -r 2684d7555f48 -r 65881cff2fc8 sys/arch/hpcmips/conf/GENERIC
--- a/sys/arch/hpcmips/conf/GENERIC     Tue Mar 14 08:26:42 2000 +0000
+++ b/sys/arch/hpcmips/conf/GENERIC     Tue Mar 14 08:31:07 2000 +0000
@@ -2,11 +2,11 @@
 # Distribution kernel (any  model) kernel config file
 
 #
-#      $NetBSD: GENERIC,v 1.39 2000/03/13 01:57:06 sato Exp $
+#      $NetBSD: GENERIC,v 1.40 2000/03/14 08:31:07 uch Exp $
 #
 include                "arch/hpcmips/conf/std.hpcmips"
 
-#ident                 "GENERIC-$Revision: 1.39 $"
+#ident                 "GENERIC-$Revision: 1.40 $"
 
 maxusers       8
 
@@ -119,8 +119,6 @@
 vrpiu* at vrip? addr 0x0b000120 size 0x1a0 intr 5
 
 # Workstation Console attachments
-#fb*           at      mainbus0
-#wsdisplay*    at      fb?
 bivideo0       at      mainbus0
 hpcfb*         at      bivideo0
 wsdisplay*     at      hpcfb?
diff -r 2684d7555f48 -r 65881cff2fc8 sys/arch/hpcmips/conf/MURUROA
--- a/sys/arch/hpcmips/conf/MURUROA     Tue Mar 14 08:26:42 2000 +0000
+++ b/sys/arch/hpcmips/conf/MURUROA     Tue Mar 14 08:31:07 2000 +0000
@@ -2,12 +2,12 @@
 # Mycroft's WorkPad z50
 
 #
-#      $NetBSD: MURUROA,v 1.3 2000/02/25 05:28:42 mycroft Exp $
+#      $NetBSD: MURUROA,v 1.4 2000/03/14 08:31:07 uch Exp $
 #      From: GENERIC,v 1.29 2000/02/12 03:21:06 shin Exp
 #
 include                "arch/hpcmips/conf/std.hpcmips"
 
-#ident                 "MURUROA-$Revision: 1.3 $"
+#ident                 "MURUROA-$Revision: 1.4 $"
 
 maxusers       8
 
@@ -122,10 +122,12 @@
 vrpiu* at vrip? addr 0x0b000120 size 0x1a0 intr 5
 
 # Workstation Console attachments
-fb*            at      mainbus0
-wsdisplay*     at      fb?
+bivideo0       at      mainbus0
+hpcfb*         at      bivideo0
+wsdisplay*     at      hpcfb?
 wskbd*         at      vrkiu? mux 1
 wsmouse*       at      vrpiu? mux 0
+btnmgr*                at      mainbus0
 
 #
 # MC-R300, MC-R500
@@ -271,7 +273,6 @@
 #pseudo-device ccd             4       # concatenated disks
 
 pseudo-device  biconsdev       1       # build-in console device
-pseudo-device  btnmgr          1       # button event handler
 
 # for IPv6
 pseudo-device  gif             4       # IPv[46] over IPv[46] tunnel (RFC1933)
diff -r 2684d7555f48 -r 65881cff2fc8 sys/arch/hpcmips/conf/NULLCONF
--- a/sys/arch/hpcmips/conf/NULLCONF    Tue Mar 14 08:26:42 2000 +0000
+++ b/sys/arch/hpcmips/conf/NULLCONF    Tue Mar 14 08:31:07 2000 +0000
@@ -1,5 +1,5 @@
 #
-#      $NetBSD: NULLCONF,v 1.5 2000/02/12 03:21:07 shin Exp $
+#      $NetBSD: NULLCONF,v 1.6 2000/03/14 08:31:07 uch Exp $
 #
 include                "arch/hpcmips/conf/std.hpcmips"
 maxusers       8
@@ -33,8 +33,9 @@
 isa2   at vrisab2
 
 # Workstation Console attachments
-fb*            at      mainbus0
-wsdisplay*     at      fb?
+bivideo0       at      mainbus0
+hpcfb*         at      bivideo0
+wsdisplay*     at      hpcfb?
 wskbd*         at      vrkiu? mux 1
 
 pseudo-device  biconsdev       1       # build-in console device