xserver git update 25/5/2010

11 files changed, 1771 insertions, 1824 deletions

diff --git a/xorg-server/hw/xfree86/common/xf86.h b/xorg-server/hw/xfree86/common/xf86.h
index 2a8b7e0a9..b7a884b2a 100644
--- a/xorg-server/hw/xfree86/common/xf86.h
+++ b/xorg-server/hw/xfree86/common/xf86.h
@@ -41,8 +41,6 @@
 #include <dix-config.h>

 #endif

 

-#include <pciaccess.h>

-

 #include "xf86str.h"

 #include "xf86Opt.h"

 #include <X11/Xfuncproto.h>

@@ -62,7 +60,6 @@ extern _X_EXPORT DevPrivateKey xf86CreateRootWindowKey;
 extern _X_EXPORT DevPrivateKey xf86PixmapKey;

 extern _X_EXPORT ScrnInfoPtr *xf86Screens;	/* List of pointers to ScrnInfoRecs */

 extern _X_EXPORT const unsigned char byte_reversed[256];

-extern _X_EXPORT Bool pciSlotClaimed;

 extern _X_EXPORT Bool fbSlotClaimed;

 #if (defined(__sparc__) || defined(__sparc)) && !defined(__OpenBSD__)

 extern _X_EXPORT Bool sbusSlotClaimed;

@@ -91,21 +88,39 @@ extern _X_EXPORT Bool VTSwitchEnabled;	/* kbd driver */
 /* Function Prototypes */

 #ifndef _NO_XF86_PROTOTYPES

 

-/* xf86Bus.c */

+/* PCI related */

+#include <pciaccess.h>

+extern _X_EXPORT Bool pciSlotClaimed;

 

-extern _X_EXPORT Bool xf86CheckPciSlot( const struct pci_device * );

-extern _X_EXPORT int xf86ClaimPciSlot( struct pci_device *, DriverPtr drvp,

-		     int chipset, GDevPtr dev, Bool active);

+extern _X_EXPORT Bool xf86CheckPciSlot(const struct pci_device *);

+extern _X_EXPORT int xf86ClaimPciSlot(struct pci_device *, DriverPtr drvp,

+                                      int chipset, GDevPtr dev, Bool active);

 extern _X_EXPORT void xf86UnclaimPciSlot(struct pci_device *);

-extern _X_EXPORT Bool xf86ParsePciBusString(const char *busID, int *bus, int *device,

-			   int *func);

-extern _X_EXPORT Bool xf86ComparePciBusString(const char *busID, int bus, int device, int func);

+extern _X_EXPORT Bool xf86ParsePciBusString(const char *busID, int *bus,

+                                            int *device, int *func);

+extern _X_EXPORT Bool xf86ComparePciBusString(const char *busID, int bus,

+                                              int device, int func);

 extern _X_EXPORT void xf86FormatPciBusNumber(int busnum, char *buffer);

+extern _X_EXPORT Bool xf86IsPrimaryPci(struct pci_device * pPci);

+extern _X_EXPORT Bool xf86CheckPciMemBase(struct pci_device * pPci,

+                                          memType base);

+extern _X_EXPORT struct pci_device * xf86GetPciInfoForEntity(int entityIndex);

+extern _X_EXPORT int xf86MatchPciInstances(const char *driverName,

+        int vendorID, SymTabPtr chipsets, PciChipsets *PCIchipsets,

+        GDevPtr *devList, int numDevs, DriverPtr drvp, int **foundEntities);

+extern _X_EXPORT ScrnInfoPtr xf86ConfigPciEntity(ScrnInfoPtr pScrn,

+        int scrnFlag, int entityIndex,PciChipsets *p_chip, void *dummy,

+        EntityProc init, EntityProc enter, EntityProc leave, pointer private);

+/* Obsolete! don't use */

+extern _X_EXPORT Bool xf86ConfigActivePciEntity(ScrnInfoPtr pScrn,

+        int entityIndex,PciChipsets *p_chip, void *dummy, EntityProc init,

+        EntityProc enter, EntityProc leave, pointer private);

+

+/* xf86Bus.c */

+

 extern _X_EXPORT int  xf86GetFbInfoForScreen(int scrnIndex);

 extern _X_EXPORT int xf86ClaimFbSlot(DriverPtr drvp, int chipset, GDevPtr dev, Bool active);

 extern _X_EXPORT int xf86ClaimNoSlot(DriverPtr drvp, int chipset, GDevPtr dev, Bool active);

-extern _X_EXPORT Bool xf86IsPrimaryPci(struct pci_device * pPci);

-/* new RAC */

 extern _X_EXPORT Bool xf86DriverHasEntities(DriverPtr drvp);

 extern _X_EXPORT void xf86AddEntityToScreen(ScrnInfoPtr pScrn, int entityIndex);

 extern _X_EXPORT void xf86SetEntityInstanceForScreen(ScrnInfoPtr pScrn, int entityIndex,

@@ -114,10 +129,8 @@ extern _X_EXPORT int xf86GetNumEntityInstances(int entityIndex);
 extern _X_EXPORT GDevPtr xf86GetDevFromEntity(int entityIndex, int instance);

 extern _X_EXPORT void xf86RemoveEntityFromScreen(ScrnInfoPtr pScrn, int entityIndex);

 extern _X_EXPORT EntityInfoPtr xf86GetEntityInfo(int entityIndex);

-extern _X_EXPORT struct pci_device * xf86GetPciInfoForEntity(int entityIndex);

 extern _X_EXPORT Bool xf86SetEntityFuncs(int entityIndex, EntityProc init,

 			EntityProc enter, EntityProc leave, pointer);

-extern _X_EXPORT Bool xf86CheckPciMemBase(struct pci_device * pPci, memType base);

 extern _X_EXPORT Bool xf86IsEntityPrimary(int entityIndex);

 extern _X_EXPORT void xf86EnterServerState(xf86State state);

 extern _X_EXPORT ScrnInfoPtr xf86FindScreenForEntity(int entityIndex);

@@ -223,10 +236,6 @@ extern _X_EXPORT void xf86ShowClocks(ScrnInfoPtr scrp, MessageType from);
 extern _X_EXPORT void xf86PrintChipsets(const char *drvname, const char *drvmsg,

 		       SymTabPtr chips);

 extern _X_EXPORT int xf86MatchDevice(const char *drivername, GDevPtr **driversectlist);

-extern _X_EXPORT int xf86MatchPciInstances(const char *driverName, int vendorID,

-		      SymTabPtr chipsets, PciChipsets *PCIchipsets,

-		      GDevPtr *devList, int numDevs, DriverPtr drvp,

-		      int **foundEntities);

 extern _X_EXPORT void xf86GetClocks(ScrnInfoPtr pScrn, int num,

 		   Bool (*ClockFunc)(ScrnInfoPtr, int),

 		   void (*ProtectRegs)(ScrnInfoPtr, Bool),

@@ -265,23 +274,11 @@ extern _X_EXPORT void xf86SetSilkenMouse(ScreenPtr pScreen);
 extern _X_EXPORT pointer xf86FindXvOptions(int scrnIndex, int adapt_index, char *port_name,

 			  char **adaptor_name, pointer *adaptor_options);

 extern _X_EXPORT void xf86GetOS(const char **name, int *major, int *minor, int *teeny);

-extern _X_EXPORT ScrnInfoPtr xf86ConfigPciEntity(ScrnInfoPtr pScrn, int scrnFlag,

-				int entityIndex,PciChipsets *p_chip,

-				void *dummy, EntityProc init,

-				EntityProc enter, EntityProc leave,

-				pointer private);

 extern _X_EXPORT ScrnInfoPtr xf86ConfigFbEntity(ScrnInfoPtr pScrn, int scrnFlag,

 			       int entityIndex, EntityProc init,

 			       EntityProc enter, EntityProc leave,

 			       pointer private);

 

-/* Obsolete! don't use */

-extern _X_EXPORT Bool xf86ConfigActivePciEntity(ScrnInfoPtr pScrn,

-                               int entityIndex,PciChipsets *p_chip,

-                               void *dummy, EntityProc init,

-                               EntityProc enter, EntityProc leave,

-                               pointer private);

-

 extern _X_EXPORT Bool xf86IsScreenPrimary(int scrnIndex);

 extern _X_EXPORT int  xf86RegisterRootWindowProperty(int ScrnIndex, Atom	property, Atom type,

 				    int format, unsigned long len,

diff --git a/xorg-server/hw/xfree86/common/xf86AutoConfig.c b/xorg-server/hw/xfree86/common/xf86AutoConfig.c
index 88891e5a7..9f6348681 100644
--- a/xorg-server/hw/xfree86/common/xf86AutoConfig.c
+++ b/xorg-server/hw/xfree86/common/xf86AutoConfig.c
@@ -39,10 +39,10 @@
 #include "xf86Config.h"

 #include "xf86Priv.h"

 #include "xf86_OSlib.h"

+#include "xf86pciBus.h"

 #ifdef __sparc__

 # include "xf86sbusBus.h"

 #endif

-#include "dirent.h"

 

 #ifdef sun

 # include <sys/visual_io.h>

@@ -140,102 +140,6 @@ AppendToConfig(const char *s)
     AppendToList(s, &builtinConfig, &builtinLines);

 }

 

-static int

-videoPtrToDriverList(struct pci_device *dev,

-		     char *returnList[], int returnListMax)

-{

-    int i;

-    /* Add more entries here if we ever return more than 4 drivers for

-       any device */

-    char *driverList[5] = { NULL, NULL, NULL, NULL, NULL };

-

-    switch (dev->vendor_id)

-    {

-	/* AMD Geode LX */

-	case 0x1022:

-	    if (dev->device_id == 0x2081)

-		driverList[0] = "geode";

-	    break;

-	/* older Geode products acquired by AMD still carry an NSC vendor_id */

-	case 0x100b:

-	    if (dev->device_id == 0x0030) {

-		/* NSC Geode GX2 specifically */

-		driverList[0] = "geode";

-		/* GX2 support started its life in the NSC tree and was later 

-		   forked by AMD for GEODE so we keep it as a backup */

-		driverList[1] = "nsc";

-	    } else 

-		/* other NSC variant e.g. 0x0104 (SC1400), 0x0504 (SCx200) */

-		driverList[0] = "nsc";

-	    break;

-	/* Cyrix Geode GX1 */

-	case 0x1078:

-	    if (dev->device_id == 0x0104)

-		driverList[0] = "cyrix";

-	    break;

-	case 0x1142:		    driverList[0] = "apm"; break;

-	case 0xedd8:		    driverList[0] = "ark"; break;

-	case 0x1a03:		    driverList[0] = "ast"; break;

-	case 0x1002:		    driverList[0] = "ati"; break;

-	case 0x102c:		    driverList[0] = "chips"; break;

-	case 0x1013:		    driverList[0] = "cirrus"; break;

-	case 0x3d3d:		    driverList[0] = "glint"; break;

-	case 0x105d:		    driverList[0] = "i128"; break;

-	case 0x8086:

-	    if ((dev->device_id == 0x00d1) || (dev->device_id == 0x7800)) {

-		driverList[0] = "i740";

-            } else if (dev->device_id == 0x8108) {

-                break; /* "hooray" for poulsbo */

-	    } else {

-		driverList[0] = "intel";

-	    }

-	    break;

-	case 0x102b:		    driverList[0] = "mga";	break;

-	case 0x10c8:		    driverList[0] = "neomagic"; break;

-	case 0x10de: case 0x12d2:   driverList[0] = "nv";	break;

-	case 0x1106:		    driverList[0] = "openchrome"; break;

-        case 0x1b36:		    driverList[0] = "qxl"; break;

-	case 0x1163:		    driverList[0] = "rendition"; break;

-	case 0x5333:

-	    switch (dev->device_id)

-	    {

-		case 0x88d0: case 0x88d1: case 0x88f0: case 0x8811:

-		case 0x8812: case 0x8814: case 0x8901:

-		    driverList[0] = "s3"; break;

-		case 0x5631: case 0x883d: case 0x8a01: case 0x8a10:

-		case 0x8c01: case 0x8c03: case 0x8904: case 0x8a13:

-		    driverList[0] = "s3virge"; break;

-		default:

-		    driverList[0] = "savage"; break;

-	    }

-	    break;

-	case 0x1039:		    driverList[0] = "sis";	break;

-	case 0x126f:		    driverList[0] = "siliconmotion"; break;

-	case 0x121a:

-	    if (dev->device_id < 0x0003)

-	        driverList[0] = "voodoo";

-	    else

-	        driverList[0] = "tdfx";

-	    break;

-	case 0x1011:		    driverList[0] = "tga"; break;

-	case 0x1023:		    driverList[0] = "trident"; break;

-	case 0x100c:		    driverList[0] = "tseng"; break;

-	case 0x80ee:		    driverList[0] = "vboxvideo"; break;

-	case 0x15ad:		    driverList[0] = "vmware"; break;

-	case 0x18ca:

-	    if (dev->device_id == 0x47)

-		driverList[0] = "xgixp";

-	    else

-		driverList[0] = "xgi";

-	    break;

-	default: break;

-    }

-    for (i = 0; (i < returnListMax) && (driverList[i] != NULL); i++) {

-	returnList[i] = xnfstrdup(driverList[i]);

-    }

-    return i;	/* Number of entries added */

-}

-

 Bool

 xf86AutoConfig(void)

 {

@@ -285,132 +189,9 @@ xf86AutoConfig(void)
     return (ret == CONFIG_OK);

 }

 

-static int

-xchomp(char *line)

-{

-    size_t len = 0;

-

-    if (!line) {

-        return 1;

-    }

-

-    len = strlen(line);

-    if (line[len - 1] == '\n' && len > 0) {

-        line[len - 1] = '\0';

-    }

-    return 0;

-}

-

-#ifdef __linux__

-/* This function is used to provide a workaround for binary drivers that

- * don't export their PCI ID's properly. If distros don't end up using this

- * feature it can and should be removed because the symbol-based resolution

- * scheme should be the primary one */

-static void

-matchDriverFromFiles (char** matches, uint16_t match_vendor, uint16_t match_chip)

-{

-    DIR *idsdir;

-    FILE *fp;

-    struct dirent *direntry;

-    char *line = NULL;

-    size_t len;

-    ssize_t read;

-    char path_name[256], vendor_str[5], chip_str[5];

-    uint16_t vendor, chip;

-    int i, j;

-

-    idsdir = opendir(PCI_TXT_IDS_PATH);

-    if (!idsdir)

-        return;

-

-    xf86Msg(X_INFO, "Scanning %s directory for additional PCI ID's supported by the drivers\n", PCI_TXT_IDS_PATH);

-    direntry = readdir(idsdir);

-    /* Read the directory */

-    while (direntry) {

-        if (direntry->d_name[0] == '.') {

-            direntry = readdir(idsdir);

-            continue;

-        }

-        len = strlen(direntry->d_name);

-        /* A tiny bit of sanity checking. We should probably do better */

-        if (strncmp(&(direntry->d_name[len-4]), ".ids", 4) == 0) {

-            /* We need the full path name to open the file */

-            strncpy(path_name, PCI_TXT_IDS_PATH, 256);

-            strncat(path_name, "/", 1);

-            strncat(path_name, direntry->d_name, (256 - strlen(path_name) - 1));

-            fp = fopen(path_name, "r");

-            if (fp == NULL) {

-                xf86Msg(X_ERROR, "Could not open %s for reading. Exiting.\n", path_name);

-                goto end;

-            }

-            /* Read the file */

-#ifdef __GLIBC__

-            while ((read = getline(&line, &len, fp)) != -1) {

-#else

-            while ((line = fgetln(fp, &len)) != (char *)NULL) {

-#endif /* __GLIBC __ */

-                xchomp(line);

-                if (isdigit(line[0])) {

-                    strncpy(vendor_str, line, 4);

-                    vendor_str[4] = '\0';

-                    vendor = (int)strtol(vendor_str, NULL, 16);

-                    if ((strlen(&line[4])) == 0) {

-                        chip_str[0] = '\0';

-                        chip = -1;

-                    } else {

-                        /* Handle trailing whitespace */

-                        if (isspace(line[4])) {

-                            chip_str[0] = '\0';

-                            chip = -1;

-                        } else {

-                            /* Ok, it's a real ID */

-                            strncpy(chip_str, &line[4], 4);

-                            chip_str[4] = '\0';

-                            chip = (int)strtol(chip_str, NULL, 16);

-                        }

-                    }

-                    if (vendor == match_vendor && chip == match_chip ) {

-                        i = 0;

-                        while (matches[i]) {

-                            i++;

-                        }

-                        matches[i] = (char*)malloc(sizeof(char) * strlen(direntry->d_name) -  3);

-                        if (!matches[i]) {

-                            xf86Msg(X_ERROR, "Could not allocate space for the module name. Exiting.\n");

-                            goto end;

-                        }

-                        /* hack off the .ids suffix. This should guard

-                         * against other problems, but it will end up

-                         * taking off anything after the first '.' */

-                        for (j = 0; j < (strlen(direntry->d_name) - 3) ; j++) {

-                            if (direntry->d_name[j] == '.') {

-                                matches[i][j] = '\0';

-                                break;

-                            } else {

-                                matches[i][j] = direntry->d_name[j];

-                            }

-                        }

-                        xf86Msg(X_INFO, "Matched %s from file name %s\n", matches[i], direntry->d_name);

-                    }

-                } else {

-                    /* TODO Handle driver overrides here */

-                }

-            }

-            fclose(fp);

-        }

-        direntry = readdir(idsdir);

-    }

- end:

-    free(line);

-    closedir(idsdir);

-}

-#endif /* __linux__ */

-

 static void

 listPossibleVideoDrivers(char *matches[], int nmatches)

 {

-    struct pci_device * info = NULL;

-    struct pci_device_iterator *iter;

     int i;

     

     for (i = 0 ; i < nmatches ; i++) {

@@ -476,32 +257,7 @@ listPossibleVideoDrivers(char *matches[], int nmatches)
     }

 #endif

 

-    /* Find the primary device, and get some information about it. */

-    iter = pci_slot_match_iterator_create(NULL);

-    while ((info = pci_device_next(iter)) != NULL) {

-	if (xf86IsPrimaryPci(info)) {

-	    break;

-	}

-    }

-

-    pci_iterator_destroy(iter);

-

-    if (!info) {

-	ErrorF("Primary device is not PCI\n");

-    }

-#ifdef __linux__

-    else {

-	matchDriverFromFiles(matches, info->vendor_id, info->device_id);

-    }

-#endif /* __linux__ */

-

-    for (i = 0; (i < nmatches) && (matches[i]); i++) {

-	/* find end of matches list */

-    }

-

-    if ((info != NULL) && (i < nmatches)) {

-	i += videoPtrToDriverList(info, &(matches[i]), nmatches - i);

-    }

+    xf86PciMatchDriver(matches, nmatches);

 

     /* Fallback to platform default hardware */

     if (i < (nmatches - 1)) {

diff --git a/xorg-server/hw/xfree86/common/xf86Bus.c b/xorg-server/hw/xfree86/common/xf86Bus.c
index 09b94654c..77693d742 100644
--- a/xorg-server/hw/xfree86/common/xf86Bus.c
+++ b/xorg-server/hw/xfree86/common/xf86Bus.c
@@ -49,8 +49,6 @@
 #include "xf86_OSproc.h"

 #include "xf86VGAarbiter.h"

 

-#include "Pci.h"

-

 /* Entity data */

 EntityPtr *xf86Entities = NULL;	/* Bus slots claimed by drivers */

 int xf86NumEntities = 0;

@@ -113,10 +111,6 @@ xf86BusConfig(void)
     if (xorgHWAccess)

         xorgHWAccess = xf86EnableIO();

 

-    /* Locate bus slot that had register IO enabled at server startup */

-    if (xorgHWAccess)

-        xf86FindPrimaryDevice();

-

     /*

      * Now call each of the Probe functions.  Each successful probe will

      * result in an extra entry added to the xf86Screens[] list for each

@@ -559,39 +553,6 @@ xf86PostScreenInit(void)
     xf86EnterServerState(OPERATING);

 }

 

-/*

- * xf86FindPrimaryDevice() - Find the display device which

- * was active when the server was started.

- */

-void

-xf86FindPrimaryDevice(void)

-{

-    if (primaryBus.type != BUS_NONE) {

-	char *bus;

-	char loc[16];

-

-	switch (primaryBus.type) {

-	case BUS_PCI:

-	    bus = "PCI";

-	    snprintf(loc, sizeof(loc), " %2.2x@%2.2x:%2.2x:%1.1x",

-		     primaryBus.id.pci->bus,

-		     primaryBus.id.pci->domain,

-		     primaryBus.id.pci->dev,

-		     primaryBus.id.pci->func);

-	    break;

-	case BUS_SBUS:

-	    bus = "SBUS";

-	    snprintf(loc, sizeof(loc), " %2.2x", primaryBus.id.sbus.fbNum);

-	    break;

-	default:

-	    bus = "";

-	    loc[0] = '\0';

-	}

-

-	xf86MsgVerb(X_INFO, 2, "Primary Device is: %s%s\n",bus,loc);

-    }

-}

-

 int

 xf86GetLastScrnFlag(int entityIndex)

 {

diff --git a/xorg-server/hw/xfree86/common/xf86Bus.h b/xorg-server/hw/xfree86/common/xf86Bus.h
index b22e2e772..4e3d7d7cb 100644
--- a/xorg-server/hw/xfree86/common/xf86Bus.h
+++ b/xorg-server/hw/xfree86/common/xf86Bus.h
@@ -1,76 +1,75 @@
-/*
- * Copyright (c) 1997-2003 by The XFree86 Project, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name of the copyright holder(s)
- * and author(s) shall not be used in advertising or otherwise to promote
- * the sale, use or other dealings in this Software without prior written
- * authorization from the copyright holder(s) and author(s).
- */
-
-/*
- * This file contains definitions of the bus-related data structures/types.
- * Everything contained here is private to xf86Bus.c.  In particular the
- * video drivers must not include this file.
- */
-
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#ifndef _XF86_BUS_H
-#define _XF86_BUS_H
-
-#include "xf86pciBus.h"
-#if defined(__sparc__) || defined(__sparc)
-#include "xf86sbusBus.h"
-#endif
-
-typedef struct {
-    DriverPtr                   driver;
-    int                         chipset;
-    int                         entityProp;
-    EntityProc                  entityInit;
-    EntityProc                  entityEnter;
-    EntityProc                  entityLeave;
-    pointer                     private;
-    Bool                        active;
-    Bool                        inUse;
-    BusRec                      bus;
-    pointer                     busAcc;
-    int                         lastScrnFlag;
-    DevUnion *                  entityPrivates;
-    int                         numInstances;
-    GDevPtr *                   devices;   
-    IOADDRESS                   domainIO;
-} EntityRec, *EntityPtr;
-
-#define ACCEL_IS_SHARABLE 0x100
-#define IS_SHARED_ACCEL 0x200
-#define SA_PRIM_INIT_DONE 0x400
-
-extern EntityPtr *xf86Entities;
-extern int xf86NumEntities;
-extern BusRec primaryBus;
-
-int xf86AllocateEntity(void);
-BusType StringToBusType(const char* busID, const char **retID);
-
-#endif /* _XF86_BUS_H */
+/*

+ * Copyright (c) 1997-2003 by The XFree86 Project, Inc.

+ *

+ * Permission is hereby granted, free of charge, to any person obtaining a

+ * copy of this software and associated documentation files (the "Software"),

+ * to deal in the Software without restriction, including without limitation

+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,

+ * and/or sell copies of the Software, and to permit persons to whom the

+ * Software is furnished to do so, subject to the following conditions:

+ *

+ * The above copyright notice and this permission notice shall be included in

+ * all copies or substantial portions of the Software.

+ *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

+ * OTHER DEALINGS IN THE SOFTWARE.

+ *

+ * Except as contained in this notice, the name of the copyright holder(s)

+ * and author(s) shall not be used in advertising or otherwise to promote

+ * the sale, use or other dealings in this Software without prior written

+ * authorization from the copyright holder(s) and author(s).

+ */

+

+/*

+ * This file contains definitions of the bus-related data structures/types.

+ * Everything contained here is private to xf86Bus.c.  In particular the

+ * video drivers must not include this file.

+ */

+

+#ifdef HAVE_XORG_CONFIG_H

+#include <xorg-config.h>

+#endif

+

+#ifndef _XF86_BUS_H

+#define _XF86_BUS_H

+

+#include "xf86pciBus.h"

+#if defined(__sparc__) || defined(__sparc)

+#include "xf86sbusBus.h"

+#endif

+

+typedef struct {

+    DriverPtr                   driver;

+    int                         chipset;

+    int                         entityProp;

+    EntityProc                  entityInit;

+    EntityProc                  entityEnter;

+    EntityProc                  entityLeave;

+    pointer                     private;

+    Bool                        active;

+    Bool                        inUse;

+    BusRec                      bus;

+    int                         lastScrnFlag;

+    DevUnion *                  entityPrivates;

+    int                         numInstances;

+    GDevPtr *                   devices;   

+    IOADDRESS                   domainIO;

+} EntityRec, *EntityPtr;

+

+#define ACCEL_IS_SHARABLE 0x100

+#define IS_SHARED_ACCEL 0x200

+#define SA_PRIM_INIT_DONE 0x400

+

+extern EntityPtr *xf86Entities;

+extern int xf86NumEntities;

+extern BusRec primaryBus;

+

+int xf86AllocateEntity(void);

+BusType StringToBusType(const char* busID, const char **retID);

+

+#endif /* _XF86_BUS_H */

diff --git a/xorg-server/hw/xfree86/common/xf86Configure.c b/xorg-server/hw/xfree86/common/xf86Configure.c
index 11dfcb848..c2b7464cd 100644
--- a/xorg-server/hw/xfree86/common/xf86Configure.c
+++ b/xorg-server/hw/xfree86/common/xf86Configure.c
@@ -681,8 +681,6 @@ DoConfigure(void)
 	    xorgHWAccess = FALSE;

     }

 

-    xf86FindPrimaryDevice();

- 

     /* Create XF86Config file structure */

     xf86config = calloc(1, sizeof(XF86ConfigRec));

 

diff --git a/xorg-server/hw/xfree86/common/xf86Helper.c b/xorg-server/hw/xfree86/common/xf86Helper.c
index 4cc543fc4..1b9bd1f1e 100644
--- a/xorg-server/hw/xfree86/common/xf86Helper.c
+++ b/xorg-server/hw/xfree86/common/xf86Helper.c
@@ -38,9 +38,6 @@
 #include <xorg-config.h>

 #endif

 

-#include <pciaccess.h>

-#include "Pci.h"

-

 #include <X11/X.h>

 #include "os.h"

 #include "servermd.h"

@@ -57,7 +54,6 @@
 #include "xf86Xinput.h"

 #include "xf86InPriv.h"

 #include "mivalidate.h"

-#include "xf86Bus.h"

 #include "xf86Crtc.h"

 

 /* For xf86GetClocks */

@@ -1444,8 +1440,6 @@ xf86MatchDevice(const char *drivername, GDevPtr **sectlist)
     if (sectlist)

 	*sectlist = NULL;

 

-    if (xf86DoConfigure && xf86DoConfigurePass1) return 1;

-

     /*

      * This is a very important function that matches the device sections

      * as they show up in the config file with the drivers that the server

@@ -1506,420 +1500,6 @@ xf86MatchDevice(const char *drivername, GDevPtr **sectlist)
     return i;

 }

 

-static Bool

-pciDeviceHasBars(struct pci_device *pci)

-{

-    int i;

-

-    for (i = 0; i < 6; i++)

-	if (pci->regions[i].size)

-	    return TRUE;

-

-    if (pci->rom_size)

-	return TRUE;

-

-    return FALSE;

-}

-

-struct Inst {

-    struct pci_device *	pci;

-    GDevPtr		dev;

-    Bool		foundHW;  /* PCIid in list of supported chipsets */

-    Bool		claimed;  /* BusID matches with a device section */

-    int 		chip;

-    int 		screen;

-};

-

-

-/**

- * Find set of unclaimed devices matching a given vendor ID.

- *

- * Used by drivers to find as yet unclaimed devices matching the specified

- * vendor ID.

- *

- * \param driverName     Name of the driver.  This is used to find Device

- *                       sections in the config file.

- * \param vendorID       PCI vendor ID of associated devices.  If zero, then

- *                       the true vendor ID must be encoded in the \c PCIid

- *                       fields of the \c PCIchipsets entries.

- * \param chipsets       Symbol table used to associate chipset names with

- *                       PCI IDs.

- * \param devList        List of Device sections parsed from the config file.

- * \param numDevs        Number of entries in \c devList.

- * \param drvp           Pointer the driver's control structure.

- * \param foundEntities  Returned list of entity indicies associated with the

- *                       driver.

- *

- * \returns

- * The number of elements in returned in \c foundEntities on success or zero

- * on failure.

- *

- * \todo

- * This function does a bit more than short description says.  Fill in some

- * more of the details of its operation.

- *

- * \todo

- * The \c driverName parameter is redundant.  It is the same as

- * \c DriverRec::driverName.  In a future version of this function, remove

- * that parameter.

- */

-int

-xf86MatchPciInstances(const char *driverName, int vendorID,

-		      SymTabPtr chipsets, PciChipsets *PCIchipsets,

-		      GDevPtr *devList, int numDevs, DriverPtr drvp,

-		      int **foundEntities)

-{

-    int i,j;

-    struct pci_device * pPci;

-    struct pci_device_iterator *iter;

-    struct Inst *instances = NULL;

-    int numClaimedInstances = 0;

-    int allocatedInstances = 0;

-    int numFound = 0;

-    SymTabRec *c;

-    PciChipsets *id;

-    int *retEntities = NULL;

-

-    *foundEntities = NULL;

-

-

-    /* Each PCI device will contribute at least one entry.  Each device

-     * section can contribute at most one entry.  The sum of the two is

-     * guaranteed to be larger than the maximum possible number of entries.

-     * Do this calculation and memory allocation once now to eliminate the

-     * need for realloc calls inside the loop.

-     */

-    if (!(xf86DoConfigure && xf86DoConfigurePass1)) {

-	unsigned max_entries = numDevs;

-

-	iter = pci_slot_match_iterator_create(NULL);

-	while ((pPci = pci_device_next(iter)) != NULL) {

-	    max_entries++;

-	}

-

-	pci_iterator_destroy(iter);

-	instances = xnfalloc(max_entries * sizeof(struct Inst));

-    }

-

-    iter = pci_slot_match_iterator_create(NULL);

-    while ((pPci = pci_device_next(iter)) != NULL) {

-	unsigned device_class = pPci->device_class;

-	Bool foundVendor = FALSE;

-

-

-	/* Convert the pre-PCI 2.0 device class for a VGA adapter to the

-	 * 2.0 version of the same class.

-	 */

-	if ( device_class == 0x00000101 ) {

-	    device_class = 0x00030000;

-	}

-

-

-	/* Find PCI devices that match the given vendor ID.  The vendor ID is

-	 * either specified explicitly as a parameter to the function or

-	 * implicitly encoded in the high bits of id->PCIid.

-	 *

-	 * The first device with a matching vendor is recorded, even if the

-	 * device ID doesn't match.  This is done because the Device section

-	 * in the xorg.conf file can over-ride the device ID.  A matching PCI

-	 * ID might not be found now, but after the device ID over-ride is

-	 * applied there /might/ be a match.

-	 */

-	for (id = PCIchipsets; id->PCIid != -1; id++) {

-	    const unsigned vendor_id = ((id->PCIid & 0xFFFF0000) >> 16)

-		| vendorID;

-	    const unsigned device_id = (id->PCIid & 0x0000FFFF);

-	    const unsigned match_class = 0x00030000 | id->PCIid;

-

-	    if ((vendor_id == pPci->vendor_id)

-		|| ((vendorID == PCI_VENDOR_GENERIC) && (match_class == device_class))) {

-		if (!foundVendor && (instances != NULL)) {

-		    ++allocatedInstances;

-		    instances[allocatedInstances - 1].pci = pPci;

-		    instances[allocatedInstances - 1].dev = NULL;

-		    instances[allocatedInstances - 1].claimed = FALSE;

-		    instances[allocatedInstances - 1].foundHW = FALSE;

-		    instances[allocatedInstances - 1].screen = 0;

-		}

-

-		foundVendor = TRUE;

-

-		if ( (device_id == pPci->device_id)

-		     || ((vendorID == PCI_VENDOR_GENERIC) 

-			 && (match_class == device_class)) ) {

-		    if ( instances != NULL ) {

-			instances[allocatedInstances - 1].foundHW = TRUE;

-			instances[allocatedInstances - 1].chip = id->numChipset;

-		    }

-

-

-		    if ( xf86DoConfigure && xf86DoConfigurePass1 ) {

-			if (xf86CheckPciSlot(pPci)) {

-			    GDevPtr pGDev = 

-			      xf86AddBusDeviceToConfigure(drvp->driverName,

-							  BUS_PCI, pPci, -1);

-			    if (pGDev) {

-				/* After configure pass 1, chipID and chipRev

-				 * are treated as over-rides, so clobber them

-				 * here.

-				 */

-				pGDev->chipID = -1;

-				pGDev->chipRev = -1;

-			    }

-

-			    numFound++;

-			}

-		    }

-		    else {

-			numFound++;

-		    }

-

-		    break;

-		}

-	    }

-	}

-    }

-

-    pci_iterator_destroy(iter);

-

-

-    /* In "probe only" or "configure" mode (signaled by instances being NULL),

-     * our work is done.  Return the number of detected devices.

-     */

-    if ( instances == NULL ) {

-	return numFound;

-    }

-

-

-    /*

-     * This may be debatable, but if no PCI devices with a matching vendor

-     * type is found, return zero now.  It is probably not desirable to

-     * allow the config file to override this.

-     */

-    if (allocatedInstances <= 0) {

-	free(instances);

-	return 0;

-    }

-

-

-    DebugF("%s instances found: %d\n", driverName, allocatedInstances);

-

-   /*

-    * Check for devices that need duplicated instances.  This is required

-    * when there is more than one screen per entity.

-    *

-    * XXX This currently doesn't work for cases where the BusID isn't

-    * specified explicitly in the config file.

-    */

-

-    for (j = 0; j < numDevs; j++) {

-        if (devList[j]->screen > 0 && devList[j]->busID

-	    && *devList[j]->busID) {

-	    for (i = 0; i < allocatedInstances; i++) {

-	        pPci = instances[i].pci;

-	        if (xf86ComparePciBusString(devList[j]->busID, 

-					    PCI_MAKE_BUS( pPci->domain, pPci->bus ),

-					    pPci->dev,

-					    pPci->func)) {

-		    allocatedInstances++;

-		    instances[allocatedInstances - 1] = instances[i];

-		    instances[allocatedInstances - 1].screen =

-		      				devList[j]->screen;

-		    numFound++;

-		    break;

-		}

-	    }

-	}

-    }

-

-    for (i = 0; i < allocatedInstances; i++) {

-	GDevPtr dev = NULL;

-	GDevPtr devBus = NULL;

-

-	pPci = instances[i].pci;

-	for (j = 0; j < numDevs; j++) {

-	    if (devList[j]->busID && *devList[j]->busID) {

-		if (xf86ComparePciBusString(devList[j]->busID, 

-					    PCI_MAKE_BUS( pPci->domain, pPci->bus ),

-					    pPci->dev,

-					    pPci->func) &&

-		    devList[j]->screen == instances[i].screen) {

-

-		    if (devBus)

-                        xf86MsgVerb(X_WARNING,0,

-			    "%s: More than one matching Device section for "

-			    "instances\n\t(BusID: %s) found: %s\n",

-			    driverName, devList[j]->busID,

-			    devList[j]->identifier);

-		    else

-			devBus = devList[j];

-		}

-	    } else {

-		/*

-		 * if device section without BusID is found

-		 * only assign to it to the primary device.

-		 */

-		if (xf86IsPrimaryPci(pPci)) {

-		    xf86Msg(X_PROBED, "Assigning device section with no busID"

-			    " to primary device\n");

-		    if (dev || devBus)

-			xf86MsgVerb(X_WARNING, 0,

-			    "%s: More than one matching Device section "

-			    "found: %s\n", driverName, devList[j]->identifier);

-		    else

-			dev = devList[j];

-		}

-	    }

-	}

-	if (devBus) dev = devBus;  /* busID preferred */

-	if (!dev) {

-	    if (xf86CheckPciSlot(pPci) && pciDeviceHasBars(pPci)) {

-		xf86MsgVerb(X_WARNING, 0, "%s: No matching Device section "

-			    "for instance (BusID PCI:%u@%u:%u:%u) found\n",

-			    driverName, pPci->domain, pPci->bus, pPci->dev,

-			    pPci->func);

-	    }

-	} else {

-	    numClaimedInstances++;

-	    instances[i].claimed = TRUE;

-	    instances[i].dev = dev;

-	}

-    }

-    DebugF("%s instances found: %d\n", driverName, numClaimedInstances);

-    /*

-     * Now check that a chipset or chipID override in the device section

-     * is valid.  Chipset has precedence over chipID.

-     * If chipset is not valid ignore BusSlot completely.

-     */

-    for (i = 0; i < allocatedInstances && numClaimedInstances > 0; i++) {

-	MessageType from = X_PROBED;

-

-	if (!instances[i].claimed) {

-	    continue;

-	}

-	if (instances[i].dev->chipset) {

-	    for (c = chipsets; c->token >= 0; c++) {

-		if (xf86NameCmp(c->name, instances[i].dev->chipset) == 0)

-		    break;

-	    }

-	    if (c->token == -1) {

-		instances[i].claimed = FALSE;

-		numClaimedInstances--;

-		xf86MsgVerb(X_WARNING, 0, "%s: Chipset \"%s\" in Device "

-			    "section \"%s\" isn't valid for this driver\n",

-			    driverName, instances[i].dev->chipset,

-			    instances[i].dev->identifier);

-	    } else {

-		instances[i].chip = c->token;

-

-		for (id = PCIchipsets; id->numChipset >= 0; id++) {

-		    if (id->numChipset == instances[i].chip)

-			break;

-		}

-		if(id->numChipset >=0){

-		    xf86Msg(X_CONFIG,"Chipset override: %s\n",

-			     instances[i].dev->chipset);

-		    from = X_CONFIG;

-		} else {

-		    instances[i].claimed = FALSE;

-		    numClaimedInstances--;

-		    xf86MsgVerb(X_WARNING, 0, "%s: Chipset \"%s\" in Device "

-				"section \"%s\" isn't a valid PCI chipset\n",

-				driverName, instances[i].dev->chipset,

-				instances[i].dev->identifier);

-		}

-	    }

-	} else if (instances[i].dev->chipID > 0) {

-	    for (id = PCIchipsets; id->numChipset >= 0; id++) {

-		if (id->PCIid == instances[i].dev->chipID)

-		    break;

-	    }

-	    if (id->numChipset == -1) {

-		instances[i].claimed = FALSE;

-		numClaimedInstances--;

-		xf86MsgVerb(X_WARNING, 0, "%s: ChipID 0x%04X in Device "

-			    "section \"%s\" isn't valid for this driver\n",

-			    driverName, instances[i].dev->chipID,

-			    instances[i].dev->identifier);

-	    } else {

-		instances[i].chip = id->numChipset;

-

-		xf86Msg( X_CONFIG,"ChipID override: 0x%04X\n",

-			 instances[i].dev->chipID);

-		from = X_CONFIG;

-	    }

-	} else if (!instances[i].foundHW) {

-	    /*

-	     * This means that there was no override and the PCI chipType

-	     * doesn't match one that is supported

-	     */

-	    instances[i].claimed = FALSE;

-	    numClaimedInstances--;

-	}

-	if (instances[i].claimed == TRUE){

-	    for (c = chipsets; c->token >= 0; c++) {

-		if (c->token == instances[i].chip)

-		    break;

-	    }

-	    xf86Msg(from,"Chipset %s found\n",

-		    c->name);

-	}

-    }

-

-    /*

-     * Of the claimed instances, check that another driver hasn't already

-     * claimed its slot.

-     */

-    numFound = 0;

-    for (i = 0; i < allocatedInstances && numClaimedInstances > 0; i++) {

-	

-	if (!instances[i].claimed)

-	    continue;

-	pPci = instances[i].pci;

-

-

-        /*

-	 * Allow the same entity to be used more than once for devices with

-	 * multiple screens per entity.  This assumes implicitly that there

-	 * will be a screen == 0 instance.

-	 *

-	 * XXX Need to make sure that two different drivers don't claim

-	 * the same screen > 0 instance.

-	 */

-        if (instances[i].screen == 0 && !xf86CheckPciSlot( pPci ))

-	    continue;

-

-	DebugF("%s: card at %d:%d:%d is claimed by a Device section\n",

-	       driverName, pPci->bus, pPci->dev, pPci->func);

-

-	/* Allocate an entry in the lists to be returned */

-	numFound++;

-	retEntities = xnfrealloc(retEntities, numFound * sizeof(int));

-	retEntities[numFound - 1] = xf86ClaimPciSlot( pPci, drvp,

-						      instances[i].chip,

-						      instances[i].dev,

-						      instances[i].dev->active);

-        if (retEntities[numFound - 1] == -1 && instances[i].screen > 0) {

-	    for (j = 0; j < xf86NumEntities; j++) {

-	        EntityPtr pEnt = xf86Entities[j];

-	        if (pEnt->bus.type != BUS_PCI)

-		    continue;

-	        if (pEnt->bus.id.pci == pPci) {

-		    retEntities[numFound - 1] = j;

-		    xf86AddDevToEntity(j, instances[i].dev);

-		    break;

-		}

-	    }

-	}

-    }

-    free(instances);

-    if (numFound > 0) {

-	*foundEntities = retEntities;

-    }

-	

-    return numFound;

-}

-

 /*

  * xf86GetClocks -- get the dot-clocks via a BIG BAD hack ...

  */

@@ -2349,28 +1929,6 @@ xf86FindXvOptions(int scrnIndex, int adaptor_index, char *port_name,
 #define LoaderGetOS xf86GetOS

 #include "loader/os.c"

 

-/* new RAC */

-/*

- * xf86ConfigPciEntityInactive() -- This function can be used

- * to configure an inactive entity as well as to reconfigure an

- * previously active entity inactive. If the entity has been

- * assigned to a screen before it will be removed. If p_chip is

- * non-NULL all static resources listed there will be registered.

- */

-static void

-xf86ConfigPciEntityInactive(EntityInfoPtr pEnt, PciChipsets *p_chip,

-			    EntityProc init, EntityProc enter,

-			    EntityProc leave, pointer private)

-{

-    ScrnInfoPtr pScrn;

-

-    if ((pScrn = xf86FindScreenForEntity(pEnt->index)))

-	xf86RemoveEntityFromScreen(pScrn,pEnt->index);

-

-    /* shared resources are only needed when entity is active: remove */

-    xf86SetEntityFuncs(pEnt->index,init,enter,leave,private);

-}

-

 static void

 xf86ConfigFbEntityInactive(EntityInfoPtr pEnt, EntityProc init,

 			   EntityProc enter, EntityProc leave, pointer private)

@@ -2383,42 +1941,6 @@ xf86ConfigFbEntityInactive(EntityInfoPtr pEnt, EntityProc init,
 }

 

 ScrnInfoPtr

-xf86ConfigPciEntity(ScrnInfoPtr pScrn, int scrnFlag, int entityIndex,

-			  PciChipsets *p_chip, void *dummy, EntityProc init,

-			  EntityProc enter, EntityProc leave, pointer private)

-{

-    EntityInfoPtr pEnt = xf86GetEntityInfo(entityIndex);

-    if (!pEnt) return pScrn;

-

-    if (!(pEnt->location.type == BUS_PCI)

-	|| !xf86GetPciInfoForEntity(entityIndex)) {

-	free(pEnt);

-	return pScrn;

-    }

-    if (!pEnt->active) {

-	xf86ConfigPciEntityInactive(pEnt, p_chip, init,  enter,

-				    leave,  private);

-	free(pEnt);

-	return pScrn;

-    }

-

-    if (!pScrn)

-	pScrn = xf86AllocateScreen(pEnt->driver,scrnFlag);

-    if (xf86IsEntitySharable(entityIndex)) {

-        xf86SetEntityShared(entityIndex);

-    }

-    xf86AddEntityToScreen(pScrn,entityIndex);

-    if (xf86IsEntityShared(entityIndex)) {

-        return pScrn;

-    }

-    free(pEnt);

-

-    xf86SetEntityFuncs(entityIndex,init,enter,leave,private);

-

-    return pScrn;

-}

-

-ScrnInfoPtr

 xf86ConfigFbEntity(ScrnInfoPtr pScrn, int scrnFlag, int entityIndex,

 		   EntityProc init, EntityProc enter, EntityProc leave,

 		   pointer private)

@@ -2446,33 +1968,6 @@ xf86ConfigFbEntity(ScrnInfoPtr pScrn, int scrnFlag, int entityIndex,
     return pScrn;

 }

 

-/*

- *

- *  OBSOLETE ! xf86ConfigActivePciEntity() is an obsolete function.

- *             It is likely to be removed. Don't use!

- */

-

-Bool

-xf86ConfigActivePciEntity(ScrnInfoPtr pScrn, int entityIndex,

-                          PciChipsets *p_chip, void *dummy, EntityProc init,

-                          EntityProc enter, EntityProc leave, pointer private)

-{

-    EntityInfoPtr pEnt = xf86GetEntityInfo(entityIndex);

-    if (!pEnt) return FALSE;

-

-    if (!pEnt->active || !(pEnt->location.type == BUS_PCI)) {

-        free(pEnt);

-        return FALSE;

-    }

-    xf86AddEntityToScreen(pScrn,entityIndex);

-

-    free(pEnt);

-    if (!xf86SetEntityFuncs(entityIndex,init,enter,leave,private))

-        return FALSE;

-

-    return TRUE;

-}

-

 Bool

 xf86IsScreenPrimary(int scrnIndex)

 {

diff --git a/xorg-server/hw/xfree86/common/xf86Priv.h b/xorg-server/hw/xfree86/common/xf86Priv.h
index b0a0f44cc..17fd5aaa9 100644
--- a/xorg-server/hw/xfree86/common/xf86Priv.h
+++ b/xorg-server/hw/xfree86/common/xf86Priv.h
@@ -110,14 +110,10 @@ extern _X_EXPORT  RootWinPropPtr *xf86RegisteredPropertiesTable;
 #ifndef _NO_XF86_PROTOTYPES

 

 /* xf86Bus.c */

-

 extern _X_EXPORT Bool xf86BusConfig(void);

 extern _X_EXPORT void xf86BusProbe(void);

 extern _X_EXPORT void xf86AccessEnter(void);

 extern _X_EXPORT void xf86AccessLeave(void);

-

-extern _X_EXPORT void xf86FindPrimaryDevice(void);

-/* new RAC */

 extern _X_EXPORT void xf86PostProbe(void);

 extern _X_EXPORT void xf86ClearEntityListForScreen(int scrnIndex);

 extern _X_EXPORT void xf86AddDevToEntity(int entityIndex, GDevPtr dev);

diff --git a/xorg-server/hw/xfree86/common/xf86Xinput.c b/xorg-server/hw/xfree86/common/xf86Xinput.c
index f1096f1a5..55cd49c1f 100644
--- a/xorg-server/hw/xfree86/common/xf86Xinput.c
+++ b/xorg-server/hw/xfree86/common/xf86Xinput.c
@@ -551,9 +551,9 @@ InputClassMatches(XF86ConfInputClassPtr iclass, InputAttributes *attrs)
             return FALSE;

 

         for (cur = iclass->match_tag, match = FALSE; *cur && !match; cur++) {

-            const char *tag;

-            for(tag = *attrs->tags; *tag; tag++) {

-                if (!strcmp(tag, *cur)) {

+            char * const *tag;

+            for(tag = attrs->tags; *tag; tag++) {

+                if (!strcmp(*tag, *cur)) {

                     match = TRUE;

                     break;

                 }

diff --git a/xorg-server/hw/xfree86/common/xf86pciBus.c b/xorg-server/hw/xfree86/common/xf86pciBus.c
index 925751256..8d968dc39 100644
--- a/xorg-server/hw/xfree86/common/xf86pciBus.c
+++ b/xorg-server/hw/xfree86/common/xf86pciBus.c
@@ -41,6 +41,7 @@
 #include "Pci.h"

 #include "xf86.h"

 #include "xf86Priv.h"

+#include "dirent.h" /* DIR, FILE type definitions */

 

 /* Bus-specific headers */

 #include "xf86Bus.h"

@@ -581,3 +582,748 @@ xf86PciIsolateDevice(char *argument)
     } else

         FatalError("Invalid isolated device specification\n");

 }

+

+static Bool

+pciDeviceHasBars(struct pci_device *pci)

+{

+    int i;

+

+    for (i = 0; i < 6; i++)

+	if (pci->regions[i].size)

+	    return TRUE;

+

+    if (pci->rom_size)

+	return TRUE;

+

+    return FALSE;

+}

+

+struct Inst {

+    struct pci_device *	pci;

+    GDevPtr		dev;

+    Bool		foundHW;  /* PCIid in list of supported chipsets */

+    Bool		claimed;  /* BusID matches with a device section */

+    int 		chip;

+    int 		screen;

+};

+

+

+/**

+ * Find set of unclaimed devices matching a given vendor ID.

+ *

+ * Used by drivers to find as yet unclaimed devices matching the specified

+ * vendor ID.

+ *

+ * \param driverName     Name of the driver.  This is used to find Device

+ *                       sections in the config file.

+ * \param vendorID       PCI vendor ID of associated devices.  If zero, then

+ *                       the true vendor ID must be encoded in the \c PCIid

+ *                       fields of the \c PCIchipsets entries.

+ * \param chipsets       Symbol table used to associate chipset names with

+ *                       PCI IDs.

+ * \param devList        List of Device sections parsed from the config file.

+ * \param numDevs        Number of entries in \c devList.

+ * \param drvp           Pointer the driver's control structure.

+ * \param foundEntities  Returned list of entity indicies associated with the

+ *                       driver.

+ *

+ * \returns

+ * The number of elements in returned in \c foundEntities on success or zero

+ * on failure.

+ *

+ * \todo

+ * This function does a bit more than short description says.  Fill in some

+ * more of the details of its operation.

+ *

+ * \todo

+ * The \c driverName parameter is redundant.  It is the same as

+ * \c DriverRec::driverName.  In a future version of this function, remove

+ * that parameter.

+ */

+int

+xf86MatchPciInstances(const char *driverName, int vendorID,

+		      SymTabPtr chipsets, PciChipsets *PCIchipsets,

+		      GDevPtr *devList, int numDevs, DriverPtr drvp,

+		      int **foundEntities)

+{

+    int i,j;

+    struct pci_device * pPci;

+    struct pci_device_iterator *iter;

+    struct Inst *instances = NULL;

+    int numClaimedInstances = 0;

+    int allocatedInstances = 0;

+    int numFound = 0;

+    SymTabRec *c;

+    PciChipsets *id;

+    int *retEntities = NULL;

+

+    *foundEntities = NULL;

+

+

+    /* Each PCI device will contribute at least one entry.  Each device

+     * section can contribute at most one entry.  The sum of the two is

+     * guaranteed to be larger than the maximum possible number of entries.

+     * Do this calculation and memory allocation once now to eliminate the

+     * need for realloc calls inside the loop.

+     */

+    if (!(xf86DoConfigure && xf86DoConfigurePass1)) {

+	unsigned max_entries = numDevs;

+

+	iter = pci_slot_match_iterator_create(NULL);

+	while ((pPci = pci_device_next(iter)) != NULL) {

+	    max_entries++;

+	}

+

+	pci_iterator_destroy(iter);

+	instances = xnfalloc(max_entries * sizeof(struct Inst));

+    }

+

+    iter = pci_slot_match_iterator_create(NULL);

+    while ((pPci = pci_device_next(iter)) != NULL) {

+	unsigned device_class = pPci->device_class;

+	Bool foundVendor = FALSE;

+

+

+	/* Convert the pre-PCI 2.0 device class for a VGA adapter to the

+	 * 2.0 version of the same class.

+	 */

+	if ( device_class == 0x00000101 ) {

+	    device_class = 0x00030000;

+	}

+

+

+	/* Find PCI devices that match the given vendor ID.  The vendor ID is

+	 * either specified explicitly as a parameter to the function or

+	 * implicitly encoded in the high bits of id->PCIid.

+	 *

+	 * The first device with a matching vendor is recorded, even if the

+	 * device ID doesn't match.  This is done because the Device section

+	 * in the xorg.conf file can over-ride the device ID.  A matching PCI

+	 * ID might not be found now, but after the device ID over-ride is

+	 * applied there /might/ be a match.

+	 */

+	for (id = PCIchipsets; id->PCIid != -1; id++) {

+	    const unsigned vendor_id = ((id->PCIid & 0xFFFF0000) >> 16)

+		| vendorID;

+	    const unsigned device_id = (id->PCIid & 0x0000FFFF);

+	    const unsigned match_class = 0x00030000 | id->PCIid;

+

+	    if ((vendor_id == pPci->vendor_id)

+		|| ((vendorID == PCI_VENDOR_GENERIC) && (match_class == device_class))) {

+		if (!foundVendor && (instances != NULL)) {

+		    ++allocatedInstances;

+		    instances[allocatedInstances - 1].pci = pPci;

+		    instances[allocatedInstances - 1].dev = NULL;

+		    instances[allocatedInstances - 1].claimed = FALSE;

+		    instances[allocatedInstances - 1].foundHW = FALSE;

+		    instances[allocatedInstances - 1].screen = 0;

+		}

+

+		foundVendor = TRUE;

+

+		if ( (device_id == pPci->device_id)

+		     || ((vendorID == PCI_VENDOR_GENERIC)

+			 && (match_class == device_class)) ) {

+		    if ( instances != NULL ) {

+			instances[allocatedInstances - 1].foundHW = TRUE;

+			instances[allocatedInstances - 1].chip = id->numChipset;

+		    }

+

+

+		    if ( xf86DoConfigure && xf86DoConfigurePass1 ) {

+			if (xf86CheckPciSlot(pPci)) {

+			    GDevPtr pGDev =

+			      xf86AddBusDeviceToConfigure(drvp->driverName,

+							  BUS_PCI, pPci, -1);

+			    if (pGDev) {

+				/* After configure pass 1, chipID and chipRev

+				 * are treated as over-rides, so clobber them

+				 * here.

+				 */

+				pGDev->chipID = -1;

+				pGDev->chipRev = -1;

+			    }

+

+			    numFound++;

+			}

+		    }

+		    else {

+			numFound++;

+		    }

+

+		    break;

+		}

+	    }

+	}

+    }

+

+    pci_iterator_destroy(iter);

+

+

+    /* In "probe only" or "configure" mode (signaled by instances being NULL),

+     * our work is done.  Return the number of detected devices.

+     */

+    if ( instances == NULL ) {

+	return numFound;

+    }

+

+

+    /*

+     * This may be debatable, but if no PCI devices with a matching vendor

+     * type is found, return zero now.  It is probably not desirable to

+     * allow the config file to override this.

+     */

+    if (allocatedInstances <= 0) {

+	free(instances);

+	return 0;

+    }

+

+

+    DebugF("%s instances found: %d\n", driverName, allocatedInstances);

+

+   /*

+    * Check for devices that need duplicated instances.  This is required

+    * when there is more than one screen per entity.

+    *

+    * XXX This currently doesn't work for cases where the BusID isn't

+    * specified explicitly in the config file.

+    */

+

+    for (j = 0; j < numDevs; j++) {

+        if (devList[j]->screen > 0 && devList[j]->busID

+	    && *devList[j]->busID) {

+	    for (i = 0; i < allocatedInstances; i++) {

+	        pPci = instances[i].pci;

+	        if (xf86ComparePciBusString(devList[j]->busID,

+					    PCI_MAKE_BUS( pPci->domain, pPci->bus ),

+					    pPci->dev,

+					    pPci->func)) {

+		    allocatedInstances++;

+		    instances[allocatedInstances - 1] = instances[i];

+		    instances[allocatedInstances - 1].screen = devList[j]->screen;

+		    numFound++;

+		    break;

+		}

+	    }

+	}

+    }

+

+    for (i = 0; i < allocatedInstances; i++) {

+	GDevPtr dev = NULL;

+	GDevPtr devBus = NULL;

+

+	pPci = instances[i].pci;

+	for (j = 0; j < numDevs; j++) {

+	    if (devList[j]->busID && *devList[j]->busID) {

+		if (xf86ComparePciBusString(devList[j]->busID,

+					    PCI_MAKE_BUS( pPci->domain, pPci->bus ),

+					    pPci->dev,

+					    pPci->func) &&

+		    devList[j]->screen == instances[i].screen) {

+

+		    if (devBus)

+                        xf86MsgVerb(X_WARNING,0,

+			    "%s: More than one matching Device section for "

+			    "instances\n\t(BusID: %s) found: %s\n",

+			    driverName, devList[j]->busID,

+			    devList[j]->identifier);

+		    else

+			devBus = devList[j];

+		}

+	    } else {

+		/*

+		 * if device section without BusID is found

+		 * only assign to it to the primary device.

+		 */

+		if (xf86IsPrimaryPci(pPci)) {

+		    xf86Msg(X_PROBED, "Assigning device section with no busID"

+			    " to primary device\n");

+		    if (dev || devBus)

+			xf86MsgVerb(X_WARNING, 0,

+			    "%s: More than one matching Device section "

+			    "found: %s\n", driverName, devList[j]->identifier);

+		    else

+			dev = devList[j];

+		}

+	    }

+	}

+	if (devBus) dev = devBus;  /* busID preferred */

+	if (!dev) {

+	    if (xf86CheckPciSlot(pPci) && pciDeviceHasBars(pPci)) {

+		xf86MsgVerb(X_WARNING, 0, "%s: No matching Device section "

+			    "for instance (BusID PCI:%u@%u:%u:%u) found\n",

+			    driverName, pPci->domain, pPci->bus, pPci->dev,

+			    pPci->func);

+	    }

+	} else {

+	    numClaimedInstances++;

+	    instances[i].claimed = TRUE;

+	    instances[i].dev = dev;

+	}

+    }

+    DebugF("%s instances found: %d\n", driverName, numClaimedInstances);

+    /*

+     * Now check that a chipset or chipID override in the device section

+     * is valid.  Chipset has precedence over chipID.

+     * If chipset is not valid ignore BusSlot completely.

+     */

+    for (i = 0; i < allocatedInstances && numClaimedInstances > 0; i++) {

+	MessageType from = X_PROBED;

+

+	if (!instances[i].claimed) {

+	    continue;

+	}

+	if (instances[i].dev->chipset) {

+	    for (c = chipsets; c->token >= 0; c++) {

+		if (xf86NameCmp(c->name, instances[i].dev->chipset) == 0)

+		    break;

+	    }

+	    if (c->token == -1) {

+		instances[i].claimed = FALSE;

+		numClaimedInstances--;

+		xf86MsgVerb(X_WARNING, 0, "%s: Chipset \"%s\" in Device "

+			    "section \"%s\" isn't valid for this driver\n",

+			    driverName, instances[i].dev->chipset,

+			    instances[i].dev->identifier);

+	    } else {

+		instances[i].chip = c->token;

+

+		for (id = PCIchipsets; id->numChipset >= 0; id++) {

+		    if (id->numChipset == instances[i].chip)

+			break;

+		}

+		if(id->numChipset >=0){

+		    xf86Msg(X_CONFIG,"Chipset override: %s\n",

+			     instances[i].dev->chipset);

+		    from = X_CONFIG;

+		} else {

+		    instances[i].claimed = FALSE;

+		    numClaimedInstances--;

+		    xf86MsgVerb(X_WARNING, 0, "%s: Chipset \"%s\" in Device "

+				"section \"%s\" isn't a valid PCI chipset\n",

+				driverName, instances[i].dev->chipset,

+				instances[i].dev->identifier);

+		}

+	    }

+	} else if (instances[i].dev->chipID > 0) {

+	    for (id = PCIchipsets; id->numChipset >= 0; id++) {

+		if (id->PCIid == instances[i].dev->chipID)

+		    break;

+	    }

+	    if (id->numChipset == -1) {

+		instances[i].claimed = FALSE;

+		numClaimedInstances--;

+		xf86MsgVerb(X_WARNING, 0, "%s: ChipID 0x%04X in Device "

+			    "section \"%s\" isn't valid for this driver\n",

+			    driverName, instances[i].dev->chipID,

+			    instances[i].dev->identifier);

+	    } else {

+		instances[i].chip = id->numChipset;

+

+		xf86Msg( X_CONFIG,"ChipID override: 0x%04X\n",

+			 instances[i].dev->chipID);

+		from = X_CONFIG;

+	    }

+	} else if (!instances[i].foundHW) {

+	    /*

+	     * This means that there was no override and the PCI chipType

+	     * doesn't match one that is supported

+	     */

+	    instances[i].claimed = FALSE;

+	    numClaimedInstances--;

+	}

+	if (instances[i].claimed == TRUE){

+	    for (c = chipsets; c->token >= 0; c++) {

+		if (c->token == instances[i].chip)

+		    break;

+	    }

+	    xf86Msg(from,"Chipset %s found\n",

+		    c->name);

+	}

+    }

+

+    /*

+     * Of the claimed instances, check that another driver hasn't already

+     * claimed its slot.

+     */

+    numFound = 0;

+    for (i = 0; i < allocatedInstances && numClaimedInstances > 0; i++) {

+	if (!instances[i].claimed)

+	    continue;

+	pPci = instances[i].pci;

+

+

+        /*

+	 * Allow the same entity to be used more than once for devices with

+	 * multiple screens per entity.  This assumes implicitly that there

+	 * will be a screen == 0 instance.

+	 *

+	 * XXX Need to make sure that two different drivers don't claim

+	 * the same screen > 0 instance.

+	 */

+        if (instances[i].screen == 0 && !xf86CheckPciSlot( pPci ))

+	    continue;

+

+	DebugF("%s: card at %d:%d:%d is claimed by a Device section\n",

+	       driverName, pPci->bus, pPci->dev, pPci->func);

+

+	/* Allocate an entry in the lists to be returned */

+	numFound++;

+	retEntities = xnfrealloc(retEntities, numFound * sizeof(int));

+	retEntities[numFound - 1] = xf86ClaimPciSlot( pPci, drvp,

+						      instances[i].chip,

+						      instances[i].dev,

+						      instances[i].dev->active);

+        if (retEntities[numFound - 1] == -1 && instances[i].screen > 0) {

+	    for (j = 0; j < xf86NumEntities; j++) {

+	        EntityPtr pEnt = xf86Entities[j];

+	        if (pEnt->bus.type != BUS_PCI)

+		    continue;

+	        if (pEnt->bus.id.pci == pPci) {

+		    retEntities[numFound - 1] = j;

+		    xf86AddDevToEntity(j, instances[i].dev);

+		    break;

+		}

+	    }

+	}

+    }

+    free(instances);

+    if (numFound > 0) {

+	*foundEntities = retEntities;

+    }

+

+    return numFound;

+}

+

+/*

+ * xf86ConfigPciEntityInactive() -- This function can be used

+ * to configure an inactive entity as well as to reconfigure an

+ * previously active entity inactive. If the entity has been

+ * assigned to a screen before it will be removed. If p_chip is

+ * non-NULL all static resources listed there will be registered.

+ */

+static void

+xf86ConfigPciEntityInactive(EntityInfoPtr pEnt, PciChipsets *p_chip,

+			    EntityProc init, EntityProc enter,

+			    EntityProc leave, pointer private)

+{

+    ScrnInfoPtr pScrn;

+

+    if ((pScrn = xf86FindScreenForEntity(pEnt->index)))

+	xf86RemoveEntityFromScreen(pScrn,pEnt->index);

+

+    /* shared resources are only needed when entity is active: remove */

+    xf86SetEntityFuncs(pEnt->index,init,enter,leave,private);

+}

+

+ScrnInfoPtr

+xf86ConfigPciEntity(ScrnInfoPtr pScrn, int scrnFlag, int entityIndex,

+			  PciChipsets *p_chip, void *dummy, EntityProc init,

+			  EntityProc enter, EntityProc leave, pointer private)

+{

+    EntityInfoPtr pEnt = xf86GetEntityInfo(entityIndex);

+    if (!pEnt) return pScrn;

+

+    if (!(pEnt->location.type == BUS_PCI)

+	|| !xf86GetPciInfoForEntity(entityIndex)) {

+	free(pEnt);

+	return pScrn;

+    }

+    if (!pEnt->active) {

+	xf86ConfigPciEntityInactive(pEnt, p_chip, init,  enter,

+				    leave,  private);

+	free(pEnt);

+	return pScrn;

+    }

+

+    if (!pScrn)

+	pScrn = xf86AllocateScreen(pEnt->driver,scrnFlag);

+    if (xf86IsEntitySharable(entityIndex)) {

+        xf86SetEntityShared(entityIndex);

+    }

+    xf86AddEntityToScreen(pScrn,entityIndex);

+    if (xf86IsEntityShared(entityIndex)) {

+        return pScrn;

+    }

+    free(pEnt);

+

+    xf86SetEntityFuncs(entityIndex,init,enter,leave,private);

+

+    return pScrn;

+}

+

+/*

+ *  OBSOLETE ! xf86ConfigActivePciEntity() is an obsolete function.

+ *             It is likely to be removed. Don't use!

+ */

+Bool

+xf86ConfigActivePciEntity(ScrnInfoPtr pScrn, int entityIndex,

+                          PciChipsets *p_chip, void *dummy, EntityProc init,

+                          EntityProc enter, EntityProc leave, pointer private)

+{

+    EntityInfoPtr pEnt = xf86GetEntityInfo(entityIndex);

+    if (!pEnt) return FALSE;

+

+    if (!pEnt->active || !(pEnt->location.type == BUS_PCI)) {

+        free(pEnt);

+        return FALSE;

+    }

+    xf86AddEntityToScreen(pScrn,entityIndex);

+

+    free(pEnt);

+    if (!xf86SetEntityFuncs(entityIndex,init,enter,leave,private))

+        return FALSE;

+

+    return TRUE;

+}

+

+static int

+videoPtrToDriverList(struct pci_device *dev,

+		     char *returnList[], int returnListMax)

+{

+    int i;

+    /* Add more entries here if we ever return more than 4 drivers for

+       any device */

+    char *driverList[5] = { NULL, NULL, NULL, NULL, NULL };

+

+    switch (dev->vendor_id)

+    {

+	/* AMD Geode LX */

+	case 0x1022:

+	    if (dev->device_id == 0x2081)

+		driverList[0] = "geode";

+	    break;

+	/* older Geode products acquired by AMD still carry an NSC vendor_id */

+	case 0x100b:

+	    if (dev->device_id == 0x0030) {

+		/* NSC Geode GX2 specifically */

+		driverList[0] = "geode";

+		/* GX2 support started its life in the NSC tree and was later

+		   forked by AMD for GEODE so we keep it as a backup */

+		driverList[1] = "nsc";

+	    } else

+		/* other NSC variant e.g. 0x0104 (SC1400), 0x0504 (SCx200) */

+		driverList[0] = "nsc";

+	    break;

+	/* Cyrix Geode GX1 */

+	case 0x1078:

+	    if (dev->device_id == 0x0104)

+		driverList[0] = "cyrix";

+	    break;

+	case 0x1142:		    driverList[0] = "apm"; break;

+	case 0xedd8:		    driverList[0] = "ark"; break;

+	case 0x1a03:		    driverList[0] = "ast"; break;

+	case 0x1002:		    driverList[0] = "ati"; break;

+	case 0x102c:		    driverList[0] = "chips"; break;

+	case 0x1013:		    driverList[0] = "cirrus"; break;

+	case 0x3d3d:		    driverList[0] = "glint"; break;

+	case 0x105d:		    driverList[0] = "i128"; break;

+	case 0x8086:

+	    if ((dev->device_id == 0x00d1) || (dev->device_id == 0x7800)) {

+		driverList[0] = "i740";

+            } else if (dev->device_id == 0x8108) {

+                break; /* "hooray" for poulsbo */

+	    } else {

+		driverList[0] = "intel";

+	    }

+	    break;

+	case 0x102b:		    driverList[0] = "mga";	break;

+	case 0x10c8:		    driverList[0] = "neomagic"; break;

+	case 0x10de: case 0x12d2:   driverList[0] = "nv";	break;

+	case 0x1106:		    driverList[0] = "openchrome"; break;

+        case 0x1b36:		    driverList[0] = "qxl"; break;

+	case 0x1163:		    driverList[0] = "rendition"; break;

+	case 0x5333:

+	    switch (dev->device_id)

+	    {

+		case 0x88d0: case 0x88d1: case 0x88f0: case 0x8811:

+		case 0x8812: case 0x8814: case 0x8901:

+		    driverList[0] = "s3"; break;

+		case 0x5631: case 0x883d: case 0x8a01: case 0x8a10:

+		case 0x8c01: case 0x8c03: case 0x8904: case 0x8a13:

+		    driverList[0] = "s3virge"; break;

+		default:

+		    driverList[0] = "savage"; break;

+	    }

+	    break;

+	case 0x1039:		    driverList[0] = "sis";	break;

+	case 0x126f:		    driverList[0] = "siliconmotion"; break;

+	case 0x121a:

+	    if (dev->device_id < 0x0003)

+	        driverList[0] = "voodoo";

+	    else

+	        driverList[0] = "tdfx";

+	    break;

+	case 0x1011:		    driverList[0] = "tga"; break;

+	case 0x1023:		    driverList[0] = "trident"; break;

+	case 0x100c:		    driverList[0] = "tseng"; break;

+	case 0x80ee:		    driverList[0] = "vboxvideo"; break;

+	case 0x15ad:		    driverList[0] = "vmware"; break;

+	case 0x18ca:

+	    if (dev->device_id == 0x47)

+		driverList[0] = "xgixp";

+	    else

+		driverList[0] = "xgi";

+	    break;

+	default: break;

+    }

+    for (i = 0; (i < returnListMax) && (driverList[i] != NULL); i++) {

+	returnList[i] = xnfstrdup(driverList[i]);

+    }

+    return i;	/* Number of entries added */

+}

+

+static int

+xchomp(char *line)

+{

+    size_t len = 0;

+

+    if (!line) {

+        return 1;

+    }

+

+    len = strlen(line);

+    if (line[len - 1] == '\n' && len > 0) {

+        line[len - 1] = '\0';

+    }

+    return 0;

+}

+

+#ifdef __linux__

+/* This function is used to provide a workaround for binary drivers that

+ * don't export their PCI ID's properly. If distros don't end up using this

+ * feature it can and should be removed because the symbol-based resolution

+ * scheme should be the primary one */

+static void

+matchDriverFromFiles (char** matches, uint16_t match_vendor, uint16_t match_chip)

+{

+    DIR *idsdir;

+    FILE *fp;

+    struct dirent *direntry;

+    char *line = NULL;

+    size_t len;

+    ssize_t read;

+    char path_name[256], vendor_str[5], chip_str[5];

+    uint16_t vendor, chip;

+    int i, j;

+

+    idsdir = opendir(PCI_TXT_IDS_PATH);

+    if (!idsdir)

+        return;

+

+    xf86Msg(X_INFO, "Scanning %s directory for additional PCI ID's supported by the drivers\n", PCI_TXT_IDS_PATH);

+    direntry = readdir(idsdir);

+    /* Read the directory */

+    while (direntry) {

+        if (direntry->d_name[0] == '.') {

+            direntry = readdir(idsdir);

+            continue;

+        }

+        len = strlen(direntry->d_name);

+        /* A tiny bit of sanity checking. We should probably do better */

+        if (strncmp(&(direntry->d_name[len-4]), ".ids", 4) == 0) {

+            /* We need the full path name to open the file */

+            strncpy(path_name, PCI_TXT_IDS_PATH, 256);

+            strncat(path_name, "/", 1);

+            strncat(path_name, direntry->d_name, (256 - strlen(path_name) - 1));

+            fp = fopen(path_name, "r");

+            if (fp == NULL) {

+                xf86Msg(X_ERROR, "Could not open %s for reading. Exiting.\n", path_name);

+                goto end;

+            }

+            /* Read the file */

+#ifdef __GLIBC__

+            while ((read = getline(&line, &len, fp)) != -1) {

+#else

+            while ((line = fgetln(fp, &len)) != (char *)NULL) {

+#endif /* __GLIBC __ */

+                xchomp(line);

+                if (isdigit(line[0])) {

+                    strncpy(vendor_str, line, 4);

+                    vendor_str[4] = '\0';

+                    vendor = (int)strtol(vendor_str, NULL, 16);

+                    if ((strlen(&line[4])) == 0) {

+                        chip_str[0] = '\0';

+                        chip = -1;

+                    } else {

+                        /* Handle trailing whitespace */

+                        if (isspace(line[4])) {

+                            chip_str[0] = '\0';

+                            chip = -1;

+                        } else {

+                            /* Ok, it's a real ID */

+                            strncpy(chip_str, &line[4], 4);

+                            chip_str[4] = '\0';

+                            chip = (int)strtol(chip_str, NULL, 16);

+                        }

+                    }

+                    if (vendor == match_vendor && chip == match_chip ) {

+                        i = 0;

+                        while (matches[i]) {

+                            i++;

+                        }

+                        matches[i] = (char*)malloc(sizeof(char) * strlen(direntry->d_name) -  3);

+                        if (!matches[i]) {

+                            xf86Msg(X_ERROR, "Could not allocate space for the module name. Exiting.\n");

+                            goto end;

+                        }

+                        /* hack off the .ids suffix. This should guard

+                         * against other problems, but it will end up

+                         * taking off anything after the first '.' */

+                        for (j = 0; j < (strlen(direntry->d_name) - 3) ; j++) {

+                            if (direntry->d_name[j] == '.') {

+                                matches[i][j] = '\0';

+                                break;

+                            } else {

+                                matches[i][j] = direntry->d_name[j];

+                            }

+                        }

+                        xf86Msg(X_INFO, "Matched %s from file name %s\n", matches[i], direntry->d_name);

+                    }

+                } else {

+                    /* TODO Handle driver overrides here */

+                }

+            }

+            fclose(fp);

+        }

+        direntry = readdir(idsdir);

+    }

+ end:

+    free(line);

+    closedir(idsdir);

+}

+#endif /* __linux__ */

+

+void

+xf86PciMatchDriver(char* matches[], int nmatches) {

+    int i;

+    struct pci_device * info = NULL;

+    struct pci_device_iterator *iter;

+

+    /* Find the primary device, and get some information about it. */

+    iter = pci_slot_match_iterator_create(NULL);

+    while ((info = pci_device_next(iter)) != NULL) {

+	if (xf86IsPrimaryPci(info)) {

+	    break;

+	}

+    }

+

+    pci_iterator_destroy(iter);

+

+    if (!info) {

+	ErrorF("Primary device is not PCI\n");

+    }

+#ifdef __linux__

+    else {

+	matchDriverFromFiles(matches, info->vendor_id, info->device_id);

+    }

+#endif /* __linux__ */

+

+    for (i = 0; (i < nmatches) && (matches[i]); i++) {

+	/* find end of matches list */

+    }

+

+    if ((info != NULL) && (i < nmatches)) {

+	i += videoPtrToDriverList(info, &(matches[i]), nmatches - i);

+    }

+}

diff --git a/xorg-server/hw/xfree86/common/xf86pciBus.h b/xorg-server/hw/xfree86/common/xf86pciBus.h
index b534645ee..c8a2eebdd 100644
--- a/xorg-server/hw/xfree86/common/xf86pciBus.h
+++ b/xorg-server/hw/xfree86/common/xf86pciBus.h
@@ -37,5 +37,6 @@ void xf86PciProbe(void);
 Bool xf86PciAddMatchingDev(DriverPtr drvp);

 Bool xf86PciProbeDev(DriverPtr drvp);

 void xf86PciIsolateDevice(char *argument);

+void xf86PciMatchDriver(char* matches[], int nmatches);

 

 #endif /* _XF86_PCI_BUS_H */

diff --git a/xorg-server/hw/xfree86/common/xf86str.h b/xorg-server/hw/xfree86/common/xf86str.h
index de1f1b60a..c4fbe0403 100644
--- a/xorg-server/hw/xfree86/common/xf86str.h
+++ b/xorg-server/hw/xfree86/common/xf86str.h
@@ -1,919 +1,917 @@
-
-/*
- * Copyright (c) 1997-2003 by The XFree86 Project, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name of the copyright holder(s)
- * and author(s) shall not be used in advertising or otherwise to promote
- * the sale, use or other dealings in this Software without prior written
- * authorization from the copyright holder(s) and author(s).
- */
-
-/*
- * This file contains definitions of the public XFree86 data structures/types.
- * Any data structures that video drivers need to access should go here.
- */
-
-#ifndef _XF86STR_H
-#define _XF86STR_H
-
-#include "misc.h"
-#include "input.h"
-#include "scrnintstr.h"
-#include "pixmapstr.h"
-#include "colormapst.h"
-#include "xf86Module.h"
-#include "xf86Opt.h"
-#include "xf86Pci.h"
-
-#include <pciaccess.h>
-
-/**
- * Integer type that is of the size of the addressable memory (machine size).
- * On most platforms \c uintptr_t will suffice.  However, on some mixed
- * 32-bit / 64-bit platforms, such as 32-bit binaries on 64-bit PowerPC, this
- * must be 64-bits.
- */
-#include <inttypes.h>
-#if defined(__powerpc__)
-typedef uint64_t memType;
-#else
-typedef uintptr_t memType;
-#endif
-
-
-/* Video mode flags */
-
-typedef enum {
-    V_PHSYNC	= 0x0001,
-    V_NHSYNC	= 0x0002,
-    V_PVSYNC	= 0x0004,
-    V_NVSYNC	= 0x0008,
-    V_INTERLACE	= 0x0010,
-    V_DBLSCAN	= 0x0020,
-    V_CSYNC	= 0x0040,
-    V_PCSYNC	= 0x0080,
-    V_NCSYNC	= 0x0100,
-    V_HSKEW	= 0x0200,	/* hskew provided */
-    V_BCAST	= 0x0400,
-    V_PIXMUX	= 0x1000,
-    V_DBLCLK	= 0x2000,
-    V_CLKDIV2	= 0x4000
-} ModeFlags;
-
-typedef enum {
-    INTERLACE_HALVE_V	= 0x0001	/* Halve V values for interlacing */
-} CrtcAdjustFlags;
-
-/* Flags passed to ChipValidMode() */
-typedef enum {
-    MODECHECK_INITIAL = 0,
-    MODECHECK_FINAL   = 1
-} ModeCheckFlags;
-
-/* These are possible return values for xf86CheckMode() and ValidMode() */
-typedef enum {
-    MODE_OK	= 0,	/* Mode OK */
-    MODE_HSYNC,		/* hsync out of range */
-    MODE_VSYNC,		/* vsync out of range */
-    MODE_H_ILLEGAL,	/* mode has illegal horizontal timings */
-    MODE_V_ILLEGAL,	/* mode has illegal horizontal timings */
-    MODE_BAD_WIDTH,	/* requires an unsupported linepitch */
-    MODE_NOMODE,	/* no mode with a maching name */
-    MODE_NO_INTERLACE,	/* interlaced mode not supported */
-    MODE_NO_DBLESCAN,	/* doublescan mode not supported */
-    MODE_NO_VSCAN,	/* multiscan mode not supported */
-    MODE_MEM,		/* insufficient video memory */
-    MODE_VIRTUAL_X,	/* mode width too large for specified virtual size */
-    MODE_VIRTUAL_Y,	/* mode height too large for specified virtual size */
-    MODE_MEM_VIRT,	/* insufficient video memory given virtual size */
-    MODE_NOCLOCK,	/* no fixed clock available */
-    MODE_CLOCK_HIGH,	/* clock required is too high */
-    MODE_CLOCK_LOW,	/* clock required is too low */
-    MODE_CLOCK_RANGE,	/* clock/mode isn't in a ClockRange */
-    MODE_BAD_HVALUE,	/* horizontal timing was out of range */
-    MODE_BAD_VVALUE,	/* vertical timing was out of range */
-    MODE_BAD_VSCAN,	/* VScan value out of range */
-    MODE_HSYNC_NARROW,	/* horizontal sync too narrow */
-    MODE_HSYNC_WIDE,	/* horizontal sync too wide */
-    MODE_HBLANK_NARROW,	/* horizontal blanking too narrow */
-    MODE_HBLANK_WIDE,	/* horizontal blanking too wide */
-    MODE_VSYNC_NARROW,	/* vertical sync too narrow */
-    MODE_VSYNC_WIDE,	/* vertical sync too wide */
-    MODE_VBLANK_NARROW,	/* vertical blanking too narrow */
-    MODE_VBLANK_WIDE,	/* vertical blanking too wide */
-    MODE_PANEL,         /* exceeds panel dimensions */
-    MODE_INTERLACE_WIDTH, /* width too large for interlaced mode */
-    MODE_ONE_WIDTH,     /* only one width is supported */
-    MODE_ONE_HEIGHT,    /* only one height is supported */
-    MODE_ONE_SIZE,      /* only one resolution is supported */
-    MODE_NO_REDUCED,    /* monitor doesn't accept reduced blanking */
-    MODE_BANDWIDTH,	/* mode requires too much memory bandwidth */
-    MODE_BAD = -2,	/* unspecified reason */
-    MODE_ERROR	= -1	/* error condition */
-} ModeStatus;
-
-/*
- * The mode sets are, from best to worst: USERDEF, DRIVER, and DEFAULT/BUILTIN.
- * Preferred will bubble a mode to the top within a set.
- */
-# define M_T_BUILTIN 0x01        /* built-in mode */
-# define M_T_CLOCK_C (0x02 | M_T_BUILTIN) /* built-in mode - configure clock */
-# define M_T_CRTC_C  (0x04 | M_T_BUILTIN) /* built-in mode - configure CRTC  */
-# define M_T_CLOCK_CRTC_C  (M_T_CLOCK_C | M_T_CRTC_C)
-                               /* built-in mode - configure CRTC and clock */
-# define M_T_PREFERRED 0x08	/* preferred mode within a set */
-# define M_T_DEFAULT 0x10	/* (VESA) default modes */
-# define M_T_USERDEF 0x20	/* One of the modes from the config file */
-# define M_T_DRIVER  0x40	/* Supplied by the driver (EDID, etc) */
-# define M_T_USERPREF 0x80	/* mode preferred by the user config */
-
-/* Video mode */
-typedef struct _DisplayModeRec {
-    struct _DisplayModeRec *	prev;
-    struct _DisplayModeRec *	next;
-    char *			name;		/* identifier for the mode */
-    ModeStatus			status;
-    int				type;
-
-    /* These are the values that the user sees/provides */
-    int				Clock;		/* pixel clock freq (kHz) */
-    int				HDisplay;	/* horizontal timing */
-    int				HSyncStart;
-    int				HSyncEnd;
-    int				HTotal;
-    int				HSkew;
-    int				VDisplay;	/* vertical timing */
-    int				VSyncStart;
-    int				VSyncEnd;
-    int				VTotal;
-    int				VScan;
-    int				Flags;
-
-  /* These are the values the hardware uses */
-    int				ClockIndex;
-    int				SynthClock;	/* Actual clock freq to
-					  	 * be programmed  (kHz) */
-    int				CrtcHDisplay;
-    int				CrtcHBlankStart;
-    int				CrtcHSyncStart;
-    int				CrtcHSyncEnd;
-    int				CrtcHBlankEnd;
-    int				CrtcHTotal;
-    int				CrtcHSkew;
-    int				CrtcVDisplay;
-    int				CrtcVBlankStart;
-    int				CrtcVSyncStart;
-    int				CrtcVSyncEnd;
-    int				CrtcVBlankEnd;
-    int				CrtcVTotal;
-    Bool			CrtcHAdjusted;
-    Bool			CrtcVAdjusted;
-    int				PrivSize;
-    INT32 *			Private;
-    int				PrivFlags;
-
-    float			HSync, VRefresh;
-} DisplayModeRec, *DisplayModePtr;
-
-/* The monitor description */
-
-#define MAX_HSYNC 8
-#define MAX_VREFRESH 8
-
-typedef struct { float hi, lo; } range;
-
-typedef struct { CARD32 red, green, blue; } rgb;
-
-typedef struct { float red, green, blue; } Gamma;
-
-/* The permitted gamma range is 1 / GAMMA_MAX <= g <= GAMMA_MAX */
-#define GAMMA_MAX	10.0
-#define GAMMA_MIN	(1.0 / GAMMA_MAX)
-#define GAMMA_ZERO	(GAMMA_MIN / 100.0)
-
-typedef struct {
-    char *		id;
-    char *		vendor;
-    char *		model;
-    int			nHsync;
-    range		hsync[MAX_HSYNC];
-    int			nVrefresh;
-    range		vrefresh[MAX_VREFRESH];
-    DisplayModePtr	Modes;		/* Start of the monitor's mode list */
-    DisplayModePtr	Last;		/* End of the monitor's mode list */
-    Gamma		gamma;		/* Gamma of the monitor */
-    int			widthmm;
-    int			heightmm;
-    pointer		options;
-    pointer		DDC;
-    Bool                reducedblanking; /* Allow CVT reduced blanking modes? */
-    int			maxPixClock;	 /* in kHz, like mode->Clock */
-} MonRec, *MonPtr;
-
-/* the list of clock ranges */
-typedef struct x_ClockRange {
-    struct x_ClockRange *next;
-    int			minClock;	/* (kHz) */
-    int			maxClock;	/* (kHz) */
-    int			clockIndex;	/* -1 for programmable clocks */
-    Bool		interlaceAllowed;
-    Bool		doubleScanAllowed;
-    int			ClockMulFactor;
-    int			ClockDivFactor;
-    int			PrivFlags;
-} ClockRange, *ClockRangePtr;
-
-/*
- * The driverFunc. xorgDriverFuncOp specifies the action driver should
- * perform. If requested option is not supported function should return
- * FALSE. pointer can be used to pass arguments to the function or
- * to return data to the caller.
- */
-typedef struct _ScrnInfoRec *ScrnInfoPtr;
-
-/* do not change order */
-typedef enum {
-    RR_GET_INFO,
-    RR_SET_CONFIG,
-    RR_GET_MODE_MM,
-    GET_REQUIRED_HW_INTERFACES = 10
-} xorgDriverFuncOp;
-
-typedef Bool xorgDriverFuncProc		  (ScrnInfoPtr, xorgDriverFuncOp,
-					   pointer);
-
-/* RR_GET_INFO, RR_SET_CONFIG */
-typedef struct {
-    int rotation;
-    int rate;
-    int width;
-    int height;
-} xorgRRConfig;
-
-typedef union {
-    short RRRotations;
-    xorgRRConfig RRConfig;
-} xorgRRRotation, *xorgRRRotationPtr;
-
-/* RR_GET_MODE_MM */
-typedef struct {
-    DisplayModePtr mode;
-    int virtX;
-    int virtY;
-    int mmWidth;
-    int mmHeight;
-} xorgRRModeMM, *xorgRRModeMMPtr;
-
-/* GET_REQUIRED_HW_INTERFACES */
-#define HW_IO 1
-#define HW_MMIO 2
-#define HW_SKIP_CONSOLE 4
-#define NEED_IO_ENABLED(x) (x & HW_IO)
-
-typedef CARD32 xorgHWFlags;
-
-/*
- * The driver list struct.  This contains the information required for each
- * driver before a ScrnInfoRec has been allocated.
- */
-struct _DriverRec;
-
-typedef struct {
-    int			driverVersion;
-    char *		driverName;
-    void		(*Identify)(int flags);
-    Bool		(*Probe)(struct _DriverRec *drv, int flags);
-    const OptionInfoRec * (*AvailableOptions)(int chipid, int bustype);
-    pointer		module;
-    int			refCount;
-} DriverRec1;
-
-struct _SymTabRec;
-struct _PciChipsets;
-
-typedef struct _DriverRec {
-    int			driverVersion;
-    char *		driverName;
-    void		(*Identify)(int flags);
-    Bool		(*Probe)(struct _DriverRec *drv, int flags);
-    const OptionInfoRec * (*AvailableOptions)(int chipid, int bustype);
-    pointer		module;
-    int			refCount;
-    xorgDriverFuncProc  *driverFunc;
-
-    const struct pci_id_match * supported_devices;
-    Bool (*PciProbe)( struct _DriverRec * drv, int entity_num,
-        struct pci_device * dev, intptr_t match_data );
-} DriverRec, *DriverPtr;
-
-/*
- *  AddDriver flags
- */
-#define HaveDriverFuncs 1
-
-/*
- * These are the private bus types.  New types can be added here.  Types
- * required for the public interface should be added to xf86str.h, with
- * function prototypes added to xf86.h.
- */
-
-/* Tolerate prior #include <linux/input.h> */
-#if defined(linux) && defined(_INPUT_H)
-#undef BUS_NONE
-#undef BUS_ISA
-#undef BUS_PCI
-#undef BUS_SBUS
-#undef BUS_last
-#endif
-
-typedef enum {
-    BUS_NONE,
-    BUS_ISA,
-    BUS_PCI,
-    BUS_SBUS,
-    BUS_last    /* Keep last */
-} BusType;
-
-struct pci_device;
-
-typedef struct {
-    int		fbNum;
-} SbusBusId;
-
-typedef struct _bus {
-    BusType type;
-    union {
-	struct pci_device *pci;
-	SbusBusId sbus;
-    } id;
-} BusRec, *BusPtr;
-
-#define MAXCLOCKS   128
-typedef enum {
-    DAC_BPP8 = 0,
-    DAC_BPP16,
-    DAC_BPP24,
-    DAC_BPP32,
-    MAXDACSPEEDS
-} DacSpeedIndex;
-
-typedef struct {
-   char *			identifier;
-   char *			vendor;
-   char *			board;
-   char *			chipset;
-   char *			ramdac;
-   char *			driver;
-   struct _confscreenrec *	myScreenSection;
-   Bool				claimed;
-   int				dacSpeeds[MAXDACSPEEDS];
-   int				numclocks;
-   int				clock[MAXCLOCKS];
-   char *			clockchip;
-   char *			busID;
-   Bool				active;
-   Bool				inUse;
-   int				videoRam;
-   int				textClockFreq;
-   unsigned long		BiosBase;	/* Base address of video BIOS */
-   unsigned long		MemBase;	/* Frame buffer base address */
-   unsigned long		IOBase;
-   int				chipID;
-   int				chipRev;
-   pointer			options;
-   int                          irq;
-   int                          screen;         /* For multi-CRTC cards */
-} GDevRec, *GDevPtr;
-
-typedef struct {
-   char *			identifier;
-   char *			driver;
-   pointer		 	commonOptions;
-   pointer			extraOptions;
-} IDevRec, *IDevPtr;
-
-typedef struct {
-    int			frameX0;
-    int			frameY0;
-    int			virtualX;
-    int			virtualY;
-    int			depth;
-    int			fbbpp;
-    rgb			weight;
-    rgb			blackColour;
-    rgb			whiteColour;
-    int			defaultVisual;
-    char **		modes;
-    pointer		options;
-} DispRec, *DispPtr;
-
-typedef struct _confxvportrec {
-    char *		identifier;
-    pointer		options;
-} confXvPortRec, *confXvPortPtr;
-
-typedef struct _confxvadaptrec {
-    char *		identifier;
-    int			numports;
-    confXvPortPtr	ports;
-    pointer		options;
-} confXvAdaptorRec, *confXvAdaptorPtr;
-
-typedef struct _confscreenrec {
-    char *		id;
-    int			screennum;
-    int			defaultdepth;
-    int			defaultbpp;
-    int			defaultfbbpp;
-    MonPtr		monitor;
-    GDevPtr		device;
-    int			numdisplays;
-    DispPtr		displays;
-    int			numxvadaptors;
-    confXvAdaptorPtr	xvadaptors;
-    pointer		options;
-} confScreenRec, *confScreenPtr;
-
-typedef enum {
-    PosObsolete = -1,
-    PosAbsolute = 0,
-    PosRightOf,
-    PosLeftOf,
-    PosAbove,
-    PosBelow,
-    PosRelative
-} PositionType;
-
-typedef struct _screenlayoutrec {
-    confScreenPtr	screen;
-    char *		topname;
-    confScreenPtr	top;
-    char *		bottomname;
-    confScreenPtr	bottom;
-    char *		leftname;
-    confScreenPtr	left;
-    char *		rightname;
-    confScreenPtr	right;
-    PositionType	where;
-    int			x;
-    int			y;
-    char *		refname;
-    confScreenPtr	refscreen;
-} screenLayoutRec, *screenLayoutPtr;
-
-typedef struct _serverlayoutrec {
-    char *		id;
-    screenLayoutPtr	screens;
-    GDevPtr		inactives;
-    IDevPtr*            inputs; /* NULL terminated */
-    pointer		options;
-} serverLayoutRec, *serverLayoutPtr;
-
-typedef struct _confdribufferrec {
-    int                 count;
-    int                 size;
-    enum {
-	XF86DRI_WC_HINT = 0x0001 /* Placeholder: not implemented */
-    }                   flags;
-} confDRIBufferRec, *confDRIBufferPtr;
-
-typedef struct _confdrirec {
-    int                 group;
-    int                 mode;
-    int                 bufs_count;
-    confDRIBufferRec    *bufs;
-} confDRIRec, *confDRIPtr;
-
-/* These values should be adjusted when new fields are added to ScrnInfoRec */
-#define NUM_RESERVED_INTS		16
-#define NUM_RESERVED_POINTERS		14
-#define NUM_RESERVED_FUNCS		11
-
-typedef pointer (*funcPointer)(void);
-
-/* flags for depth 24 pixmap options */
-typedef enum {
-    Pix24DontCare = 0,
-    Pix24Use24,
-    Pix24Use32
-} Pix24Flags;
-
-/* Power management events: so far we only support APM */
-
-typedef enum {
-    XF86_APM_UNKNOWN = -1,
-    XF86_APM_SYS_STANDBY,
-    XF86_APM_SYS_SUSPEND,
-    XF86_APM_CRITICAL_SUSPEND,
-    XF86_APM_USER_STANDBY,
-    XF86_APM_USER_SUSPEND,
-    XF86_APM_STANDBY_RESUME,
-    XF86_APM_NORMAL_RESUME,
-    XF86_APM_CRITICAL_RESUME,
-    XF86_APM_LOW_BATTERY,
-    XF86_APM_POWER_STATUS_CHANGE,
-    XF86_APM_UPDATE_TIME,
-    XF86_APM_CAPABILITY_CHANGED,
-    XF86_APM_STANDBY_FAILED,
-    XF86_APM_SUSPEND_FAILED
-} pmEvent;
-
-typedef enum {
-    PM_WAIT,
-    PM_CONTINUE,
-    PM_FAILED,
-    PM_NONE
-} pmWait;
-
-typedef struct _PciChipsets {
-    /**
-     * Key used to match this device with its name in an array of
-     * \c SymTabRec.
-     */
-    int numChipset;
-
-    /**
-     * This value is quirky.  Depending on the driver, it can take on one of
-     * three meanings.  In drivers that have exactly one vendor ID (e.g.,
-     * radeon, mga, i810) the low 16-bits are the device ID.
-     *
-     * In drivers that can have multiple vendor IDs (e.g., the glint driver
-     * can have either 3dlabs' ID or TI's ID, the i740 driver can have either
-     * Intel's ID or Real3D's ID, etc.) the low 16-bits are the device ID and
-     * the high 16-bits are the vendor ID.
-     *
-     * In drivers that don't have a specific vendor (e.g., vga) contains the
-     * device ID for either the generic VGA or generic 8514 devices.  This
-     * turns out to be the same as the subclass and programming interface
-     * value (e.g., the full 24-bit class for the VGA device is 0x030000 (or 
-     * 0x000101) and for 8514 is 0x030001).
-     */
-    int PCIid;
-
-/* dummy place holders for drivers to build against old/new servers */
-#define RES_UNDEFINED NULL
-#define RES_EXCLUSIVE_VGA NULL
-#define RES_SHARED_VGA NULL
-    void *dummy;
-} PciChipsets;
-
-
-/* Entity properties */
-typedef void (*EntityProc)(int entityIndex,pointer private);
-
-typedef struct _entityInfo {
-    int index;
-    BusRec location;
-    int chipset;
-    Bool active;
-    GDevPtr device;
-    DriverPtr driver;
-} EntityInfoRec, *EntityInfoPtr;
-
-/* server states */
-
-typedef enum {
-    SETUP,
-    OPERATING
-} xf86State;
-
-/* DGA */
-
-typedef struct {
-   int num;		/* A unique identifier for the mode (num > 0) */
-   DisplayModePtr mode;
-   int flags;		/* DGA_CONCURRENT_ACCESS, etc... */
-   int imageWidth;	/* linear accessible portion (pixels) */
-   int imageHeight;
-   int pixmapWidth;	/* Xlib accessible portion (pixels) */
-   int pixmapHeight;	/* both fields ignored if no concurrent access */
-   int bytesPerScanline;
-   int byteOrder;	/* MSBFirst, LSBFirst */
-   int depth;
-   int bitsPerPixel;
-   unsigned long red_mask;
-   unsigned long green_mask;
-   unsigned long blue_mask;
-   short visualClass;
-   int viewportWidth;
-   int viewportHeight;
-   int xViewportStep;	/* viewport position granularity */
-   int yViewportStep;
-   int maxViewportX;	/* max viewport origin */
-   int maxViewportY;
-   int viewportFlags;	/* types of page flipping possible */
-   int offset;		/* offset into physical memory */
-   unsigned char *address;	/* server's mapped framebuffer */
-   int reserved1;
-   int reserved2;
-} DGAModeRec, *DGAModePtr;
-
-typedef struct {
-   DGAModePtr mode;
-   PixmapPtr pPix;
-} DGADeviceRec, *DGADevicePtr;
-
-/*
- * Flags for driver Probe() functions.
- */
-#define PROBE_DEFAULT	  0x00
-#define PROBE_DETECT	  0x01
-#define PROBE_TRYHARD	  0x02
-
-/*
- * Driver entry point types
- */
-
-typedef Bool xf86ProbeProc                (DriverPtr, int);
-typedef Bool xf86PreInitProc              (ScrnInfoPtr, int);
-typedef Bool xf86ScreenInitProc           (int, ScreenPtr, int, char**);
-typedef Bool xf86SwitchModeProc           (int, DisplayModePtr, int);
-typedef void xf86AdjustFrameProc          (int, int, int, int);
-typedef Bool xf86EnterVTProc              (int, int);
-typedef void xf86LeaveVTProc              (int, int);
-typedef void xf86FreeScreenProc           (int, int);
-typedef ModeStatus xf86ValidModeProc      (int, DisplayModePtr, Bool, int);
-typedef void xf86EnableDisableFBAccessProc(int, Bool);
-typedef int  xf86SetDGAModeProc           (int, int, DGADevicePtr);
-typedef int  xf86ChangeGammaProc          (int, Gamma);
-typedef void xf86PointerMovedProc         (int, int, int);
-typedef Bool xf86PMEventProc              (int, pmEvent, Bool);
-typedef void xf86DPMSSetProc		  (ScrnInfoPtr, int, int);
-typedef void xf86LoadPaletteProc   (ScrnInfoPtr, int, int *, LOCO *, VisualPtr);
-typedef void xf86SetOverscanProc          (ScrnInfoPtr, int);
-
-
-/*
- * ScrnInfoRec
- *
- * There is one of these for each screen, and it holds all the screen-specific
- * information.
- *
- * Note: the size and layout must be kept the same across versions.  New
- * fields are to be added in place of the "reserved*" fields.  No fields
- * are to be dependent on compile-time defines.
- */
-
-
-typedef struct _ScrnInfoRec {
-    int			driverVersion;
-    char *		driverName;		/* canonical name used in */
-						/* the config file */
-    ScreenPtr		pScreen;		/* Pointer to the ScreenRec */
-    int			scrnIndex;		/* Number of this screen */
-    Bool		configured;		/* Is this screen valid */
-    int			origIndex;		/* initial number assigned to
-						 * this screen before
-						 * finalising the number of
-						 * available screens */
-
-    /* Display-wide screenInfo values needed by this screen */
-    int			imageByteOrder;
-    int			bitmapScanlineUnit;
-    int			bitmapScanlinePad;
-    int			bitmapBitOrder;
-    int			numFormats;
-    PixmapFormatRec	formats[MAXFORMATS];
-    PixmapFormatRec	fbFormat;
-
-    int			bitsPerPixel;		/* fb bpp */
-    Pix24Flags		pixmap24;		/* pixmap pref for depth 24 */
-    int			depth;			/* depth of default visual */
-    MessageType		depthFrom;		/* set from config? */
-    MessageType		bitsPerPixelFrom;	/* set from config? */
-    rgb			weight;			/* r/g/b weights */
-    rgb			mask;			/* rgb masks */
-    rgb			offset;			/* rgb offsets */
-    int			rgbBits;		/* Number of bits in r/g/b */
-    Gamma		gamma;			/* Gamma of the monitor */
-    int			defaultVisual;		/* default visual class */
-    int			maxHValue;		/* max horizontal timing */
-    int			maxVValue;		/* max vertical timing value */
-    int			virtualX;		/* Virtual width */
-    int			virtualY; 		/* Virtual height */
-    int			xInc;			/* Horizontal timing increment */
-    MessageType		virtualFrom;		/* set from config? */
-    int			displayWidth;		/* memory pitch */
-    int			frameX0;		/* viewport position */
-    int			frameY0;
-    int			frameX1;
-    int			frameY1;
-    int			zoomLocked;		/* Disallow mode changes */
-    DisplayModePtr	modePool;		/* list of compatible modes */
-    DisplayModePtr	modes;			/* list of actual modes */
-    DisplayModePtr	currentMode;		/* current mode
-						 * This was previously
-						 * overloaded with the modes
-						 * field, which is a pointer
-						 * into a circular list */
-    confScreenPtr	confScreen;		/* Screen config info */
-    MonPtr		monitor;		/* Monitor information */
-    DispPtr		display;		/* Display information */
-    int *		entityList;		/* List of device entities */
-    int			numEntities;
-    int			widthmm;		/* physical display dimensions
-						 * in mm */
-    int			heightmm;
-    int			xDpi;			/* width DPI */
-    int			yDpi;			/* height DPI */
-    char *		name;			/* Name to prefix messages */
-    pointer		driverPrivate;		/* Driver private area */
-    DevUnion *		privates;		/* Other privates can hook in
-						 * here */
-    DriverPtr		drv;			/* xf86DriverList[] entry */
-    pointer		module;			/* Pointer to module head */
-    int			colorKey;
-    int			overlayFlags;
-
-    /* Some of these may be moved out of here into the driver private area */
-
-    char *		chipset;		/* chipset name */
-    char *		ramdac;			/* ramdac name */
-    char *		clockchip;		/* clock name */
-    Bool		progClock;		/* clock is programmable */
-    int			numClocks;		/* number of clocks */
-    int			clock[MAXCLOCKS];	/* list of clock frequencies */
-    int			videoRam;		/* amount of video ram (kb) */
-    unsigned long	biosBase;		/* Base address of video BIOS */
-    unsigned long	memPhysBase;		/* Physical address of FB */
-    unsigned long 	fbOffset;		/* Offset of FB in the above */
-    IOADDRESS    	domainIOBase;		/* Domain I/O base address */
-    int			memClk;			/* memory clock */
-    int			textClockFreq;		/* clock of text mode */
-    Bool		flipPixels;		/* swap default black/white */
-    pointer		options;
-
-    int			chipID;
-    int			chipRev;
-
-    /* Allow screens to be enabled/disabled individually */
-    Bool		vtSema;
-    DevUnion		pixmapPrivate;		/* saved devPrivate from pixmap */
-
-    /* hw cursor moves at SIGIO time */
-    Bool		silkenMouse;
-
-    /* Storage for clockRanges and adjustFlags for use with the VidMode ext */
-    ClockRangePtr	clockRanges;
-    int			adjustFlags;
-
-    /*
-     * These can be used when the minor ABI version is incremented.
-     * The NUM_* parameters must be reduced appropriately to keep the
-     * structure size and alignment unchanged.
-     */
-    int			reservedInt[NUM_RESERVED_INTS];
-
-    int *		entityInstanceList;
-    struct pci_device   *vgaDev;
-
-    pointer		reservedPtr[NUM_RESERVED_POINTERS];
-
-    /*
-     * Driver entry points.
-     *
-     */
-
-    xf86ProbeProc			*Probe;
-    xf86PreInitProc			*PreInit;
-    xf86ScreenInitProc			*ScreenInit;
-    xf86SwitchModeProc			*SwitchMode;
-    xf86AdjustFrameProc			*AdjustFrame;
-    xf86EnterVTProc			*EnterVT;
-    xf86LeaveVTProc			*LeaveVT;
-    xf86FreeScreenProc			*FreeScreen;
-    xf86ValidModeProc			*ValidMode;
-    xf86EnableDisableFBAccessProc	*EnableDisableFBAccess;
-    xf86SetDGAModeProc			*SetDGAMode;
-    xf86ChangeGammaProc			*ChangeGamma;
-    xf86PointerMovedProc		*PointerMoved;
-    xf86PMEventProc			*PMEvent;
-    xf86DPMSSetProc			*DPMSSet;
-    xf86LoadPaletteProc			*LoadPalette;
-    xf86SetOverscanProc			*SetOverscan;
-    xorgDriverFuncProc			*DriverFunc;
-
-    /*
-     * This can be used when the minor ABI version is incremented.
-     * The NUM_* parameter must be reduced appropriately to keep the
-     * structure size and alignment unchanged.
-     */
-    funcPointer		reservedFuncs[NUM_RESERVED_FUNCS];
-
-} ScrnInfoRec;
-
-
-typedef struct {
-   Bool (*OpenFramebuffer)(
-	ScrnInfoPtr pScrn,
-	char **name,
-	unsigned char **mem,
-	int *size,
-	int *offset,
-        int *extra
-   );
-   void	(*CloseFramebuffer)(ScrnInfoPtr pScrn);
-   Bool (*SetMode)(ScrnInfoPtr pScrn, DGAModePtr pMode);
-   void (*SetViewport)(ScrnInfoPtr pScrn, int x, int y, int flags);
-   int  (*GetViewport)(ScrnInfoPtr pScrn);
-   void (*Sync)(ScrnInfoPtr);
-   void (*FillRect)(
-	ScrnInfoPtr pScrn,
-	int x, int y, int w, int h,
-	unsigned long color
-   );
-   void (*BlitRect)(
-	ScrnInfoPtr pScrn,
-	int srcx, int srcy,
-	int w, int h,
-	int dstx, int dsty
-   );
-   void (*BlitTransRect)(
-	ScrnInfoPtr pScrn,
-	int srcx, int srcy,
-	int w, int h,
-	int dstx, int dsty,
-	unsigned long color
-   );
-} DGAFunctionRec, *DGAFunctionPtr;
-
-typedef struct _SymTabRec {
-    int			token;		/* id of the token */
-    const char *	name;		/* token name */
-} SymTabRec, *SymTabPtr;
-
-/* flags for xf86LookupMode */
-typedef enum {
-    LOOKUP_DEFAULT		= 0,	/* Use default mode lookup method */
-    LOOKUP_BEST_REFRESH,		/* Pick modes with best refresh */
-    LOOKUP_CLOSEST_CLOCK,		/* Pick modes with the closest clock */
-    LOOKUP_LIST_ORDER,			/* Pick first useful mode in list */
-    LOOKUP_CLKDIV2		= 0x0100, /* Allow half clocks */
-    LOOKUP_OPTIONAL_TOLERANCES	= 0x0200  /* Allow missing hsync/vrefresh */
-} LookupModeFlags;
-
-#define NoDepth24Support	0x00
-#define Support24bppFb		0x01	/* 24bpp framebuffer supported */
-#define Support32bppFb		0x02	/* 32bpp framebuffer supported */
-#define SupportConvert24to32	0x04	/* Can convert 24bpp pixmap to 32bpp */
-#define SupportConvert32to24	0x08	/* Can convert 32bpp pixmap to 24bpp */
-#define PreferConvert24to32	0x10	/* prefer 24bpp pixmap to 32bpp conv */
-#define PreferConvert32to24	0x20	/* prefer 32bpp pixmap to 24bpp conv */
-
-
-/* For DPMS */
-typedef void (*DPMSSetProcPtr)(ScrnInfoPtr, int, int);
-
-/* Input handler proc */
-typedef void (*InputHandlerProc)(int fd, pointer data);
-
-/* These are used by xf86GetClocks */
-#define CLK_REG_SAVE		-1
-#define CLK_REG_RESTORE		-2
-
-/*
- * misc constants
- */
-#define INTERLACE_REFRESH_WEIGHT	1.5
-#define SYNC_TOLERANCE		0.01	/* 1 percent */
-#define CLOCK_TOLERANCE		2000	/* Clock matching tolerance (2MHz) */
-
-
-#define OVERLAY_8_32_DUALFB	0x00000001
-#define OVERLAY_8_24_DUALFB	0x00000002
-#define OVERLAY_8_16_DUALFB	0x00000004
-#define OVERLAY_8_32_PLANAR	0x00000008
-
-/* Values of xf86Info.mouseFlags */
-#define MF_CLEAR_DTR       1
-#define MF_CLEAR_RTS       2
-
-/* Action Events */
-typedef enum {
-    ACTION_TERMINATE		= 0,	/* Terminate Server */
-    ACTION_NEXT_MODE		= 10,	/* Switch to next video mode */
-    ACTION_PREV_MODE,
-    ACTION_SWITCHSCREEN		= 100,	/* VT switch */
-    ACTION_SWITCHSCREEN_NEXT,
-    ACTION_SWITCHSCREEN_PREV,
-} ActionEvent;
-
-#endif /* _XF86STR_H */
+

+/*

+ * Copyright (c) 1997-2003 by The XFree86 Project, Inc.

+ *

+ * Permission is hereby granted, free of charge, to any person obtaining a

+ * copy of this software and associated documentation files (the "Software"),

+ * to deal in the Software without restriction, including without limitation

+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,

+ * and/or sell copies of the Software, and to permit persons to whom the

+ * Software is furnished to do so, subject to the following conditions:

+ *

+ * The above copyright notice and this permission notice shall be included in

+ * all copies or substantial portions of the Software.

+ *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

+ * OTHER DEALINGS IN THE SOFTWARE.

+ *

+ * Except as contained in this notice, the name of the copyright holder(s)

+ * and author(s) shall not be used in advertising or otherwise to promote

+ * the sale, use or other dealings in this Software without prior written

+ * authorization from the copyright holder(s) and author(s).

+ */

+

+/*

+ * This file contains definitions of the public XFree86 data structures/types.

+ * Any data structures that video drivers need to access should go here.

+ */

+

+#ifndef _XF86STR_H

+#define _XF86STR_H

+

+#include "misc.h"

+#include "input.h"

+#include "scrnintstr.h"

+#include "pixmapstr.h"

+#include "colormapst.h"

+#include "xf86Module.h"

+#include "xf86Opt.h"

+#include "xf86Pci.h"

+

+#include <pciaccess.h>

+

+/**

+ * Integer type that is of the size of the addressable memory (machine size).

+ * On most platforms \c uintptr_t will suffice.  However, on some mixed

+ * 32-bit / 64-bit platforms, such as 32-bit binaries on 64-bit PowerPC, this

+ * must be 64-bits.

+ */

+#include <inttypes.h>

+#if defined(__powerpc__)

+typedef uint64_t memType;

+#else

+typedef uintptr_t memType;

+#endif

+

+

+/* Video mode flags */

+

+typedef enum {

+    V_PHSYNC	= 0x0001,

+    V_NHSYNC	= 0x0002,

+    V_PVSYNC	= 0x0004,

+    V_NVSYNC	= 0x0008,

+    V_INTERLACE	= 0x0010,

+    V_DBLSCAN	= 0x0020,

+    V_CSYNC	= 0x0040,

+    V_PCSYNC	= 0x0080,

+    V_NCSYNC	= 0x0100,

+    V_HSKEW	= 0x0200,	/* hskew provided */

+    V_BCAST	= 0x0400,

+    V_PIXMUX	= 0x1000,

+    V_DBLCLK	= 0x2000,

+    V_CLKDIV2	= 0x4000

+} ModeFlags;

+

+typedef enum {

+    INTERLACE_HALVE_V	= 0x0001	/* Halve V values for interlacing */

+} CrtcAdjustFlags;

+

+/* Flags passed to ChipValidMode() */

+typedef enum {

+    MODECHECK_INITIAL = 0,

+    MODECHECK_FINAL   = 1

+} ModeCheckFlags;

+

+/* These are possible return values for xf86CheckMode() and ValidMode() */

+typedef enum {

+    MODE_OK	= 0,	/* Mode OK */

+    MODE_HSYNC,		/* hsync out of range */

+    MODE_VSYNC,		/* vsync out of range */

+    MODE_H_ILLEGAL,	/* mode has illegal horizontal timings */

+    MODE_V_ILLEGAL,	/* mode has illegal horizontal timings */

+    MODE_BAD_WIDTH,	/* requires an unsupported linepitch */

+    MODE_NOMODE,	/* no mode with a maching name */

+    MODE_NO_INTERLACE,	/* interlaced mode not supported */

+    MODE_NO_DBLESCAN,	/* doublescan mode not supported */

+    MODE_NO_VSCAN,	/* multiscan mode not supported */

+    MODE_MEM,		/* insufficient video memory */

+    MODE_VIRTUAL_X,	/* mode width too large for specified virtual size */

+    MODE_VIRTUAL_Y,	/* mode height too large for specified virtual size */

+    MODE_MEM_VIRT,	/* insufficient video memory given virtual size */

+    MODE_NOCLOCK,	/* no fixed clock available */

+    MODE_CLOCK_HIGH,	/* clock required is too high */

+    MODE_CLOCK_LOW,	/* clock required is too low */

+    MODE_CLOCK_RANGE,	/* clock/mode isn't in a ClockRange */

+    MODE_BAD_HVALUE,	/* horizontal timing was out of range */

+    MODE_BAD_VVALUE,	/* vertical timing was out of range */

+    MODE_BAD_VSCAN,	/* VScan value out of range */

+    MODE_HSYNC_NARROW,	/* horizontal sync too narrow */

+    MODE_HSYNC_WIDE,	/* horizontal sync too wide */

+    MODE_HBLANK_NARROW,	/* horizontal blanking too narrow */

+    MODE_HBLANK_WIDE,	/* horizontal blanking too wide */

+    MODE_VSYNC_NARROW,	/* vertical sync too narrow */

+    MODE_VSYNC_WIDE,	/* vertical sync too wide */

+    MODE_VBLANK_NARROW,	/* vertical blanking too narrow */

+    MODE_VBLANK_WIDE,	/* vertical blanking too wide */

+    MODE_PANEL,         /* exceeds panel dimensions */

+    MODE_INTERLACE_WIDTH, /* width too large for interlaced mode */

+    MODE_ONE_WIDTH,     /* only one width is supported */

+    MODE_ONE_HEIGHT,    /* only one height is supported */

+    MODE_ONE_SIZE,      /* only one resolution is supported */

+    MODE_NO_REDUCED,    /* monitor doesn't accept reduced blanking */

+    MODE_BANDWIDTH,	/* mode requires too much memory bandwidth */

+    MODE_BAD = -2,	/* unspecified reason */

+    MODE_ERROR	= -1	/* error condition */

+} ModeStatus;

+

+/*

+ * The mode sets are, from best to worst: USERDEF, DRIVER, and DEFAULT/BUILTIN.

+ * Preferred will bubble a mode to the top within a set.

+ */

+# define M_T_BUILTIN 0x01        /* built-in mode */

+# define M_T_CLOCK_C (0x02 | M_T_BUILTIN) /* built-in mode - configure clock */

+# define M_T_CRTC_C  (0x04 | M_T_BUILTIN) /* built-in mode - configure CRTC  */

+# define M_T_CLOCK_CRTC_C  (M_T_CLOCK_C | M_T_CRTC_C)

+                               /* built-in mode - configure CRTC and clock */

+# define M_T_PREFERRED 0x08	/* preferred mode within a set */

+# define M_T_DEFAULT 0x10	/* (VESA) default modes */

+# define M_T_USERDEF 0x20	/* One of the modes from the config file */

+# define M_T_DRIVER  0x40	/* Supplied by the driver (EDID, etc) */

+# define M_T_USERPREF 0x80	/* mode preferred by the user config */

+

+/* Video mode */

+typedef struct _DisplayModeRec {

+    struct _DisplayModeRec *	prev;

+    struct _DisplayModeRec *	next;

+    char *			name;		/* identifier for the mode */

+    ModeStatus			status;

+    int				type;

+

+    /* These are the values that the user sees/provides */

+    int				Clock;		/* pixel clock freq (kHz) */

+    int				HDisplay;	/* horizontal timing */

+    int				HSyncStart;

+    int				HSyncEnd;

+    int				HTotal;

+    int				HSkew;

+    int				VDisplay;	/* vertical timing */

+    int				VSyncStart;

+    int				VSyncEnd;

+    int				VTotal;

+    int				VScan;

+    int				Flags;

+

+  /* These are the values the hardware uses */

+    int				ClockIndex;

+    int				SynthClock;	/* Actual clock freq to

+					  	 * be programmed  (kHz) */

+    int				CrtcHDisplay;

+    int				CrtcHBlankStart;

+    int				CrtcHSyncStart;

+    int				CrtcHSyncEnd;

+    int				CrtcHBlankEnd;

+    int				CrtcHTotal;

+    int				CrtcHSkew;

+    int				CrtcVDisplay;

+    int				CrtcVBlankStart;

+    int				CrtcVSyncStart;

+    int				CrtcVSyncEnd;

+    int				CrtcVBlankEnd;

+    int				CrtcVTotal;

+    Bool			CrtcHAdjusted;

+    Bool			CrtcVAdjusted;

+    int				PrivSize;

+    INT32 *			Private;

+    int				PrivFlags;

+

+    float			HSync, VRefresh;

+} DisplayModeRec, *DisplayModePtr;

+

+/* The monitor description */

+

+#define MAX_HSYNC 8

+#define MAX_VREFRESH 8

+

+typedef struct { float hi, lo; } range;

+

+typedef struct { CARD32 red, green, blue; } rgb;

+

+typedef struct { float red, green, blue; } Gamma;

+

+/* The permitted gamma range is 1 / GAMMA_MAX <= g <= GAMMA_MAX */

+#define GAMMA_MAX	10.0

+#define GAMMA_MIN	(1.0 / GAMMA_MAX)

+#define GAMMA_ZERO	(GAMMA_MIN / 100.0)

+

+typedef struct {

+    char *		id;

+    char *		vendor;

+    char *		model;

+    int			nHsync;

+    range		hsync[MAX_HSYNC];

+    int			nVrefresh;

+    range		vrefresh[MAX_VREFRESH];

+    DisplayModePtr	Modes;		/* Start of the monitor's mode list */

+    DisplayModePtr	Last;		/* End of the monitor's mode list */

+    Gamma		gamma;		/* Gamma of the monitor */

+    int			widthmm;

+    int			heightmm;

+    pointer		options;

+    pointer		DDC;

+    Bool                reducedblanking; /* Allow CVT reduced blanking modes? */

+    int			maxPixClock;	 /* in kHz, like mode->Clock */

+} MonRec, *MonPtr;

+

+/* the list of clock ranges */

+typedef struct x_ClockRange {

+    struct x_ClockRange *next;

+    int			minClock;	/* (kHz) */

+    int			maxClock;	/* (kHz) */

+    int			clockIndex;	/* -1 for programmable clocks */

+    Bool		interlaceAllowed;

+    Bool		doubleScanAllowed;

+    int			ClockMulFactor;

+    int			ClockDivFactor;

+    int			PrivFlags;

+} ClockRange, *ClockRangePtr;

+

+/*

+ * The driverFunc. xorgDriverFuncOp specifies the action driver should

+ * perform. If requested option is not supported function should return

+ * FALSE. pointer can be used to pass arguments to the function or

+ * to return data to the caller.

+ */

+typedef struct _ScrnInfoRec *ScrnInfoPtr;

+

+/* do not change order */

+typedef enum {

+    RR_GET_INFO,

+    RR_SET_CONFIG,

+    RR_GET_MODE_MM,

+    GET_REQUIRED_HW_INTERFACES = 10

+} xorgDriverFuncOp;

+

+typedef Bool xorgDriverFuncProc		  (ScrnInfoPtr, xorgDriverFuncOp,

+					   pointer);

+

+/* RR_GET_INFO, RR_SET_CONFIG */

+typedef struct {

+    int rotation;

+    int rate;

+    int width;

+    int height;

+} xorgRRConfig;

+

+typedef union {

+    short RRRotations;

+    xorgRRConfig RRConfig;

+} xorgRRRotation, *xorgRRRotationPtr;

+

+/* RR_GET_MODE_MM */

+typedef struct {

+    DisplayModePtr mode;

+    int virtX;

+    int virtY;

+    int mmWidth;

+    int mmHeight;

+} xorgRRModeMM, *xorgRRModeMMPtr;

+

+/* GET_REQUIRED_HW_INTERFACES */

+#define HW_IO 1

+#define HW_MMIO 2

+#define HW_SKIP_CONSOLE 4

+#define NEED_IO_ENABLED(x) (x & HW_IO)

+

+typedef CARD32 xorgHWFlags;

+

+/*

+ * The driver list struct.  This contains the information required for each

+ * driver before a ScrnInfoRec has been allocated.

+ */

+struct _DriverRec;

+

+typedef struct {

+    int			driverVersion;

+    char *		driverName;

+    void		(*Identify)(int flags);

+    Bool		(*Probe)(struct _DriverRec *drv, int flags);

+    const OptionInfoRec * (*AvailableOptions)(int chipid, int bustype);

+    pointer		module;

+    int			refCount;

+} DriverRec1;

+

+struct _SymTabRec;

+struct _PciChipsets;

+

+typedef struct _DriverRec {

+    int			driverVersion;

+    char *		driverName;

+    void		(*Identify)(int flags);

+    Bool		(*Probe)(struct _DriverRec *drv, int flags);

+    const OptionInfoRec * (*AvailableOptions)(int chipid, int bustype);

+    pointer		module;

+    int			refCount;

+    xorgDriverFuncProc  *driverFunc;

+

+    const struct pci_id_match * supported_devices;

+    Bool (*PciProbe)( struct _DriverRec * drv, int entity_num,

+        struct pci_device * dev, intptr_t match_data );

+} DriverRec, *DriverPtr;

+

+/*

+ *  AddDriver flags

+ */

+#define HaveDriverFuncs 1

+

+/*

+ * These are the private bus types.  New types can be added here.  Types

+ * required for the public interface should be added to xf86str.h, with

+ * function prototypes added to xf86.h.

+ */

+

+/* Tolerate prior #include <linux/input.h> */

+#if defined(linux) && defined(_INPUT_H)

+#undef BUS_NONE

+#undef BUS_PCI

+#undef BUS_SBUS

+#undef BUS_last

+#endif

+

+typedef enum {

+    BUS_NONE,

+    BUS_PCI,

+    BUS_SBUS,

+    BUS_last    /* Keep last */

+} BusType;

+

+struct pci_device;

+

+typedef struct {

+    int		fbNum;

+} SbusBusId;

+

+typedef struct _bus {

+    BusType type;

+    union {

+	struct pci_device *pci;

+	SbusBusId sbus;

+    } id;

+} BusRec, *BusPtr;

+

+#define MAXCLOCKS   128

+typedef enum {

+    DAC_BPP8 = 0,

+    DAC_BPP16,

+    DAC_BPP24,

+    DAC_BPP32,

+    MAXDACSPEEDS

+} DacSpeedIndex;

+

+typedef struct {

+   char *			identifier;

+   char *			vendor;

+   char *			board;

+   char *			chipset;

+   char *			ramdac;

+   char *			driver;

+   struct _confscreenrec *	myScreenSection;

+   Bool				claimed;

+   int				dacSpeeds[MAXDACSPEEDS];

+   int				numclocks;

+   int				clock[MAXCLOCKS];

+   char *			clockchip;

+   char *			busID;

+   Bool				active;

+   Bool				inUse;

+   int				videoRam;

+   int				textClockFreq;

+   unsigned long		BiosBase;	/* Base address of video BIOS */

+   unsigned long		MemBase;	/* Frame buffer base address */

+   unsigned long		IOBase;

+   int				chipID;

+   int				chipRev;

+   pointer			options;

+   int                          irq;

+   int                          screen;         /* For multi-CRTC cards */

+} GDevRec, *GDevPtr;

+

+typedef struct {

+   char *			identifier;

+   char *			driver;

+   pointer		 	commonOptions;

+   pointer			extraOptions;

+} IDevRec, *IDevPtr;

+

+typedef struct {

+    int			frameX0;

+    int			frameY0;

+    int			virtualX;

+    int			virtualY;

+    int			depth;

+    int			fbbpp;

+    rgb			weight;

+    rgb			blackColour;

+    rgb			whiteColour;

+    int			defaultVisual;

+    char **		modes;

+    pointer		options;

+} DispRec, *DispPtr;

+

+typedef struct _confxvportrec {

+    char *		identifier;

+    pointer		options;

+} confXvPortRec, *confXvPortPtr;

+

+typedef struct _confxvadaptrec {

+    char *		identifier;

+    int			numports;

+    confXvPortPtr	ports;

+    pointer		options;

+} confXvAdaptorRec, *confXvAdaptorPtr;

+

+typedef struct _confscreenrec {

+    char *		id;

+    int			screennum;

+    int			defaultdepth;

+    int			defaultbpp;

+    int			defaultfbbpp;

+    MonPtr		monitor;

+    GDevPtr		device;

+    int			numdisplays;

+    DispPtr		displays;

+    int			numxvadaptors;

+    confXvAdaptorPtr	xvadaptors;

+    pointer		options;

+} confScreenRec, *confScreenPtr;

+

+typedef enum {

+    PosObsolete = -1,

+    PosAbsolute = 0,

+    PosRightOf,

+    PosLeftOf,

+    PosAbove,

+    PosBelow,

+    PosRelative

+} PositionType;

+

+typedef struct _screenlayoutrec {

+    confScreenPtr	screen;

+    char *		topname;

+    confScreenPtr	top;

+    char *		bottomname;

+    confScreenPtr	bottom;

+    char *		leftname;

+    confScreenPtr	left;

+    char *		rightname;

+    confScreenPtr	right;

+    PositionType	where;

+    int			x;

+    int			y;

+    char *		refname;

+    confScreenPtr	refscreen;

+} screenLayoutRec, *screenLayoutPtr;

+

+typedef struct _serverlayoutrec {

+    char *		id;

+    screenLayoutPtr	screens;

+    GDevPtr		inactives;

+    IDevPtr*            inputs; /* NULL terminated */

+    pointer		options;

+} serverLayoutRec, *serverLayoutPtr;

+

+typedef struct _confdribufferrec {

+    int                 count;

+    int                 size;

+    enum {

+	XF86DRI_WC_HINT = 0x0001 /* Placeholder: not implemented */

+    }                   flags;

+} confDRIBufferRec, *confDRIBufferPtr;

+

+typedef struct _confdrirec {

+    int                 group;

+    int                 mode;

+    int                 bufs_count;

+    confDRIBufferRec    *bufs;

+} confDRIRec, *confDRIPtr;

+

+/* These values should be adjusted when new fields are added to ScrnInfoRec */

+#define NUM_RESERVED_INTS		16

+#define NUM_RESERVED_POINTERS		14

+#define NUM_RESERVED_FUNCS		11

+

+typedef pointer (*funcPointer)(void);

+

+/* flags for depth 24 pixmap options */

+typedef enum {

+    Pix24DontCare = 0,

+    Pix24Use24,

+    Pix24Use32

+} Pix24Flags;

+

+/* Power management events: so far we only support APM */

+

+typedef enum {

+    XF86_APM_UNKNOWN = -1,

+    XF86_APM_SYS_STANDBY,

+    XF86_APM_SYS_SUSPEND,

+    XF86_APM_CRITICAL_SUSPEND,

+    XF86_APM_USER_STANDBY,

+    XF86_APM_USER_SUSPEND,

+    XF86_APM_STANDBY_RESUME,

+    XF86_APM_NORMAL_RESUME,

+    XF86_APM_CRITICAL_RESUME,

+    XF86_APM_LOW_BATTERY,

+    XF86_APM_POWER_STATUS_CHANGE,

+    XF86_APM_UPDATE_TIME,

+    XF86_APM_CAPABILITY_CHANGED,

+    XF86_APM_STANDBY_FAILED,

+    XF86_APM_SUSPEND_FAILED

+} pmEvent;

+

+typedef enum {

+    PM_WAIT,

+    PM_CONTINUE,

+    PM_FAILED,

+    PM_NONE

+} pmWait;

+

+typedef struct _PciChipsets {

+    /**

+     * Key used to match this device with its name in an array of

+     * \c SymTabRec.

+     */

+    int numChipset;

+

+    /**

+     * This value is quirky.  Depending on the driver, it can take on one of

+     * three meanings.  In drivers that have exactly one vendor ID (e.g.,

+     * radeon, mga, i810) the low 16-bits are the device ID.

+     *

+     * In drivers that can have multiple vendor IDs (e.g., the glint driver

+     * can have either 3dlabs' ID or TI's ID, the i740 driver can have either

+     * Intel's ID or Real3D's ID, etc.) the low 16-bits are the device ID and

+     * the high 16-bits are the vendor ID.

+     *

+     * In drivers that don't have a specific vendor (e.g., vga) contains the

+     * device ID for either the generic VGA or generic 8514 devices.  This

+     * turns out to be the same as the subclass and programming interface

+     * value (e.g., the full 24-bit class for the VGA device is 0x030000 (or 

+     * 0x000101) and for 8514 is 0x030001).

+     */

+    int PCIid;

+

+/* dummy place holders for drivers to build against old/new servers */

+#define RES_UNDEFINED NULL

+#define RES_EXCLUSIVE_VGA NULL

+#define RES_SHARED_VGA NULL

+    void *dummy;

+} PciChipsets;

+

+

+/* Entity properties */

+typedef void (*EntityProc)(int entityIndex,pointer private);

+

+typedef struct _entityInfo {

+    int index;

+    BusRec location;

+    int chipset;

+    Bool active;

+    GDevPtr device;

+    DriverPtr driver;

+} EntityInfoRec, *EntityInfoPtr;

+

+/* server states */

+

+typedef enum {

+    SETUP,

+    OPERATING

+} xf86State;

+

+/* DGA */

+

+typedef struct {

+   int num;		/* A unique identifier for the mode (num > 0) */

+   DisplayModePtr mode;

+   int flags;		/* DGA_CONCURRENT_ACCESS, etc... */

+   int imageWidth;	/* linear accessible portion (pixels) */

+   int imageHeight;

+   int pixmapWidth;	/* Xlib accessible portion (pixels) */

+   int pixmapHeight;	/* both fields ignored if no concurrent access */

+   int bytesPerScanline;

+   int byteOrder;	/* MSBFirst, LSBFirst */

+   int depth;

+   int bitsPerPixel;

+   unsigned long red_mask;

+   unsigned long green_mask;

+   unsigned long blue_mask;

+   short visualClass;

+   int viewportWidth;

+   int viewportHeight;

+   int xViewportStep;	/* viewport position granularity */

+   int yViewportStep;

+   int maxViewportX;	/* max viewport origin */

+   int maxViewportY;

+   int viewportFlags;	/* types of page flipping possible */

+   int offset;		/* offset into physical memory */

+   unsigned char *address;	/* server's mapped framebuffer */

+   int reserved1;

+   int reserved2;

+} DGAModeRec, *DGAModePtr;

+

+typedef struct {

+   DGAModePtr mode;

+   PixmapPtr pPix;

+} DGADeviceRec, *DGADevicePtr;

+

+/*

+ * Flags for driver Probe() functions.

+ */

+#define PROBE_DEFAULT	  0x00

+#define PROBE_DETECT	  0x01

+#define PROBE_TRYHARD	  0x02

+

+/*

+ * Driver entry point types

+ */

+

+typedef Bool xf86ProbeProc                (DriverPtr, int);

+typedef Bool xf86PreInitProc              (ScrnInfoPtr, int);

+typedef Bool xf86ScreenInitProc           (int, ScreenPtr, int, char**);

+typedef Bool xf86SwitchModeProc           (int, DisplayModePtr, int);

+typedef void xf86AdjustFrameProc          (int, int, int, int);

+typedef Bool xf86EnterVTProc              (int, int);

+typedef void xf86LeaveVTProc              (int, int);

+typedef void xf86FreeScreenProc           (int, int);

+typedef ModeStatus xf86ValidModeProc      (int, DisplayModePtr, Bool, int);

+typedef void xf86EnableDisableFBAccessProc(int, Bool);

+typedef int  xf86SetDGAModeProc           (int, int, DGADevicePtr);

+typedef int  xf86ChangeGammaProc          (int, Gamma);

+typedef void xf86PointerMovedProc         (int, int, int);

+typedef Bool xf86PMEventProc              (int, pmEvent, Bool);

+typedef void xf86DPMSSetProc		  (ScrnInfoPtr, int, int);

+typedef void xf86LoadPaletteProc   (ScrnInfoPtr, int, int *, LOCO *, VisualPtr);

+typedef void xf86SetOverscanProc          (ScrnInfoPtr, int);

+

+

+/*

+ * ScrnInfoRec

+ *

+ * There is one of these for each screen, and it holds all the screen-specific

+ * information.

+ *

+ * Note: the size and layout must be kept the same across versions.  New

+ * fields are to be added in place of the "reserved*" fields.  No fields

+ * are to be dependent on compile-time defines.

+ */

+

+

+typedef struct _ScrnInfoRec {

+    int			driverVersion;

+    char *		driverName;		/* canonical name used in */

+						/* the config file */

+    ScreenPtr		pScreen;		/* Pointer to the ScreenRec */

+    int			scrnIndex;		/* Number of this screen */

+    Bool		configured;		/* Is this screen valid */

+    int			origIndex;		/* initial number assigned to

+						 * this screen before

+						 * finalising the number of

+						 * available screens */

+

+    /* Display-wide screenInfo values needed by this screen */

+    int			imageByteOrder;

+    int			bitmapScanlineUnit;

+    int			bitmapScanlinePad;

+    int			bitmapBitOrder;

+    int			numFormats;

+    PixmapFormatRec	formats[MAXFORMATS];

+    PixmapFormatRec	fbFormat;

+

+    int			bitsPerPixel;		/* fb bpp */

+    Pix24Flags		pixmap24;		/* pixmap pref for depth 24 */

+    int			depth;			/* depth of default visual */

+    MessageType		depthFrom;		/* set from config? */

+    MessageType		bitsPerPixelFrom;	/* set from config? */

+    rgb			weight;			/* r/g/b weights */

+    rgb			mask;			/* rgb masks */

+    rgb			offset;			/* rgb offsets */

+    int			rgbBits;		/* Number of bits in r/g/b */

+    Gamma		gamma;			/* Gamma of the monitor */

+    int			defaultVisual;		/* default visual class */

+    int			maxHValue;		/* max horizontal timing */

+    int			maxVValue;		/* max vertical timing value */

+    int			virtualX;		/* Virtual width */

+    int			virtualY; 		/* Virtual height */

+    int			xInc;			/* Horizontal timing increment */

+    MessageType		virtualFrom;		/* set from config? */

+    int			displayWidth;		/* memory pitch */

+    int			frameX0;		/* viewport position */

+    int			frameY0;

+    int			frameX1;

+    int			frameY1;

+    int			zoomLocked;		/* Disallow mode changes */

+    DisplayModePtr	modePool;		/* list of compatible modes */

+    DisplayModePtr	modes;			/* list of actual modes */

+    DisplayModePtr	currentMode;		/* current mode

+						 * This was previously

+						 * overloaded with the modes

+						 * field, which is a pointer

+						 * into a circular list */

+    confScreenPtr	confScreen;		/* Screen config info */

+    MonPtr		monitor;		/* Monitor information */

+    DispPtr		display;		/* Display information */

+    int *		entityList;		/* List of device entities */

+    int			numEntities;

+    int			widthmm;		/* physical display dimensions

+						 * in mm */

+    int			heightmm;

+    int			xDpi;			/* width DPI */

+    int			yDpi;			/* height DPI */

+    char *		name;			/* Name to prefix messages */

+    pointer		driverPrivate;		/* Driver private area */

+    DevUnion *		privates;		/* Other privates can hook in

+						 * here */

+    DriverPtr		drv;			/* xf86DriverList[] entry */

+    pointer		module;			/* Pointer to module head */

+    int			colorKey;

+    int			overlayFlags;

+

+    /* Some of these may be moved out of here into the driver private area */

+

+    char *		chipset;		/* chipset name */

+    char *		ramdac;			/* ramdac name */

+    char *		clockchip;		/* clock name */

+    Bool		progClock;		/* clock is programmable */

+    int			numClocks;		/* number of clocks */

+    int			clock[MAXCLOCKS];	/* list of clock frequencies */

+    int			videoRam;		/* amount of video ram (kb) */

+    unsigned long	biosBase;		/* Base address of video BIOS */

+    unsigned long	memPhysBase;		/* Physical address of FB */

+    unsigned long 	fbOffset;		/* Offset of FB in the above */

+    IOADDRESS    	domainIOBase;		/* Domain I/O base address */

+    int			memClk;			/* memory clock */

+    int			textClockFreq;		/* clock of text mode */

+    Bool		flipPixels;		/* swap default black/white */

+    pointer		options;

+

+    int			chipID;

+    int			chipRev;

+

+    /* Allow screens to be enabled/disabled individually */

+    Bool		vtSema;

+    DevUnion		pixmapPrivate;		/* saved devPrivate from pixmap */

+

+    /* hw cursor moves at SIGIO time */

+    Bool		silkenMouse;

+

+    /* Storage for clockRanges and adjustFlags for use with the VidMode ext */

+    ClockRangePtr	clockRanges;

+    int			adjustFlags;

+

+    /*

+     * These can be used when the minor ABI version is incremented.

+     * The NUM_* parameters must be reduced appropriately to keep the

+     * structure size and alignment unchanged.

+     */

+    int			reservedInt[NUM_RESERVED_INTS];

+

+    int *		entityInstanceList;

+    struct pci_device   *vgaDev;

+

+    pointer		reservedPtr[NUM_RESERVED_POINTERS];

+

+    /*

+     * Driver entry points.

+     *

+     */

+

+    xf86ProbeProc			*Probe;

+    xf86PreInitProc			*PreInit;

+    xf86ScreenInitProc			*ScreenInit;

+    xf86SwitchModeProc			*SwitchMode;

+    xf86AdjustFrameProc			*AdjustFrame;

+    xf86EnterVTProc			*EnterVT;

+    xf86LeaveVTProc			*LeaveVT;

+    xf86FreeScreenProc			*FreeScreen;

+    xf86ValidModeProc			*ValidMode;

+    xf86EnableDisableFBAccessProc	*EnableDisableFBAccess;

+    xf86SetDGAModeProc			*SetDGAMode;

+    xf86ChangeGammaProc			*ChangeGamma;

+    xf86PointerMovedProc		*PointerMoved;

+    xf86PMEventProc			*PMEvent;

+    xf86DPMSSetProc			*DPMSSet;

+    xf86LoadPaletteProc			*LoadPalette;

+    xf86SetOverscanProc			*SetOverscan;

+    xorgDriverFuncProc			*DriverFunc;

+

+    /*

+     * This can be used when the minor ABI version is incremented.

+     * The NUM_* parameter must be reduced appropriately to keep the

+     * structure size and alignment unchanged.

+     */

+    funcPointer		reservedFuncs[NUM_RESERVED_FUNCS];

+

+} ScrnInfoRec;

+

+

+typedef struct {

+   Bool (*OpenFramebuffer)(

+	ScrnInfoPtr pScrn,

+	char **name,

+	unsigned char **mem,

+	int *size,

+	int *offset,

+        int *extra

+   );

+   void	(*CloseFramebuffer)(ScrnInfoPtr pScrn);

+   Bool (*SetMode)(ScrnInfoPtr pScrn, DGAModePtr pMode);

+   void (*SetViewport)(ScrnInfoPtr pScrn, int x, int y, int flags);

+   int  (*GetViewport)(ScrnInfoPtr pScrn);

+   void (*Sync)(ScrnInfoPtr);

+   void (*FillRect)(

+	ScrnInfoPtr pScrn,

+	int x, int y, int w, int h,

+	unsigned long color

+   );

+   void (*BlitRect)(

+	ScrnInfoPtr pScrn,

+	int srcx, int srcy,

+	int w, int h,

+	int dstx, int dsty

+   );

+   void (*BlitTransRect)(

+	ScrnInfoPtr pScrn,

+	int srcx, int srcy,

+	int w, int h,

+	int dstx, int dsty,

+	unsigned long color

+   );

+} DGAFunctionRec, *DGAFunctionPtr;

+

+typedef struct _SymTabRec {

+    int			token;		/* id of the token */

+    const char *	name;		/* token name */

+} SymTabRec, *SymTabPtr;

+

+/* flags for xf86LookupMode */

+typedef enum {

+    LOOKUP_DEFAULT		= 0,	/* Use default mode lookup method */

+    LOOKUP_BEST_REFRESH,		/* Pick modes with best refresh */

+    LOOKUP_CLOSEST_CLOCK,		/* Pick modes with the closest clock */

+    LOOKUP_LIST_ORDER,			/* Pick first useful mode in list */

+    LOOKUP_CLKDIV2		= 0x0100, /* Allow half clocks */

+    LOOKUP_OPTIONAL_TOLERANCES	= 0x0200  /* Allow missing hsync/vrefresh */

+} LookupModeFlags;

+

+#define NoDepth24Support	0x00

+#define Support24bppFb		0x01	/* 24bpp framebuffer supported */

+#define Support32bppFb		0x02	/* 32bpp framebuffer supported */

+#define SupportConvert24to32	0x04	/* Can convert 24bpp pixmap to 32bpp */

+#define SupportConvert32to24	0x08	/* Can convert 32bpp pixmap to 24bpp */

+#define PreferConvert24to32	0x10	/* prefer 24bpp pixmap to 32bpp conv */

+#define PreferConvert32to24	0x20	/* prefer 32bpp pixmap to 24bpp conv */

+

+

+/* For DPMS */

+typedef void (*DPMSSetProcPtr)(ScrnInfoPtr, int, int);

+

+/* Input handler proc */

+typedef void (*InputHandlerProc)(int fd, pointer data);

+

+/* These are used by xf86GetClocks */

+#define CLK_REG_SAVE		-1

+#define CLK_REG_RESTORE		-2

+

+/*

+ * misc constants

+ */

+#define INTERLACE_REFRESH_WEIGHT	1.5

+#define SYNC_TOLERANCE		0.01	/* 1 percent */

+#define CLOCK_TOLERANCE		2000	/* Clock matching tolerance (2MHz) */

+

+

+#define OVERLAY_8_32_DUALFB	0x00000001

+#define OVERLAY_8_24_DUALFB	0x00000002

+#define OVERLAY_8_16_DUALFB	0x00000004

+#define OVERLAY_8_32_PLANAR	0x00000008

+

+/* Values of xf86Info.mouseFlags */

+#define MF_CLEAR_DTR       1

+#define MF_CLEAR_RTS       2

+

+/* Action Events */

+typedef enum {

+    ACTION_TERMINATE		= 0,	/* Terminate Server */

+    ACTION_NEXT_MODE		= 10,	/* Switch to next video mode */

+    ACTION_PREV_MODE,

+    ACTION_SWITCHSCREEN		= 100,	/* VT switch */

+    ACTION_SWITCHSCREEN_NEXT,

+    ACTION_SWITCHSCREEN_PREV,

+} ActionEvent;

+

+#endif /* _XF86STR_H */