svn merge ^/branches/released .

9 files changed, 616 insertions, 220 deletions

diff --git a/xorg-server/hw/xfree86/common/compiler.h b/xorg-server/hw/xfree86/common/compiler.h
index 6414dd4a9..617f6b788 100644
--- a/xorg-server/hw/xfree86/common/compiler.h
+++ b/xorg-server/hw/xfree86/common/compiler.h
@@ -103,7 +103,7 @@
 # if defined(NO_INLINE) || defined(DO_PROTOTYPES)

 

 #  if !defined(__arm__)

-#   if !defined(__sparc__) && !defined(__sparc) && !defined(__arm32__) \

+#   if !defined(__sparc__) && !defined(__sparc) && !defined(__arm32__) && !defined(__nds32__) \

       && !(defined(__alpha__) && defined(linux)) \

       && !(defined(__ia64__) && defined(linux)) \

 

@@ -114,7 +114,7 @@ extern _X_EXPORT unsigned int inb(unsigned short);
 extern _X_EXPORT unsigned int inw(unsigned short);

 extern _X_EXPORT unsigned int inl(unsigned short);

 

-#   else /* __sparc__,  __arm32__, __alpha__*/

+#   else /* __sparc__,  __arm32__, __alpha__, __nds32__ */

 

 extern _X_EXPORT void outb(unsigned long, unsigned char);

 extern _X_EXPORT void outw(unsigned long, unsigned short);

@@ -123,7 +123,7 @@ extern _X_EXPORT unsigned int inb(unsigned long);
 extern _X_EXPORT unsigned int inw(unsigned long);

 extern _X_EXPORT unsigned int inl(unsigned long);

 

-#   endif /* __sparc__,  __arm32__, __alpha__ */

+#   endif /* __sparc__,  __arm32__, __alpha__, __nds32__ */

 #  endif /* __arm__ */

 

 #  if defined(__powerpc__) && !defined(__OpenBSD__)

@@ -1018,6 +1018,355 @@ xf_outl(unsigned short port, unsigned int val)
 #define outw xf_outw

 #define outl xf_outl

 

+#   elif defined(__nds32__)

+

+/*

+ * Assume all port access are aligned.  We need to revise this implementation

+ * if there is unaligned port access.  For ldq_u, ldl_u, ldw_u, stq_u, stl_u and

+ * stw_u, they are assumed unaligned.

+ */

+

+#define barrier()		/* no barrier */

+

+#define PORT_SIZE long

+

+static __inline__ unsigned char

+xf86ReadMmio8(__volatile__ void *base, const unsigned long offset)

+{

+	return *(volatile unsigned char *)((unsigned char *)base + offset) ;

+}

+

+static __inline__ void

+xf86WriteMmio8(__volatile__ void *base, const unsigned long offset,

+	       const unsigned int val)

+{

+	*(volatile unsigned char *)((unsigned char *)base + offset) = val ;

+	barrier();

+}

+

+static __inline__ void

+xf86WriteMmio8NB(__volatile__ void *base, const unsigned long offset,

+		 const unsigned int val)

+{

+	*(volatile unsigned char *)((unsigned char *)base + offset) = val ;

+}

+

+static __inline__ unsigned short

+xf86ReadMmio16Swap(__volatile__ void *base, const unsigned long offset)

+{

+	unsigned long addr = ((unsigned long)base) + offset;

+	unsigned short ret;

+

+	__asm__ __volatile__(

+	           "lhi %0, [%1];\n\t"

+	           "wsbh %0, %0;\n\t"

+			     : "=r" (ret)

+			     : "r" (addr));

+	return ret;

+}

+

+static __inline__ unsigned short

+xf86ReadMmio16(__volatile__ void *base, const unsigned long offset)

+{

+	return *(volatile unsigned short *)((char *)base + offset) ;

+}

+

+static __inline__ void

+xf86WriteMmio16Swap(__volatile__ void *base, const unsigned long offset,

+		  const unsigned int val)

+{

+	unsigned long addr = ((unsigned long)base) + offset;

+

+	__asm__ __volatile__(

+	           "wsbh %0, %0;\n\t"

+	           "shi %0, [%1];\n\t"

+			     : /* No outputs */

+			     : "r" (val), "r" (addr));

+	barrier();

+}

+

+static __inline__ void

+xf86WriteMmio16(__volatile__ void *base, const unsigned long offset,

+		  const unsigned int val)

+{

+	*(volatile unsigned short *)((unsigned char *)base + offset) = val ;

+	barrier();

+}

+

+static __inline__ void

+xf86WriteMmio16SwapNB(__volatile__ void *base, const unsigned long offset,

+		    const unsigned int val)

+{

+	unsigned long addr = ((unsigned long)base) + offset;

+

+	__asm__ __volatile__(

+	           "wsbh %0, %0;\n\t"

+	           "shi %0, [%1];\n\t"

+			     : /* No outputs */

+			     : "r" (val), "r" (addr));

+}

+

+static __inline__ void

+xf86WriteMmio16NB(__volatile__ void *base, const unsigned long offset,

+		    const unsigned int val)

+{

+	*(volatile unsigned short *)((unsigned char *)base + offset) = val ;

+}

+

+static __inline__ unsigned int

+xf86ReadMmio32Swap(__volatile__ void *base, const unsigned long offset)

+{

+	unsigned long addr = ((unsigned long)base) + offset;

+	unsigned int ret;

+

+	__asm__ __volatile__(

+	           "lwi %0, [%1];\n\t"

+	           "wsbh %0, %0;\n\t"

+				  "rotri %0, %0, 16;\n\t"

+			     : "=r" (ret)

+			     : "r" (addr));

+	return ret;

+}

+

+static __inline__ unsigned int

+xf86ReadMmio32(__volatile__ void *base, const unsigned long offset)

+{

+	return *(volatile unsigned int *)((unsigned char *)base + offset) ;

+}

+

+static __inline__ void

+xf86WriteMmio32Swap(__volatile__ void *base, const unsigned long offset,

+		  const unsigned int val)

+{

+	unsigned long addr = ((unsigned long)base) + offset;

+

+	__asm__ __volatile__(

+	           "wsbh %0, %0;\n\t"

+	           "rotri %0, %0, 16;\n\t"

+				  "swi %0, [%1];\n\t"

+			     : /* No outputs */

+			     : "r" (val), "r" (addr));

+	barrier();

+}

+

+static __inline__ void

+xf86WriteMmio32(__volatile__ void *base, const unsigned long offset,

+		  const unsigned int val)

+{

+	*(volatile unsigned int *)((unsigned char *)base + offset) = val ;

+	barrier();

+}

+

+static __inline__ void

+xf86WriteMmio32SwapNB(__volatile__ void *base, const unsigned long offset,

+		    const unsigned int val)

+{

+	unsigned long addr = ((unsigned long)base) + offset;

+

+	__asm__ __volatile__(

+	           "wsbh %0, %0;\n\t"

+				  "rotri %0, %0, 16;\n\t"

+				  "swi %0, [%1];\n\t"

+			     : /* No outputs */

+			     : "r" (val), "r" (addr));

+}

+

+static __inline__ void

+xf86WriteMmio32NB(__volatile__ void *base, const unsigned long offset,

+		    const unsigned int val)

+{

+	*(volatile unsigned int *)((unsigned char *)base + offset) = val ;

+}

+

+#    if defined(NDS32_MMIO_SWAP)

+static __inline__ void

+outb(unsigned PORT_SIZE port, unsigned char val)

+{

+   xf86WriteMmio8(IOPortBase, port, val);

+}

+

+static __inline__ void

+outw(unsigned PORT_SIZE port, unsigned short val)

+{

+   xf86WriteMmio16Swap(IOPortBase, port, val);

+}

+

+static __inline__ void

+outl(unsigned PORT_SIZE port, unsigned int val)

+{

+   xf86WriteMmio32Swap(IOPortBase, port, val);

+}

+

+static __inline__ unsigned int

+inb(unsigned PORT_SIZE port)

+{

+   return xf86ReadMmio8(IOPortBase, port);

+}

+

+static __inline__ unsigned int

+inw(unsigned PORT_SIZE port)

+{

+   return xf86ReadMmio16Swap(IOPortBase, port);

+}

+

+static __inline__ unsigned int

+inl(unsigned PORT_SIZE port)

+{

+   return xf86ReadMmio32Swap(IOPortBase, port);

+}

+

+static __inline__ unsigned long ldq_u(unsigned long *p)

+{

+	unsigned long addr = (unsigned long)p;

+	unsigned int ret;

+

+	__asm__ __volatile__(

+				  "lmw.bi %0, [%1], %0, 0;\n\t"

+	           "wsbh %0, %0;\n\t"

+				  "rotri %0, %0, 16;\n\t"

+			     : "=r" (ret)

+			     : "r" (addr));

+	return ret;

+}

+

+static __inline__ unsigned long ldl_u(unsigned int *p)

+{

+	unsigned long addr = (unsigned long)p;

+	unsigned int ret;

+

+	__asm__ __volatile__(

+				  "lmw.bi %0, [%1], %0, 0;\n\t"

+	           "wsbh %0, %0;\n\t"

+				  "rotri %0, %0, 16;\n\t"

+			     : "=r" (ret)

+			     : "r" (addr));

+	return ret;

+}

+

+static __inline__ void stq_u(unsigned long val, unsigned long *p)

+{

+	unsigned long addr = (unsigned long)p;

+

+	__asm__ __volatile__(

+	           "wsbh %0, %0;\n\t"

+				  "rotri %0, %0, 16;\n\t"

+				  "smw.bi %0, [%1], %0, 0;\n\t"

+			     : /* No outputs */

+			     : "r" (val), "r" (addr));

+}

+

+static __inline__ void stl_u(unsigned long val, unsigned int *p)

+{

+	unsigned long addr = (unsigned long)p;

+

+	__asm__ __volatile__(

+	           "wsbh %0, %0;\n\t"

+				  "rotri %0, %0, 16;\n\t"

+				  "smw.bi %0, [%1], %0, 0;\n\t"

+			     : /* No outputs */

+			     : "r" (val), "r" (addr));

+}

+

+#    else /* !NDS32_MMIO_SWAP */

+static __inline__ void

+outb(unsigned PORT_SIZE port, unsigned char val)

+{

+	*(volatile unsigned char*)(((unsigned PORT_SIZE)(port))) = val;

+	barrier();

+}

+

+static __inline__ void

+outw(unsigned PORT_SIZE port, unsigned short val)

+{

+	*(volatile unsigned short*)(((unsigned PORT_SIZE)(port))) = val;

+	barrier();

+}

+

+static __inline__ void

+outl(unsigned PORT_SIZE port, unsigned int val)

+{

+	*(volatile unsigned int*)(((unsigned PORT_SIZE)(port))) = val;

+	barrier();

+}

+static __inline__ unsigned int

+inb(unsigned PORT_SIZE port)

+{

+	return *(volatile unsigned char*)(((unsigned PORT_SIZE)(port)));

+}

+

+static __inline__ unsigned int

+inw(unsigned PORT_SIZE port)

+{

+	return *(volatile unsigned short*)(((unsigned PORT_SIZE)(port)));

+}

+

+static __inline__ unsigned int

+inl(unsigned PORT_SIZE port)

+{

+	return *(volatile unsigned int*)(((unsigned PORT_SIZE)(port)));

+}

+

+static __inline__ unsigned long ldq_u(unsigned long *p)

+{

+	unsigned long addr = (unsigned long)p;

+	unsigned int ret;

+

+	__asm__ __volatile__(

+				  "lmw.bi %0, [%1], %0, 0;\n\t"

+			     : "=r" (ret)

+			     : "r" (addr));

+	return ret;

+}

+

+static __inline__ unsigned long ldl_u(unsigned int *p)

+{

+	unsigned long addr = (unsigned long)p;

+	unsigned int ret;

+

+	__asm__ __volatile__(

+				  "lmw.bi %0, [%1], %0, 0;\n\t"

+			     : "=r" (ret)

+			     : "r" (addr));

+	return ret;

+}

+

+

+static __inline__ void stq_u(unsigned long val, unsigned long *p)

+{

+	unsigned long addr = (unsigned long)p;

+

+	__asm__ __volatile__(

+				  "smw.bi %0, [%1], %0, 0;\n\t"

+			     : /* No outputs */

+			     : "r" (val), "r" (addr));

+}

+

+static __inline__ void stl_u(unsigned long val, unsigned int *p)

+{

+	unsigned long addr = (unsigned long)p;

+

+	__asm__ __volatile__(

+				  "smw.bi %0, [%1], %0, 0;\n\t"

+			     : /* No outputs */

+			     : "r" (val), "r" (addr));

+}

+#    endif /* NDS32_MMIO_SWAP */

+

+#    if (((X_BYTE_ORDER == X_BIG_ENDIAN) && !defined(NDS32_MMIO_SWAP)) || ((X_BYTE_ORDER != X_BIG_ENDIAN) && defined(NDS32_MMIO_SWAP)))

+#    define ldw_u(p)	((*(unsigned char *)(p)) << 8 | \

+			(*((unsigned char *)(p)+1)))

+#    define stw_u(v,p)	(*(unsigned char *)(p)) = ((v) >> 8); \

+				(*((unsigned char *)(p)+1)) = (v)

+#    else

+#    define ldw_u(p)	((*(unsigned char *)(p)) | \

+			(*((unsigned char *)(p)+1)<<8))

+#    define stw_u(v,p)	(*(unsigned char *)(p)) = (v); \

+				(*((unsigned char *)(p)+1)) = ((v) >> 8)

+#    endif

+

+#    define mem_barrier()         /* XXX: nop for now */

+#    define write_mem_barrier()   /* XXX: nop for now */

+

 #   else /* ix86 */

 

 #    if !defined(__SUNPRO_C)

@@ -1338,6 +1687,67 @@ extern _X_EXPORT void xf86SlowBCopyToBus(unsigned char *, unsigned char *, int);
 #  define MMIO_MOVE32(base, offset, val) \

        xf86WriteMmio32Be(base, offset, (CARD32)(val))

 

+# elif defined(__nds32__)

+ /*

+  * we provide byteswapping and no byteswapping functions here

+  * with no byteswapping as default; when endianness of CPU core

+  * and I/O devices don't match, byte swapping is necessary

+  * drivers that need byteswapping should define NDS32_MMIO_SWAP

+  */

+#  define MMIO_IN8(base, offset) xf86ReadMmio8(base, offset)

+#  define MMIO_OUT8(base, offset, val) \

+    xf86WriteMmio8(base, offset, (CARD8)(val))

+#  define MMIO_ONB8(base, offset, val) \

+    xf86WriteMmioNB8(base, offset, (CARD8)(val))

+

+#  if defined(NDS32_MMIO_SWAP) /* byteswapping */

+#   define MMIO_IN16(base, offset) xf86ReadMmio16Swap(base, offset)

+#   define MMIO_IN32(base, offset) xf86ReadMmio32Swap(base, offset)

+#   define MMIO_OUT16(base, offset, val) \

+    xf86WriteMmio16Swap(base, offset, (CARD16)(val))

+#   define MMIO_OUT32(base, offset, val) \

+    xf86WriteMmio32Swap(base, offset, (CARD32)(val))

+#   define MMIO_ONB16(base, offset, val) \

+    xf86WriteMmioNB16Swap(base, offset, (CARD16)(val))

+#   define MMIO_ONB32(base, offset, val) \

+    xf86WriteMmioNB32Swap(base, offset, (CARD32)(val))

+#  else /* no byteswapping is the default */

+#   define MMIO_IN16(base, offset) xf86ReadMmio16(base, offset)

+#   define MMIO_IN32(base, offset) xf86ReadMmio32(base, offset)

+#   define MMIO_OUT16(base, offset, val) \

+     xf86WriteMmio16(base, offset, (CARD16)(val))

+#   define MMIO_OUT32(base, offset, val) \

+     xf86WriteMmio32(base, offset, (CARD32)(val))

+#   define MMIO_ONB16(base, offset, val) \

+     xf86WriteMmioNB16(base, offset, (CARD16)(val))

+#   define MMIO_ONB32(base, offset, val) \

+     xf86WriteMmioNB32(base, offset, (CARD32)(val))

+#  endif

+

+#  define MMIO_MOVE32(base, offset, val) \

+       xf86WriteMmio32(base, offset, (CARD32)(val))

+

+#ifdef N1213_HC /* for NDS32 N1213 hardcore */

+static __inline__ void nds32_flush_icache(char *addr)

+{

+	__asm__ volatile (

+		"isync %0;"

+		"msync;"

+		"isb;"

+		"cctl %0,L1I_VA_INVAL;"

+		"isb;"

+		: : "r"(addr) : "memory");

+}

+#else

+static __inline__ void nds32_flush_icache(char *addr)

+{

+	__asm__ volatile (

+		"isync %0;"

+		"isb;"

+		: : "r"(addr) : "memory");

+}

+#endif

+

 # else /* !__alpha__ && !__powerpc__ && !__sparc__ */

 

 #  define MMIO_IN8(base, offset) \

diff --git a/xorg-server/hw/xfree86/common/xf86Config.c b/xorg-server/hw/xfree86/common/xf86Config.c
index 0b1c767fb..3a8380121 100644
--- a/xorg-server/hw/xfree86/common/xf86Config.c
+++ b/xorg-server/hw/xfree86/common/xf86Config.c
@@ -60,7 +60,7 @@
 #include "configProcs.h"

 #include "globals.h"

 #include "extension.h"

-#include "Pci.h"

+#include "xf86pciBus.h"

 

 #include "xf86Xinput.h"

 extern DeviceAssocRec mouse_assoc;

@@ -2535,18 +2535,11 @@ xf86HandleConfigFile(Bool autoconfig)
            scanptr = xf86ConfigLayout.screens->screen->device->busID;

     }

     if (scanptr) {

-       int bus, device, func;

        if (strncmp(scanptr, "PCI:", 4) != 0) {

            xf86Msg(X_WARNING, "Bus types other than PCI not yet isolable.\n"

                               "\tIgnoring IsolateDevice option.\n");

-       } else if (sscanf(scanptr, "PCI:%d:%d:%d", &bus, &device, &func) == 3) {

-           xf86IsolateDevice.domain = PCI_DOM_FROM_BUS(bus);

-           xf86IsolateDevice.bus = PCI_BUS_NO_DOMAIN(bus);

-           xf86IsolateDevice.dev = device;

-           xf86IsolateDevice.func = func;

-           xf86Msg(X_INFO,

-                   "Isolating PCI bus \"%d:%d:%d\"\n", bus, device, func);

-       }

+       } else

+           xf86PciIsolateDevice(scanptr);

     }

 

     /* Now process everything else */

diff --git a/xorg-server/hw/xfree86/common/xf86Configure.c b/xorg-server/hw/xfree86/common/xf86Configure.c
index 25d884934..6cce1cdd5 100644
--- a/xorg-server/hw/xfree86/common/xf86Configure.c
+++ b/xorg-server/hw/xfree86/common/xf86Configure.c
@@ -34,6 +34,7 @@
 #define IN_XSERVER

 #include "Configint.h"

 #include "xf86DDC.h"

+#include "xf86pciBus.h"

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

 #include "xf86Bus.h"

 #include "xf86Sbus.h"

@@ -71,85 +72,6 @@ static char *DFLT_MOUSE_DEV = "/dev/mouse";
 static char *DFLT_MOUSE_PROTO = "auto";

 #endif

 

-static Bool

-bus_pci_configure(void *busData)

-{

-    int i;

-    struct pci_device * pVideo = NULL;

-

-	pVideo = (struct pci_device *) busData;

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

-	    if (DevToConfig[i].pVideo &&

-		(DevToConfig[i].pVideo->domain == pVideo->domain) &&

-		(DevToConfig[i].pVideo->bus == pVideo->bus) &&

-		(DevToConfig[i].pVideo->dev == pVideo->dev) &&

-		(DevToConfig[i].pVideo->func == pVideo->func))

-		return 0;

-

-	return 1;

-}

-

-static Bool

-bus_sbus_configure(void *busData)

-{

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

-    int i;

-

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

-        if (DevToConfig[i].sVideo &&

-        DevToConfig[i].sVideo->fbNum == ((sbusDevicePtr) busData)->fbNum)

-            return 0;

-

-#endif

-    return 1;

-}

-

-static void

-bus_pci_newdev_configure(void *busData, int i, int *chipset)

-{

-	char busnum[8];

-    struct pci_device * pVideo = NULL;

-

-    pVideo = (struct pci_device *) busData;

-

-	DevToConfig[i].pVideo = pVideo;

-

-	DevToConfig[i].GDev.busID = xnfalloc(16);

-	xf86FormatPciBusNumber(pVideo->bus, busnum);

-	sprintf(DevToConfig[i].GDev.busID, "PCI:%s:%d:%d",

-	    busnum, pVideo->dev, pVideo->func);

-

-	DevToConfig[i].GDev.chipID = pVideo->device_id;

-	DevToConfig[i].GDev.chipRev = pVideo->revision;

-

-	if (*chipset < 0) {

-	    *chipset = (pVideo->vendor_id << 16) | pVideo->device_id;

-	}

-}

-

-static void

-bus_sbus_newdev_configure(void *busData, int i)

-{

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

-	char *promPath = NULL;

-	DevToConfig[i].sVideo = (sbusDevicePtr) busData;

-	DevToConfig[i].GDev.identifier = DevToConfig[i].sVideo->descr;

-	if (sparcPromInit() >= 0) {

-	    promPath = sparcPromNode2Pathname(&DevToConfig[i].sVideo->node);

-	    sparcPromClose();

-	}

-	if (promPath) {

-	    DevToConfig[i].GDev.busID = xnfalloc(strlen(promPath) + 6);

-	    sprintf(DevToConfig[i].GDev.busID, "SBUS:%s", promPath);

-	    free(promPath);

-	} else {

-	    DevToConfig[i].GDev.busID = xnfalloc(12);

-	    sprintf(DevToConfig[i].GDev.busID, "SBUS:fb%d",

-                                DevToConfig[i].sVideo->fbNum);

-	}

-#endif

-}

-

 /*

  * This is called by the driver, either through xf86Match???Instances() or

  * directly.  We allocate a GDevRec and fill it in as much as we can, letting

@@ -164,20 +86,23 @@ xf86AddBusDeviceToConfigure(const char *driver, BusType bus, void *busData, int
 	return NULL;

 

     /* Check for duplicates */

-    switch (bus) {

-        case BUS_PCI:

-            ret = bus_pci_configure(busData);

-	        break;

-        case BUS_SBUS:

-            ret = bus_sbus_configure(busData);

-	        break;

-        default:

-	        return NULL;

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

+        switch (bus) {

+            case BUS_PCI:

+                ret = xf86PciConfigure(busData, DevToConfig[i].pVideo);

+                break;

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

+            case BUS_SBUS:

+                ret = xf86SbusConfigure(busData, DevToConfig[i].sVideo);

+                break;

+#endif

+            default:

+                return NULL;

+        }

+        if (ret == 0)

+            goto out;

     }

 

-    if (ret == 0)

-        goto out;

-

     /* Allocate new structure occurrence */

     i = nDevToConfig++;

     DevToConfig =

@@ -195,11 +120,15 @@ xf86AddBusDeviceToConfigure(const char *driver, BusType bus, void *busData, int
 

     switch (bus) {

         case BUS_PCI:

-            bus_pci_newdev_configure(busData, i, &chipset);

+            xf86PciConfigureNewDev(busData, DevToConfig[i].pVideo,

+                                   &DevToConfig[i].GDev, &chipset);

 	        break;

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

         case BUS_SBUS:

-            bus_sbus_newdev_configure(busData, i);

+            xf86SbusConfigureNewDev(busData, DevToConfig[i].sVideo,

+                                    &DevToConfig[i].GDev);

 	        break;

+#endif

         default:

 	        break;

     }

diff --git a/xorg-server/hw/xfree86/common/xf86Globals.c b/xorg-server/hw/xfree86/common/xf86Globals.c
index 44252c75f..c8534132a 100644
--- a/xorg-server/hw/xfree86/common/xf86Globals.c
+++ b/xorg-server/hw/xfree86/common/xf86Globals.c
@@ -198,7 +198,3 @@ Bool xf86VidModeAllowNonLocal = FALSE;
 RootWinPropPtr *xf86RegisteredPropertiesTable = NULL;

 Bool xf86inSuspend = FALSE;

 Bool xorgHWAccess = FALSE;

-

-struct pci_slot_match xf86IsolateDevice = {

-    PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, 0

-};

diff --git a/xorg-server/hw/xfree86/common/xf86Priv.h b/xorg-server/hw/xfree86/common/xf86Priv.h
index 17fd5aaa9..01e178372 100644
--- a/xorg-server/hw/xfree86/common/xf86Priv.h
+++ b/xorg-server/hw/xfree86/common/xf86Priv.h
@@ -35,8 +35,6 @@
 #ifndef _XF86PRIV_H

 #define _XF86PRIV_H

 

-#include <pciaccess.h>

-

 #include "xf86Privstr.h"

 #include "propertyst.h"

 #include "input.h"

@@ -72,7 +70,6 @@ extern _X_EXPORT  rgb xf86Weight;
 extern _X_EXPORT  Bool xf86FlipPixels;

 extern _X_EXPORT  Gamma xf86Gamma;

 extern _X_EXPORT  char *xf86ServerName;

-extern _X_EXPORT  struct pci_slot_match xf86IsolateDevice;

 

 /* Other parameters */

 

diff --git a/xorg-server/hw/xfree86/common/xf86pciBus.c b/xorg-server/hw/xfree86/common/xf86pciBus.c
index 8729089cf..b5e8790b6 100644
--- a/xorg-server/hw/xfree86/common/xf86pciBus.c
+++ b/xorg-server/hw/xfree86/common/xf86pciBus.c
@@ -76,6 +76,11 @@ Bool pciSlotClaimed = FALSE;
     (((c) & 0x00ffff00) \

 	 == ((PCI_CLASS_DISPLAY << 16) | (PCI_SUBCLASS_DISPLAY_VGA << 8)))

 

+

+static struct pci_slot_match xf86IsolateDevice = {

+    PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, 0

+};

+

 void

 xf86FormatPciBusNumber(int busnum, char *buffer)

 {

@@ -1302,15 +1307,10 @@ xf86PciMatchDriver(char* matches[], int nmatches) {
     }

 

     pci_iterator_destroy(iter);

-

-    if (!info) {

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

-    }

 #ifdef __linux__

-    else {

+    if (info)

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

-    }

-#endif /* __linux__ */

+#endif

 

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

 	/* find end of matches list */

@@ -1322,3 +1322,38 @@ xf86PciMatchDriver(char* matches[], int nmatches) {
 

     return i;

 }

+

+Bool

+xf86PciConfigure(void *busData, struct pci_device *pDev)

+{

+    struct pci_device * pVideo = NULL;

+

+    pVideo = (struct pci_device *) busData;

+    if (pDev &&

+        (pDev->domain == pVideo->domain) &&

+        (pDev->bus == pVideo->bus) &&

+        (pDev->dev == pVideo->dev) &&

+        (pDev->func == pVideo->func))

+        return 0;

+

+    return 1;

+}

+

+void

+xf86PciConfigureNewDev(void *busData, struct pci_device *pVideo,

+                         GDevRec *GDev, int *chipset)

+{

+    char busnum[8];

+

+    pVideo = (struct pci_device *) busData;

+

+    GDev->busID = xnfalloc(16);

+    xf86FormatPciBusNumber(pVideo->bus, busnum);

+    sprintf(GDev->busID, "PCI:%s:%d:%d", busnum, pVideo->dev, pVideo->func);

+

+    GDev->chipID = pVideo->device_id;

+    GDev->chipRev = pVideo->revision;

+

+    if (*chipset < 0)

+        *chipset = (pVideo->vendor_id << 16) | pVideo->device_id;

+}

diff --git a/xorg-server/hw/xfree86/common/xf86pciBus.h b/xorg-server/hw/xfree86/common/xf86pciBus.h
index bcbb8b822..a631fbffb 100644
--- a/xorg-server/hw/xfree86/common/xf86pciBus.h
+++ b/xorg-server/hw/xfree86/common/xf86pciBus.h
@@ -38,5 +38,8 @@ Bool xf86PciAddMatchingDev(DriverPtr drvp);
 Bool xf86PciProbeDev(DriverPtr drvp);

 void xf86PciIsolateDevice(char *argument);

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

+Bool xf86PciConfigure(void *busData, struct pci_device *pDev);

+void xf86PciConfigureNewDev(void *busData, struct pci_device *pVideo,

+                            GDevRec *GDev, int *chipset);

 

 #endif /* _XF86_PCI_BUS_H */

diff --git a/xorg-server/hw/xfree86/common/xf86sbusBus.c b/xorg-server/hw/xfree86/common/xf86sbusBus.c
index 51e7894db..f9244bca7 100644
--- a/xorg-server/hw/xfree86/common/xf86sbusBus.c
+++ b/xorg-server/hw/xfree86/common/xf86sbusBus.c
@@ -685,3 +685,32 @@ xf86SbusHandleColormaps(ScreenPtr pScreen, sbusDevicePtr psdp)
     return xf86HandleColormaps(pScreen, 256, 8,

 			       xf86SbusCmapLoadPalette, NULL, 0);

 }

+

+Bool

+xf86SbusConfigure(void *busData, sbusDevicePtr sBus)

+{

+    if (sBus && sBus->fbNum == ((sbusDevicePtr) busData)->fbNum)

+        return 0;

+    return 1;

+}

+

+void

+xf86SbusConfigureNewDev(void *busData, sbusDevicePtr sBus, GDevRec *GDev)

+{

+    char *promPath = NULL;

+

+    sBus = (sbusDevicePtr) busData;

+    GDev->identifier = sBus->descr;

+    if (sparcPromInit() >= 0) {

+        promPath = sparcPromNode2Pathname(&sBus->node);

+        sparcPromClose();

+    }

+    if (promPath) {

+        GDev->busID = xnfalloc(strlen(promPath) + 6);

+        sprintf(GDev->busID, "SBUS:%s", promPath);

+        free(promPath);

+    } else {

+        GDev->busID = xnfalloc(12);

+        sprintf(GDev->busID, "SBUS:fb%d", sBus->fbNum);

+    }

+}

diff --git a/xorg-server/hw/xfree86/common/xf86sbusBus.h b/xorg-server/hw/xfree86/common/xf86sbusBus.h
index 5cdb0951a..e210770db 100644
--- a/xorg-server/hw/xfree86/common/xf86sbusBus.h
+++ b/xorg-server/hw/xfree86/common/xf86sbusBus.h
@@ -1,100 +1,104 @@
-/*
- * SBUS bus-specific declarations
- *
- * Copyright (C) 2000 Jakub Jelinek (jakub@redhat.com)
- *
- * 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
- * JAKUB JELINEK 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.
- */
-
-#ifndef _XF86_SBUSBUS_H
-#define _XF86_SBUSBUS_H
-
-#include "xf86str.h"
-
-#define SBUS_DEVICE_BW2		0x0001
-#define SBUS_DEVICE_CG2		0x0002
-#define SBUS_DEVICE_CG3		0x0003
-#define SBUS_DEVICE_CG4		0x0004
-#define SBUS_DEVICE_CG6		0x0005
-#define SBUS_DEVICE_CG8		0x0006
-#define SBUS_DEVICE_CG12	0x0007
-#define SBUS_DEVICE_CG14	0x0008
-#define SBUS_DEVICE_LEO		0x0009
-#define SBUS_DEVICE_TCX		0x000a
-#define SBUS_DEVICE_FFB		0x000b
-#define SBUS_DEVICE_GT		0x000c
-#define SBUS_DEVICE_MGX		0x000d
-
-typedef struct sbus_prom_node {
-    int			node;
-    /* Because of misdesigned openpromio */
-    int			cookie[2];
-} sbusPromNode, *sbusPromNodePtr;
-
-typedef struct sbus_device {
-    int			devId;
-    int			fbNum;
-    int			fd;
-    int			width, height;
-    sbusPromNode	node;
-    char		*descr;
-    char		*device;
-} sbusDevice, *sbusDevicePtr;
-
-struct sbus_devtable {
-    int devId;
-    int fbType;
-    char *promName;
-    char *driverName;
-    char *descr;
-};
-
-extern _X_EXPORT void xf86SbusProbe(void);
-extern _X_EXPORT sbusDevicePtr *xf86SbusInfo;
-extern _X_EXPORT struct sbus_devtable sbusDeviceTable[];
-
-extern _X_EXPORT int xf86MatchSbusInstances(const char *driverName, int sbusDevId,
-			   GDevPtr *devList, int numDevs, DriverPtr drvp,
-			   int **foundEntities);
-extern _X_EXPORT sbusDevicePtr xf86GetSbusInfoForEntity(int entityIndex);
-extern _X_EXPORT int xf86GetEntityForSbusInfo(sbusDevicePtr psdp);
-extern _X_EXPORT void xf86SbusUseBuiltinMode(ScrnInfoPtr pScrn, sbusDevicePtr psdp);
-extern _X_EXPORT pointer xf86MapSbusMem(sbusDevicePtr psdp, unsigned long offset,
-		       unsigned long size);
-extern _X_EXPORT void xf86UnmapSbusMem(sbusDevicePtr psdp, pointer addr, unsigned long size);
-extern _X_EXPORT void xf86SbusHideOsHwCursor(sbusDevicePtr psdp);
-extern _X_EXPORT void xf86SbusSetOsHwCursorCmap(sbusDevicePtr psdp, int bg, int fg);
-extern _X_EXPORT Bool xf86SbusHandleColormaps(ScreenPtr pScreen, sbusDevicePtr psdp);
-
-extern _X_EXPORT int promRootNode;
-
-extern _X_EXPORT int promGetSibling(int node);
-extern _X_EXPORT int promGetChild(int node);
-extern _X_EXPORT char * promGetProperty(const char *prop, int *lenp);
-extern _X_EXPORT int promGetBool(const char *prop);
-
-extern _X_EXPORT int sparcPromInit(void);
-extern _X_EXPORT void sparcPromClose(void);
-extern _X_EXPORT char * sparcPromGetProperty(sbusPromNodePtr pnode, const char *prop, int *lenp);
-extern _X_EXPORT int sparcPromGetBool(sbusPromNodePtr pnode, const char *prop);
-extern _X_EXPORT void sparcPromAssignNodes(void);
-extern _X_EXPORT char * sparcPromNode2Pathname(sbusPromNodePtr pnode);
-extern _X_EXPORT int sparcPromPathname2Node(const char *pathName);
-extern _X_EXPORT char *sparcDriverName(void);
-
-#endif /* _XF86_SBUSBUS_H */
+/*

+ * SBUS bus-specific declarations

+ *

+ * Copyright (C) 2000 Jakub Jelinek (jakub@redhat.com)

+ *

+ * 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

+ * JAKUB JELINEK 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.

+ */

+

+#ifndef _XF86_SBUSBUS_H

+#define _XF86_SBUSBUS_H

+

+#include "xf86str.h"

+

+#define SBUS_DEVICE_BW2		0x0001

+#define SBUS_DEVICE_CG2		0x0002

+#define SBUS_DEVICE_CG3		0x0003

+#define SBUS_DEVICE_CG4		0x0004

+#define SBUS_DEVICE_CG6		0x0005

+#define SBUS_DEVICE_CG8		0x0006

+#define SBUS_DEVICE_CG12	0x0007

+#define SBUS_DEVICE_CG14	0x0008

+#define SBUS_DEVICE_LEO		0x0009

+#define SBUS_DEVICE_TCX		0x000a

+#define SBUS_DEVICE_FFB		0x000b

+#define SBUS_DEVICE_GT		0x000c

+#define SBUS_DEVICE_MGX		0x000d

+

+typedef struct sbus_prom_node {

+    int			node;

+    /* Because of misdesigned openpromio */

+    int			cookie[2];

+} sbusPromNode, *sbusPromNodePtr;

+

+typedef struct sbus_device {

+    int			devId;

+    int			fbNum;

+    int			fd;

+    int			width, height;

+    sbusPromNode	node;

+    char		*descr;

+    char		*device;

+} sbusDevice, *sbusDevicePtr;

+

+struct sbus_devtable {

+    int devId;

+    int fbType;

+    char *promName;

+    char *driverName;

+    char *descr;

+};

+

+extern _X_EXPORT void xf86SbusProbe(void);

+extern _X_EXPORT sbusDevicePtr *xf86SbusInfo;

+extern _X_EXPORT struct sbus_devtable sbusDeviceTable[];

+

+extern _X_EXPORT int xf86MatchSbusInstances(const char *driverName, int sbusDevId,

+			   GDevPtr *devList, int numDevs, DriverPtr drvp,

+			   int **foundEntities);

+extern _X_EXPORT sbusDevicePtr xf86GetSbusInfoForEntity(int entityIndex);

+extern _X_EXPORT int xf86GetEntityForSbusInfo(sbusDevicePtr psdp);

+extern _X_EXPORT void xf86SbusUseBuiltinMode(ScrnInfoPtr pScrn, sbusDevicePtr psdp);

+extern _X_EXPORT pointer xf86MapSbusMem(sbusDevicePtr psdp, unsigned long offset,

+		       unsigned long size);

+extern _X_EXPORT void xf86UnmapSbusMem(sbusDevicePtr psdp, pointer addr, unsigned long size);

+extern _X_EXPORT void xf86SbusHideOsHwCursor(sbusDevicePtr psdp);

+extern _X_EXPORT void xf86SbusSetOsHwCursorCmap(sbusDevicePtr psdp, int bg, int fg);

+extern _X_EXPORT Bool xf86SbusHandleColormaps(ScreenPtr pScreen, sbusDevicePtr psdp);

+

+extern _X_EXPORT int promRootNode;

+

+extern _X_EXPORT int promGetSibling(int node);

+extern _X_EXPORT int promGetChild(int node);

+extern _X_EXPORT char * promGetProperty(const char *prop, int *lenp);

+extern _X_EXPORT int promGetBool(const char *prop);

+

+extern _X_EXPORT int sparcPromInit(void);

+extern _X_EXPORT void sparcPromClose(void);

+extern _X_EXPORT char * sparcPromGetProperty(sbusPromNodePtr pnode, const char *prop, int *lenp);

+extern _X_EXPORT int sparcPromGetBool(sbusPromNodePtr pnode, const char *prop);

+extern _X_EXPORT void sparcPromAssignNodes(void);

+extern _X_EXPORT char * sparcPromNode2Pathname(sbusPromNodePtr pnode);

+extern _X_EXPORT int sparcPromPathname2Node(const char *pathName);

+extern _X_EXPORT char *sparcDriverName(void);

+

+extern Bool xf86SbusConfigure(void *busData, sbusDevicePtr sBus);

+extern void xf86SbusConfigureNewDev(void *busData, sbusDevicePtr sBus,

+                                    GDevRec *GDev);

+

+#endif /* _XF86_SBUSBUS_H */