Module Name: src
Committed By: rkujawa
Date: Tue Jan 24 00:19:39 UTC 2012
Modified Files:
src/sys/arch/amiga/conf: DRACO GENERIC GENERIC.in INSTALL WSCONS
files.amiga
Log Message:
Add voodoofb support. Allows using 3Dfx Voodoo 3 in G-REX as a console.
To generate a diff of this commit:
cvs rdiff -u -r1.153 -r1.154 src/sys/arch/amiga/conf/DRACO \
src/sys/arch/amiga/conf/files.amiga
cvs rdiff -u -r1.283 -r1.284 src/sys/arch/amiga/conf/GENERIC
cvs rdiff -u -r1.95 -r1.96 src/sys/arch/amiga/conf/GENERIC.in
cvs rdiff -u -r1.105 -r1.106 src/sys/arch/amiga/conf/INSTALL
cvs rdiff -u -r1.63 -r1.64 src/sys/arch/amiga/conf/WSCONS
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amiga/conf/DRACO
diff -u src/sys/arch/amiga/conf/DRACO:1.153 src/sys/arch/amiga/conf/DRACO:1.154
--- src/sys/arch/amiga/conf/DRACO:1.153 Thu Jan 19 22:43:11 2012
+++ src/sys/arch/amiga/conf/DRACO Tue Jan 24 00:19:39 2012
@@ -1,9 +1,9 @@
-# $NetBSD: DRACO,v 1.153 2012/01/19 22:43:11 rkujawa Exp $
+# $NetBSD: DRACO,v 1.154 2012/01/24 00:19:39 rkujawa Exp $
#
# This file was automatically created.
# Changes will be lost when make is run in this directory.
#
-# Created from: # NetBSD: GENERIC.in,v 1.94 2012/01/19 22:11:49 rkujawa Exp $
+# Created from: # NetBSD: GENERIC.in,v 1.95 2012/01/19 22:43:11 rkujawa Exp $
#
##
# GENERIC machine description file
@@ -29,7 +29,7 @@ include "arch/amiga/conf/std.amiga"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.153 $"
+#ident "GENERIC-$Revision: 1.154 $"
maxusers 8
Index: src/sys/arch/amiga/conf/files.amiga
diff -u src/sys/arch/amiga/conf/files.amiga:1.153 src/sys/arch/amiga/conf/files.amiga:1.154
--- src/sys/arch/amiga/conf/files.amiga:1.153 Thu Jan 19 00:14:08 2012
+++ src/sys/arch/amiga/conf/files.amiga Tue Jan 24 00:19:39 2012
@@ -1,4 +1,4 @@
-# $NetBSD: files.amiga,v 1.153 2012/01/19 00:14:08 rkujawa Exp $
+# $NetBSD: files.amiga,v 1.154 2012/01/24 00:19:39 rkujawa Exp $
# maxpartitions must be first item in files.${ARCH}.newconf
maxpartitions 16 # NOTE THAT AMIGA IS SPECIAL!
@@ -33,7 +33,7 @@ defflag P5PPC68KBOARD
defflag LEV6_DEFER
defflag DEVRELOAD
-defflag opt_p5pb.h P5PB_DEBUG
+defflag opt_p5pb.h P5PB_DEBUG P5PB_CONSOLE
defparam IOBZCLOCK
@@ -526,7 +526,6 @@ attach cv3dpb at zbus
include "dev/i2o/files.i2o"
include "dev/pci/files.pci"
-#include "dev/wsfb/files.wsfb"
include "arch/amiga/conf/majors.amiga"
Index: src/sys/arch/amiga/conf/GENERIC
diff -u src/sys/arch/amiga/conf/GENERIC:1.283 src/sys/arch/amiga/conf/GENERIC:1.284
--- src/sys/arch/amiga/conf/GENERIC:1.283 Thu Jan 19 22:43:11 2012
+++ src/sys/arch/amiga/conf/GENERIC Tue Jan 24 00:19:39 2012
@@ -1,9 +1,9 @@
-# $NetBSD: GENERIC,v 1.283 2012/01/19 22:43:11 rkujawa Exp $
+# $NetBSD: GENERIC,v 1.284 2012/01/24 00:19:39 rkujawa Exp $
#
# This file was automatically created.
# Changes will be lost when make is run in this directory.
#
-# Created from: # NetBSD: GENERIC.in,v 1.94 2012/01/19 22:11:49 rkujawa Exp $
+# Created from: # NetBSD: GENERIC.in,v 1.95 2012/01/19 22:43:11 rkujawa Exp $
#
##
# GENERIC machine description file
@@ -29,7 +29,7 @@ include "arch/amiga/conf/std.amiga"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.283 $"
+#ident "GENERIC-$Revision: 1.284 $"
maxusers 8
@@ -475,6 +475,7 @@ options PCI_NETBSD_CONFIGURE # supporte
p5pb0 at p5bus0 # Phase5 PCI bridge (CVPPC/BVPPC/G-REX)
p5membar* at zbus0 # Phase5 PCI bridge autoconfiguring BARs
#options P5PB_DEBUG # enable excessive debug for p5pb
+#options P5PB_CONSOLE # console on CVPPC/BVPPC/Voodoo3
pci* at p5pb0
mppb* at zbus0 # Matay Prometheus Zorro-PCI bridge
@@ -483,6 +484,9 @@ pci* at mppb?
#cv3dpb* at zbus0 # CyberVision 64/3D PCI bridge
#genfb* at pci? # generic fb, CVPPC/BVPPC only
+#voodoofb* at pci? # 3Dfx Voodoo 3 in G-REX
+#radeonfb* at pci? # untested
+
ne* at pci? # NE2000 Ethernet
# Bluetooth Controller and Device support
Index: src/sys/arch/amiga/conf/GENERIC.in
diff -u src/sys/arch/amiga/conf/GENERIC.in:1.95 src/sys/arch/amiga/conf/GENERIC.in:1.96
--- src/sys/arch/amiga/conf/GENERIC.in:1.95 Thu Jan 19 22:43:11 2012
+++ src/sys/arch/amiga/conf/GENERIC.in Tue Jan 24 00:19:39 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC.in,v 1.95 2012/01/19 22:43:11 rkujawa Exp $
+# $NetBSD: GENERIC.in,v 1.96 2012/01/24 00:19:39 rkujawa Exp $
#
##
# GENERIC machine description file
@@ -52,7 +52,7 @@ include "arch/amiga/conf/std.amiga"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.95 $"
+#ident "GENERIC-$Revision: 1.96 $"
m4_ifdef(`INSTALL_CONFIGURATION', `m4_dnl
makeoptions COPTS="-Os"
@@ -562,6 +562,7 @@ options PCI_NETBSD_CONFIGURE # supporte
p5pb0 at p5bus0 # Phase5 PCI bridge (CVPPC/BVPPC/G-REX)
p5membar* at zbus0 # Phase5 PCI bridge autoconfiguring BARs
#options P5PB_DEBUG # enable excessive debug for p5pb
+#options P5PB_CONSOLE # console on CVPPC/BVPPC/Voodoo3
pci* at p5pb0
mppb* at zbus0 # Matay Prometheus Zorro-PCI bridge
@@ -570,6 +571,9 @@ pci* at mppb?
#cv3dpb* at zbus0 # CyberVision 64/3D PCI bridge
#genfb* at pci? # generic fb, CVPPC/BVPPC only
+#voodoofb* at pci? # 3Dfx Voodoo 3 in G-REX
+#radeonfb* at pci? # untested
+
ne* at pci? # NE2000 Ethernet
# Bluetooth Controller and Device support
Index: src/sys/arch/amiga/conf/INSTALL
diff -u src/sys/arch/amiga/conf/INSTALL:1.105 src/sys/arch/amiga/conf/INSTALL:1.106
--- src/sys/arch/amiga/conf/INSTALL:1.105 Thu Jan 19 22:43:11 2012
+++ src/sys/arch/amiga/conf/INSTALL Tue Jan 24 00:19:39 2012
@@ -1,9 +1,9 @@
-# $NetBSD: INSTALL,v 1.105 2012/01/19 22:43:11 rkujawa Exp $
+# $NetBSD: INSTALL,v 1.106 2012/01/24 00:19:39 rkujawa Exp $
#
# This file was automatically created.
# Changes will be lost when make is run in this directory.
#
-# Created from: # NetBSD: GENERIC.in,v 1.94 2012/01/19 22:11:49 rkujawa Exp $
+# Created from: # NetBSD: GENERIC.in,v 1.95 2012/01/19 22:43:11 rkujawa Exp $
#
##
# GENERIC machine description file
@@ -29,7 +29,7 @@ include "arch/amiga/conf/std.amiga"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.105 $"
+#ident "GENERIC-$Revision: 1.106 $"
makeoptions COPTS="-Os"
@@ -419,6 +419,7 @@ options PCI_NETBSD_CONFIGURE # supporte
p5pb0 at p5bus0 # Phase5 PCI bridge (CVPPC/BVPPC/G-REX)
p5membar* at zbus0 # Phase5 PCI bridge autoconfiguring BARs
#options P5PB_DEBUG # enable excessive debug for p5pb
+#options P5PB_CONSOLE # console on CVPPC/BVPPC/Voodoo3
pci* at p5pb0
mppb* at zbus0 # Matay Prometheus Zorro-PCI bridge
@@ -427,6 +428,9 @@ pci* at mppb?
#cv3dpb* at zbus0 # CyberVision 64/3D PCI bridge
#genfb* at pci? # generic fb, CVPPC/BVPPC only
+#voodoofb* at pci? # 3Dfx Voodoo 3 in G-REX
+#radeonfb* at pci? # untested
+
ne* at pci? # NE2000 Ethernet
# Bluetooth Controller and Device support
Index: src/sys/arch/amiga/conf/WSCONS
diff -u src/sys/arch/amiga/conf/WSCONS:1.63 src/sys/arch/amiga/conf/WSCONS:1.64
--- src/sys/arch/amiga/conf/WSCONS:1.63 Thu Dec 15 14:25:12 2011
+++ src/sys/arch/amiga/conf/WSCONS Tue Jan 24 00:19:39 2012
@@ -1,4 +1,4 @@
-# $NetBSD: WSCONS,v 1.63 2011/12/15 14:25:12 phx Exp $
+# $NetBSD: WSCONS,v 1.64 2012/01/24 00:19:39 rkujawa Exp $
# GENERIC with wscons(4)
#
@@ -48,5 +48,17 @@ no ite5 at grf5
no ite6 at grf6
no ite7 at grf7
+# PCI framebuffers
+#genfb* at pci? # CyberVisionPPC/BlizzardVisionPPC only
+voodoofb* at pci? # 3Dfx Voodoo 3 in G-REX
+#radeonfb* at pci? # untested
+
+# Console support for CyberVisionPPC, BlizzardVisionPPC and 3Dfx Voodoo 3 in
+# G-REX.
+options P5PB_CONSOLE
+
+wsdisplay* at wsemuldisplaydev? console ?
+
pseudo-device wsfont # wsfont(4) dynamic font loading support
pseudo-device wsmux # mouse & keyboard multiplexor
+
