summaryrefslogtreecommitdiff
path: root/hw/xfree86/getconfig
diff options
context:
space:
mode:
Diffstat (limited to 'hw/xfree86/getconfig')
-rw-r--r--hw/xfree86/getconfig/cfg.man.pre37
-rw-r--r--hw/xfree86/getconfig/cfg.sample27
-rw-r--r--hw/xfree86/getconfig/getconfig4
-rw-r--r--hw/xfree86/getconfig/getconfig.man.pre26
-rw-r--r--hw/xfree86/getconfig/getconfig.pl31
-rw-r--r--hw/xfree86/getconfig/xorg.cfg50
6 files changed, 110 insertions, 65 deletions
diff --git a/hw/xfree86/getconfig/cfg.man.pre b/hw/xfree86/getconfig/cfg.man.pre
index 79db0b100..45301e707 100644
--- a/hw/xfree86/getconfig/cfg.man.pre
+++ b/hw/xfree86/getconfig/cfg.man.pre
@@ -1,4 +1,3 @@
-.\" $XFree86$
.TH getconfig __filemansuffix__ __vendorversion__
.SH NAME
getconfig - meta configuration files for getconfig(1)
@@ -7,10 +6,10 @@ getconfig - meta configuration files for getconfig(1)
.SH DESCRIPTION
.B getconfig
is a programatic interface that is used by the
-.B XFree86
+.B __xservername__
server to get configuration information about video hardware when
operating without an
-.B XF86Config
+.B __xconfigfile__
file.
.PP
This implementation of
@@ -29,7 +28,7 @@ the file format version number. The signature string is
.PP
.RS 4
.nf
-"XFree86 Project getconfig rules file.\ \ Version: "
+"Xorg getconfig rules file.\ \ Version: "
.fi
.RE
.PP
@@ -44,10 +43,10 @@ continuation convention ('\e' at the end of the line). The first logical
line of each rule is a perl expression. It may be any valid perl
expression whose evaluated (with 'eval') result may be used as the
argument to a perl 'if' statement. The second logical line should be
-the name of the XFree86 video driver to use when the rule is true, and
+the name of the __xservername__ video driver to use when the rule is true, and
subsequent logical lines of each rule, if present, are additional
configuration output for the video device's
-.B XF86Config
+.B __xconfigfile__
.B Device
section. The driver name and additional lines of configuration information
are written to standard output when the rule is chosen as the successful
@@ -70,12 +69,12 @@ They include:
.BR "$subsys " "PCI subsystem ID"
.BR "$subsysVendor " "PCI subsystem vendor ID"
.BR "$class " "PCI class"
-.BR "$XFree86Version " "XFree86 version, as a 'v' string"
-.BR "$XFree86VersionNumeric " "XFree86 numeric version"
-.BR "$XFree86VersionMajor " "XFree86 major version"
-.BR "$XFree86VersionMinor " "XFree86 minor version"
-.BR "$XFree86VersionPatch " "XFree86 patch version"
-.BR "$XFree86VersionSnap " "XFree86 snap version"
+.BR "$XorgVersion " "Xorg version, as a 'v' string"
+.BR "$XorgVersionNumeric " "Xorg numeric version"
+.BR "$XorgVersionMajor " "Xorg major version"
+.BR "$XorgVersionMinor " "Xorg minor version"
+.BR "$XorgVersionPatch " "Xorg patch version"
+.BR "$XorgVersionSnap " "Xorg snap version"
.BR "$weight " "current rule weight"
.fi
.RE
@@ -99,7 +98,7 @@ rule that evaluates to true.
.I .cfg
files located in the search path. The search path typically specified
by the
-.B XFree86
+.B __xservername__
server is:
.PP
.RS 4
@@ -114,11 +113,11 @@ server is:
where
.I <modulepath>
is the
-.B XFree86
+.B __xservername__
server's module search path.
.PP
.TP 30
-.I __projectroot__/lib/X11/getconfig/xfree86.cfg
+.I __projectroot__/lib/X11/getconfig/xorg.cfg
Default rules file that gets installed. This file doesn't contain any
rules by default.
.TP 30
@@ -128,11 +127,11 @@ appear in rules files.
.SH "SEE ALSO"
getconfig(1),
-XFree86(1),
-XF86Config(__filemansuffix__).
+__xservername__(__appmansuffix__),
+__xconfigfile__(__filemansuffix__).
.SH AUTHORS
-The XFree86 automatic configuration support and the
+The __xservername__ automatic configuration support and the
.B getconfig
interface was written by David H. Dawes, with the support of X-Oz
-Technologies.
+Technologies for XFree86.
diff --git a/hw/xfree86/getconfig/cfg.sample b/hw/xfree86/getconfig/cfg.sample
index 62d06ad38..8e26fd2e3 100644
--- a/hw/xfree86/getconfig/cfg.sample
+++ b/hw/xfree86/getconfig/cfg.sample
@@ -1,14 +1,13 @@
-# $DHD: xc/programs/Xserver/hw/xfree86/getconfig/cfg.sample,v 1.2 2003/09/23 05:12:07 dawes Exp $
-# $XFree86: xc/programs/Xserver/hw/xfree86/getconfig/cfg.sample,v 1.1 2003/10/08 14:58:29 dawes Exp $
+# $XdotOrg$
-# Some sample XFree86 getconfig rules file.
+# Some sample Xorg getconfig rules file.
#
# The line below is the getconfig rules file signature, and must be the
# first non-blank, non-comment line.
#
-XFree86 Project getconfig rules file. Version: 1.0
+Xorg Project getconfig rules file. Version: 1.0
#
# Set the weight for the following rules. This should be set, otherwise
@@ -38,15 +37,15 @@ $weight = 1000
# $subsys PCI subsystem ID
# $subsysVendor PCI subsystem vendor ID
# $class PCI class
-# $XFree86Version XFree86 version, as a 'v' string.
+# $XorgVersion Xorg version, as a 'v' string.
#
-# The XFree86 version information is also available as the following:
+# The Xorg version information is also available as the following:
#
-# $XFree86VersionNumeric
-# $XFree86VersionMajor
-# $XFree86VersionMinor
-# $XFree86VersionPatch
-# $XFree86VersionSnap
+# $XorgVersionNumeric
+# $XorgVersionMajor
+# $XorgVersionMinor
+# $XorgVersionPatch
+# $XorgVersionSnap
#
# Define a fake vendor ID for some sample rules.
@@ -67,10 +66,10 @@ $device == $nodevice
Option \
"yy"
-# Increase the weight of the following rules if the XFree86 version is 4.3 or
+# Increase the weight of the following rules if the Xorg version is 4.3 or
# higher.
-$weight++ if ($XFree86Version ge v4.3)
+$weight++ if ($XorgVersion ge v4.3)
$vendor == $novendor
nodriver
@@ -83,7 +82,7 @@ $vendor == $novendor
$weight = 100
-$vendor == $novendor && $XFree86Version eq v4.3.2.1
+$vendor == $novendor && $XorgVersion eq v4.3.2.1
nodriver3
$weight = 600
diff --git a/hw/xfree86/getconfig/getconfig b/hw/xfree86/getconfig/getconfig
index d2acc9bb8..a9e2b3ef2 100644
--- a/hw/xfree86/getconfig/getconfig
+++ b/hw/xfree86/getconfig/getconfig
@@ -1,6 +1,6 @@
#!/bin/sh
-# $DHD: xc/programs/Xserver/hw/xfree86/getconfig/getconfig.sh,v 1.2 2003/09/20 01:45:57 dawes Exp $
+# $XdotOrg$
#
# Copyright 2003 by David H. Dawes.
@@ -33,8 +33,6 @@
# Author: David Dawes <dawes@XFree86.Org>.
#
-# $XFree86: xc/programs/Xserver/hw/xfree86/getconfig/getconfig.sh,v 1.1 2003/10/08 14:58:29 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.
diff --git a/hw/xfree86/getconfig/getconfig.man.pre b/hw/xfree86/getconfig/getconfig.man.pre
index 6b43047c3..8d80e9208 100644
--- a/hw/xfree86/getconfig/getconfig.man.pre
+++ b/hw/xfree86/getconfig/getconfig.man.pre
@@ -1,7 +1,6 @@
-.\" $XFree86$
.TH getconfig 1 __vendorversion__
.SH NAME
-getconfig - get configuration information for the XFree86 server
+getconfig - get configuration information for the __xservername__ server
.SH SYNOPSIS
.B getconfig
.RI [ option
@@ -9,10 +8,10 @@ getconfig - get configuration information for the XFree86 server
.SH DESCRIPTION
.B getconfig
is a programatic interface that is used by the
-.B XFree86
+.B __xservername__
server to get configuration information about video hardware when
operating without an
-.B XF86Config
+.B __xconfigfile__
file.
.PP
This implementation of
@@ -21,7 +20,7 @@ is written in perl. It processes a prioritized and ordered list of
rules supplied internally and from meta-configuration files. The rules
are in the form of perl expressions.
.B getconfig
-writes to standard output the XF86Config-style configuration data
+writes to standard output the __xconfigfile__-style configuration data
specified by the last highest priority rule that evaluates to true.
Information about the format of the meta-configuration files can be
found in the getconfig(__filemansuffix__) manual page.
@@ -44,8 +43,9 @@ Enable debugging output.
.B \-V
Print out the version information and exit.
.TP 8
-.BI \-X " XFree86-version"
-Specify the XFree86 version in numeric (integer) form.
+.BI \-X
+.BI __xservername__-version
+Specify the __xservername__ version in numeric (integer) form.
.TP 8
.BI \-b " subsys-id"
Specify the PCI subsystem ID of the video device.
@@ -68,7 +68,7 @@ Specify the PCI vendor ID of the video device.
.I .cfg
files located in the search path. The search path typically specified
by the
-.B XFree86
+.B __xservername__
server is:
.PP
.RS 4
@@ -83,16 +83,16 @@ server is:
where
.I <modulepath>
is the
-.B XFree86
+.B __xservername__
server's module search path.
.SH "SEE ALSO"
getconfig(__filemansuffix__),
-XFree86(1),
-XF86Config(__filemansuffix__).
+__xservername__(__appmansuffix__),
+__xconfigfile__(__filemansuffix__).
.SH AUTHORS
-The XFree86 automatic configuration support and the
+The __xservername__ automatic configuration support and the
.B getconfig
interface was written by David H. Dawes, with the support of X-Oz
-Technologies.
+Technologies for XFree86.
diff --git a/hw/xfree86/getconfig/getconfig.pl b/hw/xfree86/getconfig/getconfig.pl
index fcfd7d057..85caf81f5 100644
--- a/hw/xfree86/getconfig/getconfig.pl
+++ b/hw/xfree86/getconfig/getconfig.pl
@@ -33,7 +33,6 @@
# Author: David Dawes <dawes@XFree86.Org>.
#
-# $XFree86: xc/programs/Xserver/hw/xfree86/getconfig/getconfig.pl,v 1.1 2003/10/08 14:58:29 dawes Exp $
#
# This script takes PCI id information, compares it against an ordered list
@@ -52,7 +51,7 @@ $debug = 0;
$myname = $0;
$myname =~ s/.*\///;
-$signature = "XFree86 Project getconfig rules file. Version: ";
+$signature = "Xorg Foundation getconfig rules file. Version: ";
while (@ARGV[0] =~ /^-[A-Za-z]$/) {
$f = shift;
@@ -70,9 +69,9 @@ while (@ARGV[0] =~ /^-[A-Za-z]$/) {
exit 0;
}
if ($f eq "-X") {
- $XFree86VersionNumeric = shift;
- if (!defined($XFree86VersionNumeric)) {
- print STDERR "$myname: -X requires the XFree86 version.\n";
+ $XorgVersionNumeric = shift;
+ if (!defined($XorgVersionNumeric)) {
+ print STDERR "$myname: -X requires the Xorg version.\n";
exit 1;
}
}
@@ -129,21 +128,21 @@ while (@ARGV[0] =~ /^-[A-Za-z]$/) {
printf STDERR "$myname: Version %vd.\n", $GetconfigVersion;
-if (defined($XFree86VersionNumeric)) {
- $XFree86VersionMajor = $XFree86VersionNumeric / 10000000;
- $XFree86VersionMinor = ($XFree86VersionNumeric % 10000000) / 100000;
- $XFree86VersionPatch = ($XFree86VersionNumeric % 100000) / 1000;
- $XFree86VersionSnapshot = $XFree86VersionNumeric % 1000;
- $XFree86Version = chr($XFree86VersionMajor) . chr($XFree86VersionMinor) .
- chr($XFree86VersionPatch) . chr($XFree86VersionSnapshot);
+if (defined($XorgVersionNumeric)) {
+ $XorgVersionMajor = $XorgVersionNumeric / 10000000;
+ $XorgVersionMinor = ($XorgVersionNumeric % 10000000) / 100000;
+ $XorgVersionPatch = ($XorgVersionNumeric % 100000) / 1000;
+ $XorgVersionSnapshot = $XorgVersionNumeric % 1000;
+ $XorgVersion = chr($XorgVersionMajor) . chr($XorgVersionMinor) .
+ chr($XorgVersionPatch) . chr($XorgVersionSnapshot);
}
if ($debug) {
- printf STDERR "$myname: XFree86 Version: %d, %d.%d.%d.%d, %vd.\n",
- $XFree86VersionNumeric, $XFree86VersionMajor, $XFree86VersionMinor,
- $XFree86VersionPatch, $XFree86VersionSnapshot, $XFree86Version;
+ printf STDERR "$myname: Xorg Version: %d, %d.%d.%d.%d, %vd.\n",
+ $XorgVersionNumeric, $XorgVersionMajor, $XorgVersionMinor,
+ $XorgVersionPatch, $XorgVersionSnapshot, $XorgVersion;
} else {
- printf STDERR "$myname: XFree86 Version: %vd.\n", $XFree86Version;
+ printf STDERR "$myname: Xorg Version: %vd.\n", $XorgVersion;
}
diff --git a/hw/xfree86/getconfig/xorg.cfg b/hw/xfree86/getconfig/xorg.cfg
new file mode 100644
index 000000000..848d5eb90
--- /dev/null
+++ b/hw/xfree86/getconfig/xorg.cfg
@@ -0,0 +1,50 @@
+# $XdotOrg$
+
+# Base Xorg getconfig rules file.
+
+#
+# The line below is the getconfig rules file signature, and must be the
+# first non-blank, non-comment line.
+#
+
+Xorg Project getconfig rules file. Version: 1.0
+
+#
+# Set the weight for the following rules. This should be set, otherwise
+# the previously set weight will get used, and you have no idea of knowing
+# what that might be.
+#
+
+$weight = 1000
+
+#
+# Rules. Rules consist of a condition (in perl code) followed by
+# a driver name and optionally some additional strings. The start of a
+# rule is indicated by a line with no leading white space. subsequent
+# lines making up a rule must be indented. Logical lines may be split
+# over multiple physical lines by using the usual continuation '\'.
+#
+# Rules that are not followed by a driver name may be used to do other
+# things, like setting the weight as above.
+#
+
+#
+# Pre-defined variables include:
+#
+# $vendor PCI vendor ID
+# $device PCI device ID
+# $revision PCI revision ID
+# $subsys PCI subsystem ID
+# $subsysVendor PCI subsystem vendor ID
+# $class PCI class
+# $XorgVersion Xorg version, as a 'v' string.
+#
+# The Xorg version information is also available as the following:
+#
+# $XorgVersionNumeric
+# $XorgVersionMajor
+# $XorgVersionMinor
+# $XorgVersionPatch
+# $XorgVersionSnap
+#
+
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-22 08:27:39 +0000