summaryrefslogtreecommitdiff
path: root/hw/xfree86/utils
diff options
context:
space:
mode:
Diffstat (limited to 'hw/xfree86/utils')
-rw-r--r--hw/xfree86/utils/kbd_mode/bsd-kbd_mode.c5
-rw-r--r--hw/xfree86/utils/kbd_mode/bsd-kbd_mode.man.pre6
-rw-r--r--hw/xfree86/utils/kbd_mode/sun-kbd_mode.c12
-rw-r--r--hw/xfree86/utils/kbd_mode/sun-kbd_mode.man.pre5
-rw-r--r--hw/xfree86/utils/scanpci/scanpci.c2355
-rw-r--r--hw/xfree86/utils/xorgconfig/Cards1439
-rw-r--r--hw/xfree86/utils/xorgconfig/cards.c59
-rw-r--r--hw/xfree86/utils/xorgconfig/cards.h14
8 files changed, 2011 insertions, 1884 deletions
diff --git a/hw/xfree86/utils/kbd_mode/bsd-kbd_mode.c b/hw/xfree86/utils/kbd_mode/bsd-kbd_mode.c
index 37c23cfea..f7d07eb79 100644
--- a/hw/xfree86/utils/kbd_mode/bsd-kbd_mode.c
+++ b/hw/xfree86/utils/kbd_mode/bsd-kbd_mode.c
@@ -1,10 +1,10 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/etc/kbd_mode.c,v 3.5 1996/12/23 06:47:13 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/etc/kbd_mode.c,v 3.6 1998/07/26 09:56:17 dawes Exp $ */
/* Keyboard mode control program for 386BSD */
-/* $Xorg: kbd_mode.c,v 1.3 2000/08/17 19:51:09 cpqbld Exp $ */
+/* $XConsortium: kbd_mode.c /main/7 1996/03/11 10:46:12 kaleb $ */
#include <sys/types.h>
#include <fcntl.h>
@@ -20,6 +20,7 @@
#include "scrnintstr.h"
#include "xf86.h"
+#include "xf86Priv.h"
#include "xf86_OSlib.h"
static int fd;
diff --git a/hw/xfree86/utils/kbd_mode/bsd-kbd_mode.man.pre b/hw/xfree86/utils/kbd_mode/bsd-kbd_mode.man.pre
index c959d2332..677663d7e 100644
--- a/hw/xfree86/utils/kbd_mode/bsd-kbd_mode.man.pre
+++ b/hw/xfree86/utils/kbd_mode/bsd-kbd_mode.man.pre
@@ -1,5 +1,5 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/etc/kbd_mode.man,v 3.2 1996/12/23 06:47:14 dawes Exp $
-.TH KBD_MODE 1 "Release 6.3 (XFree86 3.2)" "X Version 11"
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/etc/kbd_mode.man,v 3.5 2001/01/27 18:20:56 dawes Exp $
+.TH KBD_MODE 1 __vendorversion__
.SH NAME
kbd_mode \- recover the PC console keyboard
.SH SYNOPSIS
@@ -33,4 +33,4 @@ reset it typing:
kbd_mode -u
.sp
-.\" $Xorg: kbd_mode.man,v 1.3 2000/08/17 19:51:10 cpqbld Exp $
+.\" $TOG: kbd_mode.man /main/6 1997/07/19 10:37:14 kaleb $
diff --git a/hw/xfree86/utils/kbd_mode/sun-kbd_mode.c b/hw/xfree86/utils/kbd_mode/sun-kbd_mode.c
index 294787354..6e81fd247 100644
--- a/hw/xfree86/utils/kbd_mode/sun-kbd_mode.c
+++ b/hw/xfree86/utils/kbd_mode/sun-kbd_mode.c
@@ -27,10 +27,11 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
+/* $XFree86: xc/programs/Xserver/hw/sun/kbd_mode.c,v 3.11 2002/10/23 16:23:36 tsi Exp $ */
-#ifndef lint
+/*
static char sccsid[] = "@(#)kbd_mode.c 7.1 87/04/13";
-#endif
+ */
/*
* Copyright 1986 by Sun Microsystems, Inc.
@@ -41,7 +42,7 @@ static char sccsid[] = "@(#)kbd_mode.c 7.1 87/04/13";
#include <sys/types.h>
#include <sys/file.h>
#include <sys/ioctl.h>
-#if defined(SVR4) || defined(__bsdi_)
+#if defined(SVR4) || defined(__bsdi__)
#include <fcntl.h>
#ifndef __bsdi__
#include <sys/kbio.h>
@@ -61,15 +62,18 @@ static char sccsid[] = "@(#)kbd_mode.c 7.1 87/04/13";
#endif
#endif
#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
static void die(), usage();
static int kbd_fd;
+int
main(argc, argv)
int argc;
char** argv;
{
- int code, translate, direct = -1;
+ int code = 0, translate, direct = -1;
char led;
int click;
diff --git a/hw/xfree86/utils/kbd_mode/sun-kbd_mode.man.pre b/hw/xfree86/utils/kbd_mode/sun-kbd_mode.man.pre
index 88c4a89b4..528ed12f0 100644
--- a/hw/xfree86/utils/kbd_mode/sun-kbd_mode.man.pre
+++ b/hw/xfree86/utils/kbd_mode/sun-kbd_mode.man.pre
@@ -23,7 +23,10 @@
.\" not be used in advertising or otherwise to promote the sale, use or
.\" other dealings in this Software without prior written authorization
.\" from The Open Group.
-.TH KBD_MODE 1 "Release 6.4" "X Version 11"
+.\"
+.\" $XFree86: xc/programs/Xserver/hw/sun/kbd_mode.man,v 1.7 2001/12/14 19:59:42 dawes Exp $
+.\"
+.TH KBD_MODE 1 __xorgversion__
.SH NAME
kbd_mode \- recover the Sun console keyboard
.SH SYNOPSIS
diff --git a/hw/xfree86/utils/scanpci/scanpci.c b/hw/xfree86/utils/scanpci/scanpci.c
index f3a142fba..6093bd31a 100644
--- a/hw/xfree86/utils/scanpci/scanpci.c
+++ b/hw/xfree86/utils/scanpci/scanpci.c
@@ -1,30 +1,7 @@
-/* $Xorg: scanpci.c,v 1.3 2000/08/17 19:51:10 cpqbld Exp $ */
-/*
- * name: scanpci.c
- *
- * purpose: This program will scan for and print details of
- * devices on the PCI bus.
-
- * author: Robin Cutshaw (robin@xfree86.org)
- *
- * supported O/S's: SVR4, UnixWare, SCO, Solaris,
- * FreeBSD, NetBSD, 386BSD, BSDI BSD/386,
- * Linux, Mach/386, ISC
- * DOS (WATCOM 9.5 compiler)
- *
- * compiling: [g]cc scanpci.c -o scanpci
- * for SVR4 (not Solaris), UnixWare use:
- * [g]cc -DSVR4 scanpci.c -o scanpci
- * for DOS, watcom 9.5:
- * wcc386p -zq -omaxet -7 -4s -s -w3 -d2 name.c
- * and link with PharLap or other dos extender for exe
- *
- */
-
-/* $XFree86: xc/programs/Xserver/hw/xfree86/etc/scanpci.c,v 3.34.2.10 1998/02/27 17:13:22 robin Exp $ */
-
/*
+ * Copyright 2000 by Egbert Eich
* Copyright 1995 by Robin Cutshaw <robin@XFree86.Org>
+ * Copyright 2002 by David Dawes
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
@@ -46,1510 +23,505 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
*/
+/* $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"
+#include "xf86.h"
+#include "xf86Priv.h"
+#include "xf86_OSproc.h"
+#include "xf86Pci.h"
+#include "xf86PciInfo.h"
+#include "xf86ScanPci.h"
+#include "dummylib.h"
+
+#include <stdarg.h>
+#include <stdlib.h>
+#ifdef __linux__
+/* to get getopt on Linux */
+#ifndef __USE_POSIX2
+#define __USE_POSIX2
+#endif
+#endif
+#include <unistd.h>
+
+#if defined(ISC) || defined(Lynx)
+extern char *optarg;
+extern int optind, opterr;
+#endif
+
+pciVideoPtr *xf86PciVideoInfo = NULL;
+
+static void usage(void);
+static void identify_card(pciConfigPtr pcr, int verbose);
+static void print_default_class(pciConfigPtr pcr);
+static void print_bridge_pci_class(pciConfigPtr pcr);
+static void print_mach64(pciConfigPtr pcr);
+static void print_i128(pciConfigPtr pcr);
+static void print_dc21050(pciConfigPtr pcr);
+static void print_simba(pciConfigPtr pcr);
+static void print_460gx_sac(pciConfigPtr pcr);
+static void print_460gx_pxb(pciConfigPtr pcr);
+static void print_460gx_gxb(pciConfigPtr pcr);
+
+#define MAX_DEV_PER_VENDOR 40
+
+typedef struct {
+ unsigned int Vendor;
+ struct {
+ int DeviceID;
+ void(*func)(pciConfigPtr);
+ } Device[MAX_DEV_PER_VENDOR];
+} pciVendorDevFuncInfo;
+
+static pciVendorDevFuncInfo vendorDeviceFuncInfo[] = {
+ { PCI_VENDOR_ATI, {
+ { PCI_CHIP_MACH64CT, print_mach64 },
+ { PCI_CHIP_MACH64CX, print_mach64 },
+ { PCI_CHIP_MACH64ET, print_mach64 },
+ { PCI_CHIP_MACH64GB, print_mach64 },
+ { PCI_CHIP_MACH64GD, print_mach64 },
+ { PCI_CHIP_MACH64GI, print_mach64 },
+ { PCI_CHIP_MACH64GL, print_mach64 },
+ { PCI_CHIP_MACH64GM, print_mach64 },
+ { PCI_CHIP_MACH64GN, print_mach64 },
+ { PCI_CHIP_MACH64GO, print_mach64 },
+ { PCI_CHIP_MACH64GP, print_mach64 },
+ { PCI_CHIP_MACH64GQ, print_mach64 },
+ { PCI_CHIP_MACH64GR, print_mach64 },
+ { PCI_CHIP_MACH64GS, print_mach64 },
+ { PCI_CHIP_MACH64GT, print_mach64 },
+ { PCI_CHIP_MACH64GU, print_mach64 },
+ { PCI_CHIP_MACH64GV, print_mach64 },
+ { PCI_CHIP_MACH64GW, print_mach64 },
+ { PCI_CHIP_MACH64GX, print_mach64 },
+ { PCI_CHIP_MACH64GY, print_mach64 },
+ { PCI_CHIP_MACH64GZ, print_mach64 },
+ { PCI_CHIP_MACH64LB, print_mach64 },
+ { PCI_CHIP_MACH64LD, print_mach64 },
+ { PCI_CHIP_MACH64LG, print_mach64 },
+ { PCI_CHIP_MACH64LI, print_mach64 },
+ { PCI_CHIP_MACH64LM, print_mach64 },
+ { PCI_CHIP_MACH64LN, print_mach64 },
+ { PCI_CHIP_MACH64LP, print_mach64 },
+ { PCI_CHIP_MACH64LQ, print_mach64 },
+ { PCI_CHIP_MACH64LR, print_mach64 },
+ { PCI_CHIP_MACH64LS, print_mach64 },
+ { PCI_CHIP_MACH64VT, print_mach64 },
+ { PCI_CHIP_MACH64VU, print_mach64 },
+ { PCI_CHIP_MACH64VV, print_mach64 },
+ { 0x0000, NULL } } },
+ { PCI_VENDOR_DIGITAL, {
+ { PCI_CHIP_DC21050, print_dc21050},
+ { 0x0000, NULL } } },
+ { PCI_VENDOR_NUMNINE, {
+ { PCI_CHIP_I128, print_i128 },
+ { PCI_CHIP_I128_2, print_i128 },
+ { PCI_CHIP_I128_T2R, print_i128 },
+ { PCI_CHIP_I128_T2R4, print_i128 },
+ { 0x0000, NULL } } },
+ { PCI_VENDOR_SUN, {
+ { PCI_CHIP_SIMBA, print_simba },
+ { 0x0000, NULL } } },
+ { PCI_VENDOR_INTEL, {
+ { PCI_CHIP_460GX_SAC, print_460gx_sac },
+ { PCI_CHIP_460GX_PXB, print_460gx_pxb },
+ { PCI_CHIP_460GX_GXB_1, print_460gx_gxb },
+ { PCI_CHIP_460GX_WXB, print_460gx_pxb }, /* Uncertain */
+ { 0x0000, NULL } } },
+ { 0x0000, {
+ { 0x0000, NULL } } }
+};
-#if defined(__SVR4)
-#if !defined(SVR4)
-#define SVR4
-#endif
-#endif
+static void
+usage(void)
+{
+ printf("Usage: scanpci [-v12OfV]\n");
+ printf(" -v print config space\n");
+ printf(" -1 config type 1\n");
+ printf(" -2 config type 2\n");
+ printf(" -O use OS config support\n");
+ printf(" -f force config type\n");
+ printf(" -V set message verbosity level\n");
+}
-#ifdef __EMX__
-#define INCL_DOSFILEMGR
-#include <os2.h>
-#endif
+int
+main(int argc, char *argv[])
+{
+ pciConfigPtr *pcrpp = NULL;
+ int Verbose = 0;
+ int i = 0;
+ int force = 0;
+ int c;
-#include <stdio.h>
-#include <sys/types.h>
-#if defined(SVR4)
-#if defined(sun)
-#define __EXTENSIONS__
-#endif
-#include <sys/proc.h>
-#include <sys/tss.h>
-#if defined(NCR)
-#define __STDC
-#include <sys/sysi86.h>
-#undef __STDC
-#else
-#include <sys/sysi86.h>
-#endif
-#if defined(__SUNPRO_C) || defined(sun) || defined(__sun)
-#include <sys/psw.h>
-#else
-#include <sys/seg.h>
-#endif
-#include <sys/v86.h>
-#endif
-#if defined(__FreeBSD__) || defined(__386BSD__)
-#include <sys/file.h>
-#include <machine/console.h>
-#ifndef GCCUSESGAS
-#define GCCUSESGAS
-#endif
-#endif
-#if defined(__NetBSD__)
-#include <sys/param.h>
-#include <sys/file.h>
-#include <machine/sysarch.h>
-#ifndef GCCUSESGAS
-#define GCCUSESGAS
-#endif
-#endif
-#if defined(__bsdi__)
-#include <sys/file.h>
-#include <sys/ioctl.h>
-#include <i386/isa/pcconsioctl.h>
-#ifndef GCCUSESGAS
-#define GCCUSESGAS
-#endif
-#endif
-#if defined(SCO) || defined(ISC)
-#ifndef ISC
-#include <sys/console.h>
-#endif
-#include <sys/param.h>
-#include <sys/immu.h>
-#include <sys/region.h>
-#include <sys/proc.h>
-#include <sys/tss.h>
-#include <sys/sysi86.h>
-#include <sys/v86.h>
-#endif
-#if defined(Lynx_22)
-#ifndef GCCUSESGAS
-#define GCCUSESGAS
-#endif
-#endif
+ xf86Info.pciFlags = PCIProbe1;
+ while ((c = getopt(argc, argv, "?v12OfV:")) != -1)
+ switch(c) {
+ case 'v':
+ Verbose = 1;
+ break;
+ case '1':
+ xf86Info.pciFlags = PCIProbe1;
+ break;
+ case '2':
+ xf86Info.pciFlags = PCIProbe2;
+ break;
+ case 'O':
+ xf86Info.pciFlags = PCIOsConfig;
+ break;
+ case 'f':
+ force = 1;
+ break;
+ case 'V':
+ xf86Verbose = atoi(optarg);
+ break;
+ case '?':
+ default:
+ usage();
+ exit (1);
+ break;
+ }
-#if defined(__WATCOMC__)
+ if (force)
+ switch (xf86Info.pciFlags) {
+ case PCIProbe1:
+ xf86Info.pciFlags = PCIForceConfig1;
+ break;
+ case PCIProbe2:
+ xf86Info.pciFlags = PCIForceConfig2;
+ break;
+ default:
+ break;
+ }
-#include <stdlib.h>
-void outl(unsigned port, unsigned data);
-#pragma aux outl = "out dx, eax" parm [dx] [eax];
-void outb(unsigned port, unsigned data);
-#pragma aux outb = "out dx, al" parm [dx] [eax];
-unsigned inl(unsigned port);
-#pragma aux inl = "in eax, dx" parm [dx];
-unsigned inb(unsigned port);
-#pragma aux inb = "xor eax,eax" "in al, dx" parm [dx];
+ xf86EnableIO();
+ pcrpp = xf86scanpci(0);
-#else /* __WATCOMC__ */
+ if (!pcrpp) {
+ printf("No PCI devices found\n");
+ xf86DisableIO();
+ exit (1);
+ }
-#if defined(__GNUC__)
+ while (pcrpp[i])
+ identify_card(pcrpp[i++],Verbose);
-#if !defined(__alpha__) && !defined(__powerpc__)
-#if defined(GCCUSESGAS)
-#define OUTB_GCC "outb %0,%1"
-#define OUTL_GCC "outl %0,%1"
-#define INB_GCC "inb %1,%0"
-#define INL_GCC "inl %1,%0"
-#else
-#define OUTB_GCC "out%B0 (%1)"
-#define OUTL_GCC "out%L0 (%1)"
-#define INB_GCC "in%B0 (%1)"
-#define INL_GCC "in%L0 (%1)"
-#endif /* GCCUSESGAS */
+ xf86DisableIO();
+ exit(0);
+}
-static void outb(unsigned short port, unsigned char val) {
- __asm__ __volatile__(OUTB_GCC : :"a" (val), "d" (port)); }
-static void outl(unsigned short port, unsigned long val) {
- __asm__ __volatile__(OUTL_GCC : :"a" (val), "d" (port)); }
-static unsigned char inb(unsigned short port) { unsigned char ret;
- __asm__ __volatile__(INB_GCC : "=a" (ret) : "d" (port)); return ret; }
-static unsigned long inl(unsigned short port) { unsigned long ret;
- __asm__ __volatile__(INL_GCC : "=a" (ret) : "d" (port)); return ret; }
+static void
+identify_card(pciConfigPtr pcr, int verbose)
+{
+ int i, j;
+ int foundit = 0;
+ int foundvendor = 0;
+ const char *vname, *dname, *svname, *sname;
-#endif /* !defined(__alpha__) && !defined(__powerpc__) */
-#else /* __GNUC__ */
+ pciVendorDevFuncInfo *vdf = vendorDeviceFuncInfo;
-#if defined(__STDC__) && (__STDC__ == 1)
-# if !defined(NCR)
-# define asm __asm
-# endif
-#endif
+ if (!ScanPciSetupPciIds()) {
+ fprintf(stderr, "xf86SetupPciIds() failed\n");
+ exit(1);
+ }
-#if defined(__SUNPRO_C)
-/*
- * This section is a gross hack in if you tell anyone that I wrote it,
- * I'll deny it. :-)
- * The leave/ret instructions are the big hack to leave %eax alone on return.
- */
- unsigned char inb(int port) {
- asm(" movl 8(%esp),%edx");
- asm(" subl %eax,%eax");
- asm(" inb (%dx)");
- asm(" leave");
- asm(" ret");
- }
+ printf("\npci bus 0x%04x cardnum 0x%02x function 0x%02x:"
+ " vendor 0x%04x device 0x%04x\n",
+ pcr->busnum, pcr->devnum, pcr->funcnum,
+ pcr->pci_vendor, pcr->pci_device);
- unsigned short inw(int port) {
- asm(" movl 8(%esp),%edx");
- asm(" subl %eax,%eax");
- asm(" inw (%dx)");
- asm(" leave");
- asm(" ret");
- }
+ ScanPciFindPciNamesByDevice(pcr->pci_vendor, pcr->pci_device,
+ pcr->pci_subsys_vendor, pcr->pci_subsys_card,
+ &vname, &dname, &svname, &sname);
- unsigned long inl(int port) {
- asm(" movl 8(%esp),%edx");
- asm(" inl (%dx)");
- asm(" leave");
- asm(" ret");
+ if (vname) {
+ printf(" %s ", vname);
+ if (dname) {
+ printf("%s", dname);
+ foundit = 1;
}
+ }
- void outb(int port, unsigned char value) {
- asm(" movl 8(%esp),%edx");
- asm(" movl 12(%esp),%eax");
- asm(" outb (%dx)");
+ if (!foundit)
+ printf(" Device unknown\n");
+ else {
+ printf("\n");
+ if (verbose) {
+ for (i = 0; vdf[i].Vendor; i++) {
+ if (vdf[i].Vendor == pcr->pci_vendor) {
+ for (j = 0; vdf[i].Device[j].DeviceID; j++) {
+ if (vdf[i].Device[j].DeviceID == pcr->pci_device) {
+ (*vdf[i].Device[j].func)(pcr);
+ return;
+ }
+ }
+ break;
+ }
+ }
}
+ }
- void outw(int port, unsigned short value) {
- asm(" movl 8(%esp),%edx");
- asm(" movl 12(%esp),%eax");
- asm(" outw (%dx)");
+ if (verbose && !(pcr->pci_header_type & 0x7f) &&
+ (pcr->pci_subsys_vendor != 0 || pcr->pci_subsys_card != 0) &&
+ (pcr->pci_vendor != pcr->pci_subsys_vendor ||
+ pcr->pci_device != pcr->pci_subsys_card)) {
+ foundit = 0;
+ foundvendor = 0;
+ printf(" CardVendor 0x%04x card 0x%04x",
+ pcr->pci_subsys_vendor, pcr->pci_subsys_card);
+ if (svname) {
+ printf(" (%s", svname);
+ foundvendor = 1;
+ if (sname) {
+ printf(" %s)", sname);
+ foundit = 1;
+ }
}
- void outl(int port, unsigned long value) {
- asm(" movl 8(%esp),%edx");
- asm(" movl 12(%esp),%eax");
- asm(" outl (%dx)");
+ if (!foundit) {
+ if (!foundvendor)
+ printf(" (");
+ else
+ printf(", ");
+ printf("Card unknown)");
}
-#else
-
-#if defined(SVR4)
-# if !defined(__USLC__)
-# define __USLC__
-# endif
-#endif
-
-#ifndef SCO325
-# include <sys/inline.h>
-#else
-# include "scoasm.h"
-#endif
-
-#endif /* SUNPRO_C */
-
-#endif /* __GNUC__ */
-#endif /* __WATCOMC__ */
-
-
-#if defined(__alpha__)
-#if defined(linux)
-#include <asm/unistd.h>
-#define BUS(tag) (((tag)>>16)&0xff)
-#define DFN(tag) (((tag)>>8)&0xff)
-int pciconfig_read(
- unsigned char bus,
- unsigned char dfn,
- unsigned char off,
- unsigned char len,
- void * buf)
-{
- return __syscall(__NR_pciconfig_read, bus, dfn, off, len, buf);
-}
-int pciconfig_write(
- unsigned char bus,
- unsigned char dfn,
- unsigned char off,
- unsigned char len,
- void * buf)
-{
- return __syscall(__NR_pciconfig_write, bus, dfn, off, len, buf);
-}
-#else
-Generate compiler error - scanpci unsupported on non-linux alpha platforms
-#endif /* linux */
-#endif /* __alpha__ */
-#if defined(Lynx) && defined(__powerpc__)
-/* let's mimick the Linux Alpha stuff for LynxOS so we don't have
- * to change too much code
- */
-#include <smem.h>
-
-unsigned char *pciConfBase;
+ printf("\n");
+ }
-static __inline__ unsigned long
-swapl(unsigned long val)
-{
- unsigned char *p = (unsigned char *)&val;
- return ((p[3] << 24) | (p[2] << 16) | (p[1] << 8) | (p[0] << 0));
+ if (verbose) {
+ printf(" STATUS 0x%04x COMMAND 0x%04x\n",
+ pcr->pci_status, pcr->pci_command);
+ printf(" CLASS 0x%02x 0x%02x 0x%02x REVISION 0x%02x\n",
+ pcr->pci_base_class, pcr->pci_sub_class, pcr->pci_prog_if,
+ pcr->pci_rev_id);
+ if ((pcr->pci_base_class == PCI_CLASS_BRIDGE) &&
+ (pcr->pci_sub_class == PCI_SUBCLASS_BRIDGE_PCI))
+ print_bridge_pci_class(pcr);
+ else
+ print_default_class(pcr);
+ }
}
-
-#define BUS(tag) (((tag)>>16)&0xff)
-#define DFN(tag) (((tag)>>8)&0xff)
-
-#define PCIBIOS_DEVICE_NOT_FOUND 0x86
-#define PCIBIOS_SUCCESSFUL 0x00
-
-int pciconfig_read(
- unsigned char bus,
- unsigned char dev,
- unsigned char offset,
- int len, /* unused, alway 4 */
- unsigned long *val)
+static void
+print_default_class(pciConfigPtr pcr)
{
- unsigned long _val;
- unsigned long *ptr;
-
- dev >>= 3;
- if (bus || dev >= 16) {
- *val = 0xFFFFFFFF;
- return PCIBIOS_DEVICE_NOT_FOUND;
+ printf(" BIST 0x%02x HEADER 0x%02x LATENCY 0x%02x CACHE 0x%02x\n",
+ pcr->pci_bist, pcr->pci_header_type, pcr->pci_latency_timer,
+ pcr->pci_cache_line_size);
+ if (pcr->pci_base0) {
+ if ((pcr->pci_base0 & 0x7) == 0x4) {
+ printf(" BASE0 0x%08x%08x addr 0x%08x%08x MEM%s 64BIT\n",
+ (int)pcr->pci_base1, (int)pcr->pci_base0,
+ (int)pcr->pci_base1,
+ (int)(pcr->pci_base0 &
+ (pcr->pci_base0 & 0x1 ? 0xFFFFFFFC : 0xFFFFFFF0)),
+ (pcr->pci_base0 & 0x8) ? " PREFETCHABLE" :"");
} else {
- ptr = (unsigned long *)(pciConfBase + ((1<<dev) | offset));
- _val = swapl(*ptr);
+ printf(" BASE0 0x%08x addr 0x%08x %s%s\n",
+ (int)pcr->pci_base0,
+ (int)(pcr->pci_base0 &
+ (pcr->pci_base0 & 0x1 ? 0xFFFFFFFC : 0xFFFFFFF0)),
+ (pcr->pci_base0 & 0x1) ? "I/O" : "MEM",
+ ((pcr->pci_base0 & 0x9) == 0x8) ? " PREFETCHABLE" :"");
}
- *val = _val;
- return PCIBIOS_SUCCESSFUL;
-}
-
-int pciconfig_write(
- unsigned char bus,
- unsigned char dev,
- unsigned char offset,
- int len, /* unused, alway 4 */
- unsigned long val)
-{
- unsigned long _val;
- unsigned long *ptr;
-
- dev >>= 3;
- _val = swapl(val);
- if (bus || dev >= 16) {
- return PCIBIOS_DEVICE_NOT_FOUND;
+ }
+ if ((pcr->pci_base1) && ((pcr->pci_base0 & 0x7) != 0x4)) {
+ if ((pcr->pci_base1 & 0x7) == 0x4) {
+ printf(" BASE1 0x%08x%08x addr 0x%08x%08x MEM%s 64BIT\n",
+ (int)pcr->pci_base2, (int)pcr->pci_base1,
+ (int)pcr->pci_base2,
+ (int)(pcr->pci_base1 &
+ (pcr->pci_base1 & 0x1 ? 0xFFFFFFFC : 0xFFFFFFF0)),
+ (pcr->pci_base1 & 0x8) ? " PREFETCHABLE" :"");
} else {
- ptr = (unsigned long *)(pciConfBase + ((1<<dev) | offset));
- *ptr = _val;
+ printf(" BASE1 0x%08x addr 0x%08x %s%s\n",
+ (int)pcr->pci_base1,
+ (int)(pcr->pci_base1 &
+ (pcr->pci_base1 & 0x1 ? 0xFFFFFFFC : 0xFFFFFFF0)),
+ (pcr->pci_base1 & 0x1) ? "I/O" : "MEM",
+ ((pcr->pci_base1 & 0x9) == 0x8) ? " PREFETCHABLE" :"");
}
- return PCIBIOS_SUCCESSFUL;
-}
-#endif
-
-#if !defined(__powerpc__)
-struct pci_config_reg {
- /* start of official PCI config space header */
- union {
- unsigned long device_vendor;
- struct {
- unsigned short vendor;
- unsigned short device;
- } dv;
- } dv_id;
-#define _device_vendor dv_id.device_vendor
-#define _vendor dv_id.dv.vendor
-#define _device dv_id.dv.device
- union {
- unsigned long status_command;
- struct {
- unsigned short command;
- unsigned short status;
- } sc;
- } stat_cmd;
-#define _status_command stat_cmd.status_command
-#define _command stat_cmd.sc.command
-#define _status stat_cmd.sc.status
- union {
- unsigned long class_revision;
- struct {
- unsigned char rev_id;
- unsigned char prog_if;
- unsigned char sub_class;
- unsigned char base_class;
- } cr;
- } class_rev;
-#define _class_revision class_rev.class_revision
-#define _rev_id class_rev.cr.rev_id
-#define _prog_if class_rev.cr.prog_if
-#define _sub_class class_rev.cr.sub_class
-#define _base_class class_rev.cr.base_class
- union {
- unsigned long bist_header_latency_cache;
- struct {
- unsigned char cache_line_size;
- unsigned char latency_timer;
- unsigned char header_type;
- unsigned char bist;
- } bhlc;
- } bhlc;
-#define _bist_header_latency_cache bhlc.bist_header_latency_cache
-#define _cache_line_size bhlc.bhlc.cache_line_size
-#define _latency_timer bhlc.bhlc.latency_timer
-#define _header_type bhlc.bhlc.header_type
-#define _bist bhlc.bhlc.bist
- union {
- struct {
- unsigned long dv_base0;
- unsigned long dv_base1;
- unsigned long dv_base2;
- unsigned long dv_base3;
- unsigned long dv_base4;
- unsigned long dv_base5;
- } dv;
- struct {
- unsigned long bg_rsrvd[2];
- unsigned char primary_bus_number;
- unsigned char secondary_bus_number;
- unsigned char subordinate_bus_number;
- unsigned char secondary_latency_timer;
- unsigned char io_base;
- unsigned char io_limit;
- unsigned short secondary_status;
- unsigned short mem_base;
- unsigned short mem_limit;
- unsigned short prefetch_mem_base;
- unsigned short prefetch_mem_limit;
- } bg;
- } bc;
-#define _base0 bc.dv.dv_base0
-#define _base1 bc.dv.dv_base1
-#define _base2 bc.dv.dv_base2
-#define _base3 bc.dv.dv_base3
-#define _base4 bc.dv.dv_base4
-#define _base5 bc.dv.dv_base5
-#define _primary_bus_number bc.bg.primary_bus_number
-#define _secondary_bus_number bc.bg.secondary_bus_number
-#define _subordinate_bus_number bc.bg.subordinate_bus_number
-#define _secondary_latency_timer bc.bg.secondary_latency_timer
-#define _io_base bc.bg.io_base
-#define _io_limit bc.bg.io_limit
-#define _secondary_status bc.bg.secondary_status
-#define _mem_base bc.bg.mem_base
-#define _mem_limit bc.bg.mem_limit
-#define _prefetch_mem_base bc.bg.prefetch_mem_base
-#define _prefetch_mem_limit bc.bg.prefetch_mem_limit
- unsigned long rsvd1;
- unsigned long rsvd2;
- unsigned long _baserom;
- unsigned long rsvd3;
- unsigned long rsvd4;
- union {
- unsigned long max_min_ipin_iline;
- struct {
- unsigned char int_line;
- unsigned char int_pin;
- unsigned char min_gnt;
- unsigned char max_lat;
- } mmii;
- } mmii;
-#define _max_min_ipin_iline mmii.max_min_ipin_iline
-#define _int_line mmii.mmii.int_line
-#define _int_pin mmii.mmii.int_pin
-#define _min_gnt mmii.mmii.min_gnt
-#define _max_lat mmii.mmii.max_lat
- /* I don't know how accurate or standard this is (DHD) */
- union {
- unsigned long user_config;
- struct {
- unsigned char user_config_0;
- unsigned char user_config_1;
- unsigned char user_config_2;
- unsigned char user_config_3;
- } uc;
- } uc;
-#define _user_config uc.user_config
-#define _user_config_0 uc.uc.user_config_0
-#define _user_config_1 uc.uc.user_config_1
-#define _user_config_2 uc.uc.user_config_2
-#define _user_config_3 uc.uc.user_config_3
- /* end of official PCI config space header */
- unsigned long _pcibusidx;
- unsigned long _pcinumbus;
- unsigned long _pcibuses[16];
- unsigned short _configtype; /* config type found */
- unsigned short _ioaddr; /* config type 1 - private I/O addr */
- unsigned long _cardnum; /* config type 2 - private card number */
-};
-#else
-/* ppc is big endian, swapping bytes is not quite enough
- * to interpret the PCI config registers...
- */
-struct pci_config_reg {
- /* start of official PCI config space header */
- union {
- unsigned long device_vendor;
- struct {
- unsigned short device;
- unsigned short vendor;
- } dv;
- } dv_id;
-#define _device_vendor dv_id.device_vendor
-#define _vendor dv_id.dv.vendor
-#define _device dv_id.dv.device
- union {
- unsigned long status_command;
- struct {
- unsigned short status;
- unsigned short command;
- } sc;
- } stat_cmd;
-#define _status_command stat_cmd.status_command
-#define _command stat_cmd.sc.command
-#define _status stat_cmd.sc.status
- union {
- unsigned long class_revision;
- struct {
- unsigned char base_class;
- unsigned char sub_class;
- unsigned char prog_if;
- unsigned char rev_id;
- } cr;
- } class_rev;
-#define _class_revision class_rev.class_revision
-#define _rev_id class_rev.cr.rev_id
-#define _prog_if class_rev.cr.prog_if
-#define _sub_class class_rev.cr.sub_class
-#define _base_class class_rev.cr.base_class
- union {
- unsigned long bist_header_latency_cache;
- struct {
- unsigned char bist;
- unsigned char header_type;
- unsigned char latency_timer;
- unsigned char cache_line_size;
- } bhlc;
- } bhlc;
-#define _bist_header_latency_cache bhlc.bist_header_latency_cache
-#define _cache_line_size bhlc.bhlc.cache_line_size
-#define _latency_timer bhlc.bhlc.latency_timer
-#define _header_type bhlc.bhlc.header_type
-#define _bist bhlc.bhlc.bist
- union {
- struct {
- unsigned long dv_base0;
- unsigned long dv_base1;
- unsigned long dv_base2;
- unsigned long dv_base3;
- unsigned long dv_base4;
- unsigned long dv_base5;
- } dv;
-/* ?? */
- struct {
- unsigned long bg_rsrvd[2];
-
- unsigned char secondary_latency_timer;
- unsigned char subordinate_bus_number;
- unsigned char secondary_bus_number;
- unsigned char primary_bus_number;
-
- unsigned short secondary_status;
- unsigned char io_limit;
- unsigned char io_base;
-
- unsigned short mem_limit;
- unsigned short mem_base;
-
- unsigned short prefetch_mem_limit;
- unsigned short prefetch_mem_base;
- } bg;
- } bc;
-#define _base0 bc.dv.dv_base0
-#define _base1 bc.dv.dv_base1
-#define _base2 bc.dv.dv_base2
-#define _base3 bc.dv.dv_base3
-#define _base4 bc.dv.dv_base4
-#define _base5 bc.dv.dv_base5
-#define _primary_bus_number bc.bg.primary_bus_number
-#define _secondary_bus_number bc.bg.secondary_bus_number
-#define _subordinate_bus_number bc.bg.subordinate_bus_number
-#define _secondary_latency_timer bc.bg.secondary_latency_timer
-#define _io_base bc.bg.io_base
-#define _io_limit bc.bg.io_limit
-#define _secondary_status bc.bg.secondary_status
-#define _mem_base bc.bg.mem_base
-#define _mem_limit bc.bg.mem_limit
-#define _prefetch_mem_base bc.bg.prefetch_mem_base
-#define _prefetch_mem_limit bc.bg.prefetch_mem_limit
- unsigned long rsvd1;
- unsigned long rsvd2;
- unsigned long _baserom;
- unsigned long rsvd3;
- unsigned long rsvd4;
- union {
- unsigned long max_min_ipin_iline;
- struct {
- unsigned char max_lat;
- unsigned char min_gnt;
- unsigned char int_pin;
- unsigned char int_line;
- } mmii;
- } mmii;
-#define _max_min_ipin_iline mmii.max_min_ipin_iline
-#define _int_line mmii.mmii.int_line
-#define _int_pin mmii.mmii.int_pin
-#define _min_gnt mmii.mmii.min_gnt
-#define _max_lat mmii.mmii.max_lat
- /* I don't know how accurate or standard this is (DHD) */
- union {
- unsigned long user_config;
- struct {
- unsigned char user_config_3;
- unsigned char user_config_2;
- unsigned char user_config_1;
- unsigned char user_config_0;
- } uc;
- } uc;
-#define _user_config uc.user_config
-#define _user_config_0 uc.uc.user_config_0
-#define _user_config_1 uc.uc.user_config_1
-#define _user_config_2 uc.uc.user_config_2
-#define _user_config_3 uc.uc.user_config_3
- /* end of official PCI config space header */
- unsigned long _pcibusidx;
- unsigned long _pcinumbus;
- unsigned long _pcibuses[16];
- unsigned short _ioaddr; /* config type 1 - private I/O addr */
- unsigned short _configtype; /* config type found */
- unsigned long _cardnum; /* config type 2 - private card number */
-};
-#endif
-
-extern void identify_card(struct pci_config_reg *, int);
-extern void print_i128(struct pci_config_reg *);
-extern void print_mach64(struct pci_config_reg *);
-extern void print_pcibridge(struct pci_config_reg *);
-extern void enable_os_io();
-extern void disable_os_io();
-
-#define MAX_DEV_PER_VENDOR_CFG1 32
-#define MAX_DEV_PER_VENDOR_CFG2 16
-#define MAX_PCI_DEVICES 64
-#define NF ((void (*)())NULL)
-#define PCI_MULTIFUNC_DEV 0x80
-#if defined(__alpha__) || defined(__powerpc__)
-#define PCI_ID_REG 0x00
-#define PCI_CMD_STAT_REG 0x04
-#define PCI_CLASS_REG 0x08
-#define PCI_HEADER_MISC 0x0C
-#define PCI_MAP_REG_START 0x10
-#define PCI_MAP_ROM_REG 0x30
-#define PCI_INTERRUPT_REG 0x3C
-#define PCI_REG_USERCONFIG 0x40
-#endif
-
-struct pci_vendor_device {
- unsigned short vendor_id;
- char *vendorname;
- struct pci_device {
- unsigned short device_id;
- char *devicename;
- void (*print_func)(struct pci_config_reg *);
- } device[MAX_DEV_PER_VENDOR_CFG1];
-} pvd[] = {
- { 0x0e11, "Compaq", {
- { 0x3033, "QVision 1280/p", NF },
- { 0xae10, "Smart-2/P RAID Controller", NF },
- { 0xae32, "Netellignet 10/100", NF },
- { 0xae34, "Netellignet 10", NF },
- { 0xae35, "NetFlex 3", NF },
- { 0xae40, "Netellignet 10/100 Dual", NF },
- { 0xae43, "Netellignet 10/100 ProLiant", NF },
- { 0xb011, "Netellignet 10/100 Integrated", NF },
- { 0xf130, "ThunderLAN", NF },
- { 0xf150, "NetFlex 3 BNC", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x1000, "NCR", {
- { 0x0001, "53C810", NF },
- { 0x0002, "53C820", NF },
- { 0x0003, "53C825", NF },
- { 0x0004, "53C815", NF },
- { 0x0005, "53C810AP", NF },
- { 0x0006, "53C860", NF },
- { 0x000B, "53C896", NF },
- { 0x000C, "53C895", NF },
- { 0x000D, "53C885", NF },
- { 0x000F, "53C875", NF },
- { 0x008F, "53C875J", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x1002, "ATI", {
- { 0x4158, "Mach32", NF },
- { 0x4354, "Mach64 CT", print_mach64 },
- { 0x4358, "Mach64 CX", print_mach64 },
- { 0x4554, "Mach64 ET", print_mach64 },
- { 0x4742, "Mach64 GB", print_mach64 },
- { 0x4744, "Mach64 GD", print_mach64 },
- { 0x4750, "Mach64 GP", print_mach64 },
- { 0x4754, "Mach64 GT", print_mach64 },
- { 0x4755, "Mach64 GT", print_mach64 },
- { 0x4758, "Mach64 GX", print_mach64 },
- { 0x4C47, "Mach64 LT", print_mach64 },
- { 0x5654, "Mach64 VT", print_mach64 },
- { 0x0000, (char *)NULL, NF } } },
- { 0x1004, "VLSI", {
- { 0x0005, "82C592-FC1", NF },
- { 0x0006, "82C593-FC1", NF },
- { 0x0007, "82C594-AFC2", NF },
- { 0x0009, "82C597-AFC2", NF },
- { 0x000C, "82C541 Lynx", NF },
- { 0x000D, "82C543 Lynx ISA", NF },
- { 0x0702, "VAS96011", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x1005, "Avance Logic", {
- { 0x2301, "ALG2301", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x100B, "NS", {
- { 0x0002, "87415", NF },
- { 0xD001, "87410", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x100C, "Tseng Labs", {
- { 0x3202, "ET4000w32p rev A", NF },
- { 0x3205, "ET4000w32p rev B", NF },
- { 0x3206, "ET4000w32p rev D", NF },
- { 0x3207, "ET4000w32p rev C", NF },
- { 0x3208, "ET6000/6100", NF },
- { 0x4702, "ET6300", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x100E, "Weitek", {
- { 0x9001, "P9000", NF },
- { 0x9100, "P9100", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x1011, "Digital Equipment Corporation", {
- { 0x0001, "DC21050 PCI-PCI Bridge",print_pcibridge},
- { 0x0002, "DC21040 10Mb/s Ethernet", NF },
- { 0x0004, "TGA", NF },
- { 0x0009, "DC21140 10/100 Mb/s Ethernet", NF },
- { 0x000D, "TGA2", NF },
- { 0x000F, "DEFPA (FDDI PCI)", NF },
- { 0x0014, "DC21041 10Mb/s Ethernet Plus", NF },
- { 0x0019, "DC21142 10/100 Mb/s Ethernet", NF },
- { 0x0021, "DC21052", NF },
- { 0x0024, "DC21152", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x1013, "Cirrus Logic", {
- { 0x0038, "GD 7548", NF },
- { 0x00A0, "GD 5430", NF },
- { 0x00A4, "GD 5434-4", NF },
- { 0x00A8, "GD 5434-8", NF },
- { 0x00AC, "GD 5436", NF },
- { 0x00B8, "GD 5446", NF },
- { 0x00BC, "GD 5480", NF },
- { 0x00D0, "GD 5462", NF },
- { 0x00D4, "GD 5464", NF },
- { 0x1100, "CL 6729", NF },
- { 0x1110, "CL 6832", NF },
- { 0x1200, "GD 7542", NF },
- { 0x1202, "GD 7543", NF },
- { 0x1204, "GD 7541", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x1014, "IBM", {
- { 0x000A, "Fire Coral", NF },
- { 0x0018, "Token Ring", NF },
- { 0x001D, "82G2675", NF },
- { 0x0022, "82351 pci-pci bridge", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x101A, "NCR", {
- { 0x0000, (char *)NULL, NF } } },
- { 0x101C, "WD*", {
- { 0x3296, "WD 7197", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x1022, "AMD", {
- { 0x2000, "79C970 Lance", NF },
- { 0x2020, "53C974 SCSI", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x1023, "Trident", {
- { 0x9320, "TGUI 9320", NF },
- { 0x9420, "TGUI 9420", NF },
- { 0x9440, "TGUI 9440", NF },
- { 0x9660, "TGUI 9660/9680/9682", NF },
-#if 0
- { 0x9680, "TGUI 9680", NF },
- { 0x9682, "TGUI 9682", NF },
-#endif
- { 0x9750, "TGUI 9750", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x1025, "ALI", {
- { 0x1435, "M1435", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x102B, "Matrox", {
- { 0x0518, "MGA-2 Atlas PX2085", NF },
- { 0x0519, "MGA Millennium", NF },
- { 0x051a, "MGA Mystique", NF },
- { 0x051b, "MGA Millennium II", NF },
- { 0x0D10, "MGA Impression", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x102C, "CT", {
- { 0x00D8, "65545", NF },
- { 0x00DC, "65548", NF },
- { 0x00E0, "65550", NF },
- { 0x00E4, "65554", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x1031, "Miro", {
- { 0x5601, "ZR36050", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x1033, "NEC", {
- { 0x0046, "PowerVR PCX2", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x1036, "FD", {
- { 0x0000, "TMC-18C30 (36C70)", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x1039, "SIS", {
- { 0x0001, "86C201", NF },
- { 0x0002, "86C202", NF },
- { 0x0008, "85C503", NF },
- { 0x0205, "86C205", NF },
- { 0x0406, "85C501", NF },
- { 0x0496, "85C496", NF },
- { 0x0601, "85C601", NF },
- { 0x5107, "5107", NF },
- { 0x5511, "85C5511", NF },
- { 0x5513, "85C5513", NF },
- { 0x5571, "5571", NF },
- { 0x5597, "5597", NF },
- { 0x7001, "7001", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x103C, "HP", {
- { 0x1030, "J2585A", NF },
- { 0x1031, "J2585B", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x1042, "SMC/PCTECH", {
- { 0x1000, "FDC 37C665/RZ1000", NF },
- { 0x1001, "FDC /RZ1001", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x1044, "DPT", {
- { 0xA400, "SmartCache/Raid", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x1045, "Opti", {
- { 0xC178, "92C178", NF },
- { 0xC557, "82C557 Viper-M", NF },
- { 0xC558, "82C558 Viper-M ISA+IDE", NF },
- { 0xC621, "82C621", NF },
- { 0xC700, "82C700", NF },
- { 0xC701, "82C701 FireStar Plus", NF },
- { 0xC814, "82C814 Firebridge 1", NF },
- { 0xC822, "82C822", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x104A, "SGS Thomson", {
- { 0x0008, "STG2000", NF },
- { 0x0009, "STG1764", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x104B, "BusLogic", {
- { 0x0140, "946C 01", NF },
- { 0x1040, "946C 10", NF },
- { 0x8130, "FlashPoint", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x104C, "Texas Instruments", {
- { 0x3d04, "3DLabs Permedia", NF },
- { 0x3d07, "3DLabs Permedia 2", NF },
- { 0xAC12, "PCI1130", NF },
- { 0xAC15, "PCI1131", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x104E, "Oak", {
- { 0x0107, "OTI107", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x1050, "Windbond", {
- { 0x0940, "89C940 NE2000-PCI", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x1057, "Motorola", {
- { 0x0001, "MPC105 Eagle", NF },
- { 0x0002, "MPC105 Grackle", NF },
- { 0x4801, "Raven", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x105A, "Promise", {
- { 0x4D33, "IDE UltraDMA/33", NF },
- { 0x5300, "DC5030", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x105D, "Number Nine", {
- { 0x2309, "Imagine-128", print_i128 },
- { 0x2339, "Imagine-128-II", print_i128 },
- { 0x493D, "Imagine-128-T2R", print_i128 },
- { 0x0000, (char *)NULL, NF } } },
- { 0x1060, "UMC", {
- { 0x0101, "UM8673F", NF },
- { 0x673A, "UM8886BF", NF },
- { 0x886A, "UM8886A", NF },
- { 0x8881, "UM8881F", NF },
- { 0x8886, "UM8886F", NF },
- { 0x8891, "UM8891A", NF },
- { 0x9017, "UM9017F", NF },
- { 0xE886, "UM8886N", NF },
- { 0xE891, "UM8891N", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x1061, "X", {
- { 0x0001, "ITT AGX016", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x1066, "PICOP", {
- { 0x0001, "PT86C52x Vesuvius", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x106B, "Apple", {
- { 0x0001, "Bandit", NF },
- { 0x0002, "Grand Central", NF },
- { 0x000E, "Hydra", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x1074, "Nexgen", {
- { 0x0000, (char *)NULL, NF } } },
- { 0x1077, "QLogic", {
- { 0x1020, "ISP1020", NF },
- { 0x1022, "ISP1022", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x1078, "Cyrix", {
- { 0x0000, "5510", NF },
- { 0x0001, "PCI Master", NF },
- { 0x0002, "5520", NF },
- { 0x0100, "5530 Kahlua Legacy", NF },
- { 0x0101, "5530 Kahlua SMI", NF },
- { 0x0102, "5530 Kahlua IDE", NF },
- { 0x0103, "5530 Kahlua Audio", NF },
- { 0x0104, "5530 Kahlua Video", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x107D, "Leadtek", {
- { 0x0000, "S3 805", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x1080, "Contaq", {
- { 0x0600, "82C599", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x1083, "FOREX", {
- { 0x0000, (char *)NULL, NF } } },
- { 0x108D, "Olicom", {
- { 0x0001, "OC-3136", NF },
- { 0x0011, "OC-2315", NF },
- { 0x0012, "OC-2325", NF },
- { 0x0013, "OC-2183", NF },
- { 0x0014, "OC-2326", NF },
- { 0x0021, "OC-6151", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x108E, "Sun", {
- { 0x1000, "EBUS", NF },
- { 0x1001, "Happy Meal", NF },
- { 0x8000, "PCI Bus Module", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x1095, "CMD", {
- { 0x0640, "640A", NF },
- { 0x0643, "643", NF },
- { 0x0646, "646", NF },
- { 0x0670, "670", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x1098, "Vision", {
- { 0x0001, "QD 8500", NF },
- { 0x0002, "QD 8580", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x109E, "Brooktree", {
- { 0x0350, "Bt848", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x10A8, "Sierra", {
- { 0x0000, "STB Horizon 64", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x10AA, "ACC", {
- { 0x0000, "2056", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x10AD, "Winbond", {
- { 0x0001, "W83769F", NF },
- { 0x0105, "SL82C105", NF },
- { 0x0565, "W83C553", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x10B3, "Databook", {
- { 0xB106, "DB87144", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x10B7, "3COM", {
- { 0x5900, "3C590 10bT", NF },
- { 0x5950, "3C595 100bTX", NF },
- { 0x5951, "3C595 100bT4", NF },
- { 0x5952, "3C595 10b-MII", NF },
- { 0x9000, "3C900 10bTPO", NF },
- { 0x9001, "3C900 10b Combo", NF },
- { 0x9050, "3C905 100bTX", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x10B8, "SMC", {
- { 0x0005, "9432 TX", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x10B9, "ALI", {
- { 0x1445, "M1445", NF },
- { 0x1449, "M1449", NF },
- { 0x1451, "M1451", NF },
- { 0x1461, "M1461", NF },
- { 0x1489, "M1489", NF },
- { 0x1511, "M1511", NF },
- { 0x1513, "M1513", NF },
- { 0x1521, "M1521", NF },
- { 0x1523, "M1523", NF },
- { 0x1531, "M1531 Aladdin IV", NF },
- { 0x1533, "M1533 Aladdin IV", NF },
- { 0x5215, "M4803", NF },
- { 0x5219, "M5219", NF },
- { 0x5229, "M5229 TXpro", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x10BA, "Mitsubishi", {
- { 0x0000, (char *)NULL, NF } } },
- { 0x10BD, "Surecom", {
- { 0x0E34, "NE-34PCI Lan", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x10C8, "Neomagic", {
- { 0x0001, "Magicgraph NM2070", NF },
- { 0x0002, "Magicgraph 128V", NF },
- { 0x0003, "Magicgraph 128ZV", NF },
- { 0x0004, "Magicgraph NM2160", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x10CD, "Advanced System Products", {
- { 0x1200, "ABP940", NF },
- { 0x1300, "ABP940U", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x10DC, "CERN", {
- { 0x0001, "STAR/RD24 SCI-PCI (PMC)", NF },
- { 0x0002, "STAR/RD24 SCI-PCI (PMC)", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x10DE, "NVidia", {
- { 0x0008, "NV1", NF },
- { 0x0009, "DAC64", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x10E0, "IMS", {
- { 0x8849, "8849", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x10E1, "Tekram", {
- { 0x690C, "DC690C", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x10E3, "Tundra", {
- { 0x0000, "CA91C042 Universe", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x10E8, "AMCC", {
- { 0x8043, "Myrinet PCI (M2-PCI-32)", NF },
- { 0x807D, "S5933 PCI44", NF },
- { 0x809C, "S5933 Traquair HEPC3", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x10EA, "Intergraphics", {
- { 0x1680, "IGA-1680", NF },
- { 0x1682, "IGA-1682", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x10EC, "Realtek", {
- { 0x8029, "8029", NF },
- { 0x8129, "8129", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x10FA, "Truevision", {
- { 0x000C, "Targa 1000", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x1101, "Initio Corp", {
- { 0x9100, "320 P", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x1106, "VIA", {
- { 0x0505, "VT 82C505", NF },
- { 0x0561, "VT 82C505", NF },
- { 0x0576, "VT 82C576 3V", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x1119, "Vortex", {
- { 0x0001, "GDT 6000b", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x111A, "EF", {
- { 0x0000, "155P-MF1", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x1127, "Fore Systems", {
- { 0x0000, (char *)NULL, NF } } },
- { 0x112F, "Imaging Technology", {
- { 0x0000, (char *)NULL, NF } } },
- { 0x113C, "PLX", {
- { 0x0000, (char *)NULL, NF } } },
- { 0x1142, "Alliance", {
- { 0x3210, "ProMotion 6410", NF },
- { 0x6422, "ProMotion 6422", NF },
- { 0x6424, "ProMotion AT24", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x114A, "VMIC", {
- { 0x0000, (char *)NULL, NF } } },
- { 0x114F, "DIGI*", {
- { 0x0000, (char *)NULL, NF } } },
- { 0x1159, "Mutech", {
- { 0x0001, "MV1000", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x1163, "Rendition", {
- { 0x0001, "V1000", NF },
- { 0x2000, "V2100", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x1179, "Toshiba", {
- { 0x0000, (char *)NULL, NF } } },
- { 0x1193, "Zeinet", {
- { 0x0001, "1221", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x11CB, "Specialix", {
- { 0x0000, (char *)NULL, NF } } },
- { 0x11FE, "Control", {
- { 0x0000, (char *)NULL, NF } } },
- { 0x120E, "Cyclades", {
- { 0x0000, (char *)NULL, NF } } },
- { 0x121A, "3Dfx Interactive", {
- { 0x0001, "Voodoo Graphics", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x1236, "Sigma Designs", {
- { 0x6401, "REALmagic64/GX (SD 6425)", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x1281, "YOKOGAWA", {
- { 0x0000, (char *)NULL, NF } } },
- { 0x1292, "TriTech Microelectronics", {
- { 0xfc02, "Pyramid3D TR25202", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x12D2, "NVidia/SGS-Thomson", {
- { 0x0018, "Riva128", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x1C1C, "Symphony", {
- { 0x0001, "82C101", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x1DE1, "Tekram", {
- { 0xDC29, "DC290", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x3D3D, "3Dlabs", {
- { 0x0001, "GLINT 300SX", NF },
- { 0x0002, "GLINT 500TX", NF },
- { 0x0003, "GLINT Delta", NF },
- { 0x0004, "GLINT Permedia", NF },
- { 0x0006, "GLINT MX", NF },
- { 0x0007, "GLINT Permedia 2", NF },
- { 0x0000, (char *)NULL, NF } } } ,
- { 0x4005, "Avance", {
- { 0x0000, (char *)NULL, NF } } },
- { 0x5333, "S3", {
- { 0x0551, "Plato/PX", NF },
- { 0x5631, "ViRGE", NF },
- { 0x8811, "Trio32/64", NF },
- { 0x8812, "Aurora64V+", NF },
- { 0x8814, "Trio64UV+", NF },
- { 0x883D, "ViRGE/VX", NF },
- { 0x8880, "868", NF },
- { 0x88B0, "928", NF },
- { 0x88C0, "864-0", NF },
- { 0x88C1, "864-1", NF },
- { 0x88D0, "964-0", NF },
- { 0x88D1, "964-1", NF },
- { 0x88F0, "968", NF },
- { 0x8901, "Trio64V2/DX or /GX", NF },
- { 0x8902, "PLATO/PX", NF },
- { 0x8A01, "ViRGE/DX or /GX", NF },
- { 0x8A10, "ViRGE/GX2", NF },
- { 0x8C01, "ViRGE/MX", NF },
- { 0x8C02, "ViRGE/MX+", NF },
- { 0x8C03, "ViRGE/MX+MV", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x8086, "Intel", {
- { 0x0482, "82375EB pci-eisa bridge", NF },
- { 0x0483, "82424ZX cache dram controller", NF },
- { 0x0484, "82378IB/ZB pci-isa bridge", NF },
- { 0x0486, "82430ZX Aries", NF },
- { 0x04A3, "82434LX/NX pci cache mem controller", NF },
- { 0x1230, "82371 bus-master IDE controller", NF },
- { 0x1223, "SAA7116", NF },
- { 0x1229, "82557 10/100MBit network controller",NF},
- { 0x122D, "82437 Triton", NF },
- { 0x122E, "82471 Triton", NF },
- { 0x1230, "82438", NF },
- { 0x1250, "82439", NF },
- { 0x7000, "82371 pci-isa bridge", NF },
- { 0x7010, "82371 bus-master IDE controller", NF },
- { 0x7100, "82439 TX", NF },
- { 0x7110, "82371AB PIIX4 ISA", NF },
- { 0x7111, "82371AB PIIX4 IDE", NF },
- { 0x7112, "82371AB PIIX4 USB", NF },
- { 0x7113, "82371AB PIIX4 ACPI", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x9004, "Adaptec", {
- { 0x5078, "7850", NF },
- { 0x5578, "7855", NF },
- { 0x6078, "7860", NF },
- { 0x7078, "294x", NF },
- { 0x7178, "2940", NF },
- { 0x7278, "7872", NF },
- { 0x7478, "2944", NF },
- { 0x8178, "2940U", NF },
- { 0x8278, "3940U", NF },
- { 0x8478, "2944U", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x907F, "Atronics", {
- { 0x2015, "IDE-2015PL", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0xEDD8, "ARK Logic", {
- { 0xA091, "1000PV", NF },
- { 0xA099, "2000PV", NF },
- { 0xA0A1, "2000MT", NF },
- { 0xA0A9, "2000MI", NF },
- { 0x0000, (char *)NULL, NF } } },
- { 0x0000, (char *)NULL, {
- { 0x0000, (char *)NULL, NF } } }
-};
-
-#if defined(__alpha__)
-#define PCI_EN 0x00000000
-#else
-#define PCI_EN 0x80000000
-#endif
-
-#define PCI_MODE1_ADDRESS_REG 0xCF8
-#define PCI_MODE1_DATA_REG 0xCFC
-
-#define PCI_MODE2_ENABLE_REG 0xCF8
-#ifdef PC98
-#define PCI_MODE2_FORWARD_REG 0xCF9
-#else
-#define PCI_MODE2_FORWARD_REG 0xCFA
-#endif
-
-
-main(int argc, unsigned char *argv[])
-{
- unsigned long tmplong1, tmplong2, config_cmd;
- unsigned char tmp1, tmp2;
- unsigned int idx;
- struct pci_config_reg pcr;
- int ch, verbose = 0, do_mode1_scan = 0, do_mode2_scan = 0;
- int func;
-
- while((ch = getopt(argc, argv, "v12")) != EOF) {
- switch((char)ch) {
- case '1':
- do_mode1_scan = 1;
- break;
- case '2':
- do_mode2_scan = 1;
- break;
- case 'v':
- verbose = 1;
- break;
- default :
- printf("Usage: %s [-v12] \n", argv[0]);
- exit(1);
- }
}
-#if !defined(MSDOS)
- if (getuid()) {
- printf("This program must be run as root\n");
- exit(1);
- }
-#endif
-
- enable_os_io();
-
-#if !defined(__alpha__) && !defined(__powerpc__)
- pcr._configtype = 0;
-
- outb(PCI_MODE2_ENABLE_REG, 0x00);
- outb(PCI_MODE2_FORWARD_REG, 0x00);
- tmp1 = inb(PCI_MODE2_ENABLE_REG);
- tmp2 = inb(PCI_MODE2_FORWARD_REG);
- if ((tmp1 == 0x00) && (tmp2 == 0x00)) {
- pcr._configtype = 2;
- printf("PCI says configuration type 2\n");
- } else {
- tmplong1 = inl(PCI_MODE1_ADDRESS_REG);
- outl(PCI_MODE1_ADDRESS_REG, PCI_EN);
- tmplong2 = inl(PCI_MODE1_ADDRESS_REG);
- outl(PCI_MODE1_ADDRESS_REG, tmplong1);
- if (tmplong2 == PCI_EN) {
- pcr._configtype = 1;
- printf("PCI says configuration type 1\n");
+ if ((pcr->pci_base2) && ((pcr->pci_base1 & 0x7) != 0x4)) {
+ if ((pcr->pci_base2 & 0x7) == 0x4) {
+ printf(" BASE2 0x%08x%08x addr 0x%08x%08x MEM%s 64BIT\n",
+ (int)pcr->pci_base3, (int)pcr->pci_base2,
+ (int)pcr->pci_base3,
+ (int)(pcr->pci_base2 &
+ (pcr->pci_base2 & 0x1 ? 0xFFFFFFFC : 0xFFFFFFF0)),
+ (pcr->pci_base2 & 0x8) ? " PREFETCHABLE" :"");
} else {
- printf("No PCI !\n");
- disable_os_io();
- exit(1);
+ printf(" BASE2 0x%08x addr 0x%08x %s%s\n",
+ (int)pcr->pci_base2,
+ (int)(pcr->pci_base2 &
+ (pcr->pci_base2 & 0x1 ? 0xFFFFFFFC : 0xFFFFFFF0)),
+ (pcr->pci_base2 & 0x1) ? "I/O" : "MEM",
+ ((pcr->pci_base2 & 0x9) == 0x8) ? " PREFETCHABLE" :"");
}
}
-#else
- pcr._configtype = 1;
-#endif
-
- /* Try pci config 1 probe first */
-
- if ((pcr._configtype == 1) || do_mode1_scan) {
- printf("\nPCI probing configuration type 1\n");
-
- pcr._ioaddr = 0xFFFF;
-
- pcr._pcibuses[0] = 0;
- pcr._pcinumbus = 1;
- pcr._pcibusidx = 0;
- idx = 0;
-
- do {
- printf("Probing for devices on PCI bus %d:\n\n", pcr._pcibusidx);
-
- for (pcr._cardnum = 0x0; pcr._cardnum < MAX_DEV_PER_VENDOR_CFG1;
- pcr._cardnum += 0x1) {
- func = 0;
- do { /* loop over the different functions, if present */
-#if !defined(__alpha__) && !defined(__powerpc__)
- config_cmd = PCI_EN | (pcr._pcibuses[pcr._pcibusidx]<<16) |
- (pcr._cardnum<<11) | (func<<8);
-
- outl(PCI_MODE1_ADDRESS_REG, config_cmd); /* ioreg 0 */
- pcr._device_vendor = inl(PCI_MODE1_DATA_REG);
-#else
- pciconfig_read(pcr._pcibuses[pcr._pcibusidx], pcr._cardnum<<3,
- PCI_ID_REG, 4, &pcr._device_vendor);
-#endif
-
- if ((pcr._vendor == 0xFFFF) || (pcr._device == 0xFFFF))
- break; /* nothing there */
-
- printf("\npci bus 0x%x cardnum 0x%02x function 0x%04x: vendor 0x%04x device 0x%04x\n",
- pcr._pcibuses[pcr._pcibusidx], pcr._cardnum, func,
- pcr._vendor, pcr._device);
-
-#if !defined(__alpha__) && !defined(__powerpc__)
- outl(PCI_MODE1_ADDRESS_REG, config_cmd | 0x04);
- pcr._status_command = inl(PCI_MODE1_DATA_REG);
- outl(PCI_MODE1_ADDRESS_REG, config_cmd | 0x08);
- pcr._class_revision = inl(PCI_MODE1_DATA_REG);
- outl(PCI_MODE1_ADDRESS_REG, config_cmd | 0x0C);
- pcr._bist_header_latency_cache = inl(PCI_MODE1_DATA_REG);
- outl(PCI_MODE1_ADDRESS_REG, config_cmd | 0x10);
- pcr._base0 = inl(PCI_MODE1_DATA_REG);
- outl(PCI_MODE1_ADDRESS_REG, config_cmd | 0x14);
- pcr._base1 = inl(PCI_MODE1_DATA_REG);
- outl(PCI_MODE1_ADDRESS_REG, config_cmd | 0x18);
- pcr._base2 = inl(PCI_MODE1_DATA_REG);
- outl(PCI_MODE1_ADDRESS_REG, config_cmd | 0x1C);
- pcr._base3 = inl(PCI_MODE1_DATA_REG);
- outl(PCI_MODE1_ADDRESS_REG, config_cmd | 0x20);
- pcr._base4 = inl(PCI_MODE1_DATA_REG);
- outl(PCI_MODE1_ADDRESS_REG, config_cmd | 0x24);
- pcr._base5 = inl(PCI_MODE1_DATA_REG);
- outl(PCI_MODE1_ADDRESS_REG, config_cmd | 0x30);
- pcr._baserom = inl(PCI_MODE1_DATA_REG);
- outl(PCI_MODE1_ADDRESS_REG, config_cmd | 0x3C);
- pcr._max_min_ipin_iline = inl(PCI_MODE1_DATA_REG);
- outl(PCI_MODE1_ADDRESS_REG, config_cmd | 0x40);
- pcr._user_config = inl(PCI_MODE1_DATA_REG);
-#else
- pciconfig_read(pcr._pcibuses[pcr._pcibusidx], pcr._cardnum<<3,
- PCI_CMD_STAT_REG, 4, &pcr._status_command);
- pciconfig_read(pcr._pcibuses[pcr._pcibusidx], pcr._cardnum<<3,
- PCI_CLASS_REG, 4, &pcr._class_revision);
- pciconfig_read(pcr._pcibuses[pcr._pcibusidx], pcr._cardnum<<3,
- PCI_HEADER_MISC, 4, &pcr._bist_header_latency_cache);
- pciconfig_read(pcr._pcibuses[pcr._pcibusidx], pcr._cardnum<<3,
- PCI_MAP_REG_START, 4, &pcr._base0);
- pciconfig_read(pcr._pcibuses[pcr._pcibusidx], pcr._cardnum<<3,
- PCI_MAP_REG_START + 0x04, 4, &pcr._base1);
- pciconfig_read(pcr._pcibuses[pcr._pcibusidx], pcr._cardnum<<3,
- PCI_MAP_REG_START + 0x08, 4, &pcr._base2);
- pciconfig_read(pcr._pcibuses[pcr._pcibusidx], pcr._cardnum<<3,
- PCI_MAP_REG_START + 0x0C, 4, &pcr._base3);
- pciconfig_read(pcr._pcibuses[pcr._pcibusidx], pcr._cardnum<<3,
- PCI_MAP_REG_START + 0x10, 4, &pcr._base4);
- pciconfig_read(pcr._pcibuses[pcr._pcibusidx], pcr._cardnum<<3,
- PCI_MAP_REG_START + 0x14, 4, &pcr._base5);
- pciconfig_read(pcr._pcibuses[pcr._pcibusidx], pcr._cardnum<<3,
- PCI_MAP_ROM_REG, 4, &pcr._baserom);
- pciconfig_read(pcr._pcibuses[pcr._pcibusidx], pcr._cardnum<<3,
- PCI_INTERRUPT_REG, 4, &pcr._max_min_ipin_iline);
- pciconfig_read(pcr._pcibuses[pcr._pcibusidx], pcr._cardnum<<3,
- PCI_REG_USERCONFIG, 4, &pcr._user_config);
-#endif
-
- /* check for pci-pci bridges */
-#define PCI_CLASS_MASK 0xff000000
-#define PCI_SUBCLASS_MASK 0x00ff0000
-#define PCI_CLASS_BRIDGE 0x06000000
-#define PCI_SUBCLASS_BRIDGE_PCI 0x00040000
- switch(pcr._class_revision & (PCI_CLASS_MASK|PCI_SUBCLASS_MASK)) {
- case PCI_CLASS_BRIDGE|PCI_SUBCLASS_BRIDGE_PCI:
- if (pcr._secondary_bus_number > 0) {
- pcr._pcibuses[pcr._pcinumbus++] = pcr._secondary_bus_number;
- }
- break;
- default:
- break;
- }
- if((func==0) && ((pcr._header_type & PCI_MULTIFUNC_DEV) == 0)) {
- /* not a multi function device */
- func = 8;
- } else {
- func++;
- }
-
- if (idx++ >= MAX_PCI_DEVICES)
- continue;
-
- identify_card(&pcr, verbose);
- } while( func < 8 );
- }
- } while (++pcr._pcibusidx < pcr._pcinumbus);
+ if ((pcr->pci_base3) && ((pcr->pci_base2 & 0x7) != 0x4)) {
+ if ((pcr->pci_base3 & 0x7) == 0x4) {
+ printf(" BASE3 0x%08x%08x addr 0x%08x%08x MEM%s 64BIT\n",
+ (int)pcr->pci_base4, (int)pcr->pci_base3,
+ (int)pcr->pci_base4,
+ (int)(pcr->pci_base3 &
+ (pcr->pci_base3 & 0x1 ? 0xFFFFFFFC : 0xFFFFFFF0)),
+ (pcr->pci_base3 & 0x8) ? " PREFETCHABLE" :"");
+ } else {
+ printf(" BASE3 0x%08x addr 0x%08x %s%s\n",
+ (int)pcr->pci_base3,
+ (int)(pcr->pci_base3 &
+ (pcr->pci_base3 & 0x1 ? 0xFFFFFFFC : 0xFFFFFFF0)),
+ (pcr->pci_base3 & 0x1) ? "I/O" : "MEM",
+ ((pcr->pci_base3 & 0x9) == 0x8) ? " PREFETCHABLE" :"");
+ }
}
-
-#if !defined(__alpha__) && !defined(__powerpc__)
- /* Now try pci config 2 probe (deprecated) */
-
- if ((pcr._configtype == 2) || do_mode2_scan) {
- outb(PCI_MODE2_ENABLE_REG, 0xF1);
- outb(PCI_MODE2_FORWARD_REG, 0x00); /* bus 0 for now */
-
- printf("\nPCI probing configuration type 2\n");
-
- pcr._pcibuses[0] = 0;
- pcr._pcinumbus = 1;
- pcr._pcibusidx = 0;
- idx = 0;
-
- do {
- for (pcr._ioaddr = 0xC000; pcr._ioaddr < 0xD000; pcr._ioaddr += 0x0100){
- outb(PCI_MODE2_FORWARD_REG, pcr._pcibuses[pcr._pcibusidx]); /* bus 0 for now */
- pcr._device_vendor = inl(pcr._ioaddr);
- outb(PCI_MODE2_FORWARD_REG, 0x00); /* bus 0 for now */
-
- if ((pcr._vendor == 0xFFFF) || (pcr._device == 0xFFFF))
- continue;
- if ((pcr._vendor == 0xF0F0) || (pcr._device == 0xF0F0))
- continue; /* catch ASUS P55TP4XE motherboards */
-
- printf("\npci bus 0x%x slot at 0x%04x, vendor 0x%04x device 0x%04x\n",
- pcr._pcibuses[pcr._pcibusidx], pcr._ioaddr, pcr._vendor,
- pcr._device);
-
- outb(PCI_MODE2_FORWARD_REG, pcr._pcibuses[pcr._pcibusidx]); /* bus 0 for now */
- pcr._status_command = inl(pcr._ioaddr + 0x04);
- pcr._class_revision = inl(pcr._ioaddr + 0x08);
- pcr._bist_header_latency_cache = inl(pcr._ioaddr + 0x0C);
- pcr._base0 = inl(pcr._ioaddr + 0x10);
- pcr._base1 = inl(pcr._ioaddr + 0x14);
- pcr._base2 = inl(pcr._ioaddr + 0x18);
- pcr._base3 = inl(pcr._ioaddr + 0x1C);
- pcr._base4 = inl(pcr._ioaddr + 0x20);
- pcr._base5 = inl(pcr._ioaddr + 0x24);
- pcr._baserom = inl(pcr._ioaddr + 0x30);
- pcr._max_min_ipin_iline = inl(pcr._ioaddr + 0x3C);
- pcr._user_config = inl(pcr._ioaddr + 0x40);
- outb(PCI_MODE2_FORWARD_REG, 0x00); /* bus 0 for now */
-
- /* check for pci-pci bridges (currently we only know Digital) */
- if ((pcr._vendor == 0x1011) && (pcr._device == 0x0001))
- if (pcr._secondary_bus_number > 0)
- pcr._pcibuses[pcr._pcinumbus++] = pcr._secondary_bus_number;
-
- if (idx++ >= MAX_PCI_DEVICES)
- continue;
-
- identify_card(&pcr, verbose);
+ if ((pcr->pci_base4) && ((pcr->pci_base3 & 0x7) != 0x4)) {
+ if ((pcr->pci_base4 & 0x7) == 0x4) {
+ printf(" BASE4 0x%08x%08x addr 0x%08x%08x MEM%s 64BIT\n",
+ (int)pcr->pci_base5, (int)pcr->pci_base4,
+ (int)pcr->pci_base5,
+ (int)(pcr->pci_base4 &
+ (pcr->pci_base4 & 0x1 ? 0xFFFFFFFC : 0xFFFFFFF0)),
+ (pcr->pci_base4 & 0x8) ? " PREFETCHABLE" :"");
+ } else {
+ printf(" BASE4 0x%08x addr 0x%08x %s%s\n",
+ (int)pcr->pci_base4,
+ (int)(pcr->pci_base4 &
+ (pcr->pci_base4 & 0x1 ? 0xFFFFFFFC : 0xFFFFFFF0)),
+ (pcr->pci_base4 & 0x1) ? "I/O" : "MEM",
+ ((pcr->pci_base4 & 0x9) == 0x8) ? " PREFETCHABLE" :"");
}
- } while (++pcr._pcibusidx < pcr._pcinumbus);
-
- outb(PCI_MODE2_ENABLE_REG, 0x00);
}
-
-#endif /* __alpha__ */
-
- disable_os_io();
+ if ((pcr->pci_base5) && ((pcr->pci_base4 & 0x7) != 0x4)) {
+ printf(" BASE5 0x%08x addr 0x%08x %s%s%s\n",
+ (int)pcr->pci_base5,
+ (int)(pcr->pci_base5 &
+ (pcr->pci_base5 & 0x1 ? 0xFFFFFFFC : 0xFFFFFFF0)),
+ (pcr->pci_base5 & 0x1) ? "I/O" : "MEM",
+ ((pcr->pci_base5 & 0x9) == 0x8) ? " PREFETCHABLE" :"",
+ ((pcr->pci_base5 & 0x7) == 0x4) ? " 64BIT" : "");
+ }
+ if (pcr->pci_baserom)
+ printf(" BASEROM 0x%08x addr 0x%08x %sdecode-enabled\n",
+ (int)pcr->pci_baserom, (int)(pcr->pci_baserom & 0xFFFF8000),
+ pcr->pci_baserom & 0x1 ? "" : "not-");
+ if (pcr->pci_max_min_ipin_iline)
+ printf(" MAX_LAT 0x%02x MIN_GNT 0x%02x"
+ " INT_PIN 0x%02x INT_LINE 0x%02x\n",
+ pcr->pci_max_lat, pcr->pci_min_gnt,
+ pcr->pci_int_pin, pcr->pci_int_line);
+ if (pcr->pci_user_config)
+ printf(" BYTE_0 0x%02x BYTE_1 0x%02x"
+ " BYTE_2 0x%02x BYTE_3 0x%02x\n",
+ (int)pcr->pci_user_config_0, (int)pcr->pci_user_config_1,
+ (int)pcr->pci_user_config_2, (int)pcr->pci_user_config_3);
}
+#define PCI_B_FAST_B_B 0x80
+#define PCI_B_SB_RESET 0x40
+#define PCI_B_M_ABORT 0x20
+#define PCI_B_VGA_EN 0x08
+#define PCI_B_ISA_EN 0x04
+#define PCI_B_SERR_EN 0x02
+#define PCI_B_P_ERR 0x01
-void
-identify_card(struct pci_config_reg *pcr, int verbose)
+static void
+print_bridge_pci_class(pciConfigPtr pcr)
{
-
- int i = 0, j, foundit = 0;
-
- while (pvd[i].vendorname != (char *)NULL) {
- if (pvd[i].vendor_id == pcr->_vendor) {
- j = 0;
- printf(" %s ", pvd[i].vendorname);
- while (pvd[i].device[j].devicename != (char *)NULL) {
- if (pvd[i].device[j].device_id == pcr->_device) {
- printf("%s", pvd[i].device[j].devicename);
- foundit = 1;
- break;
- }
- j++;
- }
- }
- if (foundit)
- break;
- i++;
+ 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\n",
+ pcr->pci_primary_bus_number, pcr->pci_secondary_bus_number,
+ 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 (!foundit)
- printf(" Device unknown\n");
- else {
- printf("\n");
- if (verbose) {
- if (pvd[i].device[j].print_func != (void (*)())NULL) {
- pvd[i].device[j].print_func(pcr);
- return;
- }
- }
+ 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);
}
+ }
- if (verbose) {
- if (pcr->_status_command)
- printf(" STATUS 0x%04x COMMAND 0x%04x\n",
- pcr->_status, pcr->_command);
- if (pcr->_class_revision)
- printf(" CLASS 0x%02x 0x%02x 0x%02x REVISION 0x%02x\n",
- pcr->_base_class, pcr->_sub_class, pcr->_prog_if,
- pcr->_rev_id);
- if (pcr->_bist_header_latency_cache)
- printf(" BIST 0x%02x HEADER 0x%02x LATENCY 0x%02x CACHE 0x%02x\n",
- pcr->_bist, pcr->_header_type, pcr->_latency_timer,
- pcr->_cache_line_size);
- if (pcr->_base0)
- printf(" BASE0 0x%08x addr 0x%08x %s\n",
- pcr->_base0, pcr->_base0 & (pcr->_base0 & 0x1 ?
- 0xFFFFFFFC : 0xFFFFFFF0),
- pcr->_base0 & 0x1 ? "I/O" : "MEM");
- if (pcr->_base1)
- printf(" BASE1 0x%08x addr 0x%08x %s\n",
- pcr->_base1, pcr->_base1 & (pcr->_base1 & 0x1 ?
- 0xFFFFFFFC : 0xFFFFFFF0),
- pcr->_base1 & 0x1 ? "I/O" : "MEM");
- if (pcr->_base2)
- printf(" BASE2 0x%08x addr 0x%08x %s\n",
- pcr->_base2, pcr->_base2 & (pcr->_base2 & 0x1 ?
- 0xFFFFFFFC : 0xFFFFFFF0),
- pcr->_base2 & 0x1 ? "I/O" : "MEM");
- if (pcr->_base3)
- printf(" BASE3 0x%08x addr 0x%08x %s\n",
- pcr->_base3, pcr->_base3 & (pcr->_base3 & 0x1 ?
- 0xFFFFFFFC : 0xFFFFFFF0),
- pcr->_base3 & 0x1 ? "I/O" : "MEM");
- if (pcr->_base4)
- printf(" BASE4 0x%08x addr 0x%08x %s\n",
- pcr->_base4, pcr->_base4 & (pcr->_base4 & 0x1 ?
- 0xFFFFFFFC : 0xFFFFFFF0),
- pcr->_base4 & 0x1 ? "I/O" : "MEM");
- if (pcr->_base5)
- printf(" BASE5 0x%08x addr 0x%08x %s\n",
- pcr->_base5, pcr->_base5 & (pcr->_base5 & 0x1 ?
- 0xFFFFFFFC : 0xFFFFFFF0),
- pcr->_base5 & 0x1 ? "I/O" : "MEM");
- if (pcr->_baserom)
- printf(" BASEROM 0x%08x addr 0x%08x %sdecode-enabled\n",
- pcr->_baserom, pcr->_baserom & 0xFFFF8000,
- pcr->_baserom & 0x1 ? "" : "not-");
- if (pcr->_max_min_ipin_iline)
- printf(" MAX_LAT 0x%02x MIN_GNT 0x%02x INT_PIN 0x%02x INT_LINE 0x%02x\n",
- pcr->_max_lat, pcr->_min_gnt,
- pcr->_int_pin, pcr->_int_line);
- if (pcr->_user_config)
- printf(" BYTE_0 0x%02x BYTE_1 0x%02x BYTE_2 0x%02x BYTE_3 0x%02x\n",
- pcr->_user_config_0, pcr->_user_config_1,
- pcr->_user_config_2, pcr->_user_config_3);
- }
+ 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_",
+ (pcr->pci_bridge_control & PCI_B_SB_RESET) ? "" : "NO_",
+ (pcr->pci_bridge_control & PCI_B_M_ABORT) ? "" : "NO_",
+ (pcr->pci_bridge_control & PCI_B_VGA_EN) ? "" : "NO_",
+ (pcr->pci_bridge_control & PCI_B_ISA_EN) ? "" : "NO_",
+ (pcr->pci_bridge_control & PCI_B_SERR_EN) ? "" : "NO_",
+ (pcr->pci_bridge_control & PCI_B_P_ERR) ? "" : "NO_");
}
-
-void
-print_mach64(struct pci_config_reg *pcr)
+static void
+print_mach64(pciConfigPtr pcr)
{
- unsigned long sparse_io = 0;
-
- if (pcr->_status_command)
- printf(" STATUS 0x%04x COMMAND 0x%04x\n",
- pcr->_status, pcr->_command);
- if (pcr->_class_revision)
- printf(" CLASS 0x%02x 0x%02x 0x%02x REVISION 0x%02x\n",
- pcr->_base_class, pcr->_sub_class, pcr->_prog_if, pcr->_rev_id);
- if (pcr->_bist_header_latency_cache)
- printf(" BIST 0x%02x HEADER 0x%02x LATENCY 0x%02x CACHE 0x%02x\n",
- pcr->_bist, pcr->_header_type, pcr->_latency_timer,
- pcr->_cache_line_size);
- if (pcr->_base0)
- printf(" APBASE 0x%08x addr 0x%08x\n",
- pcr->_base0, pcr->_base0 & (pcr->_base0 & 0x1 ?
- 0xFFFFFFFC : 0xFFFFFFF0));
- if (pcr->_base1)
- printf(" BLOCKIO 0x%08x addr 0x%08x\n",
- pcr->_base1, pcr->_base1 & (pcr->_base1 & 0x1 ?
- 0xFFFFFFFC : 0xFFFFFFF0));
- if (pcr->_baserom)
- printf(" BASEROM 0x%08x addr 0x%08x %sdecode-enabled\n",
- pcr->_baserom, pcr->_baserom & 0xFFFF8000,
- pcr->_baserom & 0x1 ? "" : "not-");
- if (pcr->_max_min_ipin_iline)
- printf(" MAX_LAT 0x%02x MIN_GNT 0x%02x INT_PIN 0x%02x INT_LINE 0x%02x\n",
- pcr->_max_lat, pcr->_min_gnt, pcr->_int_pin, pcr->_int_line);
- switch (pcr->_user_config_0 & 0x03) {
+ CARD32 sparse_io = 0;
+
+ printf(" CardVendor 0x%04x card 0x%04x\n",
+ pcr->pci_subsys_vendor, pcr->pci_subsys_card);
+ printf(" STATUS 0x%04x COMMAND 0x%04x\n",
+ pcr->pci_status, pcr->pci_command);
+ printf(" CLASS 0x%02x 0x%02x 0x%02x REVISION 0x%02x\n",
+ pcr->pci_base_class, pcr->pci_sub_class,
+ pcr->pci_prog_if, pcr->pci_rev_id);
+ printf(" BIST 0x%02x HEADER 0x%02x LATENCY 0x%02x CACHE 0x%02x\n",
+ pcr->pci_bist, pcr->pci_header_type, pcr->pci_latency_timer,
+ pcr->pci_cache_line_size);
+ if (pcr->pci_base0)
+ printf(" APBASE 0x%08x addr 0x%08x\n",
+ (int)pcr->pci_base0, (int)(pcr->pci_base0 &
+ (pcr->pci_base0 & 0x1 ? 0xFFFFFFFC : 0xFFFFFFF0)));
+ if (pcr->pci_base1)
+ printf(" BLOCKIO 0x%08x addr 0x%08x\n",
+ (int)pcr->pci_base1, (int)(pcr->pci_base1 &
+ (pcr->pci_base1 & 0x1 ? 0xFFFFFFFC : 0xFFFFFFF0)));
+ if (pcr->pci_base2)
+ printf(" REGBASE 0x%08x addr 0x%08x\n",
+ (int)pcr->pci_base2, (int)(pcr->pci_base2 &
+ (pcr->pci_base2 & 0x1 ? 0xFFFFFFFC : 0xFFFFFFF0)));
+ if (pcr->pci_baserom)
+ printf(" BASEROM 0x%08x addr 0x%08x %sdecode-enabled\n",
+ (int)pcr->pci_baserom, (int)(pcr->pci_baserom & 0xFFFF8000),
+ pcr->pci_baserom & 0x1 ? "" : "not-");
+ if (pcr->pci_max_min_ipin_iline)
+ printf(" MAX_LAT 0x%02x MIN_GNT 0x%02x"
+ " INT_PIN 0x%02x INT_LINE 0x%02x\n",
+ pcr->pci_max_lat, pcr->pci_min_gnt,
+ pcr->pci_int_pin, pcr->pci_int_line);
+ switch (pcr->pci_user_config_0 & 0x03) {
case 0:
sparse_io = 0x2ec;
break;
@@ -1560,231 +532,248 @@ print_mach64(struct pci_config_reg *pcr)
sparse_io = 0x1c8;
break;
}
- printf(" SPARSEIO 0x%03x %s %s\n",
- sparse_io, pcr->_user_config_0 & 0x04 ? "Block IO enabled" :
- "Sparse IO enabled",
- pcr->_user_config_0 & 0x08 ? "Disable 0x46E8" : "Enable 0x46E8");
+ printf(" SPARSEIO 0x%03x %s IO enabled %sable 0x46E8\n",
+ (int)sparse_io, pcr->pci_user_config_0 & 0x04 ? "Block" : "Sparse",
+ pcr->pci_user_config_0 & 0x08 ? "Dis" : "En");
}
-void
-print_i128(struct pci_config_reg *pcr)
+static void
+print_i128(pciConfigPtr pcr)
{
- if (pcr->_status_command)
- printf(" STATUS 0x%04x COMMAND 0x%04x\n",
- pcr->_status, pcr->_command);
- if (pcr->_class_revision)
- printf(" CLASS 0x%02x 0x%02x 0x%02x REVISION 0x%02x\n",
- pcr->_base_class, pcr->_sub_class, pcr->_prog_if, pcr->_rev_id);
- if (pcr->_bist_header_latency_cache)
- printf(" BIST 0x%02x HEADER 0x%02x LATENCY 0x%02x CACHE 0x%02x\n",
- pcr->_bist, pcr->_header_type, pcr->_latency_timer,
- pcr->_cache_line_size);
+ printf(" CardVendor 0x%04x card 0x%04x\n",
+ pcr->pci_subsys_vendor, pcr->pci_subsys_card);
+ printf(" STATUS 0x%04x COMMAND 0x%04x\n",
+ pcr->pci_status, pcr->pci_command);
+ printf(" CLASS 0x%02x 0x%02x 0x%02x REVISION 0x%02x\n",
+ pcr->pci_base_class, pcr->pci_sub_class, pcr->pci_prog_if,
+ pcr->pci_rev_id);
+ printf(" BIST 0x%02x HEADER 0x%02x LATENCY 0x%02x CACHE 0x%02x\n",
+ pcr->pci_bist, pcr->pci_header_type, pcr->pci_latency_timer,
+ pcr->pci_cache_line_size);
printf(" MW0_AD 0x%08x addr 0x%08x %spre-fetchable\n",
- pcr->_base0, pcr->_base0 & 0xFFC00000,
- pcr->_base0 & 0x8 ? "" : "not-");
+ (int)pcr->pci_base0, (int)(pcr->pci_base0 & 0xFFC00000),
+ pcr->pci_base0 & 0x8 ? "" : "not-");
printf(" MW1_AD 0x%08x addr 0x%08x %spre-fetchable\n",
- pcr->_base1, pcr->_base1 & 0xFFC00000,
- pcr->_base1 & 0x8 ? "" : "not-");
+ (int)pcr->pci_base1, (int)(pcr->pci_base1 & 0xFFC00000),
+ pcr->pci_base1 & 0x8 ? "" : "not-");
printf(" XYW_AD(A) 0x%08x addr 0x%08x\n",
- pcr->_base2, pcr->_base2 & 0xFFC00000);
+ (int)pcr->pci_base2, (int)(pcr->pci_base2 & 0xFFC00000));
printf(" XYW_AD(B) 0x%08x addr 0x%08x\n",
- pcr->_base3, pcr->_base3 & 0xFFC00000);
+ (int)pcr->pci_base3, (int)(pcr->pci_base3 & 0xFFC00000));
printf(" RBASE_G 0x%08x addr 0x%08x\n",
- pcr->_base4, pcr->_base4 & 0xFFFF0000);
+ (int)pcr->pci_base4, (int)(pcr->pci_base4 & 0xFFFF0000));
printf(" IO 0x%08x addr 0x%08x\n",
- pcr->_base5, pcr->_base5 & 0xFFFFFF00);
+ (int)pcr->pci_base5, (int)(pcr->pci_base5 & 0xFFFFFF00));
printf(" RBASE_E 0x%08x addr 0x%08x %sdecode-enabled\n",
- pcr->_baserom, pcr->_baserom & 0xFFFF8000,
- pcr->_baserom & 0x1 ? "" : "not-");
- if (pcr->_max_min_ipin_iline)
- printf(" MAX_LAT 0x%02x MIN_GNT 0x%02x INT_PIN 0x%02x INT_LINE 0x%02x\n",
- pcr->_max_lat, pcr->_min_gnt, pcr->_int_pin, pcr->_int_line);
+ (int)pcr->pci_baserom, (int)(pcr->pci_baserom & 0xFFFF8000),
+ pcr->pci_baserom & 0x1 ? "" : "not-");
+ if (pcr->pci_max_min_ipin_iline)
+ printf(" MAX_LAT 0x%02x MIN_GNT 0x%02x"
+ " INT_PIN 0x%02x INT_LINE 0x%02x\n",
+ pcr->pci_max_lat, pcr->pci_min_gnt,
+ pcr->pci_int_pin, pcr->pci_int_line);
}
-void
-print_pcibridge(struct pci_config_reg *pcr)
+static void
+print_dc21050(pciConfigPtr pcr)
{
- if (pcr->_status_command)
- printf(" STATUS 0x%04x COMMAND 0x%04x\n",
- pcr->_status, pcr->_command);
- if (pcr->_class_revision)
- printf(" CLASS 0x%02x 0x%02x 0x%02x REVISION 0x%02x\n",
- pcr->_base_class, pcr->_sub_class, pcr->_prog_if, pcr->_rev_id);
- if (pcr->_bist_header_latency_cache)
- printf(" BIST 0x%02x HEADER 0x%02x LATENCY 0x%02x CACHE 0x%02x\n",
- pcr->_bist, pcr->_header_type, pcr->_latency_timer,
- pcr->_cache_line_size);
- printf(" PRIBUS 0x%02x SECBUS 0x%02x SUBBUS 0x%02x SECLT 0x%02x\n",
- pcr->_primary_bus_number, pcr->_secondary_bus_number,
- pcr->_subordinate_bus_number, pcr->_secondary_latency_timer);
- printf(" IOBASE: 0x%02x00 IOLIM 0x%02x00 SECSTATUS 0x%04x\n",
- pcr->_io_base, pcr->_io_limit, pcr->_secondary_status);
- printf(" NOPREFETCH MEMBASE: 0x%08x MEMLIM 0x%08x\n",
- pcr->_mem_base, pcr->_mem_limit);
- printf(" PREFETCH MEMBASE: 0x%08x MEMLIM 0x%08x\n",
- pcr->_prefetch_mem_base, pcr->_prefetch_mem_limit);
+ printf(" STATUS 0x%04x COMMAND 0x%04x\n",
+ pcr->pci_status, pcr->pci_command);
+ printf(" CLASS 0x%02x 0x%02x 0x%02x REVISION 0x%02x\n",
+ pcr->pci_base_class, pcr->pci_sub_class, pcr->pci_prog_if,
+ pcr->pci_rev_id);
+ printf(" BIST 0x%02x HEADER 0x%02x LATENCY 0x%02x CACHE 0x%02x\n",
+ pcr->pci_bist, pcr->pci_header_type, pcr->pci_latency_timer,
+ pcr->pci_cache_line_size);
+ printf(" PRIBUS 0x%02x SECBUS 0x%02x SUBBUS 0x%02x SECLT 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);
printf(" RBASE_E 0x%08x addr 0x%08x %sdecode-enabled\n",
- pcr->_baserom, pcr->_baserom & 0xFFFF8000,
- pcr->_baserom & 0x1 ? "" : "not-");
- if (pcr->_max_min_ipin_iline)
- printf(" MAX_LAT 0x%02x MIN_GNT 0x%02x INT_PIN 0x%02x INT_LINE 0x%02x\n",
- pcr->_max_lat, pcr->_min_gnt, pcr->_int_pin, pcr->_int_line);
+ (int)pcr->pci_baserom, (int)(pcr->pci_baserom & 0xFFFF8000),
+ pcr->pci_baserom & 0x1 ? "" : "not-");
+ if (pcr->pci_max_min_ipin_iline)
+ printf(" MAX_LAT 0x%02x MIN_GNT 0x%02x"
+ " INT_PIN 0x%02x INT_LINE 0x%02x\n",
+ pcr->pci_max_lat, pcr->pci_min_gnt,
+ pcr->pci_int_pin, pcr->pci_int_line);
}
-static int io_fd;
-#ifdef __EMX__
-USHORT callgate[3] = {0,0,0};
-#endif
-
-void
-enable_os_io()
+static void
+print_simba(pciConfigPtr pcr)
{
-#if defined(SVR4) || defined(SCO) || defined(ISC)
-#if defined(SI86IOPL)
- sysi86(SI86IOPL, 3);
-#else
- sysi86(SI86V86, V86SC_IOPL, PS_IOPL);
-#endif
-#endif
-#if defined(linux)
- iopl(3);
-#endif
-#if defined(__FreeBSD__) || defined(__386BSD__) || defined(__bsdi__)
- if ((io_fd = open("/dev/console", O_RDWR, 0)) < 0) {
- perror("/dev/console");
- exit(1);
- }
-#if defined(__FreeBSD__) || defined(__386BSD__)
- if (ioctl(io_fd, KDENABIO, 0) < 0) {
- perror("ioctl(KDENABIO)");
- exit(1);
- }
-#endif
-#if defined(__bsdi__)
- if (ioctl(io_fd, PCCONENABIOPL, 0) < 0) {
- perror("ioctl(PCCONENABIOPL)");
- exit(1);
- }
-#endif
-#endif
-#if defined(__NetBSD__)
-#if !defined(USE_I386_IOPL)
- if ((io_fd = open("/dev/io", O_RDWR, 0)) < 0) {
- perror("/dev/io");
- exit(1);
- }
-#else
- if (i386_iopl(1) < 0) {
- perror("i386_iopl");
- exit(1);
- }
-#endif /* USE_I386_IOPL */
-#endif /* __NetBSD__ */
-#if defined(__OpenBSD__)
- if (i386_iopl(1) < 0) {
- perror("i386_iopl");
- exit(1);
- }
-#endif /* __OpenBSD__ */
-#if defined(MACH386)
- if ((io_fd = open("/dev/iopl", O_RDWR, 0)) < 0) {
- perror("/dev/iopl");
- exit(1);
- }
-#endif
-#ifdef __EMX__
- {
- HFILE hfd;
- ULONG dlen,action;
- APIRET rc;
- static char *ioDrvPath = "/dev/fastio$";
-
- if (DosOpen((PSZ)ioDrvPath, (PHFILE)&hfd, (PULONG)&action,
- (ULONG)0, FILE_SYSTEM, FILE_OPEN,
- OPEN_SHARE_DENYNONE|OPEN_FLAGS_NOINHERIT|OPEN_ACCESS_READONLY,
- (ULONG)0) != 0) {
- fprintf(stderr,"Error opening fastio$ driver...\n");
- fprintf(stderr,"Please install xf86sup.sys in config.sys!\n");
- exit(42);
- }
- callgate[0] = callgate[1] = 0;
-
-/* Get callgate from driver for fast io to ports and other stuff */
+ int i;
+ CARD8 io, mem;
+
+ printf(" STATUS 0x%04x COMMAND 0x%04x\n",
+ pcr->pci_status, pcr->pci_command);
+ printf(" CLASS 0x%02x 0x%02x 0x%02x REVISION 0x%02x\n",
+ pcr->pci_base_class, pcr->pci_sub_class, pcr->pci_prog_if,
+ pcr->pci_rev_id);
+ printf(" HEADER 0x%02x LATENCY 0x%02x CACHE 0x%02x\n",
+ pcr->pci_header_type, pcr->pci_latency_timer,
+ pcr->pci_cache_line_size);
+ printf(" PRIBUS 0x%02x SECBUS 0x%02x SUBBUS 0x%02x SECLT 0x%02x\n",
+ pcr->pci_primary_bus_number, pcr->pci_secondary_bus_number,
+ pcr->pci_subordinate_bus_number, pcr->pci_secondary_latency_timer);
+ printf(" SECSTATUS 0x%04x\n",
+ pcr->pci_secondary_status);
+ 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_",
+ (pcr->pci_bridge_control & PCI_B_SB_RESET) ? "" : "NO_",
+ (pcr->pci_bridge_control & PCI_B_M_ABORT) ? "" : "NO_",
+ (pcr->pci_bridge_control & PCI_B_VGA_EN) ? "" : "NO_",
+ (pcr->pci_bridge_control & PCI_B_ISA_EN) ? "" : "NO_",
+ (pcr->pci_bridge_control & PCI_B_SERR_EN) ? "" : "NO_",
+ (pcr->pci_bridge_control & PCI_B_P_ERR) ? "" : "NO_");
+ printf(" TICK 0x%08lx SECCNTL 0x%02x\n", (long)
+ pciReadLong(pcr->tag, 0x00b0), pciReadByte(pcr->tag, 0x00dd));
+ printf(" MASTER RETRIES: PRIMARY 0x%02x, SECONDARY 0x%02x\n",
+ pciReadByte(pcr->tag, 0x00c0), pciReadByte(pcr->tag, 0x00dc));
+ printf(" TARGET RETRIES: PIO 0x%02x, DMA 0x%02x\n",
+ pciReadByte(pcr->tag, 0x00d8), pciReadByte(pcr->tag, 0x00da));
+ printf(" TARGET LATENCY: PIO 0x%02x, DMA 0x%02x\n",
+ pciReadByte(pcr->tag, 0x00d9), pciReadByte(pcr->tag, 0x00db));
+ printf(" DMA AFSR 0x%08lx%08lx AFAR 0x%08lx%08lx\n",
+ (long)pciReadLong(pcr->tag, 0x00cc),
+ (long)pciReadLong(pcr->tag, 0x00c8),
+ (long)pciReadLong(pcr->tag, 0x00d4),
+ (long)pciReadLong(pcr->tag, 0x00d0));
+ printf(" PIO AFSR 0x%08lx%08lx AFAR 0x%08lx%08lx\n",
+ (long)pciReadLong(pcr->tag, 0x00ec),
+ (long)pciReadLong(pcr->tag, 0x00e8),
+ (long)pciReadLong(pcr->tag, 0x00f4),
+ (long)pciReadLong(pcr->tag, 0x00f0));
+ printf(" PCI CNTL 0x%08lx%08lx DIAG 0x%08lx%08lx\n",
+ (long)pciReadLong(pcr->tag, 0x00e4),
+ (long)pciReadLong(pcr->tag, 0x00e0),
+ (long)pciReadLong(pcr->tag, 0x00fc),
+ (long)pciReadLong(pcr->tag, 0x00f8));
+ printf(" MAPS: I/O 0x%02x, MEM 0x%02x\n",
+ (io = pciReadByte(pcr->tag, 0x00de)),
+ (mem = pciReadByte(pcr->tag, 0x00df)));
+ for (i = 0; i < 8; i++)
+ if (io & (1 << i))
+ printf(" BUS I/O 0x%06x-0x%06x\n", i << 21, ((i + 1) << 21) - 1);
+ for (i = 0; i < 8; i++)
+ if (mem & (1 << i))
+ printf(" BUS MEM 0x%08x-0x%08x\n", i << 29, ((i + 1) << 29) - 1);
+}
- rc = DosDevIOCtl(hfd, (ULONG)0x76, (ULONG)0x64,
- NULL, 0, NULL,
- (ULONG*)&callgate[2], sizeof(USHORT), &dlen);
- if (rc) {
- fprintf(stderr,"xf86-OS/2: EnableIOPorts failed, rc=%d, dlen=%d; emergency exit\n",
- rc,dlen);
- DosClose(hfd);
- exit(42);
- }
+static int cbn_460gx = -1;
-/* Calling callgate with function 13 sets IOPL for the program */
+static void
+print_460gx_sac(pciConfigPtr pcr)
+{
+ CARD32 tmp;
+
+ /* Print generalities */
+ printf(" STATUS 0x%04x COMMAND 0x%04x\n",
+ pcr->pci_status, pcr->pci_command);
+ printf(" CLASS 0x%02x 0x%02x 0x%02x REVISION 0x%02x\n",
+ pcr->pci_base_class, pcr->pci_sub_class, pcr->pci_prog_if,
+ pcr->pci_rev_id);
+
+ tmp = pcr->pci_user_config;
+ pcr->pci_user_config = 0;
+ print_default_class(pcr);
+ pcr->pci_user_config = tmp;
+
+ /* Only print what XFree86 might be interested in */
+ if (pcr->busnum == 0) {
+ if ((pcr->devnum != 0x10) || (pcr->funcnum != 0))
+ return;
+
+ /* Get Chipset Bus Number */
+ cbn_460gx = (unsigned int)pciReadByte(pcr->tag, 0x0040);
+ printf(" CBN 0x%02x CBUSES 0x%02x\n",
+ cbn_460gx, pciReadByte(pcr->tag, 0x0044));
+
+ return;
+ }
- asm volatile ("movl $13,%%ebx;.byte 0xff,0x1d;.long _callgate"
- : /*no outputs */
- : /*no inputs */
- : "eax","ebx","ecx","edx","cc");
+ if ((pcr->busnum != cbn_460gx) || (pcr->funcnum != 0))
+ return;
- DosClose(hfd);
- }
-#endif
-#if defined(Lynx) && defined(__powerpc__)
- pciConfBase = (unsigned char *) smem_create("PCI-CONF",
- (char *)0x80800000, 64*1024, SM_READ|SM_WRITE);
- if (pciConfBase == (void *) -1)
- exit(1);
-#endif
+ switch (pcr->devnum) {
+ case 0:
+ printf(" F16NUM 0x%02x F16CPL 0x%02x DEVNPRES 0x%08lx\n",
+ pciReadByte(pcr->tag, 0x0060), pciReadByte(pcr->tag, 0x0078),
+ (long)pciReadLong(pcr->tag, 0x0070));
+
+ return;
+
+ case 0x10:
+ printf(" TOM 0x%04x IORD 0x%04x\n",
+ pciReadWord(pcr->tag, 0x0050), pciReadWord(pcr->tag, 0x008E));
+ /* Fall through */
+
+ case 0x11: case 0x12: case 0x13:
+ case 0x14: case 0x15: case 0x16: case 0x17:
+ printf(" BUSNO 0x%02x SUBNO 0x%02x\n",
+ pciReadByte(pcr->tag, 0x0048), pciReadByte(pcr->tag, 0x0049));
+ printf(" VGASE 0x%02x PCIS 0x%02x IOR 0x%02x\n",
+ pciReadByte(pcr->tag, 0x0080), pciReadByte(pcr->tag, 0x0084),
+ pciReadByte(pcr->tag, 0x008C));
+ /* Fall through */
+
+ default:
+ return;
+ }
}
+static void
+print_460gx_pxb(pciConfigPtr pcr)
+{
+ CARD32 tmp;
+
+ /* Print generalities */
+ printf(" STATUS 0x%04x COMMAND 0x%04x\n",
+ pcr->pci_status, pcr->pci_command);
+ printf(" CLASS 0x%02x 0x%02x 0x%02x REVISION 0x%02x\n",
+ pcr->pci_base_class, pcr->pci_sub_class, pcr->pci_prog_if,
+ pcr->pci_rev_id);
+
+ tmp = pcr->pci_user_config;
+ pcr->pci_user_config = 0;
+ print_default_class(pcr);
+ pcr->pci_user_config = tmp;
+
+ /* Only print what XFree86 might be interested in */
+ printf(" ERRCMD 0x%02x GAPEN 0x%02x\n",
+ pciReadByte(pcr->tag, 0x0046), pciReadByte(pcr->tag, 0x0060));
+}
-void
-disable_os_io()
+static void
+print_460gx_gxb(pciConfigPtr pcr)
{
-#if defined(SVR4) || defined(SCO) || defined(ISC)
-#if defined(SI86IOPL)
- sysi86(SI86IOPL, 0);
-#else
- sysi86(SI86V86, V86SC_IOPL, 0);
-#endif
-#endif
-#if defined(linux)
- iopl(0);
-#endif
-#if defined(__FreeBSD__) || defined(__386BSD__)
- if (ioctl(io_fd, KDDISABIO, 0) < 0) {
- perror("ioctl(KDDISABIO)");
- close(io_fd);
- exit(1);
- }
- close(io_fd);
-#endif
-#if defined(__NetBSD__)
-#if !defined(USE_I386_IOPL)
- close(io_fd);
-#else
- if (i386_iopl(0) < 0) {
- perror("i386_iopl");
- exit(1);
- }
-#endif /* NetBSD1_1 */
-#endif /* __NetBSD__ */
-#if defined(__bsdi__)
- if (ioctl(io_fd, PCCONDISABIOPL, 0) < 0) {
- perror("ioctl(PCCONDISABIOPL)");
- close(io_fd);
- exit(1);
- }
- close(io_fd);
-#endif
-#if defined(MACH386)
- close(io_fd);
-#endif
-#if defined(Lynx) && defined(__powerpc__)
- smem_create(NULL, (char *) pciConfBase, 0, SM_DETACH);
- smem_remove("PCI-CONF");
- pciConfBase = NULL;
-#endif
+ CARD32 tmp;
+
+ /* Print generalities */
+ printf(" STATUS 0x%04x COMMAND 0x%04x\n",
+ pcr->pci_status, pcr->pci_command);
+ printf(" CLASS 0x%02x 0x%02x 0x%02x REVISION 0x%02x\n",
+ pcr->pci_base_class, pcr->pci_sub_class, pcr->pci_prog_if,
+ pcr->pci_rev_id);
+
+ tmp = pcr->pci_user_config;
+ pcr->pci_user_config = 0;
+ print_default_class(pcr);
+ pcr->pci_user_config = tmp;
+
+ /* Only print what XFree86 might be interested in */
+ printf(" BAPBASE 0x%08lx%08lx AGPSIZ 0x%02x VGAGE 0x%02x\n",
+ (long)pciReadLong(pcr->tag, 0x009C),
+ (long)pciReadLong(pcr->tag, 0x0098),
+ pciReadByte(pcr->tag, 0x00A2), pciReadByte(pcr->tag, 0x0060));
}
+
+#include "xf86getpagesize.c"
diff --git a/hw/xfree86/utils/xorgconfig/Cards b/hw/xfree86/utils/xorgconfig/Cards
index 0412fdd61..83d8840ea 100644
--- a/hw/xfree86/utils/xorgconfig/Cards
+++ b/hw/xfree86/utils/xorgconfig/Cards
@@ -1,4 +1,4 @@
-# $Xorg: Cards,v 1.3 2000/08/17 19:53:04 cpqbld Exp $
+# $XConsortium: Cards /main/27 1996/10/28 05:43:53 kaleb $
# This is the database of card definitions used by xf86config.
# Each definition should have a NAME entry, CHIPSET (descriptive) and
# SERVER (one of Mono, VGA16, SVGA, S3, 8514, Mach8, Mach32, Mach64, AGX,
@@ -18,7 +18,228 @@
# The majority of entries are just a binding of a model name to a
# chipset/server and untested.
#
-# $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/Cards,v 3.51.2.15 1998/02/27 15:28:57 dawes Exp $
+# $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/Cards,v 3.80 2002/11/18 05:24:19 paulo Exp $
+
+# VGA
+
+NAME * Generic VGA compatible
+SERVER VGA16
+DRIVER vga
+
+NAME * Generic VESA compatible
+SERVER VGA16
+DRIVER vesa
+
+NAME * Unsupported VGA compatible
+SERVER VGA16
+DRIVER vga
+UNSUPPORTED
+
+
+# #
+# generic #
+# #
+
+NAME ** Alliance Pro Motion (generic) [apm]
+#CHIPSET apm
+SERVER SVGA
+DRIVER apm
+LINE #Option "no_accel"
+
+NAME ** Ark Logic (generic) [ark]
+#CHIPSET ark
+SERVER SVGA
+DRIVER ark
+
+NAME ** ATI (generic) [ati]
+#CHIPSET ati
+SERVER SVGA
+DRIVER ati
+
+NAME ** ATI Rage 128 based (generic) [r128]
+#CHIPSET r128
+SERVER SVGA
+DRIVER r128
+
+NAME ** ATI Radeon (generic) [radeon]
+#CHIPSET radeon
+SERVER SVGA
+DRIVER radeon
+
+NAME ** Chips and Technologies (generic) [chips]
+#CHIPSET chips
+SERVER SVGA
+DRIVER chips
+LINE # Option "suspend_hack"
+LINE # Option "STN"
+LINE # Option "no_stretch"
+LINE # Option "no_center"
+LINE # Option "use_modeline"
+LINE # Option "fix_panel_size"
+LINE # videoram 512
+LINE # Option "noaccel"
+LINE # Option "no_bitblt"
+LINE # Option "xaa_no_color_exp"
+LINE # Option "xaa_benchmark"
+LINE # Option "hw_cursor"
+LINE # Option "nolinear"
+LINE # MemBase 0x03b00000
+LINE # Option "hw_clocks"
+LINE # Textclockfreq 25.175
+
+NAME ** Cirrus Logic (generic) [cirrus]
+#CHIPSET cirrus
+SERVER SVGA
+DRIVER cirrus
+LINE # MemBase 0x00e00000 # ISA card that maps to 14Mb
+LINE # MemBase 0x04000000 # VLB card that maps to 64Mb
+LINE # MemBase 0x80000000 # VLB card that maps to 2048Mb
+LINE # MemBase 0x02000000 # VLB card that maps to 32Mb
+LINE # Option "linear"
+LINE # Option "fifo_conservative"
+
+NAME ** Cyrix MediaGX (generic) [cyrix]
+#CHIPSET cyrix
+SERVER SVGA
+DRIVER cyrix
+
+NAME ** Linux framebuffer (generic) [fbdev]
+#CHIPSET fbdev
+SERVER SVGA
+DRIVER fbdev
+
+NAME ** 3DLabs, TI (generic) [glint]
+#CHIPSET glint
+SERVER SVGA
+DRIVER glint
+LINE #Option "no_accel"
+
+NAME ** Number Nine I128 (generic) [i128]
+#CHIPSET i128
+SERVER SVGA
+DRIVER i128
+
+NAME ** Intel i740 (generic) [i740]
+#CHIPSET i740
+SERVER SVGA
+DRIVER i740
+
+NAME ** Intel i810 (generic) [i810]
+#CHIPSET i810
+SERVER SVGA
+DRIVER i810
+
+NAME ** Matrox Graphics (generic) [mga]
+#CHIPSET mga
+SERVER SVGA
+DRIVER mga
+LINE # Option "mga_sdram"
+
+NAME ** NeoMagic (generic) [neomagic]
+#CHIPSET neomagic
+SERVER SVGA
+DRIVER neomagic
+LINE # Chipset "NM2160"
+LINE # IOBase 0xfea00000
+LINE # MemBase 0xfd000000
+LINE # VideoRam 2048
+LINE # DacSpeed 90
+LINE # Option "linear"
+LINE # Option "nolinear"
+LINE # Option "sw_cursor"
+LINE # Option "hw_cursor"
+LINE # Option "no_accel"
+LINE # Option "intern_disp"
+LINE # Option "extern_disp"
+LINE # Option "mmio"
+LINE # Option "no_mmio"
+LINE # Option "lcd_center"
+LINE # Option "no_stretch"
+
+NAME ** NVIDIA (generic) [nv]
+#CHIPSET nv
+SERVER SVGA
+DRIVER nv
+
+NAME ** Rendition (generic) [rendition]
+#CHIPSET rendition
+SERVER SVGA
+DRIVER rendition
+LINE # Option "sw_cursor"
+
+NAME ** S3 (not ViRGE or Savage) (generic) [s3]
+#CHIPSET s3
+SERVER SVGA
+DRIVER s3
+
+NAME ** S3 ViRGE (generic) [s3virge]
+#CHIPSET s3virge
+SERVER SVGA
+DRIVER s3virge
+LINE # Option "xaa_benchmark"
+LINE # Option "fifo_moderate"
+LINE # Option "pci_burst_on"
+LINE # Option "pci_retry"
+LINE # Option "lcd_center"
+LINE # Set_LCDClk <pixel_clock_for_LCD>
+
+NAME ** S3 Savage (generic) [savage]
+#CHIPSET savage
+SERVER SVGA
+DRIVER savage
+
+NAME ** Silicon Motion (generic) [siliconmotion]
+#CHIPSET siliconmotion
+SERVER SVGA
+DRIVER siliconmotion
+
+NAME ** SiS (generic) [sis]
+#CHIPSET sis
+SERVER SVGA
+DRIVER sis
+LINE # Option "no_accel"
+LINE # Option "fifo_moderate"
+LINE # Option "fifo_conserv"
+LINE # Option "fifo_aggressive"
+LINE # Option "no_BitBlt"
+LINE # Option "fast_vram"
+LINE # Option "pci_burst_on"
+LINE # Option "xaa_benchmark"
+LINE # Option "ext_eng_queue"
+
+NAME ** 3Dfx (generic) [tdfx]
+#CHIPSET tdfx
+SERVER SVGA
+DRIVER tdfx
+
+NAME ** DEC TGA (generic) [tga]
+#CHIPSET tga
+SERVER SVGA
+DRIVER tga
+
+NAME ** Trident (generic) [trident]
+#CHIPSET trident
+SERVER SVGA
+DRIVER trident
+
+NAME ** Tseng Labs (generic) [tseng]
+#CHIPSET tseng
+SERVER SVGA
+DRIVER tseng
+LINE # Option "linear"
+LINE # Option "noaccel"
+LINE # Option "power_saver"
+LINE # Option "fast_dram"
+LINE # Option "pci_retry"
+LINE # Option "hibit_high"
+LINE # Option "hibit_low"
+LINE # MemBase 0x3C00000
+
+NAME ** VMWare guest OS (generic) [vmware]
+#CHIPSET vmware
+SERVER SVGA
+DRIVER vmware
+
#Chips & Technologies
@@ -26,6 +247,7 @@
NAME Chips & Technologies CT65520
CHIPSET ct65520
SERVER SVGA
+DRIVER chips
LINE # Device section for C&T cards.
LINE # Option "suspend_hack"
LINE # Option "STN"
@@ -65,7 +287,7 @@ LINE # Option "noaccel"
LINE # Option "no_bitblt"
LINE # Option "xaa_no_color_exp"
LINE # Option "xaa_benchmark"
-LINE # Option "sw_cursor"
+LINE # Option "hw_cursor"
LINE # Option "mmio"
SEE Chips & Technologies CT65540
@@ -84,7 +306,7 @@ LINE # Option "noaccel"
LINE # Option "no_bitblt"
LINE # Option "xaa_no_color_exp"
LINE # Option "xaa_benchmark"
-LINE # Option "sw_cursor"
+LINE # Option "hw_cursor"
LINE # Option "sync_on_green"
LINE # Option "fast_dram"
LINE # Option "use_vclk1"
@@ -103,20 +325,30 @@ NAME Chips & Technologies CT68554
CHIPSET ct68554
SEE Chips & Technologies CT65550
+NAME Chips & Technologies CT69000
+CHIPSET ct69000
+SEE Chips & Technologies CT65550
+
+NAME Chips & Technologies CT69030
+CHIPSET ct69030
+SEE Chips & Technologies CT65550
+
NAME Chips & Technologies CT64200
CHIPSET ct64200
SERVER SVGA
+DRIVER chips
LINE # Device section for C&T cards.
LINE # videoram 1024
NAME Chips & Technologies CT64300
CHIPSET ct64300
SERVER SVGA
+DRIVER chips
LINE # Option "noaccel"
LINE # Option "no_bitblt"
LINE # Option "xaa_no_color_exp"
LINE # Option "xaa_benchmark"
-LINE # Option "sw_cursor"
+LINE # Option "hw_cursor"
LINE # Option "nolinear"
LINE # MemBase 0x03b00000
LINE # Option "hw_clocks"
@@ -127,8 +359,9 @@ SEE Chips & Technologies CT64200
#tested
NAME Cirrus Logic GD542x
-CHIPSET CL-GD5420/2/4/6/8/9
SERVER SVGA
+DRIVER vga
+UNSUPPORTED
NOCLOCKPROBE
LINE # Device section for Cirrus Logic GD5420/2/4/6/8/9-based cards.
LINE #MemBase 0x00e00000
@@ -137,8 +370,9 @@ LINE #Option "linear"
#tested
NAME Cirrus Logic GD543x
-CHIPSET CL-GD5430/5434
+CHIPSET CL-GD5430/5434/5436
SERVER SVGA
+DRIVER cirrus
NOCLOCKPROBE
LINE # Device section for Cirrus Logic GD5430/34-based cards.
LINE #MemBase 0x00e00000 # ISA card that maps to 14Mb
@@ -150,6 +384,7 @@ LINE #Option "linear"
NAME Cirrus Logic GD544x
CHIPSET CL-GD544x
SERVER SVGA
+DRIVER cirrus
NOCLOCKPROBE
NAME Creative Labs Graphics Blaster MA201
@@ -162,13 +397,25 @@ SEE Cirrus Logic GD544x
NAME Cirrus Logic GD5462
CHIPSET CL-GD5462
SERVER SVGA
+DRIVER cirrus
NOCLOCKPROBE
+LINE #Option "fifo_conservative"
#tested
NAME Cirrus Logic GD5464
CHIPSET CL-GD5464
SERVER SVGA
+DRIVER cirrus
+NOCLOCKPROBE
+LINE #Option "fifo_conservative"
+
+#tested
+NAME Cirrus Logic GD5465
+CHIPSET CL-GD5465
+SERVER SVGA
+DRIVER cirrus
NOCLOCKPROBE
+LINE #Option "fifo_conservative"
NAME Creative Labs Graphics Blaster MA302
CHIPSET CL-GD5462
@@ -183,6 +430,13 @@ CHIPSET CL-GD5464
SEE Cirrus Logic GD5464
#tested
+NAME Cirrus Logic GD5480
+CHIPSET CL-GD5480
+SERVER SVGA
+DRIVER cirrus
+NOCLOCKPROBE
+
+#tested
NAME Diamond SpeedStar 64
CHIPSET CL-GD5434
SEE Cirrus Logic GD543x
@@ -200,6 +454,7 @@ SEE Cirrus Logic GD542x
NAME Orchid Kelvin 64 VLB Rev A
CHIPSET CL-GD5434
SERVER SVGA
+DRIVER cirrus
NOCLOCKPROBE
LINE # Device section for Orchid Kelvin 64 VLB Rev A
LINE # Linear framebuffer maps at 2048Mb. Some motherboards make linear addressing
@@ -212,6 +467,7 @@ LINE #Option "linear"
NAME Orchid Kelvin 64 VLB Rev B
CHIPSET CL-GD5434
SERVER SVGA
+DRIVER cirrus
NOCLOCKPROBE
LINE # Device section for Orchid Kelvin 64 VLB Rev B
LINE # Linear framebuffer maps at 32Mb. Some motherboards make linear addressing
@@ -283,22 +539,90 @@ SEE Cirrus Logic GD543x
NAME Cirrus Logic GD62xx (laptop)
CHIPSET CL-GD6205/15/25/35
SERVER SVGA
+DRIVER vga
+UNSUPPORTED
NOCLOCKPROBE
NAME Cirrus Logic GD64xx (laptop)
CHIPSET CL-GD6420/6440
SERVER SVGA
+DRIVER vga
+UNSUPPORTED
NAME Cirrus Logic GD754x (laptop)
CHIPSET CL-GD7541/42/43/48
SERVER SVGA
+DRIVER vga
+UNSUPPORTED
+NOCLOCKPROBE
+
+NAME Techworks Ultimate 3D
+CHIPSET CL-GD5464
+SEE Cirrus Logic GD5464
+
+NAME VideoLogic GrafixStar 550
+CHIPSET CL-GD5464
+SEE Cirrus Logic GD5464
+
+NAME Jaton Video-70P
+CHIPSET CL-GD5464
+SEE Cirrus Logic GD5464
+
+NAME PixelView Combo TV Pro (Prolink)
+CHIPSET CL-GD5480, 4MB
+SERVER SVGA
+DRIVER vga
+UNSUPPORTED
+LINE # COMMENT on card TV Tuner
+NOCLOCKPROBE
+
+NAME PixelView Combo TV 3D AGP (Prolink)
+CHIPSET CL-GD5465, 4MB
+SERVER SVGA
+DRIVER vga
+UNSUPPORTED
+LINE # COMMENT on card TV+FM Tuner
+NOCLOCKPROBE
+
+NAME Creative Labs Graphics Blaster Eclipse (OEM Model CT6510)
+SEE Cirrus Logic GD5465
+
+NAME VideoLogic GrafixStar 560 (PCI/AGP)
+SEE Cirrus Logic GD5465
+
+NAME Cirrus Logic GD5446 (noname card)
+CHIPSET CL-GD5446, 1MB (upgradable to 2MB).
+SERVER SVGA
+DRIVER vga
+UNSUPPORTED
NOCLOCKPROBE
+NAME Octek VL-VGA-26
+CHIPSET CL-GD5426
+SEE Cirrus Logic GD542x
+
+NAME Octek VL-VGA-28
+CHIPSET CL-GD5428
+SEE Cirrus Logic GD542x
+
+NAME Octek Combo-26
+CHIPSET CL-GD5426
+SEE Cirrus Logic GD542x
+
+NAME Octek Combo-28
+CHIPSET CL-GD5428
+SEE Cirrus Logic GD542x
+
+NAME Octek AVGA-20
+SEE Cirrus Logic GD542x
+
# S3 801/805
NAME S3 801/805 (generic)
CHIPSET S3 801/805
SERVER S3
+DRIVER vga
+UNSUPPORTED
NAME S3 86C801 (generic)
SEE S3 801/805 (generic)
@@ -310,28 +634,38 @@ SEE S3 801/805 (generic)
NAME S3 801/805 with ATT20c490 RAMDAC
CHIPSET S3 801/805
SERVER S3
+DRIVER vga
+UNSUPPORTED
RAMDAC att20c490
LINE #Option "dac_8_bit" # Not supported by some 20c490 clones
NAME S3 801/805 with SC1148{2,3,4} RAMDAC
CHIPSET S3 801/805
SERVER S3
+DRIVER vga
+UNSUPPORTED
RAMDAC sc11482
NAME S3 801/805 with SC1148{5,7,9} RAMDAC
CHIPSET S3 801/805
SERVER S3
+DRIVER vga
+UNSUPPORTED
RAMDAC sc11485
NAME S3 801/805 with S3 GenDAC
CHIPSET S3 801/805
SERVER S3
+DRIVER vga
+UNSUPPORTED
RAMDAC s3gendac
CLOCKCHIP s3gendac
NAME S3 801/805 with ATT20c490 RAMDAC and ICD2061A
CHIPSET S3 801/805
SERVER S3
+DRIVER vga
+UNSUPPORTED
RAMDAC att20c490
CLOCKCHIP icd2061a
LINE #Option "dac_8_bit" # Not supported by some 20c490 clones
@@ -339,6 +673,8 @@ LINE #Option "dac_8_bit" # Not supported by some 20c490 clones
NAME S3 801/805 with Chrontel 8391
CHIPSET S3 801/805
SERVER S3
+DRIVER vga
+UNSUPPORTED
RAMDAC att20c490
CLOCKCHIP ch8391
LINE Option "dac_8_bit"
@@ -347,21 +683,29 @@ LINE Option "dac_8_bit"
NAME Actix GE32+ 2MB
CHIPSET S3 801/805
SERVER S3
+DRIVER vga
+UNSUPPORTED
RAMDAC att20c490
LINE #Option "dac_8_bit"
NAME Actix GE32i
CHIPSET S3 805i
SERVER S3
+DRIVER vga
+UNSUPPORTED
NAME Orchid Fahrenheit VA
CHIPSET S3 801/805
SERVER S3
+DRIVER vga
+UNSUPPORTED
RAMDAC att20c490
NAME Orchid Fahrenheit 1280
CHIPSET S3 801
SERVER S3
+DRIVER vga
+UNSUPPORTED
LINE #Probable clocks:
LINE #Clocks 25.20 28.32 32.50 0.00 40.00 44.90 50.40 65.00
LINE #Clocks 78.00 56.70 63.10 75.10 80.00 89.90 100.90 31.50
@@ -369,6 +713,8 @@ LINE #Clocks 78.00 56.70 63.10 75.10 80.00 89.90 100.90 31.50
NAME Orchid Fahrenheit-1280+
CHIPSET S3 801/805
SERVER S3
+DRIVER vga
+UNSUPPORTED
RAMDAC att20C490
LINE Dacspeed 110
LINE Option "dac_8_bit"
@@ -380,6 +726,8 @@ LINE #Clocks 130.0 120.20 80.0 31.50 110.30 65.0 75.0 94.60
NAME Diamond Stealth 24
CHIPSET S3 801/805
SERVER S3
+DRIVER vga
+UNSUPPORTED
CLOCKCHIP icd2061a
LINE #Option "nolinear"
LINE #Ramdac "att20c490" # The Diamond RAMDAC is reportedly compatible for 15bpp
@@ -408,8 +756,9 @@ SEE S3 801/805 with Chrontel 8391
# S3 864/Trio64/Trio32/868
NAME S3 864 (generic)
-CHIPSET S3 864
SERVER S3
+DRIVER vga
+UNSUPPORTED
NAME S3 86C864 (generic)
SEE S3 864 (generic)
@@ -420,6 +769,8 @@ SEE S3 864 (generic)
NAME S3 864 with SDAC (86C716)
CHIPSET S3 864
SERVER S3
+DRIVER vga
+UNSUPPORTED
RAMDAC s3_sdac
CLOCKCHIP s3_sdac
NOCLOCKPROBE
@@ -427,17 +778,23 @@ NOCLOCKPROBE
NAME S3 864 with ATT 20C498 or 21C498
CHIPSET S3 864
SERVER S3
+DRIVER vga
+UNSUPPORTED
RAMDAC att20c498
NAME S3 864 with STG1703
CHIPSET S3 864
SERVER S3
+DRIVER vga
+UNSUPPORTED
RAMDAC stg1703
NOCLOCKPROBE
NAME S3 868 (generic)
CHIPSET S3 868
SERVER S3
+DRIVER vga
+UNSUPPORTED
NAME S3 86C868 (generic)
SEE S3 868 (generic)
@@ -448,16 +805,22 @@ SEE S3 868 (generic)
NAME S3 868 with SDAC (86C716)
CHIPSET S3 868
SERVER S3
+DRIVER vga
+UNSUPPORTED
NOCLOCKPROBE
NAME S3 868 with ATT 20C498 or 21C498
CHIPSET S3 868
SERVER S3
+DRIVER vga
+UNSUPPORTED
RAMDAC att20c498
NAME S3 868 with ATT 20C409
CHIPSET S3 868
SERVER S3
+DRIVER vga
+UNSUPPORTED
RAMDAC att20c409
NOCLOCKPROBE
@@ -466,16 +829,18 @@ CLOCKCHIP icd2061a
SEE S3 868 with ATT 20C498 or 21C498
NAME S3 Trio64 (generic)
-CHIPSET S3 Trio64
SERVER S3
+DRIVER vga
+UNSUPPORTED
NOCLOCKPROBE
NAME S3 86C764 (generic)
SEE S3 Trio64 (generic)
NAME S3 Trio64V+ (generic)
-CHIPSET S3 Trio64V+
SERVER S3
+DRIVER vga
+UNSUPPORTED
NOCLOCKPROBE
NAME S3 86C765 (generic)
@@ -484,6 +849,8 @@ SEE S3 Trio64V+ (generic)
NAME S3 Trio32 (generic)
CHIPSET S3 Trio32
SERVER S3
+DRIVER vga
+UNSUPPORTED
NOCLOCKPROBE
NAME Genoa Phantom 64i with S3 SDAC
@@ -493,6 +860,8 @@ SEE S3 864 with SDAC (86C716)
NAME Number Nine GXE64
CHIPSET S3 864
SERVER S3
+DRIVER vga
+UNSUPPORTED
CLOCKCHIP icd2061a
LINE Option "number_nine"
@@ -529,6 +898,8 @@ SEE S3 864 with SDAC (86C716)
NAME ELSA Winner 1000PRO with STG1700 or AT&T RAMDAC
CHIPSET S3 864
SERVER S3
+DRIVER vga
+UNSUPPORTED
CLOCKCHIP icd2061a
NAME ELSA Winner 1000PRO/X
@@ -537,6 +908,8 @@ SEE S3 868 with SDAC (86C716)
NAME ELSA Winner 1000ISA
CHIPSET S3 805i
SERVER S3
+DRIVER vga
+UNSUPPORTED
CLOCKCHIP icd2061a
LINE Option "dac_8_bit"
LINE # the following settings should be detected and set automatically by XF86_S3
@@ -626,8 +999,9 @@ SEE S3 Trio64V+ (generic)
# S3 Trio64V2
NAME S3 Trio64V2 (generic)
-CHIPSET S3 Trio64V2
SERVER S3
+DRIVER vga
+UNSUPPORTED
NOCLOCKPROBE
NAME S3 Trio64V2/DX (generic)
@@ -651,6 +1025,8 @@ SEE S3 Trio64V2/DX (generic)
NAME S3 Aurora64V+ (generic)
CHIPSET S3 Aurora64V+
SERVER S3
+DRIVER vga
+UNSUPPORTED
NOCLOCKPROBE
LINE # Option "lcd_center"
LINE # Set_LCDClk <pixel_clock_for_LCD>
@@ -676,6 +1052,8 @@ SEE S3 Aurora64V+ (generic)
NAME S3 964 (generic)
CHIPSET S3 964
SERVER S3
+DRIVER vga
+UNSUPPORTED
NOCLOCKPROBE
NAME S3 86C964 (generic)
@@ -687,6 +1065,8 @@ SEE S3 964 (generic)
NAME S3 968 (generic)
CHIPSET S3 968
SERVER S3
+DRIVER vga
+UNSUPPORTED
NOCLOCKPROBE
NAME S3 86C968 (generic)
@@ -698,6 +1078,8 @@ SEE S3 968 (generic)
NAME Number Nine GXE64 Pro
CHIPSET S3 964
SERVER S3
+DRIVER vga
+UNSUPPORTED
RAMDAC ti3025
LINE Option "number_nine"
@@ -781,21 +1163,29 @@ SEE S3 964 (generic)
NAME Miro Crystal 20SV
CHIPSET S3 964
SERVER S3
+DRIVER vga
+UNSUPPORTED
CLOCKCHIP icd2061a
NAME Miro Crystal 40SV
CHIPSET S3 964
SERVER S3
+DRIVER vga
+UNSUPPORTED
CLOCKCHIP ti3025
NAME Miro Crystal 80SV
CHIPSET S3 968
SERVER S3
+DRIVER vga
+UNSUPPORTED
NOCLOCKPROBE
NAME Miro Video 20SV
CHIPSET S3 968
SERVER S3
+DRIVER vga
+UNSUPPORTED
RAMDAC att20c505
LINE #DacSpeed 150
CLOCKCHIP ics9161a
@@ -803,65 +1193,87 @@ CLOCKCHIP ics9161a
NAME SPEA Mercury 64
CHIPSET S3 964
SERVER S3
+DRIVER vga
+UNSUPPORTED
CLOCKCHIP ics9161a
LINE #Option "spea_mercury"
NAME ELSA Winner 2000PRO-2
CHIPSET S3 964
SERVER S3
+DRIVER vga
+UNSUPPORTED
LINE #Option "ELSA_w2000pro"
NOCLOCKPROBE
NAME ELSA Winner 2000PRO-4
CHIPSET S3 964
SERVER S3
+DRIVER vga
+UNSUPPORTED
LINE #Option "ELSA_w2000pro"
NOCLOCKPROBE
NAME ELSA Winner 2000PRO/X-2
CHIPSET S3 968
SERVER S3
+DRIVER vga
+UNSUPPORTED
LINE #Option "sync_on_green"
NOCLOCKPROBE
NAME ELSA Winner 2000PRO/X-4
CHIPSET S3 968
SERVER S3
+DRIVER vga
+UNSUPPORTED
LINE #Option "sync_on_green"
NOCLOCKPROBE
NAME ELSA Winner 2000PRO/X-8
CHIPSET S3 968
SERVER S3
+DRIVER vga
+UNSUPPORTED
LINE #Option "sync_on_green"
NOCLOCKPROBE
NAME ELSA Winner 2000AVI
CHIPSET S3 968
SERVER S3
+DRIVER vga
+UNSUPPORTED
LINE #Option "sync_on_green"
NOCLOCKPROBE
NAME ELSA Gloria-4
CHIPSET S3 968
SERVER S3
+DRIVER vga
+UNSUPPORTED
LINE #Option "sync_on_green"
NOCLOCKPROBE
NAME ELSA Gloria-8
CHIPSET S3 968
SERVER S3
+DRIVER vga
+UNSUPPORTED
LINE #Option "sync_on_green"
NOCLOCKPROBE
NAME VideoLogic GrafixStar 700
CHIPSET S3 968
SERVER S3
+DRIVER vga
+UNSUPPORTED
NOCLOCKPROBE
NAME LeadTek WinFast S430
CHIPSET S3 968
SERVER S3
+DRIVER vga
+UNSUPPORTED
NOCLOCKPROBE
NAME WinFast S430
@@ -870,6 +1282,8 @@ SEE LeadTek WinFast S430
NAME LeadTek WinFast S510
CHIPSET S3 968
SERVER S3
+DRIVER vga
+UNSUPPORTED
NOCLOCKPROBE
NAME WinFast S510
@@ -880,6 +1294,8 @@ SEE LeadTek WinFast S510
NAME S3 928 (generic)
CHIPSET S3 928
SERVER S3
+DRIVER vga
+UNSUPPORTED
NAME S3 86C928 (generic)
SEE S3 928 (generic)
@@ -887,12 +1303,16 @@ SEE S3 928 (generic)
NAME Actix Ultra
CHIPSET S3 928
SERVER S3
+DRIVER vga
+UNSUPPORTED
RAMDAC att20c490
LINE #Option "dac_8_bit"
NAME Diamond Stealth Pro
CHIPSET S3 928
SERVER S3
+DRIVER vga
+UNSUPPORTED
CLOCKCHIP icd2061a
LINE #Ramdac "att20c490" # The Diamond RAMDAC is reportedly compatible for 15bpp
LINE #Option "no_linear" # Some VLB machines may require this
@@ -900,6 +1320,8 @@ LINE #Option "no_linear" # Some VLB machines may require this
NAME ELSA Winner 1000VL
CHIPSET S3 928
SERVER S3
+DRIVER vga
+UNSUPPORTED
LINE # the following settings should be detected and set automatically by XF86_S3
LINE # if the serial number of the ELSA card is printed correctly:
LINE #ClockChip "icd2061a"
@@ -917,12 +1339,16 @@ SEE S3 928 (generic)
NAME SPEA/V7 Mercury
CHIPSET S3 928
SERVER S3
+DRIVER vga
+UNSUPPORTED
CLOCKCHIP sc11412
LINE Option "spea_mercury"
NAME STB Pegasus
CHIPSET S3 928
SERVER S3
+DRIVER vga
+UNSUPPORTED
RAMDAC bt485
CLOCKCHIP icd2061a
LINE Option "stb_pegasus"
@@ -931,6 +1357,8 @@ LINE #Option "sync_on_green"
NAME Number Nine GXE Level 14/16
CHIPSET S3 928
SERVER S3
+DRIVER vga
+UNSUPPORTED
DACSPEED 200
CLOCKCHIP icd2061a
LINE Option "number_nine"
@@ -940,12 +1368,16 @@ LINE #Option "nomemaccess"
NAME Number Nine GXE Level 10/11/12
CHIPSET S3 928
SERVER S3
+DRIVER vga
+UNSUPPORTED
CLOCKCHIP icd2061a
LINE Option "number_nine"
NAME 928Movie
CHIPSET S3 928
SERVER S3
+DRIVER vga
+UNSUPPORTED
CLOCKCHIP icd2595
RAMDAC bt485
LINE # pixel multiplexing not supported
@@ -955,6 +1387,8 @@ LINE # pixel multiplexing not supported
NAME S3 911/924 (generic)
CHIPSET S3 911/924
SERVER S3
+DRIVER vga
+UNSUPPORTED
NAME S3 86C911 (generic)
SEE S3 911/924 (generic)
@@ -965,6 +1399,8 @@ SEE S3 911/924 (generic)
NAME Diamond Stealth VRAM
CHIPSET S3 911/924
SERVER S3
+DRIVER vga
+UNSUPPORTED
CLOCKCHIP icd2061a
#NAME Orchid Fahrenheit 1280
@@ -973,6 +1409,8 @@ CLOCKCHIP icd2061a
NAME S3 924 with SC1148 DAC
CHIPSET S3 924
SERVER S3
+DRIVER vga
+UNSUPPORTED
LINE #Probable clocks:
LINE #Clocks 25.2 28.3 39.7 1.7 49.9 76.7 35.7 44
LINE #Clocks 130.2 119.5 79.4 31.2 110.0 65.2 74.9 71.3
@@ -982,11 +1420,13 @@ LINE #Clocks 130.2 119.5 79.4 31.2 110.0 65.2 74.9 71.3
NAME S3 ViRGE (old S3V server)
CHIPSET S3 ViRGE
SERVER S3V
+DRIVER s3virge
NOCLOCKPROBE
NAME S3 ViRGE (generic)
CHIPSET S3 ViRGE
SERVER SVGA
+DRIVER s3virge
NOCLOCKPROBE
LINE #Option "xaa_benchmark"
LINE #Option "fifo_moderate"
@@ -996,6 +1436,7 @@ LINE #Option "pci_retry"
NAME S3 ViRGE/DX (generic)
CHIPSET S3 ViRGE/DX
SERVER SVGA
+DRIVER s3virge
NOCLOCKPROBE
LINE #Option "xaa_benchmark"
LINE #Option "fifo_moderate"
@@ -1005,6 +1446,7 @@ LINE #Option "pci_retry"
NAME S3 ViRGE/GX (generic)
CHIPSET S3 ViRGE/GX
SERVER SVGA
+DRIVER s3virge
NOCLOCKPROBE
LINE #Option "xaa_benchmark"
LINE #Option "fifo_moderate"
@@ -1015,6 +1457,7 @@ LINE #Option "pci_retry"
NAME S3 ViRGE/GX2 (generic)
CHIPSET S3 ViRGE/GX2
SERVER SVGA
+DRIVER s3virge
NOCLOCKPROBE
LINE #Option "xaa_benchmark"
LINE #Option "fifo_moderate"
@@ -1024,6 +1467,7 @@ LINE #Option "pci_retry"
NAME S3 ViRGE/MX (generic)
CHIPSET S3 ViRGE/MX
SERVER SVGA
+DRIVER s3virge
NOCLOCKPROBE
LINE #Option "lcd_center"
LINE #Set_LCDClk <pixel_clock_for_LCD>
@@ -1032,6 +1476,9 @@ LINE #Option "fifo_moderate"
LINE #Option "pci_burst_on"
LINE #Option "pci_retry"
+NAME S3 ViRGE/MX+ (generic)
+SEE S3 ViRGE/MX (generic)
+
@@ -1050,6 +1497,9 @@ SEE S3 ViRGE/GX2 (generic)
NAME S3 86C260 (generic)
SEE S3 ViRGE/MX (generic)
+NAME S3 86C280 (generic)
+SEE S3 ViRGE/MX+ (generic)
+
NAME ELSA Victory 3D
SEE S3 ViRGE (generic)
@@ -1105,10 +1555,7 @@ SEE LeadTek WinFast 3D S600
NAME LeadTek WinFast 3D S680
SEE S3 ViRGE/GX2 (generic)
-NAME WinFast 3D S600
-SEE LeadTek WinFast 3D S680
-
-NAME miro miroMedia 3D
+NAME Miro MiroMedia 3D
SEE S3 ViRGE (generic)
NAME Orchid Technology Fahrenheit Video 3D
@@ -1131,6 +1578,7 @@ SEE S3 ViRGE (generic)
NAME S3 ViRGE/VX (generic)
CHIPSET S3 ViRGE/VX
SERVER SVGA
+DRIVER s3virge
NOCLOCKPROBE
LINE #Option "xaa_benchmark"
LINE #Option "fifo_moderate"
@@ -1162,6 +1610,8 @@ SEE S3 ViRGE/VX (generic)
NAME MELCO WGP-VX8
SEE S3 ViRGE/VX (generic)
+NAME Diamond Stealth 3D 4000
+SEE S3 ViRGE/GX2 (generic)
NAME Toshiba Tecra 750CDT
SEE S3 ViRGE/MX (generic)
@@ -1175,15 +1625,31 @@ SEE S3 ViRGE/MX (generic)
NAME Toshiba Tecra 550CDT
SEE S3 ViRGE/MX (generic)
+# currently unsupported S3
+NAME S3 86C365 (Trio3D)
+SEE * Unsupported VGA compatible
+NAME S3 86C391 (Savage3D)
+SEE * Unsupported VGA compatible
+NAME S3 Trio3D
+SEE * Unsupported VGA compatible
+
+NAME S3 Savage3D
+SEE * Unsupported VGA compatible
+
+NAME S3 Savage4
+SERVER SVGA
+DRIVER vga
+UNSUPPORTED
# ET4000/ET6000
NAME ET3000 (generic)
CHIPSET ET3000
SERVER SVGA
+DRIVER tseng
NAME Genoa 5400
SEE ET3000 (generic)
@@ -1191,14 +1657,17 @@ SEE ET3000 (generic)
NAME ET4000 (generic)
CHIPSET ET4000
SERVER SVGA
+DRIVER tseng
NAME ET4000/W32 (generic)
CHIPSET ET4000/W32
SERVER W32
+DRIVER tseng
NAME ET4000 W32i, W32p (generic)
CHIPSET ET4000/W32(i/p)
SERVER SVGA
+DRIVER tseng
LINE #Option "linear" # for linear mode at 8bpp
LINE #Option "noaccel" # when problems with accelerator
LINE #Option "power_saver" # enable VESA DPMS
@@ -1212,6 +1681,7 @@ LINE # -- see README.tseng for more (important) information on MemBase
NAME ET6000 (generic)
CHIPSET ET6000
SERVER SVGA
+DRIVER tseng
NOCLOCKPROBE
LINE #videoram 2304 # 2.25 MB, when memory probe is incorrect
LINE #Option "linear" # for linear mode at 8bpp
@@ -1223,8 +1693,7 @@ LINE #Option "xaa_no_color_exp" # When text (or bitmap) is not rendered cor
NAME ET6100 (generic)
CHIPSET ET6100
-SERVER XSuSE_Tseng
-NOCLOCKPROBE
+SEE ET6000 (generic)
NAME Diamond Stealth 32
CLOCKCHIP icd2061a
@@ -1358,184 +1827,174 @@ SEE ET6000 (generic)
NAME Interay PMC Viper
SEE ET6000 (generic)
-2-the-Max MAXColor 6000
+NAME 2-the-Max MAXColor 6000
SEE ET6000 (generic)
-Gainward Challenger EV
+NAME Gainward Challenger EV
SEE ET6000 (generic)
-MachSpeed VGA ET6000
+NAME MachSpeed VGA ET6000
SEE ET6000 (generic)
-KouTech KeyVision 128 EV
+NAME KouTech KeyVision 128 EV
SEE ET6000 (generic)
+NAME Jaton Video-58P
+SEE ET6000 (generic)
# ATI
+NAME ATI Rage 128
+CHIPSET ati
+SERVER SVGA
+DRIVER ati
+
NAME ATI 8514 Ultra (no VGA)
-CHIPSET ATI-Mach8
+CHIPSET ati
SERVER Mach8
+DRIVER vga
+UNSUPPORTED
NAME ATI Graphics Ultra
-CHIPSET ATI-Mach8
+CHIPSET ati
SERVER Mach8
-LINE #Probable clocks:
-LINE #Clocks 43 49 80 36 50 56 0 45 30 32 110 79 40 45 75 65
-LINE #Clocks 22 25 46 18 25 28 0 22 15 16 55 40 20 22 38 32
+DRIVER ati
NAME ATI Graphics Ultra Pro
-CHIPSET ATI-Mach32
+CHIPSET ati
SERVER Mach32
-LINE #Probable clocks:
-LINE #Clocks 100 126 92 36 51 57 0 44 135 32 110 80 39
-LINE #Clocks 45 75 65 50 63 46 18 25 28 0 22 67 16 55 40 19 23 37 33
-LINE #Option "dac_8_bit"
+DRIVER ati
NAME ATI Wonder SVGA
-CHIPSET ATI vgawonder
+CHIPSET ati
SERVER SVGA
-LINE #probable clocks:
-LINE #Clocks 30 32 11 80 42 48 92 36 40 45 75 65 50 56 0 0
-LINE #Clocks 15 16 55 0 21 24 46 18 20 22 37 32 25 28 0 0
+DRIVER ati
NAME ATI Ultra Plus
-CHIPSET ATI-Mach32
+CHIPSET ati
SERVER Mach32
+DRIVER ati
NAME ATI Mach32
-CHIPSET ATI-Mach32
+CHIPSET ati
SERVER Mach32
+DRIVER ati
NAME ATI Mach64
-CHIPSET ATI-Mach64
+CHIPSET ati
SERVER Mach64
+DRIVER ati
NOCLOCKPROBE
-NAME ATI Mach64 with AT&T 20C408 RAMDAC
-CHIPSET ATI-Mach64
-SERVER Mach64
-LINE #Ramdac "att20c408"
-NOCLOCKPROBE
+NAME ATI Mach64 CT (264CT)
+SEE ATI Mach64
-NAME ATI Mach64 with CH8398 RAMDAC
-CHIPSET ATI-Mach64
-SERVER Mach64
-LINE #Ramdac "ch8398"
-NOCLOCKPROBE
+NAME ATI Mach64 VT (264VT)
+SEE ATI Mach64
-NAME ATI Mach64 with IBM RGB514 RAMDAC
-CHIPSET ATI-Mach64
-SERVER Mach64
-LINE #Ramdac "ibm_rgb514"
-NOCLOCKPROBE
+NAME ATI Mach64 GT (264GT), aka 3D RAGE
+SEE ATI Mach64
-NAME ATI Mach64 CT (264CT), Internal RAMDAC
-CHIPSET ATI-Mach64
-SERVER Mach64
-NOCLOCKPROBE
+NAME ATI Mach64 3D RAGE II
+SEE ATI Mach64
-NAME ATI Mach64 VT (264VT), Internal RAMDAC
-CHIPSET ATI-Mach64
-SERVER Mach64
-NOCLOCKPROBE
+NAME ATI Mach64 3D RAGE II+DVD
+SEE ATI Mach64
-NAME ATI Mach64 GT (264GT), aka 3D RAGE, Internal RAMDAC
-CHIPSET ATI-Mach64
-SERVER Mach64
-NOCLOCKPROBE
+NAME ATI Mach64 3D Rage IIC
+SEE ATI Mach64
-NAME ATI Mach64 3D RAGE II, Internal RAMDAC
-CHIPSET ATI-Mach64
-SERVER Mach64
-NOCLOCKPROBE
+NAME ATI Mach64 3D Rage Pro
+SEE ATI Mach64
-NAME ATI Mach64 3D RAGE II+, Internal RAMDAC
-CHIPSET ATI-Mach64
-SERVER Mach64
-NOCLOCKPROBE
+NAME ATI 3D Pro Turbo
+SEE ATI Mach64
-NAME ATI Xpert@Play PCI and AGP, 3D Rage Pro
-CHIPSET ATI-Mach64
-SERVER Mach64
-NOCLOCKPROBE
+NAME ATI 3D Pro Turbo PC2TV
+SEE ATI Mach64
-NAME ATI Xpert@Work, 3D Rage Pro
-CHIPSET ATI-Mach64
-SERVER Mach64
-NOCLOCKPROBE
+NAME ATI 3D Xpression
+SEE ATI Mach64
-NAME ATI Pro Turbo+PC2TV, 3D Rage II+DVD
-CHIPSET ATI-Mach64
-SERVER Mach64
-NOCLOCKPROBE
+NAME ATI 3D Xpression+
+SEE ATI Mach64
-NAME ATI Graphics Xpression with STG1702 RAMDAC
+NAME ATI 3D Xpression+ PC2TV
SEE ATI Mach64
-NAME ATI Graphics Xpression with 68875 RAMDAC
+NAME ATI All-in-Wonder
SEE ATI Mach64
-NAME ATI Graphics Xpression with CH8398 RAMDAC
-SEE ATI Mach64 with CH8398 RAMDAC
+NAME ATI All-in-Wonder Pro
+SEE ATI Mach64
-NAME ATI Graphics Xpression with AT&T 20C408 RAMDAC
-SEE ATI Mach64 with AT&T 20C408 RAMDAC
+NAME ATI Graphics Pro Turbo
+SEE ATI Mach64
-NAME ATI Graphics Xpression with Mach64 CT (264CT)
-SEE ATI Mach64 CT (264CT), Internal RAMDAC
+NAME ATI Graphics Pro Turbo 1600
+SEE ATI Mach64
-NAME ATI Video Xpression
-SEE ATI Mach64 VT (264VT), Internal RAMDAC
+NAME ATI Graphics Xpression
+SEE ATI Mach64
-NAME ATI 3D Xpression
-SEE ATI Mach64 GT (264GT), aka 3D RAGE, Internal RAMDAC
+NAME ATI Video Boost
+SEE ATI Mach64
-NAME ATI 3D Xpression+ PC2TV
-SEE ATI Mach64 3D RAGE II, Internal RAMDAC
+NAME ATI Video Charger
+SEE ATI Mach64
-NAME ATI 3D Pro Turbo
-SEE ATI Mach64 3D RAGE II, Internal RAMDAC
+NAME ATI Video Xpression
+SEE ATI Mach64
-NAME ATI All-in-Wonder
-SEE ATI Mach64 3D RAGE II+, Internal RAMDAC
+NAME ATI Video Xpression+
+SEE ATI Mach64
+
+NAME ATI WinBoost
+SEE ATI Mach64
-NAME ATI Win Boost with STG1702 RAMDAC
+NAME ATI WinCharger
SEE ATI Mach64
-NAME ATI Win Boost with CH8398 RAMDAC
-SEE ATI Mach64 with CH8398 RAMDAC
+NAME ATI WinTurbo
+SEE ATI Mach64
-NAME ATI Win Boost with AT&T 20C408 RAMDAC
-SEE ATI Mach64 with AT&T 20C408 RAMDAC
+NAME ATI Xpert 98
+SEE ATI Mach64
-NAME ATI Win Boost with Mach64 CT (264CT)
-SEE ATI Mach64 CT (264CT), Internal RAMDAC
+NAME ATI Xpert XL
+SEE ATI Mach64
-NAME ATI Graphics Pro Turbo
+NAME ATI Xpert@Play
SEE ATI Mach64
-NAME ATI Graphics Pro Turbo 1600
-SEE ATI Mach64 with IBM RGB514 RAMDAC
+NAME ATI Xpert@Play 98
+SEE ATI Mach64
+
+NAME ATI Xpert@Work
+SEE ATI Mach64
-NAME ATI Win Turbo
+NAME ATI integrated on Intel Maui MU440EX motherboard
SEE ATI Mach64
NAME ASUS PCI-V264CT
-SEE ATI Mach64 CT (264CT), Internal RAMDAC
+SEE ATI Mach64
NAME ASUS PCI-AV264CT
-SEE ATI Mach64 CT (264CT), Internal RAMDAC
+SEE ATI Mach64
# AGX
NAME AGX (generic)
CHIPSET AGX-014/15/16
SERVER AGX
+DRIVER vga
+UNSUPPORTED
NAME Boca Vortex (Sierra RAMDAC)
CHIPSET AGX-015
SERVER AGX
+DRIVER vga
+UNSUPPORTED
RAMDAC sc15025
LINE Option "dac_8_bit"
LINE Option "no_wait_state"
@@ -1547,6 +2006,8 @@ SEE AGX (generic)
NAME Orchid Celsius (AT&T RAMDAC)
CHIPSET AGX-015
SERVER AGX
+DRIVER vga
+UNSUPPORTED
RAMDAC att20c490
LINE Option "dac_8_bit"
LINE Option "no_wait_state"
@@ -1555,6 +2016,8 @@ LINE #Option "fifo_moderate" # 2x bus bw - may result in random pixels
NAME Orchid Celsius (Sierra RAMDAC)
CHIPSET AGX-015
SERVER AGX
+DRIVER vga
+UNSUPPORTED
RAMDAC sc15025
LINE Option "dac_8_bit"
LINE Option "no_wait_state"
@@ -1564,6 +2027,8 @@ LINE #Option "fifo_moderate" # 2x bus bw - may result in random pixels
NAME Spider Black Widow
CHIPSET AGX-015
SERVER AGX
+DRIVER vga
+UNSUPPORTED
RAMDAC sc15025
LINE Option "dac_8_bit"
LINE Option "no_wait_state"
@@ -1573,6 +2038,8 @@ LINE #Option "fifo_moderate" # 2x bus bw - may result in random pixels
NAME Spider Black Widow Plus
CHIPSET AGX-016
SERVER AGX
+DRIVER vga
+UNSUPPORTED
RAMDAC sc15025
LINE Option "dac_8_bit"
LINE Option "no_wait_state"
@@ -1585,6 +2052,8 @@ LINE #Clocks 89.0 119.8 79.9 31.5 110.0 64.9 74.9 94.9
NAME Hercules Graphite HG210
CHIPSET AGX-014
SERVER AGX
+DRIVER vga
+UNSUPPORTED
RAMDAC bt482
DACSPEED 85
LINE Chipset "AGX-014"
@@ -1597,6 +2066,8 @@ LINE #Clocks 70.0 75.0 80.0 85.0 90.0 95.0 100.0 110.0
NAME Hercules Graphite Pro
CHIPSET AGX-015
SERVER AGX
+DRIVER vga
+UNSUPPORTED
# Card specific DAC, doesn't appear in ramdac menu
LINE Ramdac "herc_dual_dac"
LINE Chipset "AGX-015"
@@ -1610,6 +2081,8 @@ LINE #Clocks 70.0 75.0 80.0 85.0 90.0 95.0 100.0 110.0
NAME Hercules Graphite Power
CHIPSET AGX-016
SERVER AGX
+DRIVER vga
+UNSUPPORTED
# Card specific DAC, doesn't appear in ramdac menu
# The glue logic state machine for RAMDAC switching doesn't work as
# documented, for now we're stuck with the small RAMDAC
@@ -1626,6 +2099,8 @@ LINE #Clocks 70.0 75.0 80.0 85.0 90.0 95.0 100.0 110.0
NAME XGA-2 (ISA bus)
CHIPSET XGA-2
SERVER AGX
+DRIVER vga
+UNSUPPORTED
NOCLOCKPROBE
LINE #Instance 7 # XGA instance 0-7
LINE #COPbase 0xC8F00 # XGA memory-mapped register address
@@ -1634,6 +2109,8 @@ LINE #POSbase 0 # Disable probing if above are specified
NAME XGA-1 (ISA bus)
CHIPSET XGA-1
SERVER AGX
+DRIVER vga
+UNSUPPORTED
LINE #Instance 7 # XGA instance 0-7
LINE #COPbase 0xC8F00 # XGA memory-mapped register address
LINE #POSbase 0 # Disable probing if above are specified
@@ -1643,18 +2120,26 @@ LINE #POSbase 0 # Disable probing if above are specified
NAME Paradise/WD 90CXX
CHIPSET WD90CXX
SERVER SVGA
+DRIVER vga
+UNSUPPORTED
NAME DFI-WG6000
CHIPSET WD90C33
SERVER SVGA
+DRIVER vga
+UNSUPPORTED
NAME Diamond SpeedStar 24X (not fully supported)
CHIPSET WD90C31
SERVER SVGA
+DRIVER vga
+UNSUPPORTED
NAME WD 90C24 (laptop)
CHIPSET WD90C24
SERVER SVGA
+DRIVER vga
+UNSUPPORTED
LINE #Chipset "wd90c24"
LINE #Option "noaccel" # Use this if acceleration is causing problems
LINE #Clocks 25.175 28.322 65 36 # These are not programmable
@@ -1667,6 +2152,8 @@ LINE #Clocks 44.297 # Must match Mclk
NAME WD 90C24A or 90C24A2 (laptop)
CHIPSET WD90C24A
SERVER SVGA
+DRIVER vga
+UNSUPPORTED
LINE #Chipset "wd90c24"
LINE #Clocks 25.175 28.322 65 36 # These are not programmable
LINE #Clocks 29.979 77.408 62.195 59.957 # These are programmable
@@ -1680,61 +2167,85 @@ NAME Avance Logic 2101
CHIPSET Avance Logic
LINE #chipset "al2101"
SERVER SVGA
+DRIVER vga
+UNSUPPORTED
NAME Avance Logic 2228
CHIPSET Avance Logic
LINE #chipset "ali2228"
SERVER SVGA
+DRIVER vga
+UNSUPPORTED
NAME Avance Logic 2301
CHIPSET Avance Logic
LINE #chipset "ali2301"
SERVER SVGA
+DRIVER vga
+UNSUPPORTED
NAME Avance Logic 2302
CHIPSET Avance Logic
LINE #chipset "ali2302"
SERVER SVGA
+DRIVER vga
+UNSUPPORTED
NAME Avance Logic 2308
CHIPSET Avance Logic
LINE #chipset "ali2308"
SERVER SVGA
+DRIVER vga
+UNSUPPORTED
NAME Avance Logic 2401
CHIPSET Avance Logic
LINE #chipset "ali2401"
SERVER SVGA
+DRIVER vga
+UNSUPPORTED
NAME Hercules Stingray
CHIPSET ALG-2228/2301/2302
LINE #chipset "ali2228"
SERVER SVGA
+DRIVER vga
+UNSUPPORTED
NAME SPEA/V7 Mirage VEGA Plus
CHIPSET ALG-2228
LINE #chipset "ali2228"
SERVER SVGA
+DRIVER vga
+UNSUPPORTED
# ARK Logic
NAME Ark Logic ARK1000PV (generic)
CHIPSET ARK1000PV
SERVER SVGA
+DRIVER vga
+UNSUPPORTED
# For now, treat the VL as a PV. This may be changed later
NAME Ark Logic ARK1000VL (generic)
CHIPSET ARK1000VL
LINE Chipset "ark1000pv"
SERVER SVGA
+DRIVER vga
+UNSUPPORTED
NAME Ark Logic ARK2000PV (generic)
CHIPSET ARK1000PV
SERVER SVGA
+DRIVER vga
+UNSUPPORTED
NAME Ark Logic ARK2000MT (generic)
CHIPSET ARK1000MT
SERVER SVGA
+DRIVER vga
+UNSUPPORTED
NAME Hercules Stingray Pro
SEE Ark Logic ARK1000PV (generic)
@@ -1753,27 +2264,51 @@ NAME Hercules Stingray 64/V with ICS5342
CHIPSET ARK2000MT
RAMDAC ics5342
SERVER SVGA
+DRIVER vga
+UNSUPPORTED
NAME Diamond Stealth64 Graphics 2001 series
CHIPSET ARK2000PV
RAMDAC ics5342
SERVER SVGA
+DRIVER vga
+UNSUPPORTED
# Oak
-NAME Oak (generic)
-CHIPSET Oak-067/77/87
+NAME Oak ISA Card (generic)
+CHIPSET Oak OTI-067/77
SERVER SVGA
+DRIVER vga
+UNSUPPORTED
-NAME Paradise Accelerator Value
+NAME Oak 87 VLB (generic)
CHIPSET Oak OTI-087
SERVER SVGA
+DRIVER vga
+UNSUPPORTED
+LINE Option "fifo_aggressive" # Comment this if you experience streaks.
+LINE Option "no_wait" # Comment this if you find problems.
+LINE #Option "enable_bitblt" # You may enable this and see if it works (see README.Oak file)
+
+NAME Oak 87 ISA (generic)
+CHIPSET Oak OTI-087
+SERVER SVGA
+DRIVER vga
+UNSUPPORTED
+LINE Option "noaccel" # ISA cards seem to have Color Expansion support broken
+LINE #Option "enable_bitblt" # This should work on ISA, but lets not make it default just in case.
+
+NAME Paradise Accelerator Value
+SEE Oak 87 ISA (generic)
# P9000
NAME Diamond Viper VLB 2Mb
CHIPSET Weitek 9000
SERVER P9000
+DRIVER vga
+UNSUPPORTED
LINE #Clocks must match the mode clocks (XFree86 3.1 P9000 server)
LINE #Versions later than 3.1 do not require a clocks line
LINE Chipset "vipervlb" # Required for some cards which autodetect as PCI
@@ -1784,6 +2319,8 @@ NOCLOCKPROBE
NAME Diamond Viper PCI 2Mb
CHIPSET Weitek 9000
SERVER P9000
+DRIVER vga
+UNSUPPORTED
LINE #Clocks must match the mode clocks (XFree86 3.1 P9000 server)
LINE #Versions later than 3.1 do not require a clocks line
LINE Videoram 2048 # Required
@@ -1793,170 +2330,671 @@ NOCLOCKPROBE
NAME Orchid P9000 VLB
CHIPSET Weitek 9000
SERVER P9000
+DRIVER vga
+UNSUPPORTED
LINE Chipset "orchid_p9000"
LINE Membase 0xE0000000
NOCLOCKPROBE
+# P9100
+
+NAME Weitek P9100 (generic)
+CHIPSET Weitek P9100
+SERVER SVGA
+DRIVER vga
+UNSUPPORTED
+NOCLOCKPROBE
+
+NAME Diamond Viper Pro Video
+SEE Weitek P9100 (generic)
+
# Trident
NAME Trident 8900/9000 (generic)
CHIPSET TVGA8900/9000
SERVER SVGA
+DRIVER vga
+UNSUPPORTED
NAME Trident 8900D (generic)
-CHIPSET TVGA8900D
SERVER SVGA
+DRIVER vga
+UNSUPPORTED
NAME Trident TVGA9200CXr (generic)
CHIPSET TVGA9200CXr
SERVER SVGA
+DRIVER vga
+UNSUPPORTED
NAME Trident TGUI9400CXi (generic)
CHIPSET TGUI9400CXi
SERVER SVGA
+DRIVER trident
NAME Trident TGUI9420DGi (generic)
CHIPSET TGUI9420DGi
SERVER SVGA
+DRIVER trident
NAME Trident TGUI9430DGi (generic)
CHIPSET TGUI9430DGi
SERVER SVGA
+DRIVER trident
+
+NAME Trident TGUI9420 (generic)
+CHIPSET TGUI9420
+DRIVER trident
+NOCLOCKPROBE
NAME Trident TGUI9440 (generic)
CHIPSET TGUI9440
-SERVER SVGA
+DRIVER trident
NOCLOCKPROBE
NAME Trident TGUI9660 (generic)
CHIPSET TGUI9660
-SERVER SVGA
+DRIVER trident
NOCLOCKPROBE
NAME Trident TGUI9680 (generic)
CHIPSET TGUI9680
-SERVER SVGA
+DRIVER trident
NOCLOCKPROBE
NAME Trident TGUI9682 (generic)
CHIPSET TGUI9682
SERVER SVGA
+DRIVER trident
NOCLOCKPROBE
NAME Trident TGUI9685 (generic)
CHIPSET TGUI9685
SERVER SVGA
+DRIVER trident
+NOCLOCKPROBE
+
+NAME Trident Cyber 9320 (generic)
+CHIPSET Cyber9320
+DRIVER trident
NOCLOCKPROBE
NAME Trident Cyber 9382 (generic)
CHIPSET Cyber9382
SERVER SVGA
+DRIVER trident
NOCLOCKPROBE
NAME Trident Cyber 9385 (generic)
CHIPSET Cyber9385
SERVER SVGA
+DRIVER trident
NOCLOCKPROBE
NAME Trident Cyber 9388 (generic)
CHIPSET Cyber9388
SERVER SVGA
+DRIVER trident
+NOCLOCKPROBE
+
+NAME Trident Cyber 939a (generic)
+CHIPSET Cyber939a
+DRIVER trident
NOCLOCKPROBE
NAME Trident Cyber 9397 (generic)
CHIPSET Cyber9397
SERVER SVGA
+DRIVER trident
+NOCLOCKPROBE
+
+NAME Trident Cyber 9520 (generic)
+CHIPSET Cyber9520
+DRIVER trident
+NOCLOCKPROBE
+
+NAME Trident 3DImage975 (generic)
+CHIPSET 3dimage975
+SERVER SVGA
+DRIVER trident
+NOCLOCKPROBE
+
+NAME Trident 3DImage975 AGP (generic)
+CHIPSET 3dimage975
+SERVER SVGA
+DRIVER trident
+NOCLOCKPROBE
+
+NAME Trident 3DImage985 (generic)
+CHIPSET 3dimage985
+SERVER SVGA
+DRIVER trident
+NOCLOCKPROBE
+
+NAME Trident Providia 9682 (generic)
+CHIPSET Providia9682
+DRIVER trident
+NOCLOCKPROBE
+
+NAME Trident Providia 9685 (generic)
+CHIPSET Providia9685
+DRIVER trident
+NOCLOCKPROBE
+
+NAME Trident TVGA 8800BR
+SEE * Generic VGA compatible
+
+NAME Trident TVGA 8800CS
+SEE * Generic VGA compatible
+
+NAME Trident CyberBlade (generic)
+CHIPSET CyberBlade
+SERVER SVGA
+DRIVER trident
+NOCLOCKPROBE
+
+NAME Trident Blade3D (generic)
+CHIPSET Blade3D
+SERVER SVGA
+DRIVER trident
NOCLOCKPROBE
# SiS
+NAME SiS 530
+CHIPSET SIS530
+SERVER SVGA
+DRIVER sis
+
+NAME SiS 620
+CHIPSET SIS620
+SERVER SVGA
+DRIVER sis
+
NAME SiS SG86C201
CHIPSET SIS86C201
SERVER SVGA
+DRIVER sis
-# Alliance ProMotion
+NAME SiS SG86C205
+CHIPSET SIS86C205
+SERVER SVGA
+DRIVER sis
+LINE # Option "no_accel" # Use this if acceleration is causing problems
+LINE # Option "fifo_moderate"
+LINE # Option "fifo_conserv"
+LINE # Option "fifo_aggressive"
+NOCLOCKPROBE
-NAME Alliance ProMotion 6422
-CHIPSET AP6422
+NAME SiS SG86C215
+CHIPSET SIS86C215
SERVER SVGA
+DRIVER sis
+LINE # This is a cheap version of 86c205. I am not sure if acceleration works
+LINE # Option "no_accel" # Use this if acceleration is causing problems
+LINE # Option "no_BitBlt" # Use this if acceleration is causing problems
+LINE # Option "fifo_moderate"
+LINE # Option "fifo_conserv"
+LINE # Option "fifo_aggressive"
+NOCLOCKPROBE
-# VGA
+NAME SiS SG86C225
+CHIPSET SIS86C225
+SERVER SVGA
+DRIVER sis
+LINE # Option "no_accel" # Use this if acceleration is causing problems
+LINE # Option "fifo_moderate"
+LINE # Option "fifo_conserv"
+LINE # Option "fifo_aggressive"
+NOCLOCKPROBE
-NAME Generic VGA compatible
-CHIPSET Generic VGA
-SERVER VGA16
+NAME SiS 5597
+CHIPSET SiS5597
+SERVER SVGA
+DRIVER sis
+LINE # Option "no_accel" # Use this if acceleration is causing problems
+LINE # Option "fifo_moderate"
+LINE # Option "fifo_conserv"
+LINE # Option "fifo_aggressive"
+LINE # Option "fast_vram"
+LINE # Option "pci_burst_on"
+LINE # Option "xaa_benchmark" # DON'T use with "ext_eng_queue" !!!
+LINE # Option "ext_eng_queue" # Turbo-queue. This can cause drawing
+LINE # errors, but gives some accel
+NOCLOCKPROBE
-NAME Unsupported VGA compatible
-CHIPSET Generic VGA
-SERVER VGA16
+NAME SiS 5598
+CHIPSET SIS5598
+SERVER SVGA
+DRIVER sis
+LINE # Option "no_accel" # Use this if acceleration is causing problems
+LINE # Option "fifo_moderate"
+LINE # Option "fifo_conserv"
+LINE # Option "fifo_aggressive"
+LINE # Option "fast_vram"
+LINE # Option "pci_burst_on"
+LINE # Option "xaa_benchmark" # DON'T use with "ext_eng_queue" !!!
+LINE # Option "ext_eng_queue" # Turbo-queue. This can cause drawing
+LINE # errors, but gives some accel
+NOCLOCKPROBE
+
+NAME SiS 6326
+CHIPSET SiS6326
+SERVER SVGA
+DRIVER sis
+LINE # Option "no_accel" # Use this if acceleration is causing problems
+LINE # Option "fifo_moderate"
+LINE # Option "fifo_conserv"
+LINE # Option "fifo_aggressive"
+LINE # Option "fast_vram"
+LINE # Option "pci_burst_on"
+LINE # Option "xaa_benchmark" # DON'T use with "ext_eng_queue" !!!
+LINE # Option "ext_eng_queue" # Turbo-queue. This can cause drawing
+LINE # errors, but gives some accel
+NOCLOCKPROBE
+
+NAME MSI MS-4417
+SEE SiS 6326
+
+NAME SiS 3D PRO AGP
+SEE SiS 6326
+
+NAME Miro Crystal DVD
+SEE SiS 6326
+
+NAME PC-Chips M567 Mainboard
+SEE SiS 5597
+
+NAME Diamond SpeedStar A50
+SEE SiS 6326
+
+# Cyrix
+
+NAME MediaGX
+CHIPSET mediagx
+SERVER SVGA
+DRIVER vga
+UNSUPPORTED
+NOCLOCKPROBE
+
+# Alliance ProMotion
+
+NAME Alliance ProMotion 6422
+CHIPSET AP6422
+SERVER SVGA
+DRIVER vga
UNSUPPORTED
# Number 9 I128
-NAME Number Nine Imagine I-128 (2-8MB)
+NAME Number Nine Imagine I-128
+CHIPSET I128
+SERVER I128
+DRIVER i128
+NOCLOCKPROBE
+
+NAME Number Nine Imagine I-128 Series 2
+CHIPSET I128
+SERVER I128
+DRIVER i128
+NOCLOCKPROBE
+
+NAME Number Nine Revolution 3D (T2R)
CHIPSET I128
SERVER I128
+DRIVER i128
+NOCLOCKPROBE
-NAME Number Nine Imagine I-128 Series 2 (2-4MB)
+NAME Number Nine Imagine-128 Revolution IV (T2R4)
CHIPSET I128
SERVER I128
+DRIVER i128
+NOCLOCKPROBE
# Matrox
-NAME Matrox Millennium (MGA)
+NAME Matrox Millennium 2MB
+CHIPSET mga2064w
+SERVER SVGA
+DRIVER mga
+LINE VideoRam 2048
+NOCLOCKPROBE
+
+NAME Matrox Millennium 4MB
CHIPSET mga2064w
SERVER SVGA
+DRIVER mga
+LINE VideoRam 4096
NOCLOCKPROBE
-NAME Matrox Millennium II
+NAME Matrox Millennium 8MB
+CHIPSET mga2064w
+SERVER SVGA
+DRIVER mga
+LINE VideoRam 8192
+NOCLOCKPROBE
+
+NAME Matrox Millennium II 4MB
CHIPSET mga2164w
SERVER SVGA
+DRIVER mga
+LINE VideoRam 4096
NOCLOCKPROBE
-NAME Matrox Millennium II AGP
-CHIPSET mga2164w AGP
+NAME Matrox Millennium II 8MB
+CHIPSET mga2164w
+SERVER SVGA
+DRIVER mga
+LINE VideoRam 8192
+NOCLOCKPROBE
+
+NAME Matrox Millennium II 16MB
+CHIPSET mga2164w
SERVER SVGA
+DRIVER mga
+LINE VideoRam 16384
+NOCLOCKPROBE
+
+NAME Matrox Millennium G200 4MB
+CHIPSET mgag200
+SERVER SVGA
+DRIVER mga
+LINE VideoRam 4096
+NOCLOCKPROBE
+
+NAME Matrox Millennium G200 8MB
+CHIPSET mgag200
+SERVER SVGA
+DRIVER mga
+LINE VideoRam 8192
+NOCLOCKPROBE
+
+NAME Matrox Millennium G200 16MB
+CHIPSET mgag200
+SERVER SVGA
+DRIVER mga
+LINE VideoRam 16384
+NOCLOCKPROBE
+
+NAME Matrox Millennium G200 SD 4MB
+CHIPSET mgag200
+SERVER SVGA
+DRIVER mga
+LINE VideoRam 4096
+LINE # Option "mga_sdram"
+NOCLOCKPROBE
+
+NAME Matrox Millennium G200 SD 8MB
+CHIPSET mgag200
+SERVER SVGA
+DRIVER mga
+LINE VideoRam 8192
+LINE # Option "mga_sdram"
+NOCLOCKPROBE
+
+NAME Matrox Millennium G200 SD 16MB
+CHIPSET mgag200
+SERVER SVGA
+DRIVER mga
+LINE VideoRam 16384
+LINE # Option "mga_sdram"
NOCLOCKPROBE
NAME Matrox Mystique
CHIPSET mga1064sg
SERVER SVGA
+DRIVER mga
+NOCLOCKPROBE
+
+NAME Matrox Mystique G200 4MB
+CHIPSET mgag200
+SERVER SVGA
+DRIVER mga
+LINE VideoRam 4096
+NOCLOCKPROBE
+
+NAME Matrox Mystique G200 8MB
+CHIPSET mgag200
+SERVER SVGA
+DRIVER mga
+LINE VideoRam 8192
+NOCLOCKPROBE
+
+NAME Matrox Millennium G400
+CHIPSET mgag400
+SERVER SVGA
+DRIVER mga
+NOCLOCKPROBE
+
+NAME Matrox Mystique G200 16MB
+CHIPSET mgag200
+SERVER SVGA
+DRIVER mga
+LINE VideoRam 16384
+NOCLOCKPROBE
+
+NAME Matrox Productiva G100 4MB
+CHIPSET mgag100
+SERVER SVGA
+DRIVER mga
+LINE VideoRam 4096
+NOCLOCKPROBE
+
+NAME Matrox Productiva G100 8MB
+CHIPSET mgag100
+SERVER SVGA
+DRIVER mga
+LINE VideoRam 8192
NOCLOCKPROBE
-# NV1
+# NVIDIA
NAME Diamond Edge 3D
CHIPSET nv1
SERVER SVGA
+DRIVER vga
+UNSUPPORTED
NOCLOCKPROBE
NAME RIVA128
CHIPSET RIVA128
SERVER SVGA
+DRIVER nv
+NOCLOCKPROBE
+
+NAME RIVA TNT
+CHIPSET RIVATNT
+SERVER SVGA
+DRIVER nv
+NOCLOCKPROBE
+
+NAME RIVA TNT2
+CHIPSET RIVATNT2
+SERVER SVGA
+DRIVER nv
+NOCLOCKPROBE
+
+NAME NVIDIA GeForce
+CHIPSET GeForce
+SERVER SVGA
+DRIVER nv
NOCLOCKPROBE
NAME ELSA VICTORY ERAZOR
SEE RIVA128
+NAME ELSA Winner 1000 R3D
+SEE RIVA128
+
+NAME ELSA ERAZOR II
+SEE RIVA TNT
+
NAME Diamond Viper 330
SEE RIVA128
+NAME Diamond Viper 550
+SEE RIVA TNT
+
+NAME Diamond Viper 770
+SEE RIVA TNT2
+
NAME STB Velocity 128
SEE RIVA128
+NAME STB nvidia 128
+SEE RIVA128
+
+NAME STB Velocity 4400
+SEE RIVA TNT
+
NAME ASUS 3Dexplorer
SEE RIVA128
+NAME Guillemot Maxi Gamer Xentor
+SEE RIVA TNT2
+
+NAME Guillemot Maxi Gamer Xentor 32
+SEE RIVA TNT2
+
+NAME Creative Graphics Blaster TNT
+SEE RIVA TNT
+
+NAME Creative Graphics Blaster TNT2
+SEE RIVA TNT2
+
+# 3Dfx
+NAME Voodoo Banshee (generic)
+SERVER SVGA
+CHIPSET Voodo Banshee
+DRIVER tdfx
+
+NAME Voodoo3 (generic)
+SERVER SVGA
+CHIPSET Voodoo3
+DRIVER tdfx
+
+NAME Elsa Victory II
+SEE Voodoo Banshee (generic)
+
+NAME Diamond Monster Fusion
+SEE Voodoo Banshee (generic)
+
+NAME AOpen PA2010
+SEE Voodoo Banshee (generic)
+
+NAME Chaintech Desperado 3F10
+SEE Voodoo Banshee (generic)
+
+# 3DLabs
+
+NAME ELSA GLoria-L/MX
+CHIPSET GLINT MX
+SERVER 3DLabs
+DRIVER glint
+LINE #Option "no_accel"
+NOCLOCKPROBE
+
+NAME ELSA GLoria-L
+CHIPSET GLINT 500TX
+SERVER 3DLabs
+DRIVER glint
+NOCLOCKPROBE
+
+NAME ELSA GLoria-XL
+CHIPSET GLINT MX
+SERVER 3DLabs
+DRIVER glint
+NOCLOCKPROBE
+
+NAME Diamond Fire GL 3000
+CHIPSET GLINT 500TX
+SERVER 3DLabs
+DRIVER glint
+LINE Option "firegl_3000"
+NOCLOCKPROBE
+
+NAME ELSA GLoria-S
+CHIPSET PERMEDIA
+SERVER 3DLabs
+DRIVER glint
+LINE #Option "no_accel"
+LINE #VideoRam 8192
+NOCLOCKPROBE
+
+NAME Diamond Fire GL 1000
+CHIPSET PERMEDIA
+SERVER 3DLabs
+DRIVER glint
+LINE #Option "no_accel"
+LINE #VideoRam 8192
+NOCLOCKPROBE
+
+NAME ELSA GLoria Synergy
+CHIPSET PERMEDIA 2
+SERVER 3DLabs
+DRIVER glint
+LINE #Option "no_accel"
+NOCLOCKPROBE
+
+NAME ELSA Winner 2000/Office
+CHIPSET PERMEDIA 2
+SERVER 3DLabs
+DRIVER glint
+LINE #Option "no_accel"
+NOCLOCKPROBE
+
+NAME Diamond Fire GL 1000 PRO
+CHIPSET PERMEDIA 2
+SERVER 3DLabs
+DRIVER glint
+LINE #Option "no_accel"
+NOCLOCKPROBE
+
+NAME Creative Blaster Exxtreme
+CHIPSET PERMEDIA 2
+SERVER 3DLabs
+DRIVER glint
+LINE #Option "no_accel"
+NOCLOCKPROBE
+
+NAME AccelStar Permedia II AGP
+CHIPSET PERMEDIA 2
+SERVER 3DLabs
+DRIVER glint
+LINE #Option "no_accel"
+NOCLOCKPROBE
+
+NAME Leadtek WinFast 2300
+CHIPSET PERMEDIA 2
+SERVER 3DLabs
+DRIVER glint
+NOCLOCKPROBE
+
+NAME 3DLabs Oxygen GMX
+CHIPSET PERMEDIA 2
+SERVER 3DLabs
+DRIVER glint
+LINE #Option "no_accel"
+NOCLOCKPROBE
+
+NAME Appian Jeronimo 2000
+CHIPSET PERMEDIA 3
+SERVER XFree86
+DRIVER glint
+NOCLOCKPROBE
+
# Alliance Semiconductor
NAME Diamond Stealth Video 2500
CHIPSET Alliance AT24
SERVER SVGA
+DRIVER apm
NOCLOCKPROBE
NAME AT3D
CHIPSET Alliance AT3D
SERVER SVGA
+DRIVER apm
NOCLOCKPROBE
LINE #Option "no_accel"
@@ -1966,26 +3004,68 @@ SEE AT3D
NAME Hercules Stingray 128 3D
SEE AT3D
-# Misc
+# NeoMagic
-NAME Techworks Ultimate 3D
-CHIPSET CL-GD5464
-SEE Cirrus Logic GD5464
+NAME NeoMagic (laptop/notebook)
+CHIPSET MagicGraph 128 series
+SERVER SVGA
+DRIVER neomagic
+LINE # Chipset "NM2160"
+LINE # IOBase 0xfea00000
+LINE # MemBase 0xfd000000
+LINE # VideoRam 2048
+LINE # DacSpeed 90
+LINE # Option "linear"
+LINE # Option "nolinear"
+LINE # Option "sw_cursor"
+LINE # Option "hw_cursor"
+LINE # Option "no_accel"
+LINE # Option "intern_disp"
+LINE # Option "extern_disp"
+LINE # Option "mmio"
+LINE # Option "no_mmio"
+LINE # Option "lcd_center"
+LINE # Option "no_stretch"
+
+# Epson SPC8110
+
+NAME EPSON SPC8110 (CardPC)
+CHIPSET SPC8110
+SERVER SVGA
+DRIVER vga
+UNSUPPORTED
+LINE # Chipset "spc8110"
+LINE # MemBase 0x03e00000
+LINE # VideoRam 1024
+LINE # Option "nolinear"
+LINE # Option "sw_cursor"
+LINE # Option "noaccel"
+LINE # Option "fifo_moderate"
+LINE # Option "fifo_conservative"
-NAME VideoLogic GrafixStar 550
-CHIPSET CL-GD5464
-SEE Cirrus Logic GD5464
+# Silicon Motion, Inc.
-NAME Jaton Video-70P
-CHIPSET CL-GD5464
-SEE Cirrus Logic GD5464
+NAME Silicon Motion Lynx family
+CHIPSET Lynx
+SERVER SVGA
+DRIVER siliconmotion
+NOCLOCKPROBE
-NAME Jaton Video-58P
-SEE ET6000 (generic)
+# Rendition
NAME Rendition Verite 1000
CHIPSET Verite 1000
-SEE Unsupported VGA compatible
+SERVER SVGA
+DRIVER vga
+UNSUPPORTED
+LINE # Option "sw_cursor"
+
+NAME Rendition Verite 2x00
+CHIPSET Verite 2x00
+SERVER SVGA
+DRIVER vga
+UNSUPPORTED
+LINE # Option "sw_cursor"
NAME Creative Labs 3D Blaster PCI (Verite 1000)
SEE Rendition Verite 1000
@@ -1996,8 +3076,55 @@ SEE Rendition Verite 1000
NAME Sierra Screaming 3D
SEE Rendition Verite 1000
-NAME NeoMagic (laptop/notebook)
-CHIPSET NeoMagic 128/V/ZV
-SEE Unsupported VGA compatible
+NAME Miro CRYSTAL VRX
+SEE Rendition Verite 1000
+
+NAME Diamond Stealth II S220
+CHIPSET Verite 2100
+SEE Rendition Verite 2x00
+
+NAME Hercules Thriller3D
+CHIPSET Verite 2200
+SEE Rendition Verite 2x00
+
+# Digital
+
+NAME Digital 8-plane TGA (UDB/Multia)
+CHIPSET TGA
+SERVER TGA
+DRIVER tga
+RAMDAC Bt485
+
+NAME Digital 8-plane TGA (ZLXp-E1)
+CHIPSET TGA
+SERVER TGA
+DRIVER tga
+RAMDAC Bt485
+
+NAME Digital 24-plane TGA (ZLXp-E2)
+CHIPSET TGA
+SERVER TGA
+DRIVER tga
+RAMDAC Bt463
+
+NAME Digital 24-plane+3D TGA (ZLXp-E3)
+CHIPSET TGA
+SERVER TGA
+DRIVER tga
+RAMDAC Bt463
+
+# i810
+
+NAME Intel 810
+SERVER SVGA
+DRIVER i810
+
+# i740
+
+NAME Intel 740 (generic)
+SERVER SVGA
+DRIVER i740
+
+# Misc
END
diff --git a/hw/xfree86/utils/xorgconfig/cards.c b/hw/xfree86/utils/xorgconfig/cards.c
index a714d04ca..8aac06606 100644
--- a/hw/xfree86/utils/xorgconfig/cards.c
+++ b/hw/xfree86/utils/xorgconfig/cards.c
@@ -1,10 +1,10 @@
-/* $Xorg: cards.c,v 1.3 2000/08/17 19:53:05 cpqbld Exp $ */
+/* $XConsortium: cards.c /main/9 1996/10/19 18:15:32 kaleb $ */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/cards.c,v 3.11.2.1 1998/01/18 10:35:45 hohndel Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/cards.c,v 3.17 2002/05/31 18:46:04 dawes Exp $ */
/*
* Functions to manipulate card database.
@@ -22,6 +22,7 @@
* NAME <name of card>
* CHIPSET <chipset description>
* SERVER <server name>
+ * DRIVER <driver name>
*
* Optional keywords:
* RAMDAC <ramdac identifier>
@@ -47,16 +48,13 @@ int lastcard;
Card card[MAX_CARDS];
-void sort_database();
-
-static int getline(f, l)
-FILE *f;
-char *l;
+static int
+getnextline(FILE *f, char *l)
{
if (fgets(l, 128, f) == NULL)
return -1;
-#ifdef __EMX__
+#ifdef __UNIXOS2__
{
char *p = strchr(l,'\r');
if (p) {
@@ -68,9 +66,8 @@ char *l;
return 0;
}
-static void appendstring(destp, src)
- char **destp;
- char *src;
+static void
+appendstring(char **destp, char *src)
{
char *newstr;
newstr = malloc(strlen(*destp) + strlen(src) + 1);
@@ -81,7 +78,8 @@ static void appendstring(destp, src)
*destp = newstr;
}
-int lookupcard( char *name ) {
+int
+lookupcard(char *name) {
int i;
for (i = 0; i <= lastcard; i++)
if (strcmp(name, card[i].name) == 0)
@@ -109,7 +107,7 @@ int parse_database() {
int i, lineno;
char filename[128];
-#ifndef __EMX__
+#ifndef __UNIXOS2__
strcpy(filename, CARD_DATABASE_FILE);
#else
strcpy(filename, (char*)__XOS2RedirRoot(CARD_DATABASE_FILE));
@@ -122,7 +120,7 @@ int parse_database() {
lineno = 0;
for (;;) {
- if (getline(f, buf))
+ if (getnextline(f, buf))
break;
lineno++;
if (buf[0] == '#')
@@ -133,7 +131,6 @@ int parse_database() {
break;
if (strncmp(buf, "LINE", 4) == 0 && lastcard>=0) {
/* Line of Device comment. */
- char *lines;
/* Append to existing lines. */
appendstring(&card[lastcard].lines, buf + 5);
continue;
@@ -158,7 +155,9 @@ int parse_database() {
card[lastcard].name = malloc(strlen(buf + 5) + 1);
strcpy(card[lastcard].name, buf + 5);
card[lastcard].chipset = NULL;
- card[lastcard].ramdac = NULL;
+ card[lastcard].server = NULL;
+ card[lastcard].driver = NULL;
+ card[lastcard].ramdac = NULL;
card[lastcard].clockchip = NULL;
card[lastcard].dacspeed = NULL;
card[lastcard].flags = 0;
@@ -182,6 +181,8 @@ int parse_database() {
card[lastcard].chipset = card[i].chipset;
if (card[lastcard].server == NULL)
card[lastcard].server = card[i].server;
+ if (card[lastcard].driver == NULL)
+ card[lastcard].driver = card[i].driver;
if (card[lastcard].ramdac == NULL)
card[lastcard].ramdac = card[i].ramdac;
if (card[lastcard].clockchip == NULL)
@@ -204,6 +205,12 @@ int parse_database() {
strcpy(card[lastcard].server, buf + 7);
continue;
}
+ if (strncmp(buf, "DRIVER", 6) == 0) {
+ /* Driver identifier. */
+ card[lastcard].driver = malloc(strlen(buf + 7) + 1);
+ strcpy(card[lastcard].driver, buf + 7);
+ continue;
+ }
if (strncmp(buf, "RAMDAC", 6) == 0) {
/* Ramdac indentifier. */
card[lastcard].ramdac = malloc(strlen(buf + 7) + 1);
@@ -232,12 +239,12 @@ int parse_database() {
continue;
}
/* test for missing required fields */
- if (card[lastcard].server == NULL) {
- fprintf(stderr, "Warning SERVER specification missing "
+ if (card[lastcard].driver == NULL) {
+ fprintf(stderr, "Warning DRIVER specification missing "
"in Card database entry %s (line %d).\n",
card[lastcard].name, lineno);
keypress();
- card[lastcard].server = "unknown";
+ card[lastcard].driver = "unknown";
}
if (card[lastcard].chipset == NULL) {
fprintf(stderr, "Warning CHIPSET specification missing "
@@ -266,20 +273,14 @@ int parse_database() {
return 0;
}
-#ifdef __STDC__
-#define CONST const
-#else
-#define CONST
-#endif
-
-static int compare_card(e1, e2)
- CONST void *e1;
- CONST void *e2;
+static int
+compare_card(const void *e1, const void *e2)
{
return strcmp(((Card *)e1)->name, ((Card *)e2)->name);
}
-void sort_database() {
+void
+sort_database() {
/* Each element is a bunch of words, but nothing too bad. */
qsort(card, lastcard + 1, sizeof(Card), compare_card);
}
diff --git a/hw/xfree86/utils/xorgconfig/cards.h b/hw/xfree86/utils/xorgconfig/cards.h
index 11976d978..c5299e899 100644
--- a/hw/xfree86/utils/xorgconfig/cards.h
+++ b/hw/xfree86/utils/xorgconfig/cards.h
@@ -1,10 +1,10 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/cards.h,v 3.3 1996/12/23 07:04:44 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/cards.h,v 3.5 1999/07/05 12:12:06 dawes Exp $ */
-/* $Xorg: cards.h,v 1.3 2000/08/17 19:53:05 cpqbld Exp $ */
+/* $XConsortium: cards.h /main/3 1996/02/21 18:12:53 kaleb $ */
#ifndef CARD_DATABASE_FILE
#define CARD_DATABASE_FILE "Cards"
@@ -16,7 +16,8 @@ typedef struct {
char *name; /* Name of the card. */
char *chipset; /* Chipset (decriptive). */
char *server; /* Server identifier. */
- char *ramdac; /* Ramdac identifier. */
+ char *driver; /* Driver identifier. */
+ char *ramdac; /* Ramdac identifier. */
char *clockchip; /* Clockchip identifier. */
char *dacspeed; /* DAC speed rating. */
int flags;
@@ -31,6 +32,7 @@ extern int lastcard;
extern Card card[MAX_CARDS];
-
-int parse_database();
-
+extern int lookupcard ( char *name );
+extern int parse_database ( void );
+extern void sort_database ( void );
+extern void keypress ( void );
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-27 20:29:25 +0000