321. Support automatic configuration for SBUS video devices on sparc

      (David Dawes).

5 files changed, 119 insertions, 5 deletions

diff --git a/programs/Xserver/hw/xfree86/CHANGELOG b/programs/Xserver/hw/xfree86/CHANGELOG
index 0481e4d47..c0733af5d 100644
--- a/programs/Xserver/hw/xfree86/CHANGELOG
+++ b/programs/Xserver/hw/xfree86/CHANGELOG
@@ -1,4 +1,6 @@
 XFree86 4.4.99.902 (xx February 2005)
+ 321. Support automatic configuration for SBUS video devices on sparc
+      (David Dawes).
  320. Fix missing asm component in the sunffb module on Solaris/sparc build
       (David Dawes).
  319. Make keyboard detection errors non-fatal on Solaris (David Dawes).
@@ -19371,7 +19373,7 @@ XFree86 3.0a (28 April 1994)
 XFree86 3.0 (26 April 1994)
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.3428 2005/02/08 18:44:36 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.3429 2005/02/09 19:49:10 dawes Exp $
 
 
 
diff --git a/programs/Xserver/hw/xfree86/getconfig/cfg.man b/programs/Xserver/hw/xfree86/getconfig/cfg.man
index 3d2527a58..1ce60ff7f 100644
--- a/programs/Xserver/hw/xfree86/getconfig/cfg.man
+++ b/programs/Xserver/hw/xfree86/getconfig/cfg.man
@@ -1,4 +1,50 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/getconfig/cfg.man,v 1.2 2004/12/01 02:54:17 dawes Exp $
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/getconfig/cfg.man,v 1.3 2005/01/04 01:11:20 dawes Exp $
+.\"
+.\" Copyright © 2003-2005 David H. Dawes.
+.\" Copyright © 2003-2005 X-Oz Technologies.
+.\" All rights reserved.
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining a
+.\" copy of this software and associated documentation files (the "Software"),
+.\" to deal in the Software without restriction, including without limitation
+.\" the rights to use, copy, modify, merge, publish, distribute, sublicense,
+.\" and/or sell copies of the Software, and to permit persons to whom the
+.\" Software is furnished to do so, subject to the following conditions:
+.\" 
+.\"  1. Redistributions of source code must retain the above copyright
+.\"     notice, this list of conditions, and the following disclaimer.
+.\"
+.\"  2. Redistributions in binary form must reproduce the above
+.\"     copyright notice, this list of conditions and the following
+.\"     disclaimer in the documentation and/or other materials provided
+.\"     with the distribution.
+.\" 
+.\"  3. The end-user documentation included with the redistribution,
+.\"     if any, must include the following acknowledgment: "This product
+.\"     includes software developed by X-Oz Technologies
+.\"     (http://www.x-oz.com/)."  Alternately, this acknowledgment may
+.\"     appear in the software itself, if and wherever such third-party
+.\"     acknowledgments normally appear.
+.\"
+.\"  4. Except as contained in this notice, the name of X-Oz
+.\"     Technologies shall not be used in advertising or otherwise to
+.\"     promote the sale, use or other dealings in this Software without
+.\"     prior written authorization from X-Oz Technologies.
+.\"
+.\" THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR
+.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+.\" WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL X-OZ TECHNOLOGIES OR ITS CONTRIBUTORS
+.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+.\" OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+.\" OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+.\" BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+.\" WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+.\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+.\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+.\" 
+.\" Author: David Dawes <dawes@x-oz.com>.
+.\"
 .TH getconfig __filemansuffix__  __vendorversion__
 .SH NAME
 getconfig - meta configuration files for getconfig(1)
@@ -70,6 +116,7 @@ They include:
 .BR "$subsys                 " "PCI subsystem ID"
 .BR "$subsysVendor           " "PCI subsystem vendor ID"
 .BR "$class                  " "PCI class"
+.BR "$sbuspath               " "SBUS path"
 .BR "$XFree86Version         " "XFree86 version, as a 'v' string"
 .BR "$XFree86VersionNumeric  " "XFree86 numeric version"
 .BR "$XFree86VersionMajor    " "XFree86 major version"
diff --git a/programs/Xserver/hw/xfree86/getconfig/getconfig.man b/programs/Xserver/hw/xfree86/getconfig/getconfig.man
index a8143b881..2d798c091 100644
--- a/programs/Xserver/hw/xfree86/getconfig/getconfig.man
+++ b/programs/Xserver/hw/xfree86/getconfig/getconfig.man
@@ -1,4 +1,50 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/getconfig/getconfig.man,v 1.1 2003/11/12 04:52:15 dawes Exp $
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/getconfig/getconfig.man,v 1.2 2004/12/01 02:54:17 dawes Exp $
+.\"
+.\" Copyright © 2003-2005 David H. Dawes.
+.\" Copyright © 2003-2005 X-Oz Technologies.
+.\" All rights reserved.
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining a
+.\" copy of this software and associated documentation files (the "Software"),
+.\" to deal in the Software without restriction, including without limitation
+.\" the rights to use, copy, modify, merge, publish, distribute, sublicense,
+.\" and/or sell copies of the Software, and to permit persons to whom the
+.\" Software is furnished to do so, subject to the following conditions:
+.\" 
+.\"  1. Redistributions of source code must retain the above copyright
+.\"     notice, this list of conditions, and the following disclaimer.
+.\"
+.\"  2. Redistributions in binary form must reproduce the above
+.\"     copyright notice, this list of conditions and the following
+.\"     disclaimer in the documentation and/or other materials provided
+.\"     with the distribution.
+.\" 
+.\"  3. The end-user documentation included with the redistribution,
+.\"     if any, must include the following acknowledgment: "This product
+.\"     includes software developed by X-Oz Technologies
+.\"     (http://www.x-oz.com/)."  Alternately, this acknowledgment may
+.\"     appear in the software itself, if and wherever such third-party
+.\"     acknowledgments normally appear.
+.\"
+.\"  4. Except as contained in this notice, the name of X-Oz
+.\"     Technologies shall not be used in advertising or otherwise to
+.\"     promote the sale, use or other dealings in this Software without
+.\"     prior written authorization from X-Oz Technologies.
+.\"
+.\" THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR
+.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+.\" WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL X-OZ TECHNOLOGIES OR ITS CONTRIBUTORS
+.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+.\" OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+.\" OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+.\" BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+.\" WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+.\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+.\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+.\" 
+.\" Author: David Dawes <dawes@x-oz.com>.
+.\"
 .TH getconfig 1 __vendorversion__
 .SH NAME
 getconfig - get configuration information for the XFree86 server
@@ -64,6 +110,9 @@ Specify the PCI subsystem vendor ID of the video device.
 .TP 8
 .BI \-v " vendor-id"
 Specify the PCI vendor ID of the video device.
+.TP 8
+.BI \-S " sbus-path"
+Specify the SBUS path of the video device.
 .SH FILES
 .I .cfg
 files located in the search path.  The search path typically specified
diff --git a/programs/Xserver/hw/xfree86/getconfig/getconfig.pl b/programs/Xserver/hw/xfree86/getconfig/getconfig.pl
index ec1a84fd0..cb792ad9d 100755
--- a/programs/Xserver/hw/xfree86/getconfig/getconfig.pl
+++ b/programs/Xserver/hw/xfree86/getconfig/getconfig.pl
@@ -47,7 +47,7 @@
 # Author: David Dawes <dawes@XFree86.Org>.
 #
 
-# $XFree86: xc/programs/Xserver/hw/xfree86/getconfig/getconfig.pl,v 1.2 2003/12/12 00:39:16 dawes Exp $
+# $XFree86: xc/programs/Xserver/hw/xfree86/getconfig/getconfig.pl,v 1.3 2005/02/01 00:01:16 dawes Exp $
 
 #
 # This script takes PCI id information, compares it against an ordered list
@@ -139,6 +139,14 @@ while (@ARGV[0] =~ /^-[A-Za-z]$/) {
 	    }
 	    last SWITCH;
 	}
+	if ($f eq "-S") {
+	    $sbuspath = shift;
+	    if (!defined($sbuspath)) {
+		print STDERR "$myname: -S requires the SBUS path.\n";
+		exit 1;
+	    }
+	    last SWITCH;
+	}
     }
 }
 
@@ -282,6 +290,10 @@ if ($debug) {
 ['$vendor == 0x15ad',
 	'vmware'],
 
+# Sun ffb
+['$sbuspath =~ /,ffb\@/',
+	'sunffb'],
+
 );
 
 # Reverse the search path list, since the later rules have higher priority
diff --git a/programs/Xserver/hw/xfree86/getconfig/getconfig.sh b/programs/Xserver/hw/xfree86/getconfig/getconfig.sh
index 1b9f4f85f..f514565bd 100644
--- a/programs/Xserver/hw/xfree86/getconfig/getconfig.sh
+++ b/programs/Xserver/hw/xfree86/getconfig/getconfig.sh
@@ -49,7 +49,7 @@
 # Author: David Dawes <dawes@XFree86.Org>.
 #
 
-# $XFree86: xc/programs/Xserver/hw/xfree86/getconfig/getconfig.sh,v 1.3 2005/02/01 00:01:16 dawes Exp $
+# $XFree86: xc/programs/Xserver/hw/xfree86/getconfig/getconfig.sh,v 1.4 2005/02/01 04:11:23 dawes Exp $
 
 # A simple wrapper to execute the real getconfig program.  So long as perl
 # is in $PATH, we don't need to know where it is this way.
@@ -75,4 +75,8 @@ if [ $perl_vers -lt 5 ]; then
 	exit 1
 fi
 
+if [ "X$1" = "X-D" ]; then
+	echo "executing: perl ${DIR}getconfig.pl $@" >&2
+fi
+
 exec perl ${DIR}getconfig.pl "$@"