diff options
Diffstat (limited to 'xc/programs/Xserver/hw/xfree86/etc')
75 files changed, 2433 insertions, 334 deletions
diff --git a/xc/programs/Xserver/hw/xfree86/etc/Imakefile b/xc/programs/Xserver/hw/xfree86/etc/Imakefile index e75aa4631..dd3c340cf 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/Imakefile +++ b/xc/programs/Xserver/hw/xfree86/etc/Imakefile @@ -4,7 +4,7 @@ XCOMM $XConsortium: Imakefile /main/24 1996/10/28 04:24:12 kaleb $ -XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/etc/Imakefile,v 3.45 2002/10/11 20:23:07 tsi Exp $ +XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/etc/Imakefile,v 3.49 2002/11/14 21:01:20 tsi Exp $ #include <Server.tmpl> #if SystemV @@ -62,7 +62,6 @@ XINST = Xinstall.sh SERVEREXTRASYSLIBS = ServerExtraSysLibs #endif - all:: $(FILES) #if defined(FreeBSDArchitecture) || defined(NetBSDArchitecture) || defined(OpenBSDArchitecture) @@ -88,12 +87,12 @@ DEFINES = -DUSE_I386_IOPL AllTarget(ProgramTargetName(scanpci)) -NormalProgramTarget(scanpci,scanpci.o,$(XF86OSSRC)/libxf86_os.a,-L../os-support -lxf86_os -L../scanpci -lscanpci -L../dummylib -ldummy $(SERVEREXTRASYSLIBS),NullParameter) +NormalProgramTarget(scanpci,scanpci.o,$(XF86OSSRC)/libxf86_os.a ../scanpci/libscanpci.a ../dummylib/libdummy.a,-L../os-support -lxf86_os -L../scanpci -lscanpci -L../dummylib -ldummy $(SERVEREXTRASYSLIBS),NullParameter) InstallProgram(scanpci,$(BINDIR)) InstallManPage(scanpci,$(MANDIR)) #endif -#if JoystickSupport || Joystick2Support +#if JoystickSupport SRCS3 = joycal.c AllTarget(ProgramTargetName(joycal)) @@ -105,7 +104,7 @@ InstallProgram(joycal,$(BINDIR)) SRCS4 = pcitweak.c AllTarget(ProgramTargetName(pcitweak)) -NormalProgramTarget(pcitweak,pcitweak.o,$(XF86OSSRC)/libxf86_os.a,-L../os-support -lxf86_os -L../dummylib -ldummy $(SERVEREXTRASYSLIBS),NullParameter) +NormalProgramTarget(pcitweak,pcitweak.o,$(XF86OSSRC)/libxf86_os.a ../dummylib/libdummy.a,-L../os-support -lxf86_os -L../dummylib -ldummy $(SERVEREXTRASYSLIBS),NullParameter) InstallProgram(pcitweak,$(BINDIR)) InstallManPage(pcitweak,$(MANDIR)) @@ -120,7 +119,7 @@ SYS_LIBRARIES = -li386 AllTarget(ProgramTargetName(matchagp)) -NormalProgramTarget(matchagp,matchagp.o,$(XF86OSSRC)/libxf86_os.a,-L../os-support -lxf86_os -L../scanpci -lscanpci -L../dummylib -ldummy $(SERVEREXTRASYSLIBS),NullParameter) +NormalProgramTarget(matchagp,matchagp.o,$(XF86OSSRC)/libxf86_os.a ../dummylib/libdummy.a,-L../os-support -lxf86_os -L../scanpci -lscanpci -L../dummylib -ldummy $(SERVEREXTRASYSLIBS),NullParameter) InstallProgram(matchagp,$(BINDIR)) #endif /* BuildMatchagp */ @@ -136,7 +135,51 @@ AllTarget(ProgramTargetName(mmapw)) NormalProgramTarget(mmapw,mmapw.o,NullParameter,NullParameter,NullParameter) InstallProgram(mmapw,$(BINDIR)) - SRCS = $(SRCS1) $(SRCS2) $(SRCS3) $(SRCS4) $(SRCS5) $(SRCS6) $(SRCS7) +#if defined(i386Architecture) || \ + defined(AlphaArchitecture) || \ + defined(ia64Architecture) || \ + defined(x86_64Architecture) + + SRCS8 = ioport.c + +AllTarget(ProgramTargetName(ioport)) +NormalProgramTarget(ioport,ioport.o,$(XF86OSSRC)/libxf86_os.a ../dummylib/libdummy.a,-L../os-support -lxf86_os -L../dummylib -ldummy $(SERVEREXTRASYSLIBS) MathLibrary,NullParameter) +InstallProgram(ioport,$(BINDIR)) + +IOPORT_NAMES = ProgramTargetName(inb) \ + ProgramTargetName(inw) \ + ProgramTargetName(inl) \ + ProgramTargetName(outb) \ + ProgramTargetName(outw) \ + ProgramTargetName(outl) + +all:: $(IOPORT_NAMES) + +$(IOPORT_NAMES): ProgramTargetName(ioport) + RemoveFile($@) + $(LN) $? $@ + +clean:: + RemoveFiles($(IOPORT_NAMES)) + +install:: + @for i in $(IOPORT_NAMES); do (set -x; \ + $(RM) $(DESTDIR)$(BINDIR)/$$i; \ + (cd $(DESTDIR)/$(BINDIR); $(LN) ioport $$i)); \ + done + +#endif + + SRCS9 = gtf.c + +AllTarget(ProgramTargetName(gtf)) + +NormalProgramTarget(gtf,gtf.o,NullParameter,MathLibrary,NullParameter) +InstallProgram(gtf,$(BINDIR)) +InstallManPage(gtf,$(MANDIR)) + + SRCS = $(SRCS1) $(SRCS2) $(SRCS3) $(SRCS4) $(SRCS5) $(SRCS6) $(SRCS7) \ + $(SRCS8) $(SRCS9) #if (SystemV && !defined(i386ScoArchitecture)) || SystemV4 InstallNamedProg($(INSTPROG),xf86install,$(LIBDIR)/etc) diff --git a/xc/programs/Xserver/hw/xfree86/etc/Xinstall.sh b/xc/programs/Xserver/hw/xfree86/etc/Xinstall.sh index 2b7e3a5c7..c87b0a658 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/Xinstall.sh +++ b/xc/programs/Xserver/hw/xfree86/etc/Xinstall.sh @@ -1,13 +1,13 @@ #!/bin/sh # -# $XFree86: xc/programs/Xserver/hw/xfree86/etc/Xinstall.sh,v 1.39 2002/05/05 17:53:42 herrb Exp $ +# $XFree86: xc/programs/Xserver/hw/xfree86/etc/Xinstall.sh,v 1.48 2003/02/24 04:24:17 dawes Exp $ # # Copyright © 2000 by Precision Insight, Inc. # Copyright © 2000, 2001 by VA Linux Systems, Inc. -# Copyright © 1996-2002 by The XFree86 Project, Inc. +# Copyright © 1996-2003 by The XFree86 Project, Inc. # -# This script should be used to install XFree86 4.2.0. +# This script should be used to install XFree86 4.3.0. # # Parts of this script are based on the old preinst.sh and postinst.sh # scripts. @@ -20,15 +20,24 @@ # Fallbacks for when the bindist version can't be auto-detected. # These should be updated for each release. -FULLPREFIX=4.2 -PATCHLEVEL=0 -VERSION=$FULLPREFIX.$PATCHLEVEL -FULLVERSION=$FULLPREFIX.0 +SNAPSHOT=n + +if [ $SNAPSHOT = y ]; then + FULLPREFIX=XXX + VERSION=4.2.99.902 + PATCHLEVEL=0 + FULLVERSION=$VERSION +else + FULLPREFIX=4.3 + PATCHLEVEL=0 + VERSION=$FULLPREFIX.$PATCHLEVEL + FULLVERSION=$FULLPREFIX.0 +fi SCRIPTVERSION=$VERSION # XXX Could get this (and above) version info from imake... -FreetypeCurrent=8 -FreetypeAge=2 +FreetypeCurrent=9 +FreetypeAge=3 BINDISTFULLPREFIX= BINDISTPATCHLEVEL= @@ -73,7 +82,7 @@ if [ X"$1" = "X-test" -o X"$XINST_TEST" != X ]; then fi RUNDIR=$ROOTDIR/usr/X11R6 -ETCDIR=$ROOTDIR/etc/X11 +ETCDIR=$ROOTDIR/etc VARDIR=$ROOTDIR/var OLDFILES="" @@ -148,8 +157,13 @@ ETCFLINKS=" \ XftConfig \ " +ETCFONTFILES=" \ + fonts.conf \ + fonts.dtd \ + " + -XKBDIR="$ETCDIR/xkb" +XKBDIR="$ETCDIR/X11/xkb" XKBDBDIR= FONTDIRS=" \ @@ -250,7 +264,7 @@ Description() Xaout*) echo "a.out compatibility libraries";; Xquartz*) - echo "Mac OS X Quartz compatible X server";; + echo "Mac OS X Quartz X server and extensions";; Xupd.tgz) echo "Post-release updates";; *) @@ -438,8 +452,11 @@ FindDistName() 1.4* | 5.*) DistName="Darwin-ppc-5.x" ;; - [6-9].*) - Message="No Darwin/ppc binaries available for this OS version. Try Darwin-ppc-5.x" + 6.*) + DistName="Darwin-ppc-6.x" + ;; + [7-9].*) + Message="No Darwin/ppc binaries available for this OS version. Try Darwin-ppc-6.x" ;; *) Message="No Darwin/ppc binaries available for this OS version" @@ -451,8 +468,11 @@ FindDistName() 1.4* | 5.*) DistName="Darwin-ix86-5.x" ;; - [6-9].*) - Message="No Darwin/ix86 binaries available for this OS version. Try Darwin-ix86-5.x" + 6.*) + DistName="Darwin-ix86-6.x" + ;; + [7-9].*) + Message="No Darwin/ix86 binaries available for this OS version. Try Darwin-ix86-6.x" ;; *) Message="No Darwin/ix86 binaries available for this OS version" @@ -727,7 +747,14 @@ GetBindistVersion() echo "Bindist version is $BINDISTVERSION" BINDISTFULLPREFIX=`expr $BINDISTVERSION : '\([0-9]*\.[0-9]*\)\.'` BINDISTPATCHLEVEL=`expr $BINDISTVERSION : '[0-9]*\.[0-9]*\.\([0-9]*\)'` - BINDISTFULLVERSION=$BINDISTFULLPREFIX.0 + case $BINDISTPATCHLEVEL in + 99) + BINDISTFULLVERSION=$BINDISTVERSION + ;; + *) + BINDISTFULLVERSION=$BINDISTFULLPREFIX.0 + ;; + esac else echo "Warning: can't detect the bindist version" fi @@ -879,10 +906,10 @@ echo "" echo " Welcome to the XFree86 $SCRIPTVERSION installer" echo "" echo "You are strongly advised to backup your existing XFree86 installation" -echo "before proceeding. This includes the $ROOTDIR/usr/X11R6 and $ROOTDIR/etc/X11" -echo "directories. The installation process will overwrite existing files" -echo "in those directories, and this may include some configuration files" -echo "that may have been customised." +echo "before proceeding. This includes the $ROOTDIR/usr/X11R6, $ROOTDIR/etc/X11" +echo "and $ROOTDIR/etc/fonts directories. The installation process will" +echo "overwrite existing files in those directories, and this may include" +echo "some configuration files that may have been customised." echo "" echo "If you are installing a version different from $SCRIPTVERSION, you" echo "may need an updated version of this installer script." @@ -918,7 +945,6 @@ Darwin) SERVDIST="Xxserv.tgz Xquartz.tgz" else SERVDIST="Xxserv.tgz" - EXTRAOPTDIST="Xquartz.tgz" fi ;; FreeBSD|NetBSD|OpenBSD) @@ -1089,7 +1115,7 @@ if [ X"$DOUPDATE" = XYES ]; then exit 0 fi -# Create $RUNDIR and $ETCDIR if they don't already exist +# Create $RUNDIR, $ETCDIR/X11 and $ETCDIR/fonts if they don't already exist if [ ! -d $RUNDIR ]; then NewRunDir=YES @@ -1104,10 +1130,14 @@ if [ ! -d $RUNDIR/lib/X11 ]; then echo "Creating $RUNDIR/lib/X11" mkdir $RUNDIR/lib/X11 fi -if [ ! -d $ETCDIR ]; then +if [ ! -d $ETCDIR/X11 ]; then NewEtcDir=YES - echo "Creating $ETCDIR" - mkdir $ETCDIR + echo "Creating $ETCDIR/X11" + mkdir $ETCDIR/X11 +fi +if [ ! -d $ETCDIR/fonts ]; then + echo "Creating $ETCDIR/fonts" + mkdir $ETCDIR/fonts fi if [ -d $RUNDIR -a -d $RUNDIR/bin -a -d $RUNDIR/lib ]; then @@ -1165,13 +1195,13 @@ fi if [ X"$EtcDirToMove" != X -o X"$EtcFileToMove" != X ]; then echo "XFree86 now installs most customisable configuration files under" - echo "$ETCDIR instead of under $RUNDIR/lib/X11, and has symbolic links" + echo "$ETCDIR/X11 instead of under $RUNDIR/lib/X11, and has symbolic links" echo "under $RUNDIR/lib/X11 that point to $ETCDIR. You currently have" echo "files under the following subdirectories of $RUNDIR/lib/X11:" echo "" echo "$EtcDirToMove $EtcFileToMove" echo "" - echo "Do you want to move them to $ETCDIR and create the necessary" + echo "Do you want to move them to $ETCDIR/X11 and create the necessary" Echo "links? (y/n) [y] " read response case "$response" in @@ -1185,20 +1215,20 @@ if [ X"$EtcDirToMove" != X -o X"$EtcFileToMove" != X ]; then echo "" if [ X"$NoSymLinks" != XYES ]; then for i in $EtcDirToMove; do - echo "Moving $RUNDIR/lib/X11/$i to $ETCDIR/$i ..." - if [ ! -d $ETCDIR/$i ]; then - mkdir $ETCDIR/$i + echo "Moving $RUNDIR/lib/X11/$i to $ETCDIR/X11/$i ..." + if [ ! -d $ETCDIR/X11/$i ]; then + mkdir $ETCDIR/X11/$i fi $TAR -C $RUNDIR/lib/X11/$i -c -f - . | \ - $TAR -C $ETCDIR/$i -v -x -p -U -f - && \ + $TAR -C $ETCDIR/X11/$i -v -x -p -U -f - && \ rm -fr $RUNDIR/lib/X11/$i && \ - ln -s $ETCDIR/$i $RUNDIR/lib/X11/$i + ln -s $ETCDIR/X11/$i $RUNDIR/lib/X11/$i done for i in $EtcFileToMove; do - echo "Moving $RUNDIR/lib/X11/$i to $ETCDIR/$i ..." - cp -p $RUNDIR/lib/X11/$i $ETCDIR/$i && \ + echo "Moving $RUNDIR/lib/X11/$i to $ETCDIR/X11/$i ..." + cp -p $RUNDIR/lib/X11/$i $ETCDIR/X11/$i && \ rm -fr $RUNDIR/lib/X11/$i && \ - ln -s $ETCDIR/$i $RUNDIR/lib/X11/$i + ln -s $ETCDIR/X11/$i $RUNDIR/lib/X11/$i done fi fi @@ -1229,18 +1259,18 @@ for i in $ETCDLINKS; do if [ $DoCopy = YES ]; then echo "Installing the $i config files ..." if [ X"$NoSymLinks" != XYES ]; then - if [ ! -d $ETCDIR/$i ]; then - mkdir $ETCDIR/$i + if [ ! -d $ETCDIR/X11/$i ]; then + mkdir $ETCDIR/X11/$i fi if [ ! -d $RUNDIR/lib/X11/$i ]; then - ln -s $ETCDIR/$i $RUNDIR/lib/X11/$i + ln -s $ETCDIR/X11/$i $RUNDIR/lib/X11/$i fi else if [ ! -d $RUNDIR/lib/X11/$i ]; then mkdir $RUNDIR/lib/X11/$i fi fi - $TAR -C .etctmp/$i -c -f - . | \ + $TAR -C .etctmp/X11/$i -c -f - . | \ $TAR -C $RUNDIR/lib/X11/$i -v -x -p -U -f - fi done @@ -1262,24 +1292,43 @@ for i in $ETCFLINKS; do echo "Installing the $i config file ..." if [ X"$NoSymLinks" != XYES ]; then if [ ! -f $RUNDIR/lib/X11/$i ]; then - ln -s $ETCDIR/$i $RUNDIR/lib/X11/$i + ln -s $ETCDIR/X11/$i $RUNDIR/lib/X11/$i fi fi - (set -x; cp -p .etctmp/$i $RUNDIR/lib/X11/$i) + (set -x; cp -p .etctmp/X11/$i $RUNDIR/lib/X11/$i) fi done if [ X"$XKBDIR" != X ]; then if [ X"$NoSymLinks" = XYES ]; then XKBDIR=$RUNDIR/lib/X11/xkb/compiled fi - if [ -d .etctmp/xkb ]; then + if [ -d .etctmp/X11/xkb ]; then if [ ! -d $XKBDIR ]; then mkdir $XKBDIR fi - $TAR -C .etctmp/xkb -c -f - . | \ + $TAR -C .etctmp/X11/xkb -c -f - . | \ $TAR -C $XKBDIR -v -x -p -U -f - fi fi +for i in $ETCFONTFILES; do + DoCopy=YES + if [ -f $ETCDIR/fonts/$i ]; then + Echo "Do you want to overwrite the $i config file? (y/n) [n] " + read response + case "$response" in + [yY]*) + : OK + ;; + *) + DoCopy=NO + ;; + esac + fi + if [ $DoCopy = YES ]; then + echo "Installing the $i config file ..." + (set -x; cp -p .etctmp/fonts/$i $ETCDIR/fonts/$i) + fi +done rm -fr .etctmp echo "" diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/Cygwin/bin-list b/xc/programs/Xserver/hw/xfree86/etc/bindist/Cygwin/bin-list index 23aa7b747..4a539c25c 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/Cygwin/bin-list +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/Cygwin/bin-list @@ -2,6 +2,8 @@ bin lib/libdps.a lib/libdpstk.a +lib/libexpat.a +lib/libfontconfig.a lib/libfntstubs.a lib/libfreetype.a lib/libFS.a @@ -15,6 +17,7 @@ lib/libSM.a lib/libX11.a lib/libXau.a lib/libXaw.a +lib/libXcursor.a lib/libXdmcp.a lib/libXext.a lib/libXfont.a diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/Cygwin/etc-dir b/xc/programs/Xserver/hw/xfree86/etc/bindist/Cygwin/etc-dir index 412cec0c3..ee19d5d17 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/Cygwin/etc-dir +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/Cygwin/etc-dir @@ -1 +1 @@ -etc/X11 +etc diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/Cygwin/etc-list b/xc/programs/Xserver/hw/xfree86/etc/bindist/Cygwin/etc-list index 9c558e357..5198205d9 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/Cygwin/etc-list +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/Cygwin/etc-list @@ -1 +1,2 @@ -. +X11 +fonts diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/Darwin-ix86/bin-list b/xc/programs/Xserver/hw/xfree86/etc/bindist/Darwin-ix86/bin-list index 710fb5337..7d3d37c68 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/Darwin-ix86/bin-list +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/Darwin-ix86/bin-list @@ -9,6 +9,9 @@ lib/libGLU.dylib lib/libICE.6.3.dylib lib/libICE.6.dylib lib/libICE.dylib +lib/libOSMesa.4.0.dylib +lib/libOSMesa.4.dylib +lib/libOSMesa.dylib lib/libSM.6.0.dylib lib/libSM.6.dylib lib/libSM.dylib @@ -20,6 +23,9 @@ lib/libXaw.6.dylib lib/libXaw.7.0.dylib lib/libXaw.7.dylib lib/libXaw.dylib +lib/libXcursor.1.0.dylib +lib/libXcursor.1.dylib +lib/libXcursor.dylib lib/libXext.6.4.dylib lib/libXext.6.dylib lib/libXext.dylib @@ -28,6 +34,8 @@ lib/libXfont.1.dylib lib/libXfont.dylib lib/libXft.1.1.dylib lib/libXft.1.dylib +lib/libXft.2.1.dylib +lib/libXft.2.dylib lib/libXft.dylib lib/libXi.6.0.dylib lib/libXi.6.dylib @@ -44,10 +52,10 @@ lib/libXp.dylib lib/libXpm.4.11.dylib lib/libXpm.4.dylib lib/libXpm.dylib -lib/libXrandr.1.0.dylib -lib/libXrandr.1.dylib +lib/libXrandr.2.0.dylib +lib/libXrandr.2.dylib lib/libXrandr.dylib -lib/libXrender.1.1.dylib +lib/libXrender.1.2.dylib lib/libXrender.1.dylib lib/libXrender.dylib lib/libXt.6.0.dylib @@ -59,13 +67,22 @@ lib/libXtst.dylib lib/libXTrap.6.4.dylib lib/libXTrap.6.dylib lib/libXTrap.dylib +lib/libXv.1.0.dylib +lib/libXv.1.dylib +lib/libXv.dylib lib/libdps.1.0.dylib lib/libdps.1.dylib lib/libdps.dylib lib/libdpstk.1.0.dylib lib/libdpstk.1.dylib lib/libdpstk.dylib -lib/libfreetype.6.2.dylib +lib/libexpat.1.0.dylib +lib/libexpat.1.dylib +lib/libexpat.dylib +lib/libfontconfig.1.0.dylib +lib/libfontconfig.1.dylib +lib/libfontconfig.dylib +lib/libfreetype.6.3.dylib lib/libfreetype.6.dylib lib/libfreetype.dylib lib/liboldX.6.0.dylib diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/Darwin-ix86/etc-dir b/xc/programs/Xserver/hw/xfree86/etc/bindist/Darwin-ix86/etc-dir index 412cec0c3..ee19d5d17 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/Darwin-ix86/etc-dir +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/Darwin-ix86/etc-dir @@ -1 +1 @@ -etc/X11 +etc diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/Darwin-ix86/etc-list b/xc/programs/Xserver/hw/xfree86/etc/bindist/Darwin-ix86/etc-list index 9c558e357..5198205d9 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/Darwin-ix86/etc-list +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/Darwin-ix86/etc-list @@ -1 +1,2 @@ -. +X11 +fonts diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/Darwin-ppc/bin-list b/xc/programs/Xserver/hw/xfree86/etc/bindist/Darwin-ppc/bin-list index 710fb5337..7d3d37c68 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/Darwin-ppc/bin-list +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/Darwin-ppc/bin-list @@ -9,6 +9,9 @@ lib/libGLU.dylib lib/libICE.6.3.dylib lib/libICE.6.dylib lib/libICE.dylib +lib/libOSMesa.4.0.dylib +lib/libOSMesa.4.dylib +lib/libOSMesa.dylib lib/libSM.6.0.dylib lib/libSM.6.dylib lib/libSM.dylib @@ -20,6 +23,9 @@ lib/libXaw.6.dylib lib/libXaw.7.0.dylib lib/libXaw.7.dylib lib/libXaw.dylib +lib/libXcursor.1.0.dylib +lib/libXcursor.1.dylib +lib/libXcursor.dylib lib/libXext.6.4.dylib lib/libXext.6.dylib lib/libXext.dylib @@ -28,6 +34,8 @@ lib/libXfont.1.dylib lib/libXfont.dylib lib/libXft.1.1.dylib lib/libXft.1.dylib +lib/libXft.2.1.dylib +lib/libXft.2.dylib lib/libXft.dylib lib/libXi.6.0.dylib lib/libXi.6.dylib @@ -44,10 +52,10 @@ lib/libXp.dylib lib/libXpm.4.11.dylib lib/libXpm.4.dylib lib/libXpm.dylib -lib/libXrandr.1.0.dylib -lib/libXrandr.1.dylib +lib/libXrandr.2.0.dylib +lib/libXrandr.2.dylib lib/libXrandr.dylib -lib/libXrender.1.1.dylib +lib/libXrender.1.2.dylib lib/libXrender.1.dylib lib/libXrender.dylib lib/libXt.6.0.dylib @@ -59,13 +67,22 @@ lib/libXtst.dylib lib/libXTrap.6.4.dylib lib/libXTrap.6.dylib lib/libXTrap.dylib +lib/libXv.1.0.dylib +lib/libXv.1.dylib +lib/libXv.dylib lib/libdps.1.0.dylib lib/libdps.1.dylib lib/libdps.dylib lib/libdpstk.1.0.dylib lib/libdpstk.1.dylib lib/libdpstk.dylib -lib/libfreetype.6.2.dylib +lib/libexpat.1.0.dylib +lib/libexpat.1.dylib +lib/libexpat.dylib +lib/libfontconfig.1.0.dylib +lib/libfontconfig.1.dylib +lib/libfontconfig.dylib +lib/libfreetype.6.3.dylib lib/libfreetype.6.dylib lib/libfreetype.dylib lib/liboldX.6.0.dylib diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/Darwin-ppc/etc-dir b/xc/programs/Xserver/hw/xfree86/etc/bindist/Darwin-ppc/etc-dir index 412cec0c3..ee19d5d17 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/Darwin-ppc/etc-dir +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/Darwin-ppc/etc-dir @@ -1 +1 @@ -etc/X11 +etc diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/Darwin-ppc/etc-list b/xc/programs/Xserver/hw/xfree86/etc/bindist/Darwin-ppc/etc-list index 9c558e357..5198205d9 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/Darwin-ppc/etc-list +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/Darwin-ppc/etc-list @@ -1 +1,2 @@ -. +X11 +fonts diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/Darwin-ppc/quartz-list b/xc/programs/Xserver/hw/xfree86/etc/bindist/Darwin-ppc/quartz-list index f32a0d5f7..cae427de3 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/Darwin-ppc/quartz-list +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/Darwin-ppc/quartz-list @@ -1,4 +1,8 @@ bin/X bin/XDarwinStartup bin/XDarwinQuartz +lib/libfreetype.6.3.dylib +lib/libfreetype.6.dylib +lib/libfreetype.a +lib/libfreetype.dylib ../../Applications/XDarwin.app diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD-aout/bin-list b/xc/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD-aout/bin-list index 7582a6efd..5b2f9d882 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD-aout/bin-list +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD-aout/bin-list @@ -9,21 +9,26 @@ lib/libXThrStub.so.6.0 lib/libXTrap.so.6.4 lib/libXaw.so.6.1 lib/libXaw.so.7.0 +lib/libXcursor.so.1.0 lib/libXext.so.6.4 lib/libXfont.so.1.4 lib/libXft.so.1.1 +lib/libXft.so.2.1 lib/libXi.so.6.0 lib/libXmu.so.6.2 lib/libXmuu.so.1.0 lib/libXp.so.6.2 lib/libXpm.so.4.11 -lib/libXrandr.so.1.0 -lib/libXrender.so.1.1 +lib/libXrandr.so.2.0 +lib/libXrender.so.1.2 lib/libXt.so.6.0 lib/libXtst.so.6.1 +lib/libXv.so.1.0 lib/libdps.so.1.0 lib/libdpstk.so.1.0 -lib/libfreetype.so.8.0 +lib/libexpat.so.1.0 +lib/libfontconfig.so.1.0 +lib/libfreetype.so.9.0 lib/liboldX.so.6.0 lib/libpsres.so.1.0 lib/libxrx.so.6.3 diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD-aout/etc-dir b/xc/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD-aout/etc-dir index 412cec0c3..ee19d5d17 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD-aout/etc-dir +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD-aout/etc-dir @@ -1 +1 @@ -etc/X11 +etc diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD-aout/etc-list b/xc/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD-aout/etc-list index 9c558e357..5198205d9 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD-aout/etc-list +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD-aout/etc-list @@ -1 +1,2 @@ -. +X11 +fonts diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD-aout/host.def b/xc/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD-aout/host.def index f30db1385..110bf7b9c 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD-aout/host.def +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD-aout/host.def @@ -1,9 +1,12 @@ /* * Host.def for building FreeBSD/a.out bindists * - * $XFree86: xc/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD-aout/host.def,v 1.4 2001/05/31 18:47:07 dawes Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD-aout/host.def,v 1.5 2002/12/24 16:14:42 dawes Exp $ */ #define InstallEmptyHostDef #define BuildBindist +#define HasLibpng YES +#define LibpngDir /usr/local + diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD/bin-list b/xc/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD/bin-list index 534362a1c..3b58e6e3b 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD/bin-list +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD/bin-list @@ -7,7 +7,7 @@ lib/libGLU.so.1 lib/libGLU.so lib/libICE.so.6 lib/libICE.so -lib/libOSMesa.so.3 +lib/libOSMesa.so.4 lib/libOSMesa.so lib/libSM.so.6 lib/libSM.so @@ -20,11 +20,14 @@ lib/libXTrap.so lib/libXaw.so.7 lib/libXaw.so.6 lib/libXaw.so +lib/libXcursor.so.1 +lib/libXcursor.so lib/libXext.so.6 lib/libXext.so lib/libXfont.so.1 lib/libXfont.so lib/libXft.so.1 +lib/libXft.so.2 lib/libXft.so lib/libXi.so.6 lib/libXi.so @@ -36,7 +39,7 @@ lib/libXp.so.6 lib/libXp.so lib/libXpm.so.4 lib/libXpm.so -lib/libXrandr.so.1 +lib/libXrandr.so.2 lib/libXrandr.so lib/libXrender.so.1 lib/libXrender.so @@ -44,11 +47,17 @@ lib/libXt.so.6 lib/libXt.so lib/libXtst.so.6 lib/libXtst.so +lib/libXv.so.1 +lib/libXv.so lib/libdps.so.1 lib/libdps.so lib/libdpstk.so.1 lib/libdpstk.so -lib/libfreetype.so.8 +lib/libexpat.so.1 +lib/libexpat.so +lib/libfontconfig.so.1 +lib/libfontconfig.so +lib/libfreetype.so.9 lib/libfreetype.so lib/liboldX.so.6 lib/liboldX.so diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD/etc-dir b/xc/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD/etc-dir index 412cec0c3..ee19d5d17 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD/etc-dir +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD/etc-dir @@ -1 +1 @@ -etc/X11 +etc diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD/etc-list b/xc/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD/etc-list index 9c558e357..5198205d9 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD/etc-list +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD/etc-list @@ -1 +1,2 @@ -. +X11 +fonts diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD/host.def b/xc/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD/host.def index 6e665bd2d..de4b4ef71 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD/host.def +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD/host.def @@ -1,9 +1,12 @@ /* * Host.def for building FreeBSD bindists * - * $XFree86: xc/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD/host.def,v 1.4 2001/05/31 18:47:07 dawes Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD/host.def,v 1.5 2002/12/24 16:14:41 dawes Exp $ */ #define InstallEmptyHostDef #define BuildBindist +#define HasLibpng YES +#define LibpngDir /usr/local + diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD/prog-excl b/xc/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD/prog-excl index 113d220ef..4537e640f 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD/prog-excl +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD/prog-excl @@ -1,5 +1,6 @@ lib/Server lib/X11 +lib/aout lib/lib*.so* lib/modules include/X11/bitmaps diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/Interactive/etc-dir b/xc/programs/Xserver/hw/xfree86/etc/bindist/Interactive/etc-dir index 412cec0c3..ee19d5d17 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/Interactive/etc-dir +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/Interactive/etc-dir @@ -1 +1 @@ -etc/X11 +etc diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/Interactive/etc-list b/xc/programs/Xserver/hw/xfree86/etc/bindist/Interactive/etc-list index 9c558e357..5198205d9 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/Interactive/etc-list +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/Interactive/etc-list @@ -1 +1,2 @@ -. +X11 +fonts diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-axp/bin-list b/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-axp/bin-list index c04fdd8e8..c602c78dc 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-axp/bin-list +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-axp/bin-list @@ -9,8 +9,8 @@ lib/libGLU.so lib/libICE.so.6.3 lib/libICE.so.6 lib/libICE.so -lib/libOSMesa.so.3.3 -lib/libOSMesa.so.3 +lib/libOSMesa.so.4.0 +lib/libOSMesa.so.4 lib/libOSMesa.so lib/libSM.so.6.0 lib/libSM.so.6 @@ -26,6 +26,9 @@ lib/libXaw.so.6 lib/libXaw.so.7.0 lib/libXaw.so.7 lib/libXaw.so +lib/libXcursor.so.1.0 +lib/libXcursor.so.1 +lib/libXcursor.so lib/libXext.so.6.4 lib/libXext.so.6 lib/libXext.so @@ -34,6 +37,8 @@ lib/libXfont.so.1 lib/libXfont.so lib/libXft.so.1.1 lib/libXft.so.1 +lib/libXft.so.2.1 +lib/libXft.so.2 lib/libXft.so lib/libXi.so.6.0 lib/libXi.so.6 @@ -50,10 +55,10 @@ lib/libXp.so lib/libXpm.so.4.11 lib/libXpm.so.4 lib/libXpm.so -lib/libXrandr.so.1.0 -lib/libXrandr.so.1 +lib/libXrandr.so.2.0 +lib/libXrandr.so.2 lib/libXrandr.so -lib/libXrender.so.1.1 +lib/libXrender.so.1.2 lib/libXrender.so.1 lib/libXrender.so lib/libXt.so.6.0 @@ -62,13 +67,22 @@ lib/libXt.so lib/libXtst.so.6.1 lib/libXtst.so.6 lib/libXtst.so +lib/libXv.so.1.0 +lib/libXv.so.1 +lib/libXv.so lib/libdps.so.1.0 lib/libdps.so.1 lib/libdps.so lib/libdpstk.so.1.0 lib/libdpstk.so.1 lib/libdpstk.so -lib/libfreetype.so.6.2 +lib/libexpat.so.1.0 +lib/libexpat.so.1 +lib/libexpat.so +lib/libfontconfig.so.1.0 +lib/libfontconfig.so.1 +lib/libfontconfig.so +lib/libfreetype.so.6.3 lib/libfreetype.so.6 lib/libfreetype.so lib/libpsres.so.1.0 diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-axp/etc-dir b/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-axp/etc-dir index 412cec0c3..ee19d5d17 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-axp/etc-dir +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-axp/etc-dir @@ -1 +1 @@ -etc/X11 +etc diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-axp/etc-list b/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-axp/etc-list index 9c558e357..5198205d9 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-axp/etc-list +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-axp/etc-list @@ -1 +1,2 @@ -. +X11 +fonts diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-ix86/bin-list b/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-ix86/bin-list index c04fdd8e8..c602c78dc 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-ix86/bin-list +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-ix86/bin-list @@ -9,8 +9,8 @@ lib/libGLU.so lib/libICE.so.6.3 lib/libICE.so.6 lib/libICE.so -lib/libOSMesa.so.3.3 -lib/libOSMesa.so.3 +lib/libOSMesa.so.4.0 +lib/libOSMesa.so.4 lib/libOSMesa.so lib/libSM.so.6.0 lib/libSM.so.6 @@ -26,6 +26,9 @@ lib/libXaw.so.6 lib/libXaw.so.7.0 lib/libXaw.so.7 lib/libXaw.so +lib/libXcursor.so.1.0 +lib/libXcursor.so.1 +lib/libXcursor.so lib/libXext.so.6.4 lib/libXext.so.6 lib/libXext.so @@ -34,6 +37,8 @@ lib/libXfont.so.1 lib/libXfont.so lib/libXft.so.1.1 lib/libXft.so.1 +lib/libXft.so.2.1 +lib/libXft.so.2 lib/libXft.so lib/libXi.so.6.0 lib/libXi.so.6 @@ -50,10 +55,10 @@ lib/libXp.so lib/libXpm.so.4.11 lib/libXpm.so.4 lib/libXpm.so -lib/libXrandr.so.1.0 -lib/libXrandr.so.1 +lib/libXrandr.so.2.0 +lib/libXrandr.so.2 lib/libXrandr.so -lib/libXrender.so.1.1 +lib/libXrender.so.1.2 lib/libXrender.so.1 lib/libXrender.so lib/libXt.so.6.0 @@ -62,13 +67,22 @@ lib/libXt.so lib/libXtst.so.6.1 lib/libXtst.so.6 lib/libXtst.so +lib/libXv.so.1.0 +lib/libXv.so.1 +lib/libXv.so lib/libdps.so.1.0 lib/libdps.so.1 lib/libdps.so lib/libdpstk.so.1.0 lib/libdpstk.so.1 lib/libdpstk.so -lib/libfreetype.so.6.2 +lib/libexpat.so.1.0 +lib/libexpat.so.1 +lib/libexpat.so +lib/libfontconfig.so.1.0 +lib/libfontconfig.so.1 +lib/libfontconfig.so +lib/libfreetype.so.6.3 lib/libfreetype.so.6 lib/libfreetype.so lib/libpsres.so.1.0 diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-ix86/etc-dir b/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-ix86/etc-dir index 412cec0c3..ee19d5d17 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-ix86/etc-dir +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-ix86/etc-dir @@ -1 +1 @@ -etc/X11 +etc diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-ix86/etc-list b/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-ix86/etc-list index 9c558e357..5198205d9 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-ix86/etc-list +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-ix86/etc-list @@ -1 +1,2 @@ -. +X11 +fonts diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-m68k/bin-list b/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-m68k/bin-list index c04fdd8e8..c602c78dc 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-m68k/bin-list +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-m68k/bin-list @@ -9,8 +9,8 @@ lib/libGLU.so lib/libICE.so.6.3 lib/libICE.so.6 lib/libICE.so -lib/libOSMesa.so.3.3 -lib/libOSMesa.so.3 +lib/libOSMesa.so.4.0 +lib/libOSMesa.so.4 lib/libOSMesa.so lib/libSM.so.6.0 lib/libSM.so.6 @@ -26,6 +26,9 @@ lib/libXaw.so.6 lib/libXaw.so.7.0 lib/libXaw.so.7 lib/libXaw.so +lib/libXcursor.so.1.0 +lib/libXcursor.so.1 +lib/libXcursor.so lib/libXext.so.6.4 lib/libXext.so.6 lib/libXext.so @@ -34,6 +37,8 @@ lib/libXfont.so.1 lib/libXfont.so lib/libXft.so.1.1 lib/libXft.so.1 +lib/libXft.so.2.1 +lib/libXft.so.2 lib/libXft.so lib/libXi.so.6.0 lib/libXi.so.6 @@ -50,10 +55,10 @@ lib/libXp.so lib/libXpm.so.4.11 lib/libXpm.so.4 lib/libXpm.so -lib/libXrandr.so.1.0 -lib/libXrandr.so.1 +lib/libXrandr.so.2.0 +lib/libXrandr.so.2 lib/libXrandr.so -lib/libXrender.so.1.1 +lib/libXrender.so.1.2 lib/libXrender.so.1 lib/libXrender.so lib/libXt.so.6.0 @@ -62,13 +67,22 @@ lib/libXt.so lib/libXtst.so.6.1 lib/libXtst.so.6 lib/libXtst.so +lib/libXv.so.1.0 +lib/libXv.so.1 +lib/libXv.so lib/libdps.so.1.0 lib/libdps.so.1 lib/libdps.so lib/libdpstk.so.1.0 lib/libdpstk.so.1 lib/libdpstk.so -lib/libfreetype.so.6.2 +lib/libexpat.so.1.0 +lib/libexpat.so.1 +lib/libexpat.so +lib/libfontconfig.so.1.0 +lib/libfontconfig.so.1 +lib/libfontconfig.so +lib/libfreetype.so.6.3 lib/libfreetype.so.6 lib/libfreetype.so lib/libpsres.so.1.0 diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-m68k/etc-dir b/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-m68k/etc-dir index 412cec0c3..ee19d5d17 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-m68k/etc-dir +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-m68k/etc-dir @@ -1 +1 @@ -etc/X11 +etc diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-m68k/etc-list b/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-m68k/etc-list index 9c558e357..5198205d9 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-m68k/etc-list +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-m68k/etc-list @@ -1 +1,2 @@ -. +X11 +fonts diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/bin-list b/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/bin-list index c04fdd8e8..c602c78dc 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/bin-list +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/bin-list @@ -9,8 +9,8 @@ lib/libGLU.so lib/libICE.so.6.3 lib/libICE.so.6 lib/libICE.so -lib/libOSMesa.so.3.3 -lib/libOSMesa.so.3 +lib/libOSMesa.so.4.0 +lib/libOSMesa.so.4 lib/libOSMesa.so lib/libSM.so.6.0 lib/libSM.so.6 @@ -26,6 +26,9 @@ lib/libXaw.so.6 lib/libXaw.so.7.0 lib/libXaw.so.7 lib/libXaw.so +lib/libXcursor.so.1.0 +lib/libXcursor.so.1 +lib/libXcursor.so lib/libXext.so.6.4 lib/libXext.so.6 lib/libXext.so @@ -34,6 +37,8 @@ lib/libXfont.so.1 lib/libXfont.so lib/libXft.so.1.1 lib/libXft.so.1 +lib/libXft.so.2.1 +lib/libXft.so.2 lib/libXft.so lib/libXi.so.6.0 lib/libXi.so.6 @@ -50,10 +55,10 @@ lib/libXp.so lib/libXpm.so.4.11 lib/libXpm.so.4 lib/libXpm.so -lib/libXrandr.so.1.0 -lib/libXrandr.so.1 +lib/libXrandr.so.2.0 +lib/libXrandr.so.2 lib/libXrandr.so -lib/libXrender.so.1.1 +lib/libXrender.so.1.2 lib/libXrender.so.1 lib/libXrender.so lib/libXt.so.6.0 @@ -62,13 +67,22 @@ lib/libXt.so lib/libXtst.so.6.1 lib/libXtst.so.6 lib/libXtst.so +lib/libXv.so.1.0 +lib/libXv.so.1 +lib/libXv.so lib/libdps.so.1.0 lib/libdps.so.1 lib/libdps.so lib/libdpstk.so.1.0 lib/libdpstk.so.1 lib/libdpstk.so -lib/libfreetype.so.6.2 +lib/libexpat.so.1.0 +lib/libexpat.so.1 +lib/libexpat.so +lib/libfontconfig.so.1.0 +lib/libfontconfig.so.1 +lib/libfontconfig.so +lib/libfreetype.so.6.3 lib/libfreetype.so.6 lib/libfreetype.so lib/libpsres.so.1.0 diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/etc-dir b/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/etc-dir index 412cec0c3..ee19d5d17 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/etc-dir +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/etc-dir @@ -1 +1 @@ -etc/X11 +etc diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/etc-list b/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/etc-list index 9c558e357..5198205d9 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/etc-list +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/etc-list @@ -1 +1,2 @@ -. +X11 +fonts diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-ppc/bin-list b/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-ppc/bin-list index c04fdd8e8..c602c78dc 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-ppc/bin-list +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-ppc/bin-list @@ -9,8 +9,8 @@ lib/libGLU.so lib/libICE.so.6.3 lib/libICE.so.6 lib/libICE.so -lib/libOSMesa.so.3.3 -lib/libOSMesa.so.3 +lib/libOSMesa.so.4.0 +lib/libOSMesa.so.4 lib/libOSMesa.so lib/libSM.so.6.0 lib/libSM.so.6 @@ -26,6 +26,9 @@ lib/libXaw.so.6 lib/libXaw.so.7.0 lib/libXaw.so.7 lib/libXaw.so +lib/libXcursor.so.1.0 +lib/libXcursor.so.1 +lib/libXcursor.so lib/libXext.so.6.4 lib/libXext.so.6 lib/libXext.so @@ -34,6 +37,8 @@ lib/libXfont.so.1 lib/libXfont.so lib/libXft.so.1.1 lib/libXft.so.1 +lib/libXft.so.2.1 +lib/libXft.so.2 lib/libXft.so lib/libXi.so.6.0 lib/libXi.so.6 @@ -50,10 +55,10 @@ lib/libXp.so lib/libXpm.so.4.11 lib/libXpm.so.4 lib/libXpm.so -lib/libXrandr.so.1.0 -lib/libXrandr.so.1 +lib/libXrandr.so.2.0 +lib/libXrandr.so.2 lib/libXrandr.so -lib/libXrender.so.1.1 +lib/libXrender.so.1.2 lib/libXrender.so.1 lib/libXrender.so lib/libXt.so.6.0 @@ -62,13 +67,22 @@ lib/libXt.so lib/libXtst.so.6.1 lib/libXtst.so.6 lib/libXtst.so +lib/libXv.so.1.0 +lib/libXv.so.1 +lib/libXv.so lib/libdps.so.1.0 lib/libdps.so.1 lib/libdps.so lib/libdpstk.so.1.0 lib/libdpstk.so.1 lib/libdpstk.so -lib/libfreetype.so.6.2 +lib/libexpat.so.1.0 +lib/libexpat.so.1 +lib/libexpat.so +lib/libfontconfig.so.1.0 +lib/libfontconfig.so.1 +lib/libfontconfig.so +lib/libfreetype.so.6.3 lib/libfreetype.so.6 lib/libfreetype.so lib/libpsres.so.1.0 diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-ppc/etc-dir b/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-ppc/etc-dir index 412cec0c3..ee19d5d17 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-ppc/etc-dir +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-ppc/etc-dir @@ -1 +1 @@ -etc/X11 +etc diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-ppc/etc-list b/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-ppc/etc-list index 9c558e357..5198205d9 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-ppc/etc-list +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-ppc/etc-list @@ -1 +1,2 @@ -. +X11 +fonts diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/LynxOS/etc-dir b/xc/programs/Xserver/hw/xfree86/etc/bindist/LynxOS/etc-dir index 412cec0c3..ee19d5d17 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/LynxOS/etc-dir +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/LynxOS/etc-dir @@ -1 +1 @@ -etc/X11 +etc diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/LynxOS/etc-list b/xc/programs/Xserver/hw/xfree86/etc/bindist/LynxOS/etc-list index 9c558e357..5198205d9 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/LynxOS/etc-list +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/LynxOS/etc-list @@ -1 +1,2 @@ -. +X11 +fonts diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/NetBSD-aout-ix86/bin-list b/xc/programs/Xserver/hw/xfree86/etc/bindist/NetBSD-aout-ix86/bin-list index 610791988..2d279ecdd 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/NetBSD-aout-ix86/bin-list +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/NetBSD-aout-ix86/bin-list @@ -3,25 +3,31 @@ bin lib/libGL.so.1.2 lib/libGLU.so.1.3 lib/libICE.so.6.3 +lib/libOSMesa.so.4.0 lib/libSM.so.6.0 lib/libX11.so.6.2 lib/libXTrap.so.6.4 lib/libXaw.so.6.1 lib/libXaw.so.7.0 +lib/libXcursor.so.1.0 lib/libXext.so.6.4 lib/libXfont.so.1.4 lib/libXft.so.1.1 +lib/libXft.so.2.1 lib/libXi.so.6.0 lib/libXmu.so.6.2 lib/libXmuu.so.1.0 lib/libXp.so.6.2 lib/libXpm.so.4.11 -lib/libXrandr.so.1.0 -lib/libXrender.so.1.1 +lib/libXrandr.so.2.0 +lib/libXrender.so.1.2 lib/libXt.so.6.0 lib/libXtst.so.6.1 +lib/libXv.so.1.0 lib/libdps.so.1.0 lib/libdpstk.so.1.0 -lib/libfreetype.so.8.0 +lib/libexpat.so.1.0 +lib/libfontconfig.so.1.0 +lib/libfreetype.so.9.0 lib/liboldX.so.6.0 lib/libpsres.so.1.0 diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/NetBSD-aout-ix86/etc-dir b/xc/programs/Xserver/hw/xfree86/etc/bindist/NetBSD-aout-ix86/etc-dir index 412cec0c3..ee19d5d17 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/NetBSD-aout-ix86/etc-dir +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/NetBSD-aout-ix86/etc-dir @@ -1 +1 @@ -etc/X11 +etc diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/NetBSD-aout-ix86/etc-list b/xc/programs/Xserver/hw/xfree86/etc/bindist/NetBSD-aout-ix86/etc-list index 9c558e357..00550c517 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/NetBSD-aout-ix86/etc-list +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/NetBSD-aout-ix86/etc-list @@ -1 +1 @@ -. +fonts diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/NetBSD-aout-ix86/host.def b/xc/programs/Xserver/hw/xfree86/etc/bindist/NetBSD-aout-ix86/host.def index c636f8990..6d74aca78 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/NetBSD-aout-ix86/host.def +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/NetBSD-aout-ix86/host.def @@ -1,9 +1,12 @@ /* * Host.def for building NetBSD bindists * - * $XFree86: xc/programs/Xserver/hw/xfree86/etc/bindist/NetBSD-aout-ix86/host.def,v 1.2 2001/05/31 18:47:09 dawes Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/etc/bindist/NetBSD-aout-ix86/host.def,v 1.3 2002/12/24 16:14:42 dawes Exp $ */ #define InstallEmptyHostDef #define BuildBindist +#define HasLibpng YES +#define LibpngDir /usr/pkg + diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/NetBSD-ix86/bin-list b/xc/programs/Xserver/hw/xfree86/etc/bindist/NetBSD-ix86/bin-list index f95339dc0..588fda257 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/NetBSD-ix86/bin-list +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/NetBSD-ix86/bin-list @@ -9,6 +9,9 @@ lib/libGLU.so.1.3 lib/libICE.so lib/libICE.so.6 lib/libICE.so.6.3 +lib/libOSMesa.so +lib/libOSMesa.so.4 +lib/libOSMesa.so.4.0 lib/libSM.so lib/libSM.so.6 lib/libSM.so.6.0 @@ -23,6 +26,9 @@ lib/libXaw.so.6 lib/libXaw.so.6.1 lib/libXaw.so.7 lib/libXaw.so.7.0 +lib/libXcursor.so +lib/libXcursor.so.1 +lib/libXcursor.so.1.0 lib/libXext.so lib/libXext.so.6 lib/libXext.so.6.4 @@ -32,6 +38,8 @@ lib/libXfont.so.1.4 lib/libXft.so lib/libXft.so.1 lib/libXft.so.1.1 +lib/libXft.so.2 +lib/libXft.so.2.1 lib/libXi.so lib/libXi.so.6 lib/libXi.so.6.0 @@ -48,26 +56,35 @@ lib/libXpm.so lib/libXpm.so.4 lib/libXpm.so.4.11 lib/libXrandr.so -lib/libXrandr.so.1 -lib/libXrandr.so.1.0 +lib/libXrandr.so.2 +lib/libXrandr.so.2.0 lib/libXrender.so lib/libXrender.so.1 -lib/libXrender.so.1.1 +lib/libXrender.so.1.2 lib/libXt.so lib/libXt.so.6 lib/libXt.so.6.0 lib/libXtst.so lib/libXtst.so.6 lib/libXtst.so.6.1 +lib/libXv.so +lib/libXv.so.1 +lib/libXv.so.1.0 lib/libdps.so lib/libdps.so.1 lib/libdps.so.1.0 lib/libdpstk.so lib/libdpstk.so.1 lib/libdpstk.so.1.0 +lib/libexpat.so +lib/libexpat.so.1 +lib/libexpat.so.1.0 +lib/libfontconfig.so +lib/libfontconfig.so.1 +lib/libfontconfig.so.1.0 lib/libfreetype.so -lib/libfreetype.so.8 -lib/libfreetype.so.8.0 +lib/libfreetype.so.9 +lib/libfreetype.so.9.0 lib/liboldX.so lib/liboldX.so.6 lib/liboldX.so.6.0 diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/NetBSD-ix86/etc-dir b/xc/programs/Xserver/hw/xfree86/etc/bindist/NetBSD-ix86/etc-dir index 412cec0c3..ee19d5d17 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/NetBSD-ix86/etc-dir +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/NetBSD-ix86/etc-dir @@ -1 +1 @@ -etc/X11 +etc diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/NetBSD-ix86/etc-list b/xc/programs/Xserver/hw/xfree86/etc/bindist/NetBSD-ix86/etc-list index 9c558e357..00550c517 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/NetBSD-ix86/etc-list +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/NetBSD-ix86/etc-list @@ -1 +1 @@ -. +fonts diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/NetBSD-ix86/host.def b/xc/programs/Xserver/hw/xfree86/etc/bindist/NetBSD-ix86/host.def index d82901432..e9311499f 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/NetBSD-ix86/host.def +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/NetBSD-ix86/host.def @@ -1,9 +1,16 @@ /* * Host.def for building NetBSD bindists * - * $XFree86: xc/programs/Xserver/hw/xfree86/etc/bindist/NetBSD-ix86/host.def,v 1.4 2001/05/31 18:47:09 dawes Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/etc/bindist/NetBSD-ix86/host.def,v 1.6 2003/01/12 14:15:31 herrb Exp $ */ #define InstallEmptyHostDef #define BuildBindist +/* + * These defines assume libpng is installed from the packages system + */ +#define HasLibpng YES +#define LibpngDir /usr/pkg + +#define SystemBuildLibPath /usr/lib:/usr/pkg/lib diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/OpenBSD-ix86/bin-list b/xc/programs/Xserver/hw/xfree86/etc/bindist/OpenBSD-ix86/bin-list index 44d441494..65fd6cbf6 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/OpenBSD-ix86/bin-list +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/OpenBSD-ix86/bin-list @@ -3,26 +3,32 @@ bin lib/libGL.so.1.2 lib/libGLU.so.1.3 lib/libICE.so.6.3 +lib/libOSMesa.so.4.0 lib/libSM.so.6.0 lib/libX11.so.6.2 lib/libXThrStub.so.6.1 lib/libXTrap.so.6.4 lib/libXaw.so.6.1 lib/libXaw.so.7.0 +lib/libXcursor.so.1.0 lib/libXext.so.6.4 lib/libXfont.so.1.4 lib/libXft.so.1.1 +lib/libXft.so.2.1 lib/libXi.so.6.0 lib/libXmu.so.6.2 lib/libXmuu.so.1.0 lib/libXp.so.6.2 lib/libXpm.so.4.11 -lib/libXrandr.so.1.0 -lib/libXrender.so.1.1 +lib/libXrandr.so.2.0 +lib/libXrender.so.1.2 lib/libXt.so.6.0 lib/libXtst.so.6.1 +lib/libXv.so.1.0 lib/libdps.so.1.0 lib/libdpstk.so.1.0 -lib/libfreetype.so.8.0 +lib/libexpat.so.1.0 +lib/libfontconfig.so.1.0 +lib/libfreetype.so.9.0 lib/liboldX.so.6.0 lib/libpsres.so.1.0 diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/OpenBSD-ix86/etc-dir b/xc/programs/Xserver/hw/xfree86/etc/bindist/OpenBSD-ix86/etc-dir index 412cec0c3..ee19d5d17 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/OpenBSD-ix86/etc-dir +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/OpenBSD-ix86/etc-dir @@ -1 +1 @@ -etc/X11 +etc diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/OpenBSD-ix86/etc-list b/xc/programs/Xserver/hw/xfree86/etc/bindist/OpenBSD-ix86/etc-list index 9c558e357..5198205d9 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/OpenBSD-ix86/etc-list +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/OpenBSD-ix86/etc-list @@ -1 +1,2 @@ -. +X11 +fonts diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/OpenBSD-ix86/host.def b/xc/programs/Xserver/hw/xfree86/etc/bindist/OpenBSD-ix86/host.def index 764b22118..46e1e50b5 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/OpenBSD-ix86/host.def +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/OpenBSD-ix86/host.def @@ -1,7 +1,7 @@ /* * Host.def for building OpenBSD/ix86 bindists * - * $XFree86: xc/programs/Xserver/hw/xfree86/etc/bindist/OpenBSD-ix86/host.def,v 1.4 2001/05/31 18:47:10 dawes Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/etc/bindist/OpenBSD-ix86/host.def,v 1.7 2002/12/30 16:35:10 herrb Exp $ */ #define InstallEmptyHostDef @@ -9,8 +9,13 @@ #define ForceNormalLib YES -#define HasTcl YES -#define HasTk YES -#define TkLibName tk41 -#define TclLibName tcl75 - +/* + * These defines assume libpng is installed from the ports tree + */ +#define HasLibpng YES +#define LibpngDir /usr/local +#define LibpngDirStandard NO +#define LibpngIncDir /usr/local/include/libpng +#define LibpngIncDirStandard NO +#define LibpngLibDir /usr/local/lib +#define LibpngLibDirStandard NO diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/SVR4.0/bin-list b/xc/programs/Xserver/hw/xfree86/etc/bindist/SVR4.0/bin-list index 29239e07c..bbffd2e95 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/SVR4.0/bin-list +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/SVR4.0/bin-list @@ -15,11 +15,14 @@ lib/libXTrap.so lib/libXaw.so.6.1 lib/libXaw.so.7.0 lib/libXaw.so +lib/libXcursor.so.1.0 +lib/libXcursor.so lib/libXext.so.6.4 lib/libXext.so lib/libXfont.so.1.4 lib/libXfont.so lib/libXft.so.1.1 +lib/libXft.so.2.1 lib/libXft.so lib/libXi.so.6.0 lib/libXi.so @@ -31,19 +34,25 @@ lib/libXp.so.6.2 lib/libXp.so lib/libXpm.so.4.11 lib/libXpm.so -lib/libXrandr.so.1.0 +lib/libXrandr.so.2.0 lib/libXrandr.so -lib/libXrender.so.1.1 +lib/libXrender.so.1.2 lib/libXrender.so lib/libXt.so.6.0 lib/libXt.so lib/libXtst.so.6.1 lib/libXtst.so +lib/libXv.so.1.0 +lib/libXv.so lib/libdps.so.1.0 lib/libdps.so lib/libdpstk.so.1.0 lib/libdpstk.so -lib/libfreetype.so.6.2 +lib/libexpat.so.1.0 +lib/libexpat.so +lib/libfontconfig.so.1.0 +lib/libfontconfig.so +lib/libfreetype.so.6.3 lib/libfreetype.so lib/libpsres.so.1.0 lib/libpsres.so diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/SVR4.0/etc-dir b/xc/programs/Xserver/hw/xfree86/etc/bindist/SVR4.0/etc-dir index 412cec0c3..ee19d5d17 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/SVR4.0/etc-dir +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/SVR4.0/etc-dir @@ -1 +1 @@ -etc/X11 +etc diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/SVR4.0/etc-list b/xc/programs/Xserver/hw/xfree86/etc/bindist/SVR4.0/etc-list index 9c558e357..5198205d9 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/SVR4.0/etc-list +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/SVR4.0/etc-list @@ -1 +1,2 @@ -. +X11 +fonts diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/SVR4.0/host.def b/xc/programs/Xserver/hw/xfree86/etc/bindist/SVR4.0/host.def index 57dcecf59..0c9176ec1 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/SVR4.0/host.def +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/SVR4.0/host.def @@ -1,7 +1,7 @@ /* * Host.def for building SVR4.0 bindists * - * $XFree86: xc/programs/Xserver/hw/xfree86/etc/bindist/SVR4.0/host.def,v 1.5 2001/05/31 18:47:10 dawes Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/etc/bindist/SVR4.0/host.def,v 1.6 2002/12/24 16:14:45 dawes Exp $ */ #define InstallEmptyHostDef @@ -9,3 +9,6 @@ #define ForceNormalLib YES +#define HasLibpng YES +#define LibpngDir /usr/local + diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/Solaris/bin-list b/xc/programs/Xserver/hw/xfree86/etc/bindist/Solaris/bin-list index 29239e07c..e21a5268c 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/Solaris/bin-list +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/Solaris/bin-list @@ -6,6 +6,8 @@ lib/libGLU.so.1.3 lib/libGLU.so lib/libICE.so.6.3 lib/libICE.so +lib/libOSMesa.so.4.0 +lib/libOSMesa.so lib/libSM.so.6.0 lib/libSM.so lib/libX11.so.6.2 @@ -15,11 +17,14 @@ lib/libXTrap.so lib/libXaw.so.6.1 lib/libXaw.so.7.0 lib/libXaw.so +lib/libXcursor.so.1.0 +lib/libXcursor.so lib/libXext.so.6.4 lib/libXext.so lib/libXfont.so.1.4 lib/libXfont.so lib/libXft.so.1.1 +lib/libXft.so.2.1 lib/libXft.so lib/libXi.so.6.0 lib/libXi.so @@ -31,19 +36,25 @@ lib/libXp.so.6.2 lib/libXp.so lib/libXpm.so.4.11 lib/libXpm.so -lib/libXrandr.so.1.0 +lib/libXrandr.so.2.0 lib/libXrandr.so -lib/libXrender.so.1.1 +lib/libXrender.so.1.2 lib/libXrender.so lib/libXt.so.6.0 lib/libXt.so lib/libXtst.so.6.1 lib/libXtst.so +lib/libXv.so.1.0 +lib/libXv.so lib/libdps.so.1.0 lib/libdps.so lib/libdpstk.so.1.0 lib/libdpstk.so -lib/libfreetype.so.6.2 +lib/libexpat.so.1.0 +lib/libexpat.so +lib/libfontconfig.so.1.0 +lib/libfontconfig.so +lib/libfreetype.so.6.3 lib/libfreetype.so lib/libpsres.so.1.0 lib/libpsres.so diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/Solaris/etc-dir b/xc/programs/Xserver/hw/xfree86/etc/bindist/Solaris/etc-dir index 412cec0c3..ee19d5d17 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/Solaris/etc-dir +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/Solaris/etc-dir @@ -1 +1 @@ -etc/X11 +etc diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/Solaris/etc-list b/xc/programs/Xserver/hw/xfree86/etc/bindist/Solaris/etc-list index 9c558e357..5198205d9 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/Solaris/etc-list +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/Solaris/etc-list @@ -1 +1,2 @@ -. +X11 +fonts diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/Solaris/host.def b/xc/programs/Xserver/hw/xfree86/etc/bindist/Solaris/host.def index 41184b1d9..12700249d 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/Solaris/host.def +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/Solaris/host.def @@ -1,7 +1,7 @@ /* * Host.def for building Solaris bindists * - * $XFree86: xc/programs/Xserver/hw/xfree86/etc/bindist/Solaris/host.def,v 1.5 2001/05/31 18:47:11 dawes Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/etc/bindist/Solaris/host.def,v 1.6 2002/12/24 16:14:45 dawes Exp $ */ #define InstallEmptyHostDef @@ -9,3 +9,6 @@ #define ForceNormalLib YES +#define HasLibpng YES +#define LibpngDir /usr/local + diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/UnixWare/bin-list b/xc/programs/Xserver/hw/xfree86/etc/bindist/UnixWare/bin-list index 29239e07c..e21a5268c 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/UnixWare/bin-list +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/UnixWare/bin-list @@ -6,6 +6,8 @@ lib/libGLU.so.1.3 lib/libGLU.so lib/libICE.so.6.3 lib/libICE.so +lib/libOSMesa.so.4.0 +lib/libOSMesa.so lib/libSM.so.6.0 lib/libSM.so lib/libX11.so.6.2 @@ -15,11 +17,14 @@ lib/libXTrap.so lib/libXaw.so.6.1 lib/libXaw.so.7.0 lib/libXaw.so +lib/libXcursor.so.1.0 +lib/libXcursor.so lib/libXext.so.6.4 lib/libXext.so lib/libXfont.so.1.4 lib/libXfont.so lib/libXft.so.1.1 +lib/libXft.so.2.1 lib/libXft.so lib/libXi.so.6.0 lib/libXi.so @@ -31,19 +36,25 @@ lib/libXp.so.6.2 lib/libXp.so lib/libXpm.so.4.11 lib/libXpm.so -lib/libXrandr.so.1.0 +lib/libXrandr.so.2.0 lib/libXrandr.so -lib/libXrender.so.1.1 +lib/libXrender.so.1.2 lib/libXrender.so lib/libXt.so.6.0 lib/libXt.so lib/libXtst.so.6.1 lib/libXtst.so +lib/libXv.so.1.0 +lib/libXv.so lib/libdps.so.1.0 lib/libdps.so lib/libdpstk.so.1.0 lib/libdpstk.so -lib/libfreetype.so.6.2 +lib/libexpat.so.1.0 +lib/libexpat.so +lib/libfontconfig.so.1.0 +lib/libfontconfig.so +lib/libfreetype.so.6.3 lib/libfreetype.so lib/libpsres.so.1.0 lib/libpsres.so diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/UnixWare/etc-dir b/xc/programs/Xserver/hw/xfree86/etc/bindist/UnixWare/etc-dir index 412cec0c3..ee19d5d17 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/UnixWare/etc-dir +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/UnixWare/etc-dir @@ -1 +1 @@ -etc/X11 +etc diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/UnixWare/etc-list b/xc/programs/Xserver/hw/xfree86/etc/bindist/UnixWare/etc-list index 9c558e357..5198205d9 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/UnixWare/etc-list +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/UnixWare/etc-list @@ -1 +1,2 @@ -. +X11 +fonts diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/UnixWare/host.def b/xc/programs/Xserver/hw/xfree86/etc/bindist/UnixWare/host.def index dcb4603f5..2707d10ea 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/UnixWare/host.def +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/UnixWare/host.def @@ -1,7 +1,7 @@ /* * Host.def for building UnixWare bindists * - * $XFree86: xc/programs/Xserver/hw/xfree86/etc/bindist/UnixWare/host.def,v 1.5 2001/05/31 18:47:11 dawes Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/etc/bindist/UnixWare/host.def,v 1.6 2002/12/24 16:14:45 dawes Exp $ */ #define InstallEmptyHostDef @@ -9,3 +9,6 @@ #define ForceNormalLib YES +#define HasLibpng YES +#define LibpngDir /usr/local + diff --git a/xc/programs/Xserver/hw/xfree86/etc/bindist/build-bindist b/xc/programs/Xserver/hw/xfree86/etc/bindist/build-bindist index 8c7c3dfef..ed2477318 100755 --- a/xc/programs/Xserver/hw/xfree86/etc/bindist/build-bindist +++ b/xc/programs/Xserver/hw/xfree86/etc/bindist/build-bindist @@ -1,6 +1,6 @@ #!/bin/sh # -# $XFree86: xc/programs/Xserver/hw/xfree86/etc/bindist/build-bindist,v 1.5 2001/05/31 18:39:06 dawes Exp $ +# $XFree86: xc/programs/Xserver/hw/xfree86/etc/bindist/build-bindist,v 1.6 2003/02/08 23:11:49 dawes Exp $ # Usage() @@ -103,6 +103,9 @@ if [ $createlist = YES ]; then exit 0; fi +# Make sure all directories in $FROMDIR have permissions 755 +find $FROMDIR -type d | xargs chmod 755 + for d in $SUBDIRS; do if [ ! -d $TODIR/$d ]; then echo No such dir $TODIR/$d diff --git a/xc/programs/Xserver/hw/xfree86/etc/extramodes b/xc/programs/Xserver/hw/xfree86/etc/extramodes index 1c9462bfe..f7dc01216 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/extramodes +++ b/xc/programs/Xserver/hw/xfree86/etc/extramodes @@ -1,7 +1,7 @@ // // Extra modes to include as default modes in the X server. // -// $XFree86: xc/programs/Xserver/hw/xfree86/etc/extramodes,v 1.5 2002/06/05 19:43:05 dawes Exp $ +// $XFree86: xc/programs/Xserver/hw/xfree86/etc/extramodes,v 1.6 2002/11/11 04:21:46 dawes Exp $ // # 832x624 @ 75Hz (74.55Hz) (fix if the official/Apple spec is different) hsync: 49.725kHz @@ -19,3 +19,15 @@ ModeLine "1400x1050" 155.8 1400 1464 1784 1912 1050 1052 1064 1090 +hsync +vsy # 1600x1024 @ 60Hz (SGI 1600SW) hsync: 64.0kHz Modeline "1600x1024" 106.910 1600 1620 1640 1670 1024 1027 1030 1067 -hsync -vsync +# 1920x1440 @ 85Hz (VESA GTF) hsync: 128.5kHz +Modeline "1920x1440" 341.35 1920 2072 2288 2656 1440 1441 1444 1512 -hsync +vsync + +# 2048x1536 @ 60Hz (VESA GTF) hsync: 95.3kHz +Modeline "2048x1536" 266.95 2048 2200 2424 2800 1536 1537 1540 1589 -hsync +vsync + +# 2048x1536 @ 75Hz (VESA GTF) hsync: 120.2kHz +Modeline "2048x1536" 340.48 2048 2216 2440 2832 1536 1537 1540 1603 -hsync +vsync + +# 2048x1536 @ 85Hz (VESA GTF) hsync: 137.0kHz +Modeline "2048x1536" 388.04 2048 2216 2440 2832 1536 1537 1540 1612 -hsync +vsync + diff --git a/xc/programs/Xserver/hw/xfree86/etc/extrapci.ids b/xc/programs/Xserver/hw/xfree86/etc/extrapci.ids index 4bec5cdfc..926e1a75f 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/extrapci.ids +++ b/xc/programs/Xserver/hw/xfree86/etc/extrapci.ids @@ -14,7 +14,7 @@ # changes/additions that aren't XFree86-specific to the pciids # project (http://pciids.sf.net/). # -# $XFree86: xc/programs/Xserver/hw/xfree86/etc/extrapci.ids,v 1.3 2002/09/16 18:06:06 eich Exp $ +# $XFree86: xc/programs/Xserver/hw/xfree86/etc/extrapci.ids,v 1.7 2003/02/06 04:18:09 dawes Exp $ # # Vendors, devices and subsystems. Please keep sorted. @@ -26,4 +26,20 @@ # subvendor subdevice subsystem_name <-- two tabs # # Use lower-case hex digits for all numeric values. - 0c30 F69030 + +# Example: Add a new chipset for vendor who's ID is xyzw +# +# xyzw " +# 20ce New Chipset Description + +1102 " + 0002 " + C 0401 + +# Intel(R) 852GM/855GM, 865G +8086 " + 3580 852GM/852GME/855GM/855GME Chipset Host-Hub Bridge + 3582 852GM/852GME/855GM/855GME Chipset Graphics Controller + 2570 865G Chipset Host-Hub Bridge + 2572 865G Chipset Graphics Controller + diff --git a/xc/programs/Xserver/hw/xfree86/etc/gtf.c b/xc/programs/Xserver/hw/xfree86/etc/gtf.c new file mode 100644 index 000000000..b0d9de058 --- /dev/null +++ b/xc/programs/Xserver/hw/xfree86/etc/gtf.c @@ -0,0 +1,743 @@ +/* gtf.c Generate mode timings using the GTF Timing Standard + * + * gcc gtf.c -o gtf -lm -Wall + * + * Copyright (c) 2001, Andy Ritger aritger@nvidia.com + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * o Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * o 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. + * o Neither the name of NVIDIA nor the names of its contributors + * may be used to endorse or promote products derived from this + * software without specific prior written permission. + * + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS 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 + * THE REGENTS OR 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. + * + * + * + * This program is based on the Generalized Timing Formula(GTF TM) + * Standard Version: 1.0, Revision: 1.0 + * + * The GTF Document contains the following Copyright information: + * + * Copyright (c) 1994, 1995, 1996 - Video Electronics Standards + * Association. Duplication of this document within VESA member + * companies for review purposes is permitted. All other rights + * reserved. + * + * While every precaution has been taken in the preparation + * of this standard, the Video Electronics Standards Association and + * its contributors assume no responsibility for errors or omissions, + * and make no warranties, expressed or implied, of functionality + * of suitability for any purpose. The sample code contained within + * this standard may be used without restriction. + * + * + * + * The GTF EXCEL(TM) SPREADSHEET, a sample (and the definitive) + * implementation of the GTF Timing Standard, is available at: + * + * ftp://ftp.vesa.org/pub/GTF/GTF_V1R1.xls + * + * + * + * This program takes a desired resolution and vertical refresh rate, + * and computes mode timings according to the GTF Timing Standard. + * These mode timings can then be formatted as an XFree86 modeline + * or a mode description for use by fbset(8). + * + * + * + * NOTES: + * + * The GTF allows for computation of "margins" (the visible border + * surrounding the addressable video); on most non-overscan type + * systems, the margin period is zero. I've implemented the margin + * computations but not enabled it because 1) I don't really have + * any experience with this, and 2) neither XFree86 modelines nor + * fbset fb.modes provide an obvious way for margin timings to be + * included in their mode descriptions (needs more investigation). + * + * The GTF provides for computation of interlaced mode timings; + * I've implemented the computations but not enabled them, yet. + * I should probably enable and test this at some point. + * + * + * + * TODO: + * + * o Add support for interlaced modes. + * + * o Implement the other portions of the GTF: compute mode timings + * given either the desired pixel clock or the desired horizontal + * frequency. + * + * o It would be nice if this were more general purpose to do things + * outside the scope of the GTF: like generate double scan mode + * timings, for example. + * + * o Printing digits to the right of the decimal point when the + * digits are 0 annoys me. + * + * o Error checking. + * + */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/etc/gtf.c,v 1.3 2002/12/21 02:35:20 dawes Exp $ */ + + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <math.h> + + +#if defined(__Lynx__) +#define rint(x) floor(x) +#endif + +#define MARGIN_PERCENT 1.8 /* % of active vertical image */ +#define CELL_GRAN 8.0 /* assumed character cell granularity */ +#define MIN_PORCH 1 /* minimum front porch */ +#define V_SYNC_RQD 3 /* width of vsync in lines */ +#define H_SYNC_PERCENT 8.0 /* width of hsync as % of total line */ +#define MIN_VSYNC_PLUS_BP 550.0 /* min time of vsync + back porch (microsec) */ +#define M 600.0 /* blanking formula gradient */ +#define C 40.0 /* blanking formula offset */ +#define K 128.0 /* blanking formula scaling factor */ +#define J 20.0 /* blanking formula scaling factor */ + +/* C' and M' are part of the Blanking Duty Cycle computation */ + +#define C_PRIME (((C - J) * K/256.0) + J) +#define M_PRIME (K/256.0 * M) + + +/* struct definitions */ + +typedef struct __mode +{ + int hr, hss, hse, hfl; + int vr, vss, vse, vfl; + float pclk, h_freq, v_freq; +} mode; + + +typedef struct __options +{ + int x, y; + int xf86mode, fbmode; + float v_freq; +} options; + + + + +/* prototypes */ + +void print_value(int n, char *name, float val); +void print_xf86_mode (mode *m); +void print_fb_mode (mode *m); +mode *vert_refresh (int h_pixels, int v_lines, float freq, + int interlaced, int margins); +options *parse_command_line (int argc, char *argv[]); + + + + +/* + * print_value() - print the result of the named computation; this is + * useful when comparing against the GTF EXCEL spreadsheet. + */ + +int global_verbose = 0; + +void print_value(int n, char *name, float val) +{ + if (global_verbose) { + printf("%2d: %-27s: %15f\n", n, name, val); + } +} + + + +/* print_xf86_mode() - print the XFree86 modeline, given mode timings. */ + +void print_xf86_mode (mode *m) +{ + printf ("\n"); + printf (" # %dx%d @ %.2f Hz (GTF) hsync: %.2f kHz; pclk: %.2f MHz\n", + m->hr, m->vr, m->v_freq, m->h_freq, m->pclk); + + printf (" Modeline \"%dx%d_%.2f\" %.2f" + " %d %d %d %d" + " %d %d %d %d" + " -HSync +Vsync\n\n", + m->hr, m->vr, m->v_freq, m->pclk, + m->hr, m->hss, m->hse, m->hfl, + m->vr, m->vss, m->vse, m->vfl); + +} + + + +/* + * print_fb_mode() - print a mode description in fbset(8) format; + * see the fb.modes(8) manpage. The timing description used in + * this is rather odd; they use "left and right margin" to refer + * to the portion of the hblank before and after the sync pulse + * by conceptually wrapping the portion of the blank after the pulse + * to infront of the visible region; ie: + * + * + * Timing description I'm accustomed to: + * + * + * + * <--------1--------> <--2--> <--3--> <--4--> + * _________ + * |-------------------|_______| |_______ + * + * R SS SE FL + * + * 1: visible image + * 2: blank before sync (aka front porch) + * 3: sync pulse + * 4: blank after sync (aka back porch) + * R: Resolution + * SS: Sync Start + * SE: Sync End + * FL: Frame Length + * + * + * But the fb.modes format is: + * + * + * <--4--> <--------1--------> <--2--> <--3--> + * _________ + * _______|-------------------|_______| | + * + * The fb.modes(8) manpage refers to <4> and <2> as the left and + * right "margin" (as well as upper and lower margin in the vertical + * direction) -- note that this has nothing to do with the term + * "margin" used in the GTF Timing Standard. + * + * XXX always prints the 32 bit mode -- should I provide a command + * line option to specify the bpp? It's simple enough for a user + * to edit the mode description after it's generated. + */ + +void print_fb_mode (mode *m) +{ + printf ("\n"); + printf ("mode \"%dx%d %.2fHz 32bit (GTF)\"\n", + m->hr, m->vr, m->v_freq); + printf (" # PCLK: %.2f MHz, H: %.2f kHz, V: %.2f Hz\n", + m->pclk, m->h_freq, m->v_freq); + printf (" geometry %d %d %d %d 32\n", + m->hr, m->vr, m->hr, m->vr); + printf (" timings %d %d %d %d %d %d %d\n", + (int) rint(1000000.0/m->pclk),/* pixclock in picoseconds */ + m->hfl - m->hse, /* left margin (in pixels) */ + m->hss - m->hr, /* right margin (in pixels) */ + m->vfl - m->vse, /* upper margin (in pixel lines) */ + m->vss - m->vr, /* lower margin (in pixel lines) */ + m->hse - m->hss, /* horizontal sync length (pixels) */ + m->vse - m->vss); /* vert sync length (pixel lines) */ + printf (" hsync low\n"); + printf (" vsync high\n"); + printf ("endmode\n\n"); + +} + + + + +/* + * vert_refresh() - as defined by the GTF Timing Standard, compute the + * Stage 1 Parameters using the vertical refresh frequency. In other + * words: input a desired resolution and desired refresh rate, and + * output the GTF mode timings. + * + * XXX All the code is in place to compute interlaced modes, but I don't + * feel like testing it right now. + * + * XXX margin computations are implemented but not tested (nor used by + * XFree86 of fbset mode descriptions, from what I can tell). + */ + +mode *vert_refresh (int h_pixels, int v_lines, float freq, + int interlaced, int margins) +{ + float h_pixels_rnd; + float v_lines_rnd; + float v_field_rate_rqd; + float top_margin; + float bottom_margin; + float interlace; + float h_period_est; + float vsync_plus_bp; + float v_back_porch; + float total_v_lines; + float v_field_rate_est; + float h_period; + float v_field_rate; + float v_frame_rate; + float left_margin; + float right_margin; + float total_active_pixels; + float ideal_duty_cycle; + float h_blank; + float total_pixels; + float pixel_freq; + float h_freq; + + float h_sync; + float h_front_porch; + float v_odd_front_porch_lines; + + mode *m = (mode*) malloc (sizeof (mode)); + + + /* 1. In order to give correct results, the number of horizontal + * pixels requested is first processed to ensure that it is divisible + * by the character size, by rounding it to the nearest character + * cell boundary: + * + * [H PIXELS RND] = ((ROUND([H PIXELS]/[CELL GRAN RND],0))*[CELLGRAN RND]) + */ + + h_pixels_rnd = rint((float) h_pixels / CELL_GRAN) * CELL_GRAN; + + print_value(1, "[H PIXELS RND]", h_pixels_rnd); + + + /* 2. If interlace is requested, the number of vertical lines assumed + * by the calculation must be halved, as the computation calculates + * the number of vertical lines per field. In either case, the + * number of lines is rounded to the nearest integer. + * + * [V LINES RND] = IF([INT RQD?]="y", ROUND([V LINES]/2,0), + * ROUND([V LINES],0)) + */ + + v_lines_rnd = interlaced ? + rint((float) v_lines) / 2.0 : + rint((float) v_lines); + + print_value(2, "[V LINES RND]", v_lines_rnd); + + + /* 3. Find the frame rate required: + * + * [V FIELD RATE RQD] = IF([INT RQD?]="y", [I/P FREQ RQD]*2, + * [I/P FREQ RQD]) + */ + + v_field_rate_rqd = interlaced ? (freq * 2.0) : (freq); + + print_value(3, "[V FIELD RATE RQD]", v_field_rate_rqd); + + + /* 4. Find number of lines in Top margin: + * + * [TOP MARGIN (LINES)] = IF([MARGINS RQD?]="Y", + * ROUND(([MARGIN%]/100*[V LINES RND]),0), + * 0) + */ + + top_margin = margins ? rint(MARGIN_PERCENT / 100.0 * v_lines_rnd) : (0.0); + + print_value(4, "[TOP MARGIN (LINES)]", top_margin); + + + /* 5. Find number of lines in Bottom margin: + * + * [BOT MARGIN (LINES)] = IF([MARGINS RQD?]="Y", + * ROUND(([MARGIN%]/100*[V LINES RND]),0), + * 0) + */ + + bottom_margin = margins ? rint(MARGIN_PERCENT/100.0 * v_lines_rnd) : (0.0); + + print_value(5, "[BOT MARGIN (LINES)]", bottom_margin); + + + /* 6. If interlace is required, then set variable [INTERLACE]=0.5: + * + * [INTERLACE]=(IF([INT RQD?]="y",0.5,0)) + */ + + interlace = interlaced ? 0.5 : 0.0; + + print_value(6, "[INTERLACE]", interlace); + + + /* 7. Estimate the Horizontal period + * + * [H PERIOD EST] = ((1/[V FIELD RATE RQD]) - [MIN VSYNC+BP]/1000000) / + * ([V LINES RND] + (2*[TOP MARGIN (LINES)]) + + * [MIN PORCH RND]+[INTERLACE]) * 1000000 + */ + + h_period_est = (((1.0/v_field_rate_rqd) - (MIN_VSYNC_PLUS_BP/1000000.0)) + / (v_lines_rnd + (2*top_margin) + MIN_PORCH + interlace) + * 1000000.0); + + print_value(7, "[H PERIOD EST]", h_period_est); + + + /* 8. Find the number of lines in V sync + back porch: + * + * [V SYNC+BP] = ROUND(([MIN VSYNC+BP]/[H PERIOD EST]),0) + */ + + vsync_plus_bp = rint(MIN_VSYNC_PLUS_BP/h_period_est); + + print_value(8, "[V SYNC+BP]", vsync_plus_bp); + + + /* 9. Find the number of lines in V back porch alone: + * + * [V BACK PORCH] = [V SYNC+BP] - [V SYNC RND] + * + * XXX is "[V SYNC RND]" a typo? should be [V SYNC RQD]? + */ + + v_back_porch = vsync_plus_bp - V_SYNC_RQD; + + print_value(9, "[V BACK PORCH]", v_back_porch); + + + /* 10. Find the total number of lines in Vertical field period: + * + * [TOTAL V LINES] = [V LINES RND] + [TOP MARGIN (LINES)] + + * [BOT MARGIN (LINES)] + [V SYNC+BP] + [INTERLACE] + + * [MIN PORCH RND] + */ + + total_v_lines = v_lines_rnd + top_margin + bottom_margin + vsync_plus_bp + + interlace + MIN_PORCH; + + print_value(10, "[TOTAL V LINES]", total_v_lines); + + + /* 11. Estimate the Vertical field frequency: + * + * [V FIELD RATE EST] = 1 / [H PERIOD EST] / [TOTAL V LINES] * 1000000 + */ + + v_field_rate_est = 1.0 / h_period_est / total_v_lines * 1000000.0; + + print_value(11, "[V FIELD RATE EST]", v_field_rate_est); + + + /* 12. Find the actual horizontal period: + * + * [H PERIOD] = [H PERIOD EST] / ([V FIELD RATE RQD] / [V FIELD RATE EST]) + */ + + h_period = h_period_est / (v_field_rate_rqd / v_field_rate_est); + + print_value(12, "[H PERIOD]", h_period); + + + /* 13. Find the actual Vertical field frequency: + * + * [V FIELD RATE] = 1 / [H PERIOD] / [TOTAL V LINES] * 1000000 + */ + + v_field_rate = 1.0 / h_period / total_v_lines * 1000000.0; + + print_value(13, "[V FIELD RATE]", v_field_rate); + + + /* 14. Find the Vertical frame frequency: + * + * [V FRAME RATE] = (IF([INT RQD?]="y", [V FIELD RATE]/2, [V FIELD RATE])) + */ + + v_frame_rate = interlaced ? v_field_rate / 2.0 : v_field_rate; + + print_value(14, "[V FRAME RATE]", v_frame_rate); + + + /* 15. Find number of pixels in left margin: + * + * [LEFT MARGIN (PIXELS)] = (IF( [MARGINS RQD?]="Y", + * (ROUND( ([H PIXELS RND] * [MARGIN%] / 100 / + * [CELL GRAN RND]),0)) * [CELL GRAN RND], + * 0)) + */ + + left_margin = margins ? + rint(h_pixels_rnd * MARGIN_PERCENT / 100.0 / CELL_GRAN) * CELL_GRAN : + 0.0; + + print_value(15, "[LEFT MARGIN (PIXELS)]", left_margin); + + + /* 16. Find number of pixels in right margin: + * + * [RIGHT MARGIN (PIXELS)] = (IF( [MARGINS RQD?]="Y", + * (ROUND( ([H PIXELS RND] * [MARGIN%] / 100 / + * [CELL GRAN RND]),0)) * [CELL GRAN RND], + * 0)) + */ + + right_margin = margins ? + rint(h_pixels_rnd * MARGIN_PERCENT / 100.0 / CELL_GRAN) * CELL_GRAN : + 0.0; + + print_value(16, "[RIGHT MARGIN (PIXELS)]", right_margin); + + + /* 17. Find total number of active pixels in image and left and right + * margins: + * + * [TOTAL ACTIVE PIXELS] = [H PIXELS RND] + [LEFT MARGIN (PIXELS)] + + * [RIGHT MARGIN (PIXELS)] + */ + + total_active_pixels = h_pixels_rnd + left_margin + right_margin; + + print_value(17, "[TOTAL ACTIVE PIXELS]", total_active_pixels); + + + /* 18. Find the ideal blanking duty cycle from the blanking duty cycle + * equation: + * + * [IDEAL DUTY CYCLE] = [C'] - ([M']*[H PERIOD]/1000) + */ + + ideal_duty_cycle = C_PRIME - (M_PRIME * h_period / 1000.0); + + print_value(18, "[IDEAL DUTY CYCLE]", ideal_duty_cycle); + + + /* 19. Find the number of pixels in the blanking time to the nearest + * double character cell: + * + * [H BLANK (PIXELS)] = (ROUND(([TOTAL ACTIVE PIXELS] * + * [IDEAL DUTY CYCLE] / + * (100-[IDEAL DUTY CYCLE]) / + * (2*[CELL GRAN RND])), 0)) + * * (2*[CELL GRAN RND]) + */ + + h_blank = rint(total_active_pixels * + ideal_duty_cycle / + (100.0 - ideal_duty_cycle) / + (2.0 * CELL_GRAN)) * (2.0 * CELL_GRAN); + + print_value(19, "[H BLANK (PIXELS)]", h_blank); + + + /* 20. Find total number of pixels: + * + * [TOTAL PIXELS] = [TOTAL ACTIVE PIXELS] + [H BLANK (PIXELS)] + */ + + total_pixels = total_active_pixels + h_blank; + + print_value(20, "[TOTAL PIXELS]", total_pixels); + + + /* 21. Find pixel clock frequency: + * + * [PIXEL FREQ] = [TOTAL PIXELS] / [H PERIOD] + */ + + pixel_freq = total_pixels / h_period; + + print_value(21, "[PIXEL FREQ]", pixel_freq); + + + /* 22. Find horizontal frequency: + * + * [H FREQ] = 1000 / [H PERIOD] + */ + + h_freq = 1000.0 / h_period; + + print_value(22, "[H FREQ]", h_freq); + + + + /* Stage 1 computations are now complete; I should really pass + the results to another function and do the Stage 2 + computations, but I only need a few more values so I'll just + append the computations here for now */ + + + + /* 17. Find the number of pixels in the horizontal sync period: + * + * [H SYNC (PIXELS)] =(ROUND(([H SYNC%] / 100 * [TOTAL PIXELS] / + * [CELL GRAN RND]),0))*[CELL GRAN RND] + */ + + h_sync = rint(H_SYNC_PERCENT/100.0 * total_pixels / CELL_GRAN) * CELL_GRAN; + + print_value(17, "[H SYNC (PIXELS)]", h_sync); + + + /* 18. Find the number of pixels in the horizontal front porch period: + * + * [H FRONT PORCH (PIXELS)] = ([H BLANK (PIXELS)]/2)-[H SYNC (PIXELS)] + */ + + h_front_porch = (h_blank / 2.0) - h_sync; + + print_value(18, "[H FRONT PORCH (PIXELS)]", h_front_porch); + + + /* 36. Find the number of lines in the odd front porch period: + * + * [V ODD FRONT PORCH(LINES)]=([MIN PORCH RND]+[INTERLACE]) + */ + + v_odd_front_porch_lines = MIN_PORCH + interlace; + + print_value(36, "[V ODD FRONT PORCH(LINES)]", v_odd_front_porch_lines); + + + /* finally, pack the results in the mode struct */ + + m->hr = (int) (h_pixels_rnd); + m->hss = (int) (h_pixels_rnd + h_front_porch); + m->hse = (int) (h_pixels_rnd + h_front_porch + h_sync); + m->hfl = (int) (total_pixels); + + m->vr = (int) (v_lines_rnd); + m->vss = (int) (v_lines_rnd + v_odd_front_porch_lines); + m->vse = (int) (int) (v_lines_rnd + v_odd_front_porch_lines + V_SYNC_RQD); + m->vfl = (int) (total_v_lines); + + m->pclk = pixel_freq; + m->h_freq = h_freq; + m->v_freq = freq; + + return (m); + +} + + + + +/* + * parse_command_line() - parse the command line and return an + * alloced structure containing the results. On error print usage + * and return NULL. + */ + +options *parse_command_line (int argc, char *argv[]) +{ + int n; + + options *o = (options *) calloc (1, sizeof (options)); + + if (argc < 4) goto bad_option; + + o->x = atoi (argv[1]); + o->y = atoi (argv[2]); + o->v_freq = atof (argv[3]); + + /* XXX should check for errors in the above */ + + n = 4; + + while (n < argc) { + if ((strcmp (argv[n], "-v") == 0) || + (strcmp (argv[n], "--verbose") == 0)) { + global_verbose = 1; + } else if ((strcmp (argv[n], "-f") == 0) || + (strcmp (argv[n], "--fbmode") == 0)) { + o->fbmode = 1; + } else if ((strcmp (argv[n], "-x") == 0) || + (strcmp (argv[n], "--xf86mode") == 0)) { + o->xf86mode = 1; + } else { + goto bad_option; + } + + n++; + } + + /* if neither xf86mode nor fbmode were requested, default to + xf86mode */ + + if (!o->fbmode && !o->xf86mode) o->xf86mode = 1; + + return (o); + + bad_option: + + fprintf (stderr, "\n"); + fprintf (stderr, "usage: %s x y refresh [-v|--verbose] " + "[-f|--fbmode] [-x|-xf86mode]\n", argv[0]); + + fprintf (stderr, "\n"); + + fprintf (stderr, " x : the desired horizontal " + "resolution (required)\n"); + fprintf (stderr, " y : the desired vertical " + "resolution (required)\n"); + fprintf (stderr, " refresh : the desired refresh " + "rate (required)\n"); + fprintf (stderr, " -v|--verbose : enable verbose printouts " + "(traces each step of the computation)\n"); + fprintf (stderr, " -f|--fbmode : output an fbset(8)-style mode " + "description\n"); + fprintf (stderr, " -x|-xf86mode : output an XFree86-style mode " + "description (this is the default\n" + " if no mode description is requested)\n"); + + fprintf (stderr, "\n"); + + free (o); + return (NULL); + +} + + + +int main (int argc, char *argv[]) +{ + mode *m; + options *o; + + o = parse_command_line (argc, argv); + if (!o) exit (1); + + m = vert_refresh (o->x, o->y, o->v_freq, 0, 0); + if (!m) exit (1); + + if (o->xf86mode) + print_xf86_mode(m); + + if (o->fbmode) + print_fb_mode(m); + + return 0; + +} diff --git a/xc/programs/Xserver/hw/xfree86/etc/gtf.man b/xc/programs/Xserver/hw/xfree86/etc/gtf.man new file mode 100644 index 000000000..f2d2ae9ec --- /dev/null +++ b/xc/programs/Xserver/hw/xfree86/etc/gtf.man @@ -0,0 +1,45 @@ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/etc/gtf.man,v 1.1 2002/11/12 01:31:23 dawes Exp $ +.TH GTF 1 __vendorversion__ +.SH NAME +gtf - calculate VESA GTF mode lines +.SH SYNOPSIS +.B gtf +.I h-resolution +.I v-resolution +.I refresh +.RB [ \-v | \-\-verbose ] +.RB [ \-f | \-\-fbmode ] +.RB [ \-x | \-\-xf86mode ] +.SH DESCRIPTION +.I Gtf +is a utility for calculating VESA GTF modes. Given the desired +horizontal and vertical resolutions and refresh rate (in Hz), the parameters +for a matching VESA GTF mode are printed out. Two output formats are +supported: mode lines suitable for the XFree86 +.B XF86Config(__filemansuffix__) +file, and mode parameters suitable for the Linux +.B fbset(8) +utility. + +.SH OPTIONS +.TP 8 +.BR \-v | \-\-verbose +Enable verbose printouts This shows a trace for each step of the +computation. +.TP 8 +.BR \-x | \-\-xf86mode +Print the mode parameters as XFree86-style mode lines. This is the +default format. +.TP 8 +.BR \-f | \-\-fbset +Print the mode parameters in a format suitable for +.BR fbset(8) . +.SH "SEE ALSO" +XF86Config(__filemansuffix__) +.SH AUTHOR +Andy Ritger. +.PP +This program is based on the Generalized Timing Formula (GTF(TM)) Standard +Version: 1.0, Revsion: 1.0. The GTF Excel(TM) spreadsheet, a sample +(and the definitive) implementation of the GTF Timing Standard is +available at <ftp://ftp.vesa.org/pub/GTF/VTF_V1R1.xls>. diff --git a/xc/programs/Xserver/hw/xfree86/etc/ioport.c b/xc/programs/Xserver/hw/xfree86/etc/ioport.c new file mode 100644 index 000000000..4bb20ef1b --- /dev/null +++ b/xc/programs/Xserver/hw/xfree86/etc/ioport.c @@ -0,0 +1,493 @@ +/* $XFree86: xc/programs/Xserver/hw/xfree86/etc/ioport.c,v 1.4 2003/01/01 19:16:41 tsi Exp $ */ +/* + * Copyright 2002 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that copyright + * notice and this permission notice appear in supporting documentation, and + * that the name of Marc Aurele La France not be used in advertising or + * publicity pertaining to distribution of the software without specific, + * written prior permission. Marc Aurele La France makes no representations + * about the suitability of this software for any purpose. It is provided + * "as-is" without express or implied warranty. + * + * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO + * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE + * OF THIS SOFTWARE. + */ + +#include "compiler.h" +#include "xf86_OSproc.h" + +#include <errno.h> + +static char *MyName; +static int Port = -1, Index = -1; +static unsigned int Value; + +static void +inb_usage +( +#ifdef __STDC__ + void +#endif +) +{ + fprintf(stderr, "inb [-i <index>] <port>\n"); +} + +static void +inw_usage +( +#ifdef __STDC__ + void +#endif +) +{ + fprintf(stderr, "inw [-i <index>] <port>\n"); +} + +static void +inl_usage +( +#ifdef __STDC__ + void +#endif +) +{ + fprintf(stderr, "inl [-i <index>] <port>\n"); +} + + +static void +outb_usage +( +#ifdef __STDC__ + void +#endif +) +{ + fprintf(stderr, "outb [-i <index>] <port> <value>\n"); +} + +static void +outw_usage +( +#ifdef __STDC__ + void +#endif +) +{ + fprintf(stderr, "outw [-i <index>] <port> <value>\n"); +} + +static void +outl_usage +( +#ifdef __STDC__ + void +#endif +) +{ + fprintf(stderr, "outl [-i <index>] <port> <value>\n"); +} + +static int +#ifdef __STDC__ +parse_number +( + const char *String, + void (* Usage)(void), + unsigned int Maximum) +#else +parse_number(String, Usage, Maximum) + const char *String; + void (* Usage)(); + unsigned int Maximum; +#endif +{ + char *BadString = (char *)0; + unsigned int Number = strtoul(String, &BadString, 0); + if ((Number > Maximum) || errno || + (BadString && *BadString)) + { + (*Usage)(); + exit(1); + } + + return (Number); +} + +static void +#ifdef __STDC__ +input_parse +( + int argc, + char **argv, + void (* Usage)(void)) +#else +input_parse(argc, argv, Usage) + int argc; + char **argv; + void (* Usage)(); +#endif +{ + if ((argc < 2) || (argc > 4)) + { + (*Usage)(); + exit(1); + } + + for(; (++argv, --argc); ) + { + if ((Index < 0) && + (argv[0][0] == '-') && + (argv[0][1] == 'i')) + { + if ((++argv[0], *(++argv[0])) || (++argv, --argc)) + Index = parse_number(argv[0], Usage, 0xFFU); + else + { + (*Usage)(); + exit(1); + } + } + else if (Port < 0) + { + Port = parse_number(argv[0], Usage, 0xFFFFU); + } + else + { + (*Usage)(); + exit(1); + } + } +} + +static void +#ifdef __STDC__ +output_parse +( + int argc, + char **argv, + void (* Usage)(void), + unsigned int Maximum +) +#else +output_parse(argc, argv, Usage, Maximum) + int argc; + char **argv; + void (* Usage)(); + unsigned int Maximum; +#endif +{ + char ValueSpecified = 0; + + if ((argc < 3) || (argc > 5)) + { + (*Usage)(); + exit(1); + } + + for (; (++argv, --argc); ) + { + if ((Index < 0) && + (argv[0][0] == '-') && + (argv[0][1] == 'i')) + { + if ((++argv[0], *(++argv[0])) || (++argv, --argc)) + Index = parse_number(argv[0], Usage, 0xFFU); + else + { + (*Usage)(); + exit(1); + } + } + else if (Port < 0) + { + Port = parse_number(argv[0], Usage, 0xFFFFU); + } + else if (!ValueSpecified) + { + Value = parse_number(argv[0], Usage, Maximum); + ValueSpecified = 1; + } + else + { + (*Usage)(); + exit(1); + } + } + + if (!ValueSpecified) + { + (*Usage)(); + exit(1); + } +} + +static void +#ifdef __STDC__ +do_inb +( + int argc, + char **argv +) +#else +do_inb(argc, argv) + int argc; + char **argv; +#endif +{ + input_parse(argc, argv, inb_usage); + + xf86EnableIO(); + + if (Index >= 0) + { + if (Port == 0x03C0U) + { /* Attribute Controller is different */ + unsigned short gens1; + + gens1 = ((inb(0x03CCU) & 0x01U) << 5) + 0x03BA; + (void) inb(gens1); + Index = (Index & 0x1FU) | 0x20U; + } + outb(Port, Index); + Port++; + } + Value = inb(Port); + + xf86DisableIO(); + + printf("0x%02X\n", Value); +} + +static void +#ifdef __STDC__ +do_inw +( + int argc, + char **argv +) +#else +do_inw(argc, argv) + int argc; + char **argv; +#endif +{ + input_parse(argc, argv, inw_usage); + + xf86EnableIO(); + + if (Index >= 0) + { + outb(Port, Index); + Port++; + } + Value = inw(Port); + + xf86DisableIO(); + + printf("0x%04X\n", Value); +} + +static void +#ifdef __STDC__ +do_inl +( + int argc, + char **argv +) +#else +do_inl(argc, argv) + int argc; + char **argv; +#endif +{ + input_parse(argc, argv, inl_usage); + + xf86EnableIO(); + + if (Index >= 0) + { + outb(Port, Index); + Port++; + } + Value = inl(Port); + + xf86DisableIO(); + + printf("0x%08X\n", Value); +} + +static void +#ifdef __STDC__ +do_outb +( + int argc, + char **argv +) +#else +do_outb(argc, argv) + int argc; + char **argv; +#endif +{ + output_parse(argc, argv, outb_usage, 0xFFU); + + xf86EnableIO(); + + if (Index >= 0) + { + if (Port == 0x03C0U) + { /* Attribute controller is different */ + unsigned short gens1; + + gens1 = ((inb(0x03CCU) & 0x01U) << 5) + 0x03BA; + (void) inb(gens1); + outb(0x03C0U, (Index & 0x1FU) | 0x20U); + } + else + { + outb(Port, Index); + Port++; + } + } + outb(Port, Value); + + xf86DisableIO(); + +} + +static void +#ifdef __STDC__ +do_outw +( + int argc, + char **argv +) +#else +do_outw(argc, argv) + int argc; + char **argv; +#endif +{ + output_parse(argc, argv, outw_usage, 0xFFFFU); + + xf86EnableIO(); + + if (Index >= 0) + { + outb(Port, Index); + Port++; + } + outw(Port, Value); + + xf86DisableIO(); + +} + +static void +#ifdef __STDC__ +do_outl +( + int argc, + char **argv +) +#else +do_outl(argc, argv) + int argc; + char **argv; +#endif +{ + output_parse(argc, argv, outl_usage, 0xFFFFFFFFU); + + xf86EnableIO(); + + if (Index >= 0) + { + outb(Port, Index); + Port++; + } + outl(Port, Value); + + xf86DisableIO(); + +} + +static void +usage +( +#ifdef __STDC__ + void +#endif +) +{ + inb_usage(); + inw_usage(); + inl_usage(); + outb_usage(); + outw_usage(); + outl_usage(); + exit(1); +} + +int +#ifdef __STDC__ +main +( + int argc, + char **argv +) +#else +main(argc, argv) + int argc; + char **argv; +#endif +{ + struct + { + char *Name; +#ifdef __STDC__ + void (* Function)(int, char **); +#else + void (* Function)(); +#endif + } + *Function_Entry, Function_Table[] = + { + {"inb", do_inb}, + {"inw", do_inw}, + {"inl", do_inl}, + {"outb", do_outb}, + {"outw", do_outw}, + {"outl", do_outl}, +#ifdef __STDC__ + {(char *)0, (void (*)(int, char **))usage} +#else + {(char *)0, usage} +#endif + }; + + /* Get name by which we were invoked */ + for (MyName = argv[0]; argv[0][0]; ) + if (*(argv[0]++) == '/') + MyName = argv[0]; + + /* Look up name in table and call corresponding function */ + for (Function_Entry = Function_Table; + Function_Entry->Name && + strcmp(MyName, Function_Entry->Name); + Function_Entry++); + (*Function_Entry->Function)(argc, argv); + + return (0); +} + +#include "xf86getpagesize.c" diff --git a/xc/programs/Xserver/hw/xfree86/etc/mmapr.c b/xc/programs/Xserver/hw/xfree86/etc/mmapr.c index ba2f23edc..1f37e775e 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/mmapr.c +++ b/xc/programs/Xserver/hw/xfree86/etc/mmapr.c @@ -1,6 +1,6 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/etc/mmapr.c,v 1.4 2002/10/04 20:13:50 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/etc/mmapr.c,v 1.6 2003/01/01 19:16:41 tsi Exp $ */ /* - * Copyright 2002 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 2002 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -38,6 +38,10 @@ # define MAP_FAILED ((void *)(-1)) #endif +#if defined(_SCO_DS) && !defined(_SCO_DS_LL) +#define strtoull (unsigned long long)strtoul +#endif + #if !defined(strtoull) && \ (defined(CSRG_BASED) || \ (defined(__GNU_LIBRARY__) && \ diff --git a/xc/programs/Xserver/hw/xfree86/etc/mmapw.c b/xc/programs/Xserver/hw/xfree86/etc/mmapw.c index 1f5283d6a..b9f9c1f02 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/mmapw.c +++ b/xc/programs/Xserver/hw/xfree86/etc/mmapw.c @@ -1,6 +1,6 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/etc/mmapw.c,v 1.1 2002/10/11 20:23:07 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/etc/mmapw.c,v 1.3 2003/01/01 19:16:42 tsi Exp $ */ /* - * Copyright 2002 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 2002 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -38,6 +38,10 @@ # define MAP_FAILED ((void *)(-1)) #endif +#if defined(_SCO_DS) && !defined(_SCO_DS_LL) +#define strtoull (unsigned long long)strtoul +#endif + #if !defined(strtoull) && \ (defined(CSRG_BASED) || \ (defined(__GNU_LIBRARY__) && \ diff --git a/xc/programs/Xserver/hw/xfree86/etc/pci.ids b/xc/programs/Xserver/hw/xfree86/etc/pci.ids index 490bce3d0..a6bb2fa1c 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/pci.ids +++ b/xc/programs/Xserver/hw/xfree86/etc/pci.ids @@ -7,7 +7,7 @@ # so if you have anything to contribute, please visit the home page or # send a diff -u against the most recent pci.ids to pci-ids@ucw.cz. # -# Daily snapshot on Wed 2002-10-16 10:00:04 +# Daily snapshot on Tue 2003-02-25 11:00:06 # # Vendors, devices and subsystems. Please keep sorted. @@ -21,6 +21,8 @@ 001a Ascend Communications, Inc. 0033 Paradyne corp. 003d Lockheed Martin-Marietta Corp +# Real TJN ID is e159, but they got it wrong several times --mj +0059 Tiger Jet Network Inc. (Wrong ID) 0070 Hauppauge computer works Inc. 0100 Ncipher Corp Ltd 0675 Dynalink @@ -159,10 +161,19 @@ 0017 PROTO-3 PCI Prototyping board 9100 INI-9100/9100W SCSI Host 1002 ATI Technologies Inc +# New support forthcoming in XFree86 4.3.0 + 4144 Radeon R300 AD [Radeon 9500 Pro] +# New support forthcoming in XFree86 4.3.0 + 4145 Radeon R300 AE [Radeon 9500 Pro] +# New support forthcoming in XFree86 4.3.0 + 4146 Radeon R300 AF [Radeon 9500 Pro] +# Update: Oops, AF was a typo above for 4147, should be AG + 4147 Radeon R300 AG [FireGL Z1/X1] 4158 68800AX [Mach32] 4242 Radeon R200 BB [Radeon All in Wonder 8500DV] 1002 02aa Radeon 8500 AIW DV Edition 4336 Radeon Mobility U1 + 4337 Radeon IGP 340M 4354 215CT [Mach64 CT] 4358 210888CX [Mach64 CX] 4554 210888ET [Mach64 ET] @@ -212,6 +223,8 @@ 4752 Rage XL 1002 0008 Rage XL 1002 4752 Rage XL + 1002 8008 Rage XL + 1028 00d1 PowerEdge 2550 4753 Rage XC 1002 4753 Rage XC 4754 3D Rage I/II 215GT [Mach64 GT] @@ -232,7 +245,17 @@ 4964 Radeon R250 Id [Radeon 9000] 4965 Radeon R250 Ie [Radeon 9000] 4966 Radeon R250 If [Radeon 9000] + 10f1 0002 R250 If [Tachyon G9000 PRO] + 148c 2039 R250 If [Radeon 9000 Pro "Evil Commando"] + 1509 9a00 R250 If [Radeon 9000 "AT009"] +# New subdevice - 3D Prophet 9000 PCI by Hercules. AGP version probably would have same ID, so not specified. + 1681 0040 R250 If [3D prophet 9000] + 174b 7176 R250 If [Sapphire Radeon 9000 Pro] + 174b 7192 R250 If [Radeon 9000 "Atlantis"] + 17af 2005 R250 If [Excalibur Radeon 9000 Pro] + 17af 2006 R250 If [Excalibur Radeon 9000] 4967 Radeon R250 Ig [Radeon 9000] + 496e Radeon R250 [Radeon 9000] (Secondary) 4c42 3D Rage LT Pro AGP-133 0e11 b0e8 Rage 3D LT Pro 0e11 b10e 3D Rage LT Pro (Compaq Armada 1750) @@ -251,7 +274,9 @@ 1002 0044 Rage LT Pro 1002 4c49 Rage LT Pro 4c4d Rage Mobility P/M AGP 2x + 0e11 b111 Armada M700 1002 0084 Xpert 98 AGP 2X (Mobility) + 1014 0154 ThinkPad A20m 4c4e Rage Mobility L AGP 2x 4c50 3D Rage LT Pro 1002 4c50 Rage LT Pro @@ -260,23 +285,36 @@ 4c53 Rage Mobility L 4c54 264LT [Mach64 LT] 4c57 Radeon Mobility M7 LW [Radeon Mobility 7500] + 1014 0517 ThinkPad T30 1028 00e6 Radeon Mobility M7 LW (Dell Inspiron 8100) - 4c58 Radeon Mobility M7 LX [Radeon Mobility FireGL 7800] + 144d c006 Radeon Mobility M7 LW in vpr Matrix 170B4 +# Update: More correct labelling for this FireGL chipset + 4c58 Radeon RV200 LX [Mobility FireGL 7800 M7] 4c59 Radeon Mobility M6 LY 1014 0235 ThinkPad A30p (2653-64G) 1014 0239 ThinkPad X22/X23/X24 104d 80e7 VAIO PCG-GR214EP/GR214MP/GR215MP/GR314MP/GR315MP 4c5a Radeon Mobility M6 LZ - 4c64 Radeon R250 Ld [Radeon Mobility 9000] - 4c65 Radeon R250 Le [Radeon Mobility 9000] - 4c66 Radeon R250 Lf [Radeon Mobility 9000] - 4c67 Radeon R250 Lg [Radeon Mobility 9000] +# Update: Add M9 to product name + 4c64 Radeon R250 Ld [Radeon Mobility 9000 M9] +# Update: Add M9 to product name + 4c65 Radeon R250 Le [Radeon Mobility 9000 M9] +# Update: Add M9 to product name + 4c66 Radeon R250 Lf [Radeon Mobility 9000 M9] +# Update: Add M9 to product name + 4c67 Radeon R250 Lg [Radeon Mobility 9000 M9] 4d46 Rage Mobility M4 AGP 4d4c Rage Mobility M4 AGP 4e44 Radeon R300 ND [Radeon 9700] 4e45 Radeon R300 NE [Radeon 9700] 4e46 Radeon R300 NF [Radeon 9700] - 4e47 Radeon R300 NG [Radeon 9700] +# Update: This is FireGL X1, not Radeon 9700 + 4e47 Radeon R300 NG [FireGL X1] +# Update + 4e64 Radeon R300 [Radeon 9700 Pro] (Secondary) + 4e65 Radeon R300 [Radeon 9700] (Secondary) + 4e66 Radeon R300 [Radeon 9700] (Secondary) + 4e67 Radeon R300 [FireGL X1] (Secondary) 5041 Rage 128 PA/PRO 5042 Rage 128 PB/PRO AGP 2x 5043 Rage 128 PC/PRO AGP 4x @@ -313,7 +351,8 @@ 5056 Rage 128 PV/PRO TMDS 5057 Rage 128 PW/PRO AGP 2x TMDS 5058 Rage 128 PX/PRO AGP 4x TMDS - 5144 Radeon R100 QD [Radeon 64 DDR] +# Update: This same chip is used in all 32Mb and 64Mb SDR/DDR orig Radeons, and is now known as 7200 + 5144 Radeon R100 QD [Radeon 7200] 1002 0008 Radeon 7000/Radeon VE 1002 0009 Radeon 7000/Radeon 1002 000a Radeon 7000/Radeon @@ -331,32 +370,55 @@ 5146 Radeon R100 QF 5147 Radeon R100 QG 5148 Radeon R200 QH [Radeon 8500] - 1002 0152 FireGL 8800 - 1002 0172 FireGL 8700 + 1002 010a FireGL 8800 64Mb + 1002 0152 FireGL 8800 128Mb + 1002 0162 FireGL 8700 32Mb + 1002 0172 FireGL 8700 64Mb 5149 Radeon R200 QI 514a Radeon R200 QJ 514b Radeon R200 QK 514c Radeon R200 QL [Radeon 8500 LE] 1002 003a Radeon R200 QL [Radeon 8500 LE] 1002 013a Radeon 8500 + 148c 2026 R200 QL [Radeon 8500 Evil Master II Multi Display Edition] 174b 7149 Radeon R200 QL [Sapphire Radeon 8500 LE] +# New: Radeon 9100 is basically a Radeon 8500LE branded as 9100 by Sapphire + 514d Radeon R200 QM [Radeon 9100] +# New: Radeon 8500LE chip + 514e Radeon R200 QN [Radeon 8500LE] +# New: Radeon 8500LE chip + 514f Radeon R200 QO [Radeon 8500LE] 5157 Radeon RV200 QW [Radeon 7500] 1002 013a Radeon 7500 + 1458 4000 RV200 QW [RADEON 7500 PRO MAYA AR] + 148c 2024 RV200 QW [Radeon 7500LE Dual Display] + 148c 2025 RV200 QW [Radeon 7500 Evil Master Multi Display Edition] + 148c 2036 RV200 QW [Radeon 7500 PCI Dual Display] + 174b 7147 RV200 QW [Sapphire Radeon 7500LE] 174b 7161 Radeon RV200 QW [Radeon 7500 LE] + 17af 0202 RV200 QW [Excalibur Radeon 7500LE] 5158 Radeon RV200 QX [Radeon 7500] - 5159 Radeon VE QY +# Update: More correct name + 5159 Radeon RV100 QY [Radeon 7000/VE] 1002 000a Radeon 7000/Radeon VE 1002 000b Radeon 7000 1002 0038 Radeon 7000/Radeon VE 1002 003a Radeon 7000/Radeon VE 1002 00ba Radeon 7000/Radeon VE 1002 013a Radeon 7000/Radeon VE - 174b 7112 Radeon 7000 64M TVO - 515a Radeon VE QZ + 1458 4002 RV100 QY [RADEON 7000 PRO MAYA AV Series] + 148c 2003 RV100 QY [Radeon 7000 Multi-Display Edition] + 148c 2023 RV100 QY [Radeon 7000 Evil Master Multi-Display] + 174b 7112 RV100 QY [Sapphire Radeon VE 7000] + 1787 0202 RV100 QY [Excalibur Radeon 7000] +# Update: More correct name + 515a Radeon RV100 QZ [Radeon 7000/VE] 5168 Radeon R200 Qh 5169 Radeon R200 Qi 516a Radeon R200 Qj 516b Radeon R200 Qk +# new: This one is not in ATI documentation, but is in XFree86 source code + 516c Radeon R200 Ql 5245 Rage 128 RE/SG 1002 0008 Xpert 128 1002 0028 Rage 128 AIW @@ -436,7 +498,10 @@ 1004 0306 QSound ThunderBird PCI Audio Support Registers 122d 1208 DSP368 Audio Support Registers 1483 5022 XWave Thunder 3D Audio Support Registers + 0307 Thunderbird + 0308 Thunderbird 0702 VAS96011 [Golden Gate II] + 0703 Tollgate 1005 Avance Logic Inc. [ALI] 2064 ALG2032/2064 2128 ALG2364A @@ -514,8 +579,8 @@ 1011 500b DE500B Fast Ethernet 1014 0001 10/100 EtherJet Cardbus 1025 0315 ALN315 Fast Ethernet - 1033 800c PC-9821-CS01 - 1033 800d PC-9821NR-B06 + 1033 800c PC-9821-CS01 100BASE-TX Interface Card + 1033 800d PC-9821NR-B06 100BASE-TX Interface Card 108d 0016 Rapidfire 2327 10/100 Ethernet 108d 0017 GoCard 2250 Ethernet 10/100 Cardbus 10b8 2005 SMC8032DT Extreme Ethernet 10/100 @@ -539,6 +604,7 @@ 1374 0002 Cardbus Ethernet Card 10/100 1374 0007 Cardbus Ethernet Card 10/100 1374 0008 Cardbus Ethernet Card 10/100 + 1385 2100 FA510 1395 0001 10/100 Ethernet CardBus PC Card 13d1 ab01 EtherFast 10/100 Cardbus (PCMPC200) 8086 0001 EtherExpress PRO/100 Mobile CardBus 32 @@ -598,7 +664,8 @@ 1014 1010 CS4610 SoundFusion Audio Accelerator 6003 CS 4614/22/24 [CrystalClear SoundFusion Audio Accelerator] 1013 4280 Crystal SoundFusion PCI Audio Accelerator - 1681 0050 Hercules Game Theater XP + 1681 0050 Game Theater XP + 1681 a011 Fortissimo III 7.1 6004 CS 4614/22/24 [CrystalClear SoundFusion Audio Accelerator] 6005 Crystal CS4281 PCI Audio 1013 4281 Crystal CS4281 PCI Audio @@ -660,10 +727,11 @@ 00a5 ATM Controller (1410a500) 00a6 ATM 155MBPS MM Controller (1410a600) 00b7 256-bit Graphics Rasterizer [Fire GL1] - 1902 00b8 Fire GL1 00be ATM 622MBPS Controller (1410be00) + 00dc Advanced Systems Management Adapter (ASMA) 00fc CPC710 Dual Bridge and Memory Controller (PCI-64) 0105 CPC710 Dual Bridge and Memory Controller (PCI-32) + 010f Remote Supervisor Adapter (RSA) 0142 Yotta Video Compositor Input 1014 0143 Yotta Input Controller (ytin) 0144 Yotta Video Compositor Output @@ -678,6 +746,7 @@ 1014 022e ServeRAID-4H 1014 0258 ServeRAID-5i 1014 0259 ServeRAID-5i + 0302 XA-32 chipset [Summit] ffff MPIC-2 interrupt controller 1015 LSI Logic Corp of Canada 1016 ICL Personal Systems @@ -798,6 +867,8 @@ 8520 CyberBlade i1 0e11 b16e CyberBlade i1 AGP 1023 8520 CyberBlade i1 AGP + 8620 CyberBlade/i1 + 1014 0502 ThinkPad T30 8820 CyberBlade XPAi1 9320 TGUI 9320 9350 GUI Accelerator @@ -909,9 +980,9 @@ 0007 Remote Assistant Card 3 0008 PowerEdge Expandable RAID Controller 3/Di 000a PowerEdge Expandable RAID Controller 3 - 1027 0121 PowerEdge Expandable RAID Controller 3/Di 1028 0106 PowerEdge Expandable RAID Controller 3/Di 1028 011b PowerEdge Expandable RAID Controller 3/Di + 1028 0121 PowerEdge Expandable RAID Controller 3/Di 000c Embedded Systems Management Device 4 000e PowerEdge Expandable RAID Controller 000f PowerEdge Expandable RAID Controller 4/Di @@ -925,6 +996,7 @@ 0518 MGA-II [Athena] 0519 MGA 2064W [Millennium] 051a MGA 1064SG [Mystique] + 102b 0100 MGA-1064SG Mystique 102b 1100 MGA-1084SG Mystique 102b 1200 MGA-1084SG Mystique 1100 102b MGA-1084SG Mystique @@ -1019,11 +1091,10 @@ 102b 5f52 4Sight II 102b 9010 Millennium G400 Dual Head 1458 0400 GA-G400 - 1705 0001 Digital First Millennium G450 32MB SGRAM - 1705 0002 Digital First Millennium G450 16MB SGRAM - 1705 0003 Digital First Millennium G450 32MB - 1705 0004 Digital First Millennium G450 16MB - b16f 0e11 MGA-G400 AGP + 1705 0001 Millennium G450 32MB SGRAM + 1705 0002 Millennium G450 16MB SGRAM + 1705 0003 Millennium G450 32MB + 1705 0004 Millennium G450 16MB 0527 MGA Parhelia AGP 102b 0840 Parhelia 128Mb 0d10 MGA Ultima/Impression @@ -1080,18 +1151,22 @@ 0003 ATM Controller 0004 R4000 PCI Bridge 0005 PCI to 486-like bus Bridge - 0006 GUI Accelerator + 0006 PC-9800 Graphic Accelerator 0007 PCI to UX-Bus Bridge - 0008 GUI Accelerator - 0009 GUI Accelerator for W98 + 0008 PC-9800 Graphic Accelerator + 0009 PCI to PC9800 Core-Graph Bridge + 0016 PCI to VL Bridge 001a [Nile II] 0021 Vrc4373 [Nile I] 0029 PowerVR PCX1 002a PowerVR 3D + 002c Star Alpha 2 + 002d PCI to C-bus Bridge 0035 USB 1179 0001 USB 12ee 7000 Root Hub 1799 0001 Root Hub + 003b PCI to C-bus Bridge 003e NAPCCARD Cardbus Controller 0046 PowerVR PCX2 [midas] 005a Vrc5074 [Nile 4] @@ -1121,7 +1196,8 @@ 1037 Hitachi Micro Systems 1038 AMP, Inc 1039 Silicon Integrated Systems [SiS] - 0001 5591/5592 AGP +# This is what all my tests report. I don't know if this is equivalent to "5591/5592 AGP". + 0001 SiS 530 Virtual PCI-to-PCI bridge (AGP) 0002 SG86C202 0006 85C501/2/3 0008 85C503/5513 @@ -1131,8 +1207,12 @@ 1039 0000 SiS5597 SVGA (Shared RAM) 0204 82C204 0205 SG86C205 - 0300 300/200 + 0300 SiS300/305 PCI/AGP VGA Display Adapter 107d 2720 Leadtek WinFast VR300 + 0310 SiS315H PCI/AGP VGA Display Adapter + 0315 SiS315 PCI/AGP VGA Display Adapter + 0325 SiS315PRO PCI/AGP VGA Display Adapter + 0330 SiS330 [Xabre] PCI/AGP VGA Display Adapter 0406 85C501/2 0496 85C496 0530 530 Host @@ -1159,9 +1239,11 @@ 3602 83C602 5107 5107 5300 SiS540 PCI Display Adapter + 5315 SiS550 AGP/VGA VGA Display Adapter 5401 486 PCI Chipset 5511 5511/5512 5513 5513 [IDE] + 1019 0970 P6STP-FL motherboard 1039 5513 SiS5513 EIDE Controller (A,B step) 5517 5517 5571 5571 @@ -1175,8 +1257,10 @@ 6205 VGA Controller 6236 6236 3D-AGP 6300 SiS630 GUI Accelerator+3D + 1019 0970 P6STP-FL motherboard 6306 SiS530 3D PCI/AGP 1039 6306 SiS530,620 GUI Accelerator+3D + 6325 SiS650/651/M650/740 PCI/AGP VGA Display Adapter 6326 86C326 5598/6326 1039 6326 SiS6326 GUI Accelerator 1092 0a50 SpeedStar A50 @@ -1184,11 +1268,13 @@ 1092 4910 SpeedStar A70 1092 4920 SpeedStar A70 1569 6326 SiS6326 GUI Accelerator - 7001 7001 + 7001 SiS7001 USB Controller 1039 7000 Onboard USB Controller + 7002 SiS7002 USB 2.0 + 1509 7002 Onboard USB Controller 7007 FireWire Controller 7012 SiS7012 PCI Audio Accelerator - 7013 56k Winmodem (Smart Link HAMR5600 compatible) + 7013 Intel 537 [56k Winmodem] 7016 SiS7016 10/100 Ethernet Adapter 1039 7016 SiS7016 10/100 Ethernet Adapter 7018 SiS PCI Audio Accelerator @@ -1273,6 +1359,7 @@ 3020 Samurai_IDE 1043 Asustek Computer, Inc. 0675 ISDNLink P-IN100-ST-D + 4021 v7100 Combo Deluxe [GeForce2 MX + TV tuner] 1044 Distributed Processing Technology 1012 Domino RAID Engine a400 SmartCache/Raid I-IV Controller @@ -1347,6 +1434,9 @@ 104a SGS Thomson Microelectronics 0008 STG 2000X 0009 STG 1764X + 0010 STG4000 [3D Prophet Kyro Series] +# From <http://gatekeeper.dec.com/pub/BSD/FreeBSD/FreeBSD-stable/src/share/misc/pci_vendors> + 0210 STPC Atlas ISA Bridge 0981 DEC-Tulip compatible 10/100 Ethernet 1746 STG 1764X 2774 DEC-Tulip compatible 10/100 Ethernet @@ -1359,6 +1449,7 @@ 0500 100 MBit LAN Controller 0508 TMS380C2X Compressor Interface 1000 Eagle i/f AS + 104c PCI1510 PC card Cardbus Controller 3d04 TVP4010 [Permedia] 3d07 TVP4020 [Permedia 2] 1011 4d10 Comet @@ -1402,7 +1493,7 @@ 8026 TSB43AB21 IEEE-1394a-2000 Controller (PHY/Link) 8027 PCI4451 IEEE-1394 Controller 1028 00e6 PCI4451 IEEE-1394 Controller (Dell Inspiron 8100) - 8400 USR2210 22Mbps Wireless PC Card + 8400 ACX 100 22Mbps Wireless Interface a001 TDC1570 a100 TDC1561 a102 TNETA1575 HyperSAR Plus w/PCI Host i/f & UTOPIA i/f @@ -1418,6 +1509,7 @@ ac19 PCI1221 ac1a PCI1210 ac1b PCI1450 + 0e11 b113 Armada M700 ac1c PCI1225 ac1d PCI1251A ac1e PCI1211 @@ -1440,6 +1532,8 @@ ac52 PCI1451 PC card Cardbus Controller ac53 PCI1421 PC card Cardbus Controller ac55 PCI1250 PC card Cardbus Controller + 1014 0512 ThinkPad T30 + ac56 PCI1510 PC card Cardbus Controller ac60 PCI2040 PCI to DSP Bridge Controller fe00 FireWire Host Controller fe03 12C01A FireWire Host Controller @@ -1465,6 +1559,7 @@ 1050 0840 W89C840 Ethernet Adapter 0940 W89C940 5a5a W89C940F + 6692 W6692 9970 W9970CF 1051 Anigma, Inc. 1052 ?Young Micro Systems @@ -1520,6 +1615,7 @@ 0d38 20263 105a 4d39 Fasttrak66 1275 20275 + 3376 PDC20376 4d30 20267 105a 4d33 Ultra100 105a 4d39 Fasttrak100 @@ -1537,7 +1633,8 @@ 5300 DC5300 6268 20268R 6269 PDC20271 - 105a 6269 Fasttrack tx2 + 105a 6269 FastTrak TX2/TX2000 + 6621 PDC20621 [SX4000] 4 Channel IDE RAID Controller 7275 PDC20277 105b Foxconn International, Inc. 105c Wipro Infotech Limited @@ -1878,6 +1975,7 @@ 1095 0670 USB0670 0673 USB0673 0680 PCI0680 + 3112 Silicon Image SiI 3112 SATARaid Controller 1096 Alacron 1097 Appian Technology 1098 Quantum Designs (H.K.) Ltd @@ -1897,8 +1995,10 @@ 036c Bt879(??) Video Capture 13e9 0070 Win/TV (Video Section) 036e Bt878 Video Capture - 0070 13eb WinTV/GO + 0070 13eb WinTV Series 0070 ff01 Viewcast Osprey 200 + 107d 6606 WinFast TV 2000 + 11bd 0012 PCTV pro (TV + FM stereo receiver) 11bd 001c PCTV Sat (DBC receiver) 127a 0001 Bt878 Mediastream Controller NTSC 127a 0002 Bt878 Mediastream Controller PAL BG @@ -1913,6 +2013,7 @@ 1851 1850 FlyVideo'98 - Video 1851 1851 FlyVideo II 1852 1852 FlyVideo'98 - Video (with FM Tuner) + bd11 1200 PCTV pro (TV + FM stereo receiver) 036f Bt879 Video Capture 127a 0044 Bt879 Video Capture NTSC 127a 0122 Bt879 Video Capture PAL I @@ -1948,10 +2049,11 @@ 1851 1851 FlyVideo'98 EZ - video 1852 1852 FlyVideo'98 (with FM Tuner) 0878 Bt878 Audio Capture - 0070 13eb WinTV/GO + 0070 13eb WinTV Series 0070 ff01 Viewcast Osprey 200 1002 0001 TV-Wonder 1002 0003 TV-Wonder/VE + 11bd 0012 PCTV pro (TV + FM stereo receiver, audio section) 11bd 001c PCTV Sat (DBC receiver) 127a 0001 Bt878 Video Capture (Audio Section) 127a 0002 Bt878 Video Capture (Audio Section) @@ -1964,6 +2066,7 @@ 14f1 0002 Bt878 Video Capture (Audio Section) 14f1 0003 Bt878 Video Capture (Audio Section) 14f1 0048 Bt878 Video Capture (Audio Section) + bd11 1200 PCTV pro (TV + FM stereo receiver, audio section) 0879 Bt879 Audio Capture 127a 0044 Bt879 Video Capture (Audio Section) 127a 0122 Bt879 Video Capture (Audio Section) @@ -2005,7 +2108,8 @@ 10a2 Quantum Corporation 10a3 Everex Systems Inc 10a4 Globe Manufacturing Sales -10a5 Racal Interlan +10a5 Smart Link Ltd. + 5449 SmartPCI561 modem 10a6 Informtech Industrial Ltd. 10a7 Benchmarq Microelectronics 10a8 Sierra Semiconductor @@ -2071,7 +2175,9 @@ 15ed 1003 MCCS 16-port Serial Hot Swap 9036 9036 9050 PCI <-> IOBus Bridge + 10b5 2036 SatPak GPS 10b5 2273 SH-ARC SoHard ARCnet card + 10b5 9050 MP9050 1522 0001 RockForce 4 Port V.90 Data/Fax/Voice Modem 1522 0002 RockForce 2 Port V.90 Data/Fax/Voice Modem 1522 0003 RockForce 6 Port V.90 Data/Fax/Voice Modem @@ -2082,6 +2188,7 @@ 15ed 1001 Macrolink MCCS 16-port Serial 15ed 1002 Macrolink MCCS 8-port Serial Hot Swap 15ed 1003 Macrolink MCCS 16-port Serial Hot Swap + 5654 5634 OpenLine4 Telephony Card d531 c002 PCIntelliCAN 2xSJA1000 CAN bus d84d 4006 EX-4006 1P d84d 4008 EX-4008 1P EPP/ECP @@ -2214,12 +2321,15 @@ 1028 0095 Integrated 3C905C-TX Fast Etherlink for PC Management NIC 10b7 1000 3C905C-TX Fast Etherlink for PC Management NIC 10b7 7000 10/100 Mini PCI Ethernet Adapter + 9201 3C920B-EMB Integrated Fast Ethernet Controller + 9300 3CSOHO100B-TX [910-A01] 9800 3c980-TX [Fast Etherlink XL Server Adapter] 10b7 9800 3c980-TX Fast Etherlink XL Server Adapter 9805 3c980-TX 10/100baseTX NIC [Python-T] 10b7 1201 3c982-TXM 10/100baseTX Dual Port A [Hydra] 10b7 1202 3c982-TXM 10/100baseTX Dual Port B [Hydra] 10b7 9805 3c980 10/100baseTX NIC [Python-T] + 10f1 2462 Thunder K7 S2462 9900 3C990-TX [Typhoon] 9902 3CR990-TX-95 [Typhoon 56-bit] 9903 3CR990-TX-97 [Typhoon 168-bit] @@ -2255,7 +2365,7 @@ 1001 FDC 37C922 a011 83C170QF b106 SMC34C90 -10b9 Acer Laboratories Inc. [ALi] +10b9 ALi Corporation 0111 C-Media CMI8738/C3DX Audio Device (OEM) 10b9 0111 C-Media CMI8738/C3DX Audio Device (OEM) 1435 M1435 @@ -2277,6 +2387,7 @@ 1541 M1541 10b9 1541 ALI M1541 Aladdin V/V+ AGP System Controller 1543 M1543 + 1563 M1563 HyperTransport South Bridge 1621 M1621 1631 ALI M1631 PCI North Bridge Aladdin Pro III 1632 M1632M Northbridge+Trident @@ -2285,7 +2396,9 @@ 1646 M1646 Northbridge+Trident 1647 M1647 Northbridge [MAGiK 1 / MobileMAGiK 1] 1651 M1651/M1651T Northbridge [Aladdin-Pro 5/5M,Aladdin-Pro 5T/5TM] - 1671 M1671 Northbridge [Aladdin-P4] + 1671 M1671 Super P4 Northbridge [AGP4X,PCI and SDR/DDR] + 1681 M1681 P4 Northbridge [AGP8X,HyperTransport and SDR/DDR] + 1687 M1687 K8 Northbridge [AGP8X and HyperTransport] 3141 M3141 3143 M3143 3145 M3145 @@ -2306,14 +2419,19 @@ 5239 USB 2.0 Controller 5243 M1541 PCI to AGP Controller 5247 PCI to AGP Controller + 5249 M5249 HTT to PCI Bridge 5251 M5251 P1394 OHCI 1.0 Controller 5253 M5253 P1394 OHCI 1.1 Controller 5261 M5261 Ethernet Controller 5451 M5451 PCI AC-Link Controller Audio Device + 1014 0506 ThinkPad R30 5453 M5453 PCI AC-Link Controller Modem Device 5455 M5455 PCI AC-Link Controller Audio Device - 5457 M5457 AC-Link Modem Interface Controller - 5459 SmartPCI561 56K Modem + 5457 Intel 537 [M5457 AC-Link Modem] +# Same but more usefull for driver's lookup + 5459 SmartLink SmartPCI561 56K Modem +# SmartLink PCI SoftModem + 545a SmartLink SmartPCI563 56K Modem 5471 M5471 Memory Stick Controller 5473 M5473 SD-MMC Controller 7101 M7101 PMU @@ -2336,7 +2454,7 @@ 10c6 Rambus Inc. 10c7 Media Vision 10c8 Neomagic Corporation - 0001 NM2070 [MagicGraph NM2070] + 0001 NM2070 [MagicGraph 128] 0002 NM2090 [MagicGraph 128V] 0003 NM2093 [MagicGraph 128ZV] 0004 NM2160 [MagicGraph 128XD] @@ -2358,13 +2476,14 @@ 10f7 830b MagicGraph 128XD 10f7 830d MagicGraph 128XD 10f7 8312 MagicGraph 128XD - 0005 [MagicMedia 256AV] + 0005 NM2200 [MagicGraph 256AV] + 1014 00dd ThinkPad 570 0006 NM2360 [MagicMedia 256ZX] 0016 NM2380 [MagicMedia 256XL+] 10c8 0016 MagicMedia 256XL+ - 0025 [MagicMedia 256AV+] - 0083 [MagicGraph 128ZV Plus] - 8005 [MagicMedia 256AV Audio] + 0025 NM2230 [MagicGraph 256AV+] + 0083 NM2093 [MagicGraph 128ZV+] + 8005 NM2200 [MagicMedia 256AV Audio] 0e11 b0d1 MagicMedia 256AV Audio Device on Discovery 0e11 b126 MagicMedia 256AV Audio Device on Durango 1014 00dd MagicMedia 256AV Audio Device on BlackTip Thinkpad @@ -2377,7 +2496,7 @@ 110a 8005 MagicMedia 256AV Audio Device 14c0 0004 MagicMedia 256AV Audio Device 8006 NM2360 [MagicMedia 256ZX Audio] - 8016 NM2360 [MagicMedia 256ZX Audio] + 8016 NM2380 [MagicMedia 256XL+ Audio] 10c9 Dataexpert Corporation 10ca Fujitsu Microelectr., Inc. 10cb Omron Corporation @@ -2422,7 +2541,7 @@ 0008 NV1 [EDGE 3D] 0009 NV1 [EDGE 3D] 0010 NV2 [Mutara V08] - 0020 NV4 [Riva TnT] + 0020 NV4 [RIVA TNT] 1043 0200 V3400 TNT 1048 0c18 Erazor II SGRAM 1048 0c1b Erazor II @@ -2444,7 +2563,7 @@ 10de 0020 Riva TNT 1102 1015 Graphics Blaster CT6710 1102 1016 Graphics Blaster RIVA TNT - 0028 NV5 [Riva TnT2] + 0028 NV5 [RIVA TNT2/TNT2 Pro] 1043 0200 AGP-V3800 SGRAM 1043 0201 AGP-V3800 SDRAM 1043 0205 PCI-V3800 @@ -2460,7 +2579,7 @@ 1102 1020 3D Blaster RIVA TNT2 1102 1026 3D Blaster RIVA TNT2 Digital 14af 5810 Maxi Gamer Xentor - 0029 NV5 [Riva TnT2 Ultra] + 0029 NV5 [RIVA TNT2 Ultra] 1043 0200 AGP-V3800 Deluxe 1043 0201 AGP-V3800 Ultra SDRAM 1043 0205 PCI-V3800 Ultra @@ -2470,16 +2589,18 @@ 14af 5820 Maxi Gamer Xentor 32 002a NV5 [Riva TnT2] 002b NV5 [Riva TnT2] - 002c NV6 [Vanta] + 002c NV6 [Vanta/Vanta LT] 1043 0200 AGP-V3800 Combat SDRAM 1043 0201 AGP-V3800 Combat 1092 6820 Viper V730 1102 1031 CT6938 VANTA 8MB 1102 1034 CT6894 VANTA 16MB 14af 5008 Maxi Gamer Phoenix 2 - 002d RIVA TNT2 Model 64 + 002d NV5M64 [RIVA TNT2 Model 64/Model 64 Pro] 1043 0200 AGP-V3800M 1043 0201 AGP-V3800M + 1048 0c3a Erazor III LT + 10de 001e M64 AGP4x 1102 1023 CT6892 RIVA TNT2 Value 1102 1024 CT6932 RIVA TNT2 Value 32Mb 1102 102c CT6931 RIVA TNT2 Value [Jumper] @@ -2487,7 +2608,19 @@ 1554 1041 PixelView RIVA TNT2 M64 32MB 002e NV6 [Vanta] 002f NV6 [Vanta] - 00a0 NV5 [Riva TNT2] + 0060 nForce2 ISA Bridge + 1043 80ad A7N8X Mainboard + 0064 nForce2 SMBus (MCP) + 0065 nForce2 IDE + 0066 nForce2 Ethernet Controller + 0067 nForce2 USB Controller + 1043 0c11 A7N8X Mainboard + 0068 nForce2 USB Controller + 1043 0c11 A7N8X Mainboard + 006a nForce2 AC97 Audio Controler (MCP) + 006b nForce MultiMedia audio [Via VT82C686B] + 006e nForce2 FireWire (IEEE 1394) Controller + 00a0 NV5 [Aladdin TNT2] 14af 5810 Maxi Gamer Xentor 0100 NV10 [GeForce 256 SDR] 1043 0200 AGP-V6600 SGRAM @@ -2496,43 +2629,52 @@ 1043 4009 AGP-V6600 SDRAM 1102 102d CT6941 GeForce 256 14af 5022 3D Prophet SE - 0101 NV10 [GeForce 256 DDR] + 0101 NV10DDR [GeForce 256 DDR] 1043 0202 AGP-V6800 DDR 1043 400a AGP-V6800 DDR SGRAM 1043 400b AGP-V6800 DDR SDRAM 1102 102e CT6971 GeForce 256 DDR 14af 5021 3D Prophet DDR-DVI - 0103 NV10 [Quadro] - 0110 NV11 [GeForce2 MX] + 0103 NV10GL [Quadro] + 0110 NV11 [GeForce2 MX/MX 400] 1043 4015 AGP-V7100 Pro 1043 4031 V7100 Pro with TV output + 1462 8817 MSI GeForce2 MX400 Pro32S [MS-8817] 14af 7102 3D Prophet II MX 14af 7103 3D Prophet II MX Dual-Display - 0111 NV11 [GeForce2 MX DDR] + 0111 NV11DDR [GeForce2 MX 100 DDR/200 DDR] 0112 NV11 [GeForce2 Go] - 0113 NV11 [GeForce2 MXR] - 0150 NV15 [GeForce2 GTS] + 0113 NV11GL [Quadro2 MXR/EX] + 0150 NV15 [GeForce2 GTS/Pro] 1043 4016 V7700 AGP Video Card 107d 2840 WinFast GeForce2 GTS with TV output 1462 8831 Creative GeForce2 Pro - 0151 NV15 [GeForce2 Ti] + 0151 NV15DDR [GeForce2 Ti] 1043 405f V7700Ti - 0152 NV15 [GeForce2 Ultra, Bladerunner] + 0152 NV15BR [GeForce2 Ultra, Bladerunner] 1048 0c56 GLADIAC Ultra - 0153 NV15 [Quadro2 Pro] - 0170 NV17 [GeForce4 MX460] - 0171 NV17 [GeForce4 MX440] + 0153 NV15GL [Quadro2 Pro] + 0170 NV17 [GeForce4 MX 460] + 0171 NV17 [GeForce4 MX 440] 1462 8661 G4MX440-VTP - 0172 NV17 [GeForce4 MX420] - 0173 NV1x + 1462 8730 MX440SES-T (MS-8873) + 147b 8f00 Abit Siluro GeForce4MX440 + 0172 NV17 [GeForce4 MX 420] + 0173 NV17 [GeForce4 MX 440-SE] 0174 NV17 [GeForce4 440 Go] 0175 NV17 [GeForce4 420 Go] 0176 NV17 [GeForce4 420 Go 32M] - 0178 Quadro4 500XGL + 0178 NV17GL [Quadro4 550 XGL] 0179 NV17 [GeForce4 440 Go 64M] - 017a Quadro4 200/400NVS - 017b Quadro4 550XGL - 017c Quadro4 550 GoGL + 017a NV17GL [Quadro4 200/400 NVS] + 017b NV17GL [Quadro4 550 XGL] + 017c NV17GL [Quadro4 550 GoGL] + 0181 NV18 [GeForce4 MX 440 AGP 8x] + 0182 NV18 [GeForce4 MX 440SE AGP 8x] + 0183 NV18 [GeForce4 MX 420 AGP 8x] + 0188 NV18GL [Quadro4 580 XGL] + 018a NV18GL [Quadro4 NVS] + 018b NV18GL [Quadro4 380 XGL] 01a0 NV15 [GeForce2 - nForce GPU] 01a4 nForce CPU bridge 01ab nForce 420 Memory Controller (DDR) @@ -2544,20 +2686,37 @@ 01b7 nForce AGP to PCI Bridge 01b8 nForce PCI-to-PCI bridge 01bc nForce IDE - 01c1 nForce MC97 Modem (Smart Link HAMR5600 compatible) + 01c1 Intel 537 [nForce MC97 Modem] + 01c2 nForce USB Controller + 01c3 nForce Ethernet Controller + 01e8 nForce2 AGP + 01f0 NV18 [GeForce4 MX - nForce GPU] 0200 NV20 [GeForce3] 1043 402f AGP-V8200 DDR - 0201 NV20 [GeForce3 Ti200] - 0202 NV20 [GeForce3 Ti500] + 0201 NV20 [GeForce3 Ti 200] + 0202 NV20 [GeForce3 Ti 500] 1043 405b V8200 T5 1545 002f Xtasy 6964 - 0203 NV20 [Quadro DCC] - 0250 NV25 [GeForce4 Ti4600] - 0251 NV25 [GeForce4 Ti4400] - 0253 NV25 [GeForce4 Ti4200] - 0258 Quadro4 900XGL - 0259 Quadro4 750XGL - 025b Quadro4 700XGL + 0203 NV20DCC [Quadro DCC] + 0250 NV25 [GeForce4 Ti 4600] + 0251 NV25 [GeForce4 Ti 4400] + 0252 NV25 [GeForce4 Ti] + 0253 NV25 [GeForce4 Ti 4200] + 107d 2896 WinFast A250 LE TD (Dual VGA/TV-out/DVI) + 147b 8f09 Siluro (Dual VGA/TV-out/DVI) + 0258 NV25GL [Quadro4 900 XGL] + 0259 NV25GL [Quadro4 750 XGL] + 025b NV25GL [Quadro4 700 XGL] + 0280 NV28 [GeForce4 Ti 4800] + 0281 NV28 [GeForce4 Ti 4200 AGP 8x] + 0282 NV28 [GeForce4 Ti 4800 SE] + 0288 NV28GL [Quadro4 980 XGL] + 0289 NV28GL [Quadro4 780 XGL] + 0300 NV30 [GeForce FX] + 0301 NV30 [GeForce FX 5800 Ultra] + 0302 NV30 [GeForce FX 5800] + 0308 NV30GL [Quadro FX 2000] + 0309 NV30GL [Quadro FX 1000] 10df Emulex Corporation 1ae5 LP6000 Fibre Channel Host Adapter f085 LP850 Fibre Channel Adapter @@ -2583,6 +2742,7 @@ 10e3 Tundra Semiconductor Corp. 0000 CA91C042 [Universe] 0860 CA91C860 [QSpan] + 0862 CA91C862A [QSpan-II] 10e4 Tandem Computers 10e5 Micro Industries Corporation 10e6 Gainbery Computer Products Inc. @@ -2612,6 +2772,7 @@ 2010 CyberPro 2000A 5000 CyberPro 5000 5050 CyberPro 5050 + 5202 CyberPro 5202 10eb Artists Graphics 0101 3GA 8111 Twist3 Frame Grabber @@ -2634,6 +2795,7 @@ 1186 1300 DFE-538TX 1186 1320 SN5200 1186 8139 DRN-32TX + 11f6 8139 FN22-3(A) LinxPRO Ethernet Adapter 1259 2500 AT-2500TX 1259 2503 AT-2500TX/ACPI 1429 d010 ND010 @@ -2649,10 +2811,11 @@ 8e2e 7100 KF-230TX/2 a0a0 0007 ALN-325C 8169 RTL-8169 + 1371 434e ProG-2000L 8197 SmartLAN56 56K Modem 10ed Ascii Corporation 7310 V7310 -10ee Xilinx, Inc. +10ee Xilinx Corporation 3fc0 RME Digi96 3fc1 RME Digi96/8 3fc2 RME Digi96/8 Pro @@ -2675,9 +2838,11 @@ 10fa Truevision 000c TARGA 1000 10fb Thesys Gesellschaft für Mikroelektronik mbH + 186f TH 6255 10fc I-O Data Device, Inc. # What's in the cardbus end of a Sony ACR-A01 card, comes with newer Vaio CD-RW drives 0003 Cardbus IDE Controller + 0005 Cardbus SCSI CBSC II 10fd Soyo Computer, Inc 10fe Fast Multimedia AG 10ff NCube @@ -2707,11 +2872,16 @@ 1102 8061 SBLive! Player 5.1 0004 SB Audigy 1102 0051 SB0090 Audigy Player + 1102 0053 SB0090 Audigy Player/OEM + 0006 [SB Live! Value] EMU10k1X 4001 SB Audigy FireWire Port + 1102 0010 SB Audigy FireWire Port 7002 SB Live! MIDI/Game Port 1102 0020 Gameport Joystick 7003 SB Audigy MIDI/Game port - 1102 0040 SB Audigy MIDI/Gameport + 1102 0040 SB Audigy MIDI/Game Port + 7004 [SB Live! Value] Input device controller + 8064 SB0100 [SBLive! 5.1 OEM] 8938 ES1371 1103 Triones Technologies, Inc. 0003 HPT343 @@ -2733,14 +2903,18 @@ 0130 VT6305 1394.A Controller 0305 VT8363/8365 [KT133/KM133] 1043 8033 A7V Mainboard + 1043 803e A7V-E Mainboard 1043 8042 A7V133/A7V133-C Mainboard 147b a401 KT7/KT7-RAID/KT7A/KT7A-RAID Mainboard 0391 VT8371 [KX133] 0501 VT8501 [Apollo MVP4] 0505 VT82C505 0561 VT82C561 - 0571 VT82C586B PIPC Bus Master IDE + 0571 VT82C586/B/686A/B PIPC Bus Master IDE + 1043 8052 VT8233A Bus Master ATA100/66/33 IDE 1106 0571 VT8235 Bus Master ATA133/100/66/33 IDE + 1179 0001 Magnia Z310 + 1458 5002 GA-7VAX Mainboard 0576 VT82C576 3V [Apollo Master] 0585 VT82C585VP [Apollo VP1/VPX] 0586 VT82C586/A/B PCI-to-ISA [Apollo VP] @@ -2756,11 +2930,15 @@ 0680 VT82C680 [Apollo P6] 0686 VT82C686 [Apollo Super South] 1043 8033 A7V Mainboard + 1043 803e A7V-E Mainboard 1043 8040 A7M266 Mainboard 1043 8042 A7V133/A7V133-C Mainboard 1106 0000 VT82C686/A PCI to ISA Bridge 1106 0686 VT82C686/A PCI to ISA Bridge + 1179 0001 Magnia Z310 + 147b a702 KG7-Lite Mainboard 0691 VT82C693A/694x [Apollo PRO133x] + 1179 0001 Magnia Z310 1458 0691 VT82C691 Apollo Pro System Controller 0693 VT82C693 [Apollo Pro Plus] 0698 VT82C693A [Apollo Pro133 AGP] @@ -2771,7 +2949,7 @@ 1595 VT82C595/97 [Apollo VP2/97] 3038 USB 0925 1234 USB Controller - 1234 0925 MVP3 USB Controller + 1179 0001 Magnia Z310 3040 VT82C586B ACPI 3043 VT86C100A [Rhine] 10bd 0000 VT86C100A Fast Ethernet Adapter @@ -2782,8 +2960,10 @@ 3051 VT82C596 Power Management 3057 VT82C686 [Apollo Super ACPI] 1043 8033 A7V Mainboard + 1043 803e A7V-E Mainboard 1043 8040 A7M266 Mainboard 1043 8042 A7V133/A7V133-C Mainboard + 1179 0001 Magnia Z310 3058 VT82C686 AC97 Audio Controller 0e11 b194 Soundmax integrated digital audio 1106 4511 Onboard Audio on EP7KXA @@ -2791,31 +2971,41 @@ 1462 3091 MS-6309 Onboard Audio 15dd 7609 Onboard Audio 3059 VT8233 AC97 Audio Controller + 1458 a002 GA-7VAX Onboard Audio (Realtek ALC650) 3065 VT6102 [Rhine-II] 1106 0102 VT6102 [Rhine II] Embeded Ethernet Controller on VT8235 - 1106 3065 Embedded ethernet on VIA Eden 1186 1400 DFE-530TX rev A 1186 1401 DFE-530TX rev B - 3068 AC97 Modem Controller + 3068 Intel 537 [AC97 Modem] 3074 VT8233 PCI to ISA Bridge + 1043 8052 VT8233A 3091 VT8633 [Apollo Pro266] - 3099 VT8367 [KT266] - 1043 8064 A7V266-E - 1043 807f A7V333 + 3099 VT8366/A/7 [Apollo KT266/A/333] + 1043 8064 A7V266-E Mainboard + 1043 807f A7V333 Mainboard 3101 VT8653 Host Bridge 3102 VT8662 Host Bridge 3103 VT8615 Host Bridge 3104 USB 2.0 + 1458 5004 GA-7VAX Mainboard + 3106 VT6105 [Rhine-III] 3109 VT8233C PCI to ISA Bridge 3112 VT8361 [KLE133] Host Bridge 3116 VT8375 [KM266] Host Bridge +# found on EPIA M6000/9000 mainboard + 3122 VT8623 [Apollo CLE266] integrated CastleRock graphics +# found on EPIA M6000/9000 mainboard + 3123 VT8623 [Apollo CLE266] 3128 VT8753 [P4X266 AGP] 3133 VT3133 Host Bridge 3147 VT8233A ISA Bridge 3148 P4M266 Host Bridge 3156 P/KN266 Host Bridge - 3177 VT8233A ISA Bridge - 3189 VT8377 [KT400] Host Bridge + 3168 VT8374 P4X400 Host Controller/AGP Bridge + 3177 VT8235 ISA Bridge + 1458 5001 GA-7VAX Mainboard + 3189 VT8377 [KT400 AGP] Host Bridge + 1458 5000 GA-7VAX Mainboard 5030 VT82C596 ACPI [Apollo PRO] 6100 VT85C100A [Rhine II] 8231 VT8231 [PCI-to-ISA Bridge] @@ -2831,12 +3021,12 @@ 8691 VT82C691 [Apollo Pro] 8693 VT82C693 [Apollo Pro Plus] PCI Bridge b091 VT8633 [Apollo Pro266 AGP] - b099 VT8367 [KT333 AGP] + b099 VT8366/A/7 [Apollo KT266/A/333 AGP] b101 VT8653 AGP Bridge b102 VT8362 AGP Bridge b103 VT8615 AGP Bridge b112 VT8361 [KLE133] AGP Bridge - b168 VT8235 + b168 VT8235 PCI Bridge 1107 Stratus Computers 0576 VIA VT82C570MV [Apollo] (Wrong vendor ID!) 1108 Proteon, Inc. @@ -2867,8 +3057,8 @@ 6037 Firepower Powerized SMP I/O ASIC 6073 Firepower Powerized SMP I/O ASIC 1111 Santa Cruz Operation -# DJ: Some people say that 0x1112 is Rockwell International -1112 RNS - Div. of Meret Communications Inc +# Also claimed to be RNS or Rockwell International, current PCISIG records list Osicom +1112 Osicom Technologies Inc 2200 FDDI Adapter 2300 Fast Ethernet Adapter 2340 4 Port Fast Ethernet Adapter @@ -2878,6 +3068,7 @@ 103c 1207 EN-1207D Fast Ethernet Adapter 1113 1211 EN-1207D Fast Ethernet Adapter 1216 EN-1216 Ethernet Adapter + 111a 1020 SpeedStream 1020 PCI 10/100 Ethernet Adaptor [EN-1207F-TX ?] 1217 EN-1217 Ethernet Adapter 5105 10Mbps Network card 9211 EN-1207D Fast Ethernet Adapter @@ -3018,10 +3209,14 @@ 0001 MVC IM-PCI Video frame grabber/processor 1130 Computervision 1131 Philips Semiconductors + 1561 USB 1.1 Host Controller + 1562 USB 2.0 Host Controller 3400 SmartPCI56(UCB1500) 56K Modem 7130 SAA7130 Video Broadcast Decoder + 7133 SAA7133 Audio+video broadcast decoder # PCI audio and video broadcast decoder (http://www.semiconductors.philips.com/pip/saa7134hl) 7134 SAA7134 + 7135 SAA7135 Audio+video broadcast decoder 7145 SAA7145 7146 SAA7146 114b 2003 DVRaptor Video Edit/Capture Card @@ -3050,6 +3245,7 @@ 1133 e004 DIVA 2.0 U e005 DIVA LOW 1133 e005 DIVA 2.01 S/T + e00b DIVA 2.02 e010 DIVA Server BRI-2M 1133 e010 DIVA Server BRI-2M e012 DIVA Server BRI-8M @@ -3098,6 +3294,12 @@ 1144 Cincinnati Milacron 0001 Noservo controller 1145 Workbit Corporation + 8007 NinjaSCSI-32 Workbit + f007 NinjaSCSI-32 KME + f010 NinjaSCSI-32 Workbit + f012 NinjaSCSI-32 Logitec + f013 NinjaSCSI-32 Logitec + f015 NinjaSCSI-32 Melco 1146 Force Computers 1147 Interface Corp 1148 Syskonnect (Schneider & Koch) @@ -3127,6 +3329,22 @@ 1148 9844 SK-9844 (1000Base-SX dual link) 1148 9861 SK-9861 (1000Base-SX VF45 single link) 1148 9862 SK-9862 (1000Base-SX VF45 dual link) +# Information got from SysKonnekt + 1148 9871 SK-9871 (1000Base-ZX single link) +# Information got from SysKonnekt + 1148 9872 SK-9872 (1000Base-ZX dual link) + 1259 2970 AT-2970SX [Allied Telesyn] + 1259 2972 AT-2970T [Allied Telesyn] + 1259 2975 AT-2970SX [Allied Telesyn] + 1259 2977 AT-2970T [Allied Telesyn] + 4320 SK-98xx Gigabit Ethernet Server Adapter + 1148 5021 SK-9821 V2.0 Gigabit Ethernet 10/100/1000Base-T Adapter + 1148 5041 SK-9841 V2.0 Gigabit Ethernet 1000Base-LX Adapter + 1148 5043 SK-9843 V2.0 Gigabit Ethernet 1000Base-SX Adapter + 1148 5051 SK-9851 V2.0 Gigabit Ethernet 1000Base-SX Adapter + 1148 5061 SK-9861 V2.0 Gigabit Ethernet 1000Base-SX Adapter + 1148 5071 SK-9871 V2.0 Gigabit Ethernet 1000Base-ZX Adapter + 1148 9521 SK-9521 10/100/1000Base-T Adapter 4400 Gigabit Ethernet 1149 Win System Corporation 114a VMIC @@ -3253,12 +3471,17 @@ 0014 CNB20-HE Host Bridge 0015 CMIC-GC Host Bridge 0016 CMIC-GC Host Bridge - 0017 CMIC-SL + 0017 GCNB-LE Host Bridge 0200 OSB4 South Bridge 0201 CSB5 South Bridge + 0203 CSB6 South Bridge 0211 OSB4 IDE Controller 0212 CSB5 IDE Controller - 0220 OSB4/CSB5 USB Controller + 0213 CSB6 RAID/IDE Controller + 0220 OSB4/CSB5 OHCI USB Controller + 0221 CSB6 OHCI USB Controller + 0225 GCLE Host Bridge + 0227 GCLE-2 Host Bridge 1167 Mutoh Industries Inc 1168 Thine Electronics Inc 1169 Centre for Development of Advanced Computing @@ -3309,7 +3532,9 @@ 0465 RL5c465 0466 RL5c466 0475 RL5c475 + 144d c006 vpr Matrix 170B4 CardBus bridge 0476 RL5c476 II + 1014 0185 ThinkPad A/T/X Series 104d 80df Vaio PCG-FX403 104d 80e7 VAIO PCG-GR214EP/GR214MP/GR215MP/GR314MP/GR315MP 0477 RL5c477 @@ -3318,7 +3543,9 @@ 0522 R5C522 IEEE 1394 Controller 1014 01cf ThinkPad A30p (2653-64G) 0551 R5C551 IEEE 1394 Controller + 144d c006 vpr Matrix 170B4 0552 R5C552 IEEE 1394 Controller + 1014 0511 ThinkPad A/T/X Series 1181 Telmatics International 1183 Fujikura Ltd 1184 Forks Inc @@ -3453,7 +3680,6 @@ 11c0 Hewlett Packard 11c1 Lucent Microelectronics 0440 56k WinModem - 0001 0440 LT WinModem 56k Data+Fax+Voice+Dsvd 1033 8015 LT WinModem 56k Data+Fax+Voice+Dsvd 1033 8047 LT WinModem 56k Data+Fax+Voice+Dsvd 1033 804f LT WinModem 56k Data+Fax+Voice+Dsvd @@ -3495,7 +3721,6 @@ 1468 0441 Presario 56k V.90 DF Modem 1668 0440 Lucent Win Modem 0442 56k WinModem - 0001 0440 LT WinModem 56k Data+Fax+Voice+VoiceView+Dsvd 11c1 0440 LT WinModem 56k Data+Fax+Voice+VoiceView+Dsvd 11c1 0442 LT WinModem 56k Data+Fax+Voice+VoiceView+Dsvd 13e0 0412 LT WinModem 56k Data+Fax+Voice+VoiceView+Dsvd @@ -3537,6 +3762,7 @@ 044e LT WinModem 044f V90 WildWire Modem 0450 LT WinModem + 144f 4005 Magnia SG20 0451 LT WinModem 0452 LT WinModem 0453 LT WinModem @@ -3547,15 +3773,18 @@ 0458 LT WinModem 0459 LT WinModem 045a LT WinModem + 045c LT WinModem 0461 V90 WildWire Modem 0462 V90 WildWire Modem 0480 Venus Modem (V90, 56KFlex) 5801 USB 5802 USS-312 USB Controller +# 4 port PCI USB Controller made by Agere (formely Lucent) + 5803 USS-344S USB Controller 5811 FW323 dead 0800 FireWire Host Bus Adapter 11c2 Sand Microelectronics -11c3 NEC Corp +11c3 NEC Corporation 11c4 Document Technologies, Inc 11c5 Shiva Corporation 11c6 Dainippon Screen Mfg. Co. Ltd @@ -3671,6 +3900,11 @@ 1200 CSS Corporation 1201 Vista Controls Corp 1202 Network General Corp. + 4300 Gigabit Ethernet Adapter + 1202 9841 SK-9841 LX + 1202 9842 SK-9841 LX dual link + 1202 9843 SK-9843 SX + 1202 9844 SK-9843 SX dual link 1203 Bayer Corporation, Agfa Division 1204 Lattice Semiconductor Corporation 1205 Array Corporation @@ -3717,6 +3951,7 @@ 6933 OZ6933 Cardbus Controller 1025 1016 Travelmate 612 TX 6972 OZ6912 Cardbus Controller + 1179 0001 Magnia Z310 1218 Hybricon Corp. 1219 First Virtual Corporation 121a 3Dfx Interactive, Inc. @@ -3738,7 +3973,6 @@ 139c 0016 Raven 139c 0017 Raven 14af 0002 Maxi Gamer Phoenix - 3030 3030 Skywell Magic TwinPower 0004 Voodoo Banshee [Velocity 100] 0005 Voodoo 3 121a 0004 Voodoo3 AGP @@ -3831,9 +4065,10 @@ 1241 DSC Communications # Formerly Jaycor Networks, Inc. 1242 JNI Corporation + 1560 JNIC-1560 PCI-X Fibre Channel Controller + 1242 6562 FCX2-6562 Dual Channel PCI-X Fibre Channel Adapter + 1242 656a FCX-6562 PCI-X Fibre Channel Adapter 4643 FCI-1063 Fibre Channel Adapter - 6562 FCX2-6562 Dual Channel PCI-X Fibre Channel Adapter - 656a FCX-6562 PCI-X Fibre Channel Adapter 1243 Delphax 1244 AVM Audiovisuelles MKTG & Computer System GmbH 0700 B1 ISDN @@ -3850,7 +4085,7 @@ 1249 Samsung Electronics Co., Ltd. 124a AEG Electrocom GmbH 124b SBS/Greenspring Modular I/O - 0040 PCI-40A Quad IndustryPack Carrier or cPCI-200 Four Slot IndustryPack carrier + 0040 PCI-40A or cPCI-200 Quad IndustryPack carrier 124b 9080 PCI9080 Bridge 124c Solitron Technologies, Inc. 124d Stallion Technologies, Inc. @@ -3893,8 +4128,8 @@ 1969 ES1969 Solo-1 Audiodrive 1014 0166 ES1969 SOLO-1 AudioDrive on IBM Aptiva Mainboard 125d 8888 Solo-1 Audio Adapter - 525f c888 ES1969 SOLO-1 AudioDrive (+ES1938) 1978 ES1978 Maestro 2E + 0e11 b112 Armada M700 1033 803c ES1978 Maestro-2E Audiodrive 1033 8058 ES1978 Maestro-2E Audiodrive 1092 4000 Monster Sound MX400 @@ -3926,7 +4161,9 @@ 1260 Harris Semiconductor 3873 Prism 2.5 Wavelan chipset 1186 3501 DWL-520 Wireless PCI Adapter - 1737 3874 WMP11 Wireless 802.11b PCI Adaptor + 1668 0414 HWP01170-01 802.11b PCI Wireless Adapter + 1737 3874 WMP11 Wireless 802.11b PCI Adapter + 8086 2513 Wireless 802.11b MiniPCI Adapter 8130 HMP8130 NTSC/PAL Video Decoder 8131 HMP8131 NTSC/PAL Video Decoder 1261 Matsushita-Kotobuki Electronics Industries, Ltd. @@ -4017,7 +4254,6 @@ 8086 5643 ES1371, ES1373 AudioPCI On Motherboard Vancouver 8086 5753 ES1371, ES1373 AudioPCI On Motherboard WS440BX 5000 ES1370 [AudioPCI] - 4942 4c4c Creative Sound Blaster AudioPCI128 5880 5880 AudioPCI 1274 2000 Creative Sound Blaster AudioPCI128 1274 2003 Creative SoundBlaster AudioPCI 128 @@ -4579,7 +4815,19 @@ 135a Brain Boxes 135b Giganet Inc 135c Quatech Inc + 0010 QSC-100 + 0020 DSC-100 + 0030 DSC-200/300 + 0040 QSC-200/300 + 0050 ESC-100D + 0060 ESC-100M 00f0 MPAC-100 Syncronous Serial Card (Zilog 85230) + 0170 QSCLP-100 + 0180 DSCLP-100 + 0190 SSCLP-100 + 01a0 QSCLP-200/300 + 01b0 DSCLP-200/300 + 01c0 SSCLP-200/300 135d ABB Network Partner AB 135e Sealevel Systems Inc 7101 Single Port RS-232/422/485/530 @@ -4679,6 +4927,10 @@ 0006 6500 Public Key Processor 0007 7811 Security Processor 0012 7951 Security Processor + 0014 78XX Security Processor + 0016 8065 Security Processor + 0017 8165 Security Processor + 0018 8154 Security Processor 13a4 Rascom Inc 13a5 Audio Digital Imaging Inc 13a6 Videonics Inc @@ -4729,7 +4981,10 @@ 13ce Cocom A/S 13cf Studio Audio & Video Ltd 13d0 Techsan Electronics Co Ltd +# http://www.b2c2inc.com/products/pc-specs.html + 2103 B2C2 Sky2PC PCI [SkyStar2] 13d1 Abocom Systems Inc + ab02 ADMtek Centaur-C rev 17 [D-Link DFE-680TX] CardBus Fast Ethernet Adapter ab06 RTL8139 [FE2000VX] CardBus Fast Ethernet Attached Port Adapter 13d2 Shark Multimedia Inc 13d3 IMC Networks @@ -4777,6 +5032,7 @@ 0101 CM8338B 13f6 0101 CMI8338-031 PCI Audio Device 0111 CM8738 + 1019 0970 P6STP-FL motherboard 1043 8077 CMI8738 6-channel audio controller 1043 80e2 CMI8738 6ch-MX 13f6 0111 CMI8738/C3DX PCI Audio Device @@ -4826,6 +5082,7 @@ 1411 Ikos Systems Inc 1412 IC Ensemble Inc 1712 ICE1712 [Envy24] + 1724 ICE1724 [Envy24HT] 1413 Addonics 1414 Microsoft Corporation 1415 Oxford Semiconductor Ltd @@ -4923,7 +5180,7 @@ 0001 NextMove PCI 1460 DYNARC INC 1461 Avermedia Technologies Inc -1462 Micro-star International Co Ltd +1462 Micro-Star International Co., Ltd. 1463 Fast Corporation 1464 Interactive Circuits & Systems Ltd 1465 GN NETTEST Telecom DIV. @@ -5010,6 +5267,14 @@ 0000 DSL NIC 14b4 PHILIPS Business Electronics B.V. 14b5 Creamware GmBH + 0200 Scope + 0300 Pulsar + 0400 Pulsar2 + 0600 Pulsar2 + 0800 DSP-Board + 0900 DSP-Board + 0a00 DSP-Board + 0b00 DSP-Board 14b6 Quantum Data Corp. 14b7 PROXIM Inc 0001 Symphony 4110 @@ -5020,6 +5285,7 @@ 0350 PC4800 4500 PC4500 4800 PC4800 + a504 Cisco Aironet Wireless 802.11b 14ba INTERNIX Inc. 14bb SEMTECH Corporation 14bc Globespan Semiconductor Inc. @@ -5092,40 +5358,41 @@ 14e3 AMTELCO 14e4 Broadcom Corporation 1644 NetXtreme BCM5700 Gigabit Ethernet - 1014 0277 Broadcom Vigil B5700 1000BaseTX + 1014 0277 Broadcom Vigil B5700 1000Base-T 1028 00d1 Broadcom BCM5700 1028 0106 Broadcom BCM5700 - 1028 0109 Broadcom BCM5700 1000BaseTX + 1028 0109 Broadcom BCM5700 1000Base-T 1028 010a Broadcom BCM5700 1000BaseTX - 10b7 1000 3C996-T 1000BaseTX - 10b7 1001 3C996B-T 1000BaseTX - 10b7 1002 3C996C-T 1000BaseTX - 10b7 1003 3C997-T 1000BaseTX Dual Port - 10b7 1004 3C996-SX 1000BaseSX - 10b7 1005 3C997-SX 1000BaseSX Dual Port + 10b7 1000 3C996-T 1000Base-T + 10b7 1001 3C996B-T 1000Base-T + 10b7 1002 3C996C-T 1000Base-T + 10b7 1003 3C997-T 1000Base-T Dual Port + 10b7 1004 3C996-SX 1000Base-SX + 10b7 1005 3C997-SX 1000Base-SX Dual Port 10b7 1008 3C942 Gigabit LOM (31X31) - 14e4 0002 NetXtreme 1000BaseSX - 14e4 0003 NetXtreme 1000BaseSX - 14e4 0004 NetXtreme 1000BaseTX + 14e4 0002 NetXtreme 1000Base-SX + 14e4 0003 NetXtreme 1000Base-SX + 14e4 0004 NetXtreme 1000Base-T 14e4 1028 NetXtreme 1000BaseTX - 14e4 1644 BCM5700 1000BaseTX + 14e4 1644 BCM5700 1000Base-T 1645 NetXtreme BCM5701 Gigabit Ethernet 0e11 007c NC7770 Gigabit Server Adapter (PCI-X, 10/100/1000-T) 0e11 007d NC6770 Gigabit Server Adapter (PCI-X, 1000-SX) 0e11 0085 NC7780 Gigabit Server Adapter (embedded, WOL) 0e11 0099 NC7780 Gigabit Server Adapter (embedded, WOL) 0e11 009a NC7770 Gigabit Server Adapter (PCI-X, 10/100/1000-T) - 1028 0121 Broadcom BCM5701 1000BaseTX - 10b7 1004 3C996-SX 1000BaseSX - 10b7 1006 3C996B-T 1000BaseTX - 10b7 1007 3C1000-T 1000BaseTX - 10b7 1008 3C940-BR01 1000BaseTX - 14e4 0001 BCM5701 1000BaseTX - 14e4 0005 BCM5701 1000BaseTX - 14e4 0006 BCM5701 1000BaseTX - 14e4 0007 BCM5701 1000BaseSX - 14e4 0008 BCM5701 1000BaseTX - 14e4 8008 BCM5701 1000BaseTX + 0e11 00c1 NC6770 Gigabit Server Adapter (PCI-X, 1000-SX) + 1028 0121 Broadcom BCM5701 1000Base-T + 10b7 1004 3C996-SX 1000Base-SX + 10b7 1006 3C996B-T 1000Base-T + 10b7 1007 3C1000-T 1000Base-T + 10b7 1008 3C940-BR01 1000Base-T + 14e4 0001 BCM5701 1000Base-T + 14e4 0005 BCM5701 1000Base-T + 14e4 0006 BCM5701 1000Base-T + 14e4 0007 BCM5701 1000Base-SX + 14e4 0008 BCM5701 1000Base-T + 14e4 8008 BCM5701 1000Base-T 1646 NetXtreme BCM5702 Gigabit Ethernet 0e11 00bb NC7760 1000BaseTX 1028 0126 Broadcom BCM5702 1000BaseTX @@ -5138,10 +5405,48 @@ 14e4 000b BCM5703 1000BaseTX 14e4 8009 BCM5703 1000BaseTX 14e4 800a BCM5703 1000BaseTX + 1648 NetXtreme BCM5704 Gigabit Ethernet + 0e11 00cf NC7772 Gigabit Server Adapter (PCI-X, 10,100,1000-T) + 0e11 00d0 NC7782 Gigabit Server Adapter (PCI-X, 10,100,1000-T) + 0e11 00d1 NC7783 Gigabit Server Adapter (PCI-X, 10,100,1000-T) + 10b7 2000 3C998-T Dual Port 10/100/1000 PCI-X + 10b7 3000 3C999-T Quad Port 10/100/1000 PCI-X + 1166 1648 NetXtreme CIOB-E 1000Base-T 164d NetXtreme BCM5702FE Gigabit Ethernet - 16a6 NetXtreme BCM5702X Gigabit Ethernet - 16a7 NetXtreme BCM5703X Gigabit Ethernet - 4212 BCM v.90 56k modem + 1653 NetXtreme BCM5705 Gigabit Ethernet + 165d NetXtreme BCM5705M Gigabit Ethernet + 1696 NetXtreme BCM5782 Gigabit Ethernet + 14e4 000d NetXtreme BCM5782 1000Base-T + 16a6 NetXtreme BCM5702 Gigabit Ethernet + 0e11 00bb NC7760 Gigabit Server Adapter (PCI-X, 10/100/1000-T) + 1028 0126 BCM5702 1000Base-T + 14e4 000c BCM5702 1000Base-T + 14e4 8009 BCM5702 1000Base-T + 16a7 NetXtreme BCM5703 Gigabit Ethernet + 0e11 00ca NC7771 Gigabit Server Adapter (PCI-X, 10,100,1000-T) + 0e11 00cb NC7781 Gigabit Server Adapter (PCI-X, 10,100,1000-T) + 14e4 0009 NetXtreme BCM5703 1000Base-T + 14e4 000a NetXtreme BCM5703 1000Base-SX + 14e4 000b NetXtreme BCM5703 1000Base-T + 14e4 800a NetXtreme BCM5703 1000Base-T + 16a8 NetXtreme BCM5704S Gigabit Ethernet + 10b7 2001 3C998-SX Dual Port 1000-SX PCI-X + 16c6 NetXtreme BCM5702 Gigabit Ethernet + 10b7 1100 3C1000B-T 10/100/1000 PCI + 14e4 000c BCM5702 1000Base-T + 14e4 8009 BCM5702 1000Base-T + 16c7 NetXtreme BCM5703 Gigabit Ethernet + 14e4 0009 NetXtreme BCM5703 1000Base-T + 14e4 000a NetXtreme BCM5703 1000Base-SX + 4210 BCM4210 iLine10 HomePNA 2.0 + 4211 BCM4211 iLine10 HomePNA 2.0 + V.90 56k modem + 4212 BCM4212 v.90 56k modem + 4301 BCM4301 802.11b + 4401 BCM4401 100Base-T + 4402 BCM4402 Integrated 10/100BaseT + 4410 BCM4413 iLine32 HomePNA 2.0 + 4411 BCM4413 V.90 56k modem + 4412 BCM4413 10/100BaseT 5820 BCM5820 Crypto Accelerator 5821 BCM5821 Crypto Accelerator 14e5 Pixelfusion Ltd @@ -5361,8 +5666,14 @@ 1522 0400 RockForceDUO+ 2 Port V.92/V.44 Data/Fax/Voice Modem 1522 0500 RockForceQUATRO+ 4 Port V.92/V.44 Data/Fax/Voice Modem 1522 0600 RockForce+ 2 Port V.90 Data/Fax/Voice Modem + 1522 0700 RockForce+ 4 Port V.90 Data/Fax/Voice Modem + 1522 0800 RockForceOCTO+ 8 Port V.92/V.44 Data/Fax/Voice Modem 1523 MUSIC Semiconductors 1524 ENE Technology Inc + 1211 CB1211 Cardbus Controller + 1225 CB1225 Cardbus Controller + 1410 CB1410 Cardbus Controller + 1420 CB1420 Cardbus Controller 1525 IMPACT Technologies 1526 ISS, Inc 1527 SOLECTRON @@ -5393,6 +5704,8 @@ 1541 MACHONE Communications 1542 VIVID Technology Inc 1543 SILICON Laboratories + 3052 Intel 537 [Winmodem] + 4c22 Si3036 MC'97 DAA 1544 DCM DATA Systems 1545 VISIONTEK 1546 IOI Technology Corp @@ -5631,24 +5944,37 @@ 2002 Fast Universal Data Output 1638 Standard Microsystems Corp [SMC] 1100 SMC2602W EZConnect / Addtron AWA-100 +163c Smart Link Ltd. + 5449 SmartPCI561 Modem 1657 Brocade Communications Systems, Inc. +165a Epix Inc + c100 PIXCI(R) CL1 Camera Link Video Capture Board [custom QL5232] + d200 PIXCI(R) D2X Digital Video Capture Board [custom QL5232] + d300 PIXCI(R) D3X Digital Video Capture Board [custom QL5232] 165d Hsing Tech. Enterprise Co., Ltd. 1661 Worldspace Corp. -1668 Action Tec Electronics Inc +1668 Actiontec Electronics Inc +1681 Hercules 16ab Global Sun Technology Inc + 1102 PCMCIA-to-PCI Wireless Network Bridge +16be Creatix Polymedia GmbH 16ec U.S. Robotics 3685 Wireless Access PCI Adapter Model 022415 16f6 VideoTele.com, Inc. +1705 Digital First, Inc. 170b NetOctave Inc 170c YottaYotta Inc. +172a Accelerated Encryption 1737 Linksys 173b Altima (nee Broadcom) 03e8 AC1000 Gigabit Ethernet 03ea AC9100 Gigabit Ethernet + 173b 0001 AC1002 1743 Peppercon AG 8139 ROL/F-100 Fast Ethernet Adapter with ROL 174b PC Partner Limited 175e Sanera Systems, Inc. +1787 Hightech Information System Ltd. # also used by Struck Innovative Systeme for joint developments 1796 Research Centre Juelich 0001 SIS1100 [Gigabit link] @@ -5657,7 +5983,22 @@ 0004 CAMAC Controller 0005 PROFIBUS 0006 AMCC HOTlink +1799 Belkin +17af Hightech Information System Ltd. +17cc NetChip Technology, Inc + 2280 USB 2.0 1813 Ambient Technologies Inc + 4000 HaM controllerless modem + 16be 0001 V9x HAM Data Fax Modem + 4100 HaM plus Data Fax Modem + 16be 0002 V9x HAM 1394 +1851 Microtune, Inc. +1852 Anritsu Corp. +1888 Varisys Ltd + 0301 VMFX1 FPGA PMC module + 0601 VSM2 dual PMC carrier + 0710 VS14x series PowerPC PCI board + 0720 VS24x series PowerPC PCI board 1a08 Sierra semiconductor 0000 SC15064 1b13 Jaton Corp @@ -5670,7 +6011,10 @@ 2020 DC-390 690c 690c dc29 DC290 +2000 Smart Link Ltd. 2001 Temporal Research Ltd +2003 Smart Link Ltd. +2004 Smart Link Ltd. 21c3 21st Century Computer Corp. 2348 Racore 2010 8142 100VG/AnyLAN @@ -5682,6 +6026,8 @@ 3000 Hansol Electronics Inc. 3142 Post Impression Systems. 3388 Hint Corp + 0013 HiNT HC4 PCI to ISDN bridge, Multimedia audio controller + 0014 HiNT HC4 PCI to ISDN bridge, Network controller 0021 HB1-SE33 PCI-PCI Bridge 8011 VXPro II Chipset 3388 8011 VXPro II Chipset CPU to PCI Bridge @@ -5714,6 +6060,7 @@ 000a GLINT R3 3d3d 0121 Oxygen VX1 000c GLINT R3 [Oxygen VX1] + 3d3d 0144 Oxygen VX1-4X AGP [Permedia 4] 0100 Permedia II 2D+3D 1004 Permedia 3d04 Permedia @@ -5741,6 +6088,7 @@ 0100 AladdinCARD 0200 CPC 4444 Internext Compression Inc + 0803 iTVC15 MPEG-2 Encoder 4468 Bridgeport machines 4594 Cogetec Informatique Inc 45fb Baldor Electric Company @@ -5786,6 +6134,7 @@ 5143 Qualcomm Inc 5145 Ensoniq (Old) 3031 Concert AudioPCI +5168 Animation Technologies Inc. 5301 Alliance Semiconductor Corp. 0001 ProMotion aT3D 5333 S3 Inc. @@ -5894,7 +6243,9 @@ 8c10 86C270-294 Savage/MX-MV 8c11 82C270-294 Savage/MX 8c12 86C270-294 Savage/IX-MV + 1014 017f ThinkPad T20 8c13 86C270-294 Savage/IX + 1179 0001 Magnia Z310 8c22 SuperSavage MX/128 8c24 SuperSavage MX/64 8c26 SuperSavage MX/64C @@ -5905,10 +6256,10 @@ 8c2e SuperSavage IX/C SDR 1014 01fc ThinkPad T23 (2647-4MG) 8c2f SuperSavage IX/C DDR -# Integrated in VIA ProSavage PN133 North Bridge - 8d01 VT8603 [ProSavage PN133] AGP4X VGA Controller (Twister) + 8d01 86C380 [ProSavageDDR K4M266] 8d02 VT8636A [ProSavage KN133] AGP4X VGA Controller (TwisterK) - 8d04 VT8751 [ProSavageDDR P4M266] VGA Controller + 8d03 VT8751 [ProSavageDDR P4M266] + 8d04 [ProSavageDDR K4M266] 9102 86C410 Savage 2000 1092 5932 Viper II Z200 1092 5934 Viper II Z200 @@ -5927,6 +6278,7 @@ 0001 I-30xx Scanner Interface 5555 Genroco, Inc 0003 TURBOstor HFP-832 [HiPPI NIC] +5654 VoiceTronix Pty Ltd 5700 Netpower 6356 UltraStor 6374 c't Magazin für Computertechnik @@ -6002,13 +6354,14 @@ 1029 82559 Ethernet Controller 1030 82559 InBusiness 10/100 1031 82801CAM (ICH3) PRO/100 VE (LOM) Ethernet Controller - 1014 0209 ThinkPad A30p (2653-64G) + 1014 0209 ThinkPad A/T/X Series 104d 80e7 Vaio PCG-GR214EP/GR214MP/GR215MP/GR314MP/GR315MP 107b 5350 EtherExpress PRO/100 VE 1179 0001 EtherExpress PRO/100 VE 144d c000 EtherExpress PRO/100 VE 144d c001 EtherExpress PRO/100 VE 144d c003 EtherExpress PRO/100 VE + 144d c006 vpr Matrix 170B4 1032 82801CAM (ICH3) PRO/100 VE Ethernet Controller 1033 82801CAM (ICH3) PRO/100 VM (LOM) Ethernet Controller 1034 82801CAM (ICH3) PRO/100 VM Ethernet Controller @@ -6022,8 +6375,11 @@ 103c 82801BD PRO/100 VM (CNR) Ethernet Controller 103d 82801BD PRO/100 VE (MOB) Ethernet Controller 103e 82801BD PRO/100 VM (MOB) Ethernet Controller + 1040 536EP Data Fax Modem + 16be 1040 V.9X DSP Data Fax Modem 1059 82551QM Ethernet Controller 1130 82815 815 Chipset Host Bridge and Memory Controller Hub + 1025 1016 Travelmate 612 TX 1043 8027 TUSL2-C Mainboard 104d 80df Vaio PCG-FX403 1131 82815 815 Chipset AGP Bridge @@ -6074,13 +6430,16 @@ 1014 01f2 10/100 Ethernet Server Adapter 1014 0207 Ethernet Pro/100 S 1014 0232 10/100 Dual Port Server Adapter + 1014 023a ThinkPad R30 1014 105c Netfinity 10/100 + 1014 2205 ThinkPad A22p 1014 305c 10/100 EtherJet Management Adapter 1014 405c 10/100 EtherJet Adapter with Alert on LAN 1014 505c 10/100 EtherJet Secure Management Adapter 1014 605c 10/100 EtherJet Secure Management Adapter 1014 705c 10/100 Netfinity 10/100 Ethernet Security Adapter 1014 805c 10/100 Netfinity 10/100 Ethernet Security Adapter + 1028 009b PowerEdge 2550 1033 8000 PC-9821X-B06 1033 8016 PK-UG-X006 1033 801f PK-UG-X006 @@ -6211,6 +6570,7 @@ 8086 8000 82806AA PCI64 Hub Controller (HRes) 1460 82870P2 P64H2 Hub PCI Bridge 1461 82870P2 P64H2 I/OxAPIC + 15d9 3480 P4DP6 1462 82870P2 P64H2 Hot Plug Controller 1960 80960RP [i960RP Microprocessor] 101e 0431 MegaRAID 431 RAID Controller @@ -6262,20 +6622,28 @@ 2428 82801AB PCI Bridge 2440 82801BA ISA Bridge (LPC) 2442 82801BA/BAM USB (Hub #1) + 1014 01c6 Netvista A40/A40p + 1025 1016 Travelmate 612 TX 104d 80df Vaio PCG-FX403 147b 0507 TH7II-RAID 2443 82801BA/BAM SMBus + 1014 01c6 Netvista A40/A40p + 1025 1016 Travelmate 612 TX 1043 8027 TUSL2-C Mainboard 104d 80df Vaio PCG-FX403 147b 0507 TH7II-RAID 2444 82801BA/BAM USB (Hub #2) + 1025 1016 Travelmate 612 TX 104d 80df Vaio PCG-FX403 147b 0507 TH7II-RAID 2445 82801BA/BAM AC'97 Audio + 1014 01c6 Netvista A40/A40p + 1025 1016 Travelmate 612 TX 104d 80df Vaio PCG-FX403 1462 3370 STAC9721 AC 147b 0507 TH7II-RAID - 2446 82801BA/BAM AC'97 Modem + 2446 Intel 537 [82801BA/BAM AC'97 Modem] + 1025 1016 Travelmate 612 TX 104d 80df Vaio PCG-FX403 2448 82801BAM/CAM PCI Bridge 2449 82801BA/BAM/CA/CAM Ethernet Controller @@ -6309,6 +6677,7 @@ 1025 1016 Travelmate 612TX 104d 80df Vaio PCG-FX403 244b 82801BA IDE U100 + 1014 01c6 Netvista A40/A40p 1043 8027 TUSL2-C Mainboard 147b 0507 TH7II-RAID 244c 82801BAM ISA Bridge (LPC) @@ -6322,39 +6691,64 @@ 245e 82801E PCI Bridge 2480 82801CA ISA Bridge (LPC) 2482 82801CA/CAM USB (Hub #1) - 1014 0220 ThinkPad T23 (2647-4MG) or A30p (2653-64G) + 1014 0220 ThinkPad A/T/X Series 104d 80e7 VAIO PCG-GR214EP/GR214MP/GR215MP/GR314MP/GR315MP + 15d9 3480 P4DP6 + 8086 1958 vpr Matrix 170B4 2483 82801CA/CAM SMBus - 1014 0220 ThinkPad T23 (2647-4MG) or A30p (2653-64G) + 1014 0220 ThinkPad A/T/X Series 104d 80e7 VAIO PCG-GR214EP/GR214MP/GR215MP/GR314MP/GR315MP + 15d9 3480 P4DP6 + 8086 1958 vpr Matrix 170B4 2484 82801CA/CAM USB (Hub #2) - 1014 0220 ThinkPad T23 (2647-4MG) or A30p (2653-64G) + 1014 0220 ThinkPad A/T/X Series 104d 80e7 VAIO PCG-GR214EP/GR214MP/GR215MP/GR314MP/GR315MP + 15d9 3480 P4DP6 + 8086 1958 vpr Matrix 170B4 2485 82801CA/CAM AC'97 Audio 1014 0222 ThinkPad T23 (2647-4MG) or A30p (2653-64G) + 1014 0508 ThinkPad T30 + 1014 051c ThinkPad A/T/X Series 104d 80e7 VAIO PCG-GR214EP/GR214MP/GR215MP/GR314MP/GR315MP + 144d c006 vpr Matrix 170B4 2486 82801CA/CAM AC'97 Modem - 1014 0223 ThinkPad A30p (2653-64G) + 1014 0223 ThinkPad A/T/X Series 1014 0503 ThinkPad R31 2656BBG + 1014 051a ThinkPad A/T/X Series 104d 80e7 VAIO PCG-GR214EP/GR214MP/GR215MP/GR314MP/GR315MP + 1179 0001 Toshiba Satellite 1110 Z15 internal Modem 134d 4c21 Dell Inspiron 2100 internal modem + 144d 2115 vpr Matrix 170B4 internal modem + 14f1 5421 MD56ORD V.92 MDC Modem 2487 82801CA/CAM USB (Hub #3) - 1014 0220 ThinkPad T23 (2647-4MG) or A30p (2653-64G) + 1014 0220 ThinkPad A/T/X Series 104d 80e7 VAIO PCG-GR214EP/GR214MP/GR215MP/GR314MP/GR315MP + 15d9 3480 P4DP6 + 8086 1958 vpr Matrix 170B4 248a 82801CAM IDE U100 - 1014 0220 ThinkPad T23 (2647-4MG) or A30p (2653-64G) + 1014 0220 ThinkPad A/T/X Series 104d 80e7 VAIO PCG-GR214EP/GR214MP/GR215MP/GR314MP/GR315MP + 8086 1958 vpr Matrix 170B4 248b 82801CA IDE U100 + 15d9 3480 P4DP6 248c 82801CAM ISA Bridge (LPC) 24c0 82801DB ISA Bridge (LPC) + 1462 5800 845PE Max (MS-6580) 24c2 82801DB USB (Hub #1) + 1462 5800 845PE Max (MS-6580) 24c3 82801DB SMBus + 1462 5800 845PE Max (MS-6580) 24c4 82801DB USB (Hub #2) + 1462 5800 845PE Max (MS-6580) 24c5 82801DB AC'97 Audio + 1462 5800 845PE Max (MS-6580) 24c6 82801DB AC'97 Modem 24c7 82801DB USB (Hub #3) + 1462 5800 845PE Max (MS-6580) 24cb 82801DB ICH4 IDE + 1462 5800 845PE Max (MS-6580) 24cd 82801DB USB EHCI Controller + 1462 3981 845PE Max (MS-6580) Onboard USB EHCI Controller 2500 82820 820 (Camino) Chipset Host Bridge (MCH) 1028 0095 Precision Workstation 220 Chipset 1043 801c P3C-2000 system chipset @@ -6371,7 +6765,9 @@ 2533 82860 860 (Wombat) Chipset AGP Bridge 2534 82860 860 (Wombat) Chipset PCI Bridge 2540 e7500 [Plumas] DRAM Controller + 15d9 3480 P4DP6 2541 e7500 [Plumas] DRAM Controller Error Reporting + 15d9 3480 P4DP6 2543 e7500 [Plumas] HI_B Virtual PCI Bridge (F0) 2544 e7500 [Plumas] HI_B Virtual PCI Bridge (F1) 2545 e7500 [Plumas] HI_C Virtual PCI Bridge (F0) @@ -6379,14 +6775,16 @@ 2547 e7500 [Plumas] HI_D Virtual PCI Bridge (F0) 2548 e7500 [Plumas] HI_D Virtual PCI Bridge (F1) 2560 82845G/GL [Brookdale-G] Chipset Host Bridge + 1462 5800 845PE Max (MS-6580) 2561 82845G/GL [Brookdale-G] Chipset AGP Bridge 2562 82845G/GL [Brookdale-G] Chipset Integrated Graphics Device 3092 Integrated RAID 3575 82830 830 Chipset Host Bridge - 1014 021d ThinkPad T23 (2647-4MG) or A30p (2653-64G) + 1014 021d ThinkPad A/T/X Series 104d 80e7 VAIO PCG-GR214EP/GR214MP/GR215MP/GR314MP/GR315MP 3576 82830 830 Chipset AGP Bridge 3577 82830 CGC [Chipset Graphics Controller] + 1014 0513 ThinkPad A/T/X Series 3578 82830 830 Chipset Host Bridge 5200 EtherExpress PRO/100 Intelligent Server 5201 EtherExpress PRO/100 Intelligent Server @@ -6414,6 +6812,7 @@ 7181 440LX/EX - 82443LX/EX AGP bridge 7190 440BX/ZX/DX - 82443BX/ZX/DX Host bridge 0e11 0500 Armada 1750 Laptop System Chipset + 0e11 b110 Armada M700 1179 0001 Toshiba Tecra 8100 Laptop System Chipset 7191 440BX/ZX/DX - 82443BX/ZX/DX AGP bridge 7192 440BX/ZX/DX - 82443BX/ZX/DX Host bridge (AGP disabled) @@ -6610,13 +7009,19 @@ 9005 62a1 19160 Ultra160 SCSI Controller 0083 AIC-7892D U160/m 008f AIC-7892P U160/m + 1179 0001 Magnia Z310 + 15d9 9005 Onboard SCSI Host Adapter 00c0 AHA-3960D / AIC-7899A U160/m 0e11 f620 Compaq 64-Bit/66MHz Dual Channel Wide Ultra3 SCSI Adapter 9005 f620 AHA-3960D U160/m 00c1 AIC-7899B U160/m 00c3 AIC-7899D U160/m 00c5 RAID subsystem HBA + 1028 00c5 PowerEdge 2550 00cf AIC-7899P U160/m + 1028 00d1 PowerEdge 2550 + 10f1 2462 Thunder K7 S2462 + 15d9 9005 Onboard SCSI Host Adapter 0250 ServeRAID Controller 1014 0279 ServeRAID-xx 1014 028c ServeRAID-xx @@ -6660,6 +7065,8 @@ a727 3Com Corporation aa42 Scitex Digital Video ac1e Digital Receiver Technology Inc b1b3 Shiva Europe Limited +# Pinnacle should be 11bd, but they got it wrong several times --mj +bd11 Pinnacle Systems, Inc. (Wrong ID) c001 TSI Telsys c0a9 Micron/Crucial Technology c0de Motorola @@ -6669,6 +7076,7 @@ cafe Chrysalis-ITS cccc Catapult Communications cddd Tyzx, Inc. 0101 DeepSea 1 High Speed Stereo Vision Frame Grabber + 0200 DeepSea 2 High Speed Stereo Vision Frame Grabber d4d4 Dy4 Systems Inc 0601 PCI Mezzanine Card d531 I+ME ACTIA GmbH @@ -6677,12 +7085,17 @@ dead Indigita Corporation e000 Winbond e000 W89C940 e159 Tiger Jet Network Inc. - 0001 Model 300 128k + 0001 Intel 537 0059 0001 128k ISDN-S/T Adapter 0059 0003 128k ISDN-U Adapter 0002 Tiger100APC ISDN chipset e4bf EKF Elektronik GmbH ea01 Eagle Technology +# The main chip of all these devices is by Xilinx -> It could also be a Xilinx ID. +ea60 RME + 9896 Digi32 + 9897 Digi32 Pro + 9898 Digi32/8 eabb Aashima Technology B.V. eace Endace Measurement Systems, Ltd 3100 DAG 3.10 OC-3/OC-12 @@ -6698,18 +7111,29 @@ eace Endace Measurement Systems, Ltd 422e DAG 4.2E Dual Gigabit Ethernet ec80 Belkin Corporation ec00 F5D6000 -ecc0 Echo Corporation +ecc0 Echo Digital Audio Corporation + 0050 Gina24_301 + 0051 Gina24_361 + 0060 Layla24 + 0070 Mona_301_80 + 0071 Mona_301_66 + 0072 Mona_361 + 0080 Mia edd8 ARK Logic Inc a091 1000PV [Stingray] a099 2000PV [Stingray] a0a1 2000MT a0a9 2000MI f1d0 AJA Video +# All boards I have seen have this ID not efac, though all docs say efac... + cafe KONA SD SMPTE 259M I/O efac KONA SD SMPTE 259M I/O facd KONA HD SMPTE 292M I/O fa57 Fast Search & Transfer ASA febd Ultraview Corp. -feda Epigram Inc +feda Broadcom Inc (nee Epigram) + a0fa BCM4210 iLine10 HomePNA 2.0 + a10e BCM4230 iLine10 HomePNA 2.0 fffe VMWare Inc 0710 Virtual SVGA ffff Illegal Vendor ID diff --git a/xc/programs/Xserver/hw/xfree86/etc/pcitweak.c b/xc/programs/Xserver/hw/xfree86/etc/pcitweak.c index bc2807835..42a9f9712 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/pcitweak.c +++ b/xc/programs/Xserver/hw/xfree86/etc/pcitweak.c @@ -5,7 +5,7 @@ * * Author: David Dawes <dawes@xfree86.org> */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/etc/pcitweak.c,v 1.15 2001/01/06 20:19:12 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/etc/pcitweak.c,v 1.16 2002/12/14 04:41:13 dawes Exp $ */ #include "X.h" #include "os.h" @@ -41,7 +41,7 @@ static char *myname = NULL; int main(int argc, char *argv[]) { - char c; + int c; PCITAG tag; int bus, device, func; Bool list = FALSE, rd = FALSE, wr = FALSE; diff --git a/xc/programs/Xserver/hw/xfree86/etc/scanpci.c b/xc/programs/Xserver/hw/xfree86/etc/scanpci.c index e5af74a1d..6093bd31a 100644 --- a/xc/programs/Xserver/hw/xfree86/etc/scanpci.c +++ b/xc/programs/Xserver/hw/xfree86/etc/scanpci.c @@ -23,7 +23,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/etc/scanpci.c,v 3.89 2002/10/03 21:32:19 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/etc/scanpci.c,v 3.92 2003/02/13 12:17:14 tsi Exp $ */ #include "X.h" #include "os.h" @@ -152,7 +152,7 @@ main(int argc, char *argv[]) int Verbose = 0; int i = 0; int force = 0; - char c; + int c; xf86Info.pciFlags = PCIProbe1; @@ -432,17 +432,48 @@ print_bridge_pci_class(pciConfigPtr pcr) { printf(" HEADER 0x%02x LATENCY 0x%02x\n", pcr->pci_header_type, pcr->pci_latency_timer); - printf(" PRIBUS 0x%02x SECBUS 0x%02x SUBBUS 0x%02x SECLT 0x%02x\n", + printf(" PRIBUS 0x%02x SECBUS 0x%02x SUBBUS 0x%02x\n", pcr->pci_primary_bus_number, pcr->pci_secondary_bus_number, - pcr->pci_subordinate_bus_number, pcr->pci_secondary_latency_timer); - printf(" IOBASE 0x%02x IOLIM 0x%02x SECSTATUS 0x%04x\n", - pcr->pci_io_base << 8, (pcr->pci_io_limit << 8) | 0xfff, - pcr->pci_secondary_status); - printf(" NOPREFETCH_MEMBASE 0x%08x MEMLIM 0x%08x\n", - pcr->pci_mem_base << 16, (pcr->pci_mem_limit << 16) | 0xfffff); - printf(" PREFETCH_MEMBASE 0x%08x MEMLIM 0x%08x\n", - pcr->pci_prefetch_mem_base << 16, - (pcr->pci_prefetch_mem_limit << 16) | 0xfffff); + pcr->pci_subordinate_bus_number); + printf(" SECLT 0x%02x SECSTATUS 0x%04x\n", + pcr->pci_secondary_latency_timer, pcr->pci_secondary_status); + + if (pcr->pci_io_base || pcr->pci_io_limit || + pcr->pci_upper_io_base || pcr->pci_upper_io_limit) { + if (((pcr->pci_io_base & 0x0f) == 0x01) || + ((pcr->pci_io_limit & 0x0f) == 0x01)) { + printf(" IOBASE 0x%04x%04x IOLIM 0x%04x%04x\n", + pcr->pci_upper_io_base, (pcr->pci_io_base & 0x00f0) << 8, + pcr->pci_upper_io_limit, (pcr->pci_io_limit << 8) | 0x0fff); + } else { + printf(" IOBASE 0x%04x IOLIM 0x%04x\n", + (pcr->pci_io_base & 0x00f0) << 8, + (pcr->pci_io_limit << 8) | 0x0fff); + } + } + + if (pcr->pci_mem_base || pcr->pci_mem_limit) + printf(" NOPREFETCH_MEMBASE 0x%08x MEMLIM 0x%08x\n", + (pcr->pci_mem_base & 0x00fff0) << 16, + (pcr->pci_mem_limit << 16) | 0x0fffff); + + if (pcr->pci_prefetch_mem_base || pcr->pci_prefetch_mem_limit || + pcr->pci_prefetch_upper_mem_base || + pcr->pci_prefetch_upper_mem_limit) { + if (((pcr->pci_prefetch_mem_base & 0x0f) == 0x01) || + ((pcr->pci_prefetch_mem_limit & 0x0f) == 0x01)) { + printf(" PREFETCH_MEMBASE 0x%08x%08x MEMLIM 0x%08x%08x\n", + (int)pcr->pci_prefetch_upper_mem_base, + (pcr->pci_prefetch_mem_base & 0x00fff0) << 16, + (int)pcr->pci_prefetch_upper_mem_limit, + (pcr->pci_prefetch_mem_limit << 16) | 0x0fffff); + } else { + printf(" PREFETCH_MEMBASE 0x%08x MEMLIM 0x%08x\n", + (pcr->pci_prefetch_mem_base & 0x00fff0) << 16, + (pcr->pci_prefetch_mem_limit << 16) | 0x0fffff); + } + } + printf(" %sFAST_B2B %sSEC_BUS_RST %sM_ABRT %sVGA_EN %sISA_EN" " %sSERR_EN %sPERR_EN\n", (pcr->pci_bridge_control & PCI_B_FAST_B_B) ? "" : "NO_", |