xserver libX11 libXdmcp pixman git update 22-12-2010

13 files changed, 7997 insertions, 8243 deletions

diff --git a/xorg-server/hw/xfree86/common/Makefile.am b/xorg-server/hw/xfree86/common/Makefile.am
index 56caaa5ab..c031d4be3 100644
--- a/xorg-server/hw/xfree86/common/Makefile.am
+++ b/xorg-server/hw/xfree86/common/Makefile.am
@@ -1,93 +1,92 @@
-noinst_LTLIBRARIES = libcommon.la

-

-if XORG_BUS_SPARC

-SBUS_SOURCES = xf86sbusBus.c

-endif

-

-if XV

-XVSOURCES = xf86xv.c xf86xvmc.c

-XVSDKINCS = xf86xv.h xf86xvmc.h xf86xvpriv.h

-endif

-

-if XF86VIDMODE

-XF86VMODE_SDK = vidmodeproc.h

-endif

-

-if DGA

-DGASOURCES = xf86DGA.c

-endif

-

-RANDRSOURCES = xf86RandR.c

-

-BUSSOURCES = xf86pciBus.c xf86fbBus.c xf86noBus.c $(SBUS_SOURCES)

-

-MODEDEFSOURCES = $(srcdir)/vesamodes $(srcdir)/extramodes

-

-xf86DefModeSet.c: $(srcdir)/modeline2c.awk $(MODEDEFSOURCES)

-	$(AM_V_GEN)cat $(MODEDEFSOURCES) | LC_ALL=C $(AWK) -f $(srcdir)/modeline2c.awk > $@

-	$(AM_V_GEN)echo >> $@

-

-BUILT_SOURCES = xf86DefModeSet.c

-

-AM_LDFLAGS = -r

-libcommon_la_SOURCES = xf86Configure.c xf86ShowOpts.c xf86Bus.c xf86Config.c \

-                      xf86Cursor.c $(DGASOURCES) xf86DPMS.c \

-                      xf86Events.c xf86Globals.c xf86AutoConfig.c \

-                      xf86Option.c xf86Init.c xf86VGAarbiter.c \

-                      xf86VidMode.c xf86fbman.c xf86cmap.c \

-                      xf86Helper.c xf86PM.c xf86Xinput.c xisb.c \

-                      xf86Mode.c xorgHelper.c \

-                      $(XVSOURCES) $(BUSSOURCES) $(RANDRSOURCES)

-nodist_libcommon_la_SOURCES = xf86DefModeSet.c xf86Build.h

-libcommon_la_LIBADD = $(top_builddir)/config/libconfig.la

-

-INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c \

-	   -I$(srcdir)/../loader -I$(srcdir)/../parser \

-           -I$(srcdir)/../vbe -I$(srcdir)/../int10 \

-	   -I$(srcdir)/../vgahw -I$(srcdir)/../dixmods/extmod \

-	   -I$(srcdir)/../modes -I$(srcdir)/../ramdac

-

-sdk_HEADERS = compiler.h fourcc.h xf86.h xf86Module.h xf86Opt.h \

-              xf86PciInfo.h xf86Priv.h xf86Privstr.h \

-              xf86cmap.h xf86fbman.h xf86str.h xf86Xinput.h xisb.h \

-              $(XVSDKINCS) $(XF86VMODE_SDK) xorgVersion.h \

-              xf86sbusBus.h xf86VGAarbiter.h

-

-DISTCLEANFILES = xf86Build.h

-CLEANFILES = $(BUILT_SOURCES)

-

-EXTRA_DIST = \

-	compiler.h \

-	fourcc.h \

-	scoasm.h \

-	vidmodeproc.h \

-	xf86.h \

-	xf86Bus.h \

-	xf86Config.h \

-	xf86InPriv.h \

-	xf86Module.h \

-	xf86Opt.h \

-	xf86PciInfo.h \

-	xf86Priv.h \

-	xf86Privstr.h \

-	xf86Xinput.h \

-	xf86cmap.h \

-	xf86fbman.h \

-	xf86pciBus.h \

-	xf86str.h \

-	xf86xv.h \

-	xf86xvmc.h \

-	xf86xvpriv.h \

-	xisb.h \

-	xorgVersion.h \

-	$(MODEDEFSOURCES) \

-	modeline2c.awk \

-	xf86VGAarbiter.h \

-	xf86VGAarbiterPriv.h \

-        $(DISTKBDSOURCES)

-

-if LNXACPI

-XORG_CFLAGS += -DHAVE_ACPI

-endif

-

-AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)

+noinst_LTLIBRARIES = libcommon.la
+
+if XORG_BUS_SPARC
+SBUS_SOURCES = xf86sbusBus.c
+endif
+
+if XV
+XVSOURCES = xf86xv.c xf86xvmc.c
+XVSDKINCS = xf86xv.h xf86xvmc.h xf86xvpriv.h
+endif
+
+if XF86VIDMODE
+XF86VMODE_SDK = vidmodeproc.h
+endif
+
+if DGA
+DGASOURCES = xf86DGA.c
+endif
+
+RANDRSOURCES = xf86RandR.c
+
+BUSSOURCES = xf86pciBus.c xf86fbBus.c xf86noBus.c $(SBUS_SOURCES)
+
+MODEDEFSOURCES = $(srcdir)/vesamodes $(srcdir)/extramodes
+
+xf86DefModeSet.c: $(srcdir)/modeline2c.awk $(MODEDEFSOURCES)
+	$(AM_V_GEN)cat $(MODEDEFSOURCES) | LC_ALL=C $(AWK) -f $(srcdir)/modeline2c.awk > $@
+	$(AM_V_GEN)echo >> $@
+
+BUILT_SOURCES = xf86DefModeSet.c
+
+AM_LDFLAGS = -r
+libcommon_la_SOURCES = xf86Configure.c xf86ShowOpts.c xf86Bus.c xf86Config.c \
+                      xf86Cursor.c $(DGASOURCES) xf86DPMS.c \
+                      xf86Events.c xf86Globals.c xf86AutoConfig.c \
+                      xf86Option.c xf86Init.c xf86VGAarbiter.c \
+                      xf86VidMode.c xf86fbman.c xf86cmap.c \
+                      xf86Helper.c xf86PM.c xf86Xinput.c xisb.c \
+                      xf86Mode.c xorgHelper.c \
+                      $(XVSOURCES) $(BUSSOURCES) $(RANDRSOURCES)
+nodist_libcommon_la_SOURCES = xf86DefModeSet.c xf86Build.h
+libcommon_la_LIBADD = $(top_builddir)/config/libconfig.la
+
+INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c \
+	   -I$(srcdir)/../loader -I$(srcdir)/../parser \
+           -I$(srcdir)/../vbe -I$(srcdir)/../int10 \
+	   -I$(srcdir)/../vgahw -I$(srcdir)/../dixmods/extmod \
+	   -I$(srcdir)/../modes -I$(srcdir)/../ramdac
+
+sdk_HEADERS = compiler.h fourcc.h xf86.h xf86Module.h xf86Opt.h \
+              xf86PciInfo.h xf86Priv.h xf86Privstr.h \
+              xf86cmap.h xf86fbman.h xf86str.h xf86Xinput.h xisb.h \
+              $(XVSDKINCS) $(XF86VMODE_SDK) xorgVersion.h \
+              xf86sbusBus.h xf86VGAarbiter.h
+
+DISTCLEANFILES = xf86Build.h
+CLEANFILES = $(BUILT_SOURCES)
+
+EXTRA_DIST = \
+	compiler.h \
+	fourcc.h \
+	vidmodeproc.h \
+	xf86.h \
+	xf86Bus.h \
+	xf86Config.h \
+	xf86InPriv.h \
+	xf86Module.h \
+	xf86Opt.h \
+	xf86PciInfo.h \
+	xf86Priv.h \
+	xf86Privstr.h \
+	xf86Xinput.h \
+	xf86cmap.h \
+	xf86fbman.h \
+	xf86pciBus.h \
+	xf86str.h \
+	xf86xv.h \
+	xf86xvmc.h \
+	xf86xvpriv.h \
+	xisb.h \
+	xorgVersion.h \
+	$(MODEDEFSOURCES) \
+	modeline2c.awk \
+	xf86VGAarbiter.h \
+	xf86VGAarbiterPriv.h \
+        $(DISTKBDSOURCES)
+
+if LNXACPI
+XORG_CFLAGS += -DHAVE_ACPI
+endif
+
+AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
diff --git a/xorg-server/hw/xfree86/common/compiler.h b/xorg-server/hw/xfree86/common/compiler.h
index 4cbe47c98..9e00d7571 100644
--- a/xorg-server/hw/xfree86/common/compiler.h
+++ b/xorg-server/hw/xfree86/common/compiler.h
@@ -1,1786 +1,1773 @@
-/*

- * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.

- *

- * Permission to use, copy, modify, distribute, and sell this software and its

- * documentation for any purpose is hereby granted without fee, provided that

- * the above copyright notice appear in all copies and that both that

- * copyright notice and this permission notice appear in supporting

- * documentation, and that the name of Thomas Roell not be used in

- * advertising or publicity pertaining to distribution of the software without

- * specific, written prior permission.  Thomas Roell makes no representations

- * about the suitability of this software for any purpose.  It is provided

- * "as is" without express or implied warranty.

- *

- * THOMAS ROELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

- * EVENT SHALL THOMAS ROELL BE LIABLE FOR ANY SPECIAL, INDIRECT OR

- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

- * PERFORMANCE OF THIS SOFTWARE.

- *

- */

-/*

- * Copyright (c) 1994-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).

- */

-

-#ifndef _COMPILER_H

-

-# define _COMPILER_H

-

-#if defined(__SUNPRO_C)

-# define DO_PROTOTYPES

-#endif

-

-/* Map Sun compiler platform defines to gcc-style used in the code */

-#if defined(__amd64) && !defined(__amd64__)

-# define __amd64__

-#endif

-#if defined(__i386) && !defined(__i386__)

-# define __i386__

-#endif

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

-# define __sparc__

-#endif

-#if defined(__sparcv9) && !defined(__sparc64__)

-# define __sparc64__

-#endif

-

-#ifndef _X_EXPORT

-# include <X11/Xfuncproto.h>

-#endif

-

-# include <pixman.h> /* for uint*_t types */

-

-/* Allow drivers to use the GCC-supported __inline__ and/or __inline. */

-# ifndef __inline__

-#  if defined(__GNUC__)

-    /* gcc has __inline__ */

-#  elif defined(__HIGHC__)

-#   define __inline__ _Inline

-#  else

-#   define __inline__ /**/

-#  endif

-# endif /* __inline__ */

-# ifndef __inline

-#  if defined(__GNUC__)

-    /* gcc has __inline */

-#  elif defined(__HIGHC__)

-#   define __inline _Inline

-#  else

-#   define __inline /**/

-#  endif

-# endif /* __inline */

-

-/* Support gcc's __FUNCTION__ for people using other compilers */

-#if !defined(__GNUC__) && !defined(__FUNCTION__)

-# define __FUNCTION__ __func__ /* C99 */

-#endif

-

-# if defined(NO_INLINE) || defined(DO_PROTOTYPES)

-

-#  if !defined(__arm__)

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

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

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

-

-extern _X_EXPORT void outb(unsigned short, unsigned char);

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

-extern _X_EXPORT void outl(unsigned short, unsigned int);

-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__, __nds32__ */

-

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

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

-extern _X_EXPORT void outl(unsigned long, unsigned int);

-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__, __nds32__ */

-#  endif /* __arm__ */

-

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

-extern unsigned long ldq_u(unsigned long *);

-extern unsigned long ldl_u(unsigned int *);

-extern unsigned long ldw_u(unsigned short *);

-extern void stq_u(unsigned long, unsigned long *);

-extern void stl_u(unsigned long, unsigned int *);

-extern void stw_u(unsigned long, unsigned short *);

-extern void mem_barrier(void);

-extern void write_mem_barrier(void);

-extern void stl_brx(unsigned long, volatile unsigned char *, int);

-extern void stw_brx(unsigned short, volatile unsigned char *, int);

-extern unsigned long ldl_brx(volatile unsigned char *, int);

-extern unsigned short ldw_brx(volatile unsigned char *, int);

-#  endif /* __powerpc__ && !__OpenBSD */

-

-# endif /* NO_INLINE || DO_PROTOTYPES */

-

-# ifndef NO_INLINE

-#  ifdef __GNUC__

-#   ifdef __i386__

-

-#    ifdef __SSE__

-#     define write_mem_barrier() __asm__ __volatile__ ("sfence" : : : "memory")

-#    else

-#     define write_mem_barrier() __asm__ __volatile__ ("lock; addl $0,0(%%esp)" : : : "memory")

-#    endif

-

-#    ifdef __SSE2__

-#     define mem_barrier() __asm__ __volatile__ ("mfence" : : : "memory")

-#    else

-#     define mem_barrier() __asm__ __volatile__ ("lock; addl $0,0(%%esp)" : : : "memory")

-#    endif

-

-#   elif defined __alpha__

-

-#    define mem_barrier() __asm__ __volatile__ ("mb" : : : "memory")

-#    define write_mem_barrier() __asm__ __volatile__ ("wmb" : : : "memory")

-

-#   elif defined __amd64__

-

-#    define mem_barrier() __asm__ __volatile__ ("mfence" : : : "memory")

-#    define write_mem_barrier() __asm__ __volatile__ ("sfence" : : : "memory")

-

-#   elif defined __ia64__

-

-#    ifndef __INTEL_COMPILER

-#     define mem_barrier()        __asm__ __volatile__ ("mf" : : : "memory")

-#     define write_mem_barrier()  __asm__ __volatile__ ("mf" : : : "memory")

-#    else

-#     include "ia64intrin.h"

-#     define mem_barrier() __mf()

-#     define write_mem_barrier() __mf()

-#    endif

-

-#   elif defined __mips__

-     /* Note: sync instruction requires MIPS II instruction set */

-#    define mem_barrier()		\

-	__asm__ __volatile__(		\

-		".set   push\n\t"	\

-		".set   noreorder\n\t"	\

-		".set   mips2\n\t"	\

-		"sync\n\t"		\

-		".set   pop"		\

-		: /* no output */	\

-		: /* no input */	\

-		: "memory")

-#    define write_mem_barrier() mem_barrier()

-

-#   elif defined __powerpc__

-

-#    if defined(linux) && defined(__powerpc64__)

-#     include <linux/version.h>

-#     if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)

-#      include <asm/memory.h>

-#     endif

-#    endif /* defined(linux) && defined(__powerpc64__) */

-

-#    ifndef eieio /* We deal with arch-specific eieio() routines above... */

-#     define eieio() __asm__ __volatile__ ("eieio" ::: "memory")

-#    endif /* eieio */

-#    define mem_barrier()	eieio()

-#    define write_mem_barrier()	eieio()

-

-#   elif defined __sparc__

-

-#    define barrier() __asm__ __volatile__ (".word 0x8143e00a" : : : "memory")

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

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

-#   endif

-#  endif /* __GNUC__ */

-# endif /* NO_INLINE */

-

-# ifndef mem_barrier

-#  define mem_barrier() /* NOP */

-# endif

-

-# ifndef write_mem_barrier

-#  define write_mem_barrier() /* NOP */

-# endif

-

-

-# ifndef NO_INLINE

-#  ifdef __GNUC__

-

-/* Define some packed structures to use with unaligned accesses */

-

-struct __una_u64 { uint64_t x __attribute__((packed)); };

-struct __una_u32 { uint32_t x __attribute__((packed)); };

-struct __una_u16 { uint16_t x __attribute__((packed)); };

-

-/* Elemental unaligned loads */

-

-static __inline__ uint64_t ldq_u(uint64_t *p)

-{

-	const struct __una_u64 *ptr = (const struct __una_u64 *) p;

-	return ptr->x;

-}

-

-static __inline__ uint32_t ldl_u(uint32_t *p)

-{

-	const struct __una_u32 *ptr = (const struct __una_u32 *) p;

-	return ptr->x;

-}

-

-static __inline__ uint16_t ldw_u(uint16_t *p)

-{

-	const struct __una_u16 *ptr = (const struct __una_u16 *) p;

-	return ptr->x;

-}

-

-/* Elemental unaligned stores */

-

-static __inline__ void stq_u(uint64_t val, uint64_t *p)

-{

-	struct __una_u64 *ptr = (struct __una_u64 *) p;

-	ptr->x = val;

-}

-

-static __inline__ void stl_u(uint32_t val, uint32_t *p)

-{

-	struct __una_u32 *ptr = (struct __una_u32 *) p;

-	ptr->x = val;

-}

-

-static __inline__ void stw_u(uint16_t val, uint16_t *p)

-{

-	struct __una_u16 *ptr = (struct __una_u16 *) p;

-	ptr->x = val;

-}

-#  else /* !__GNUC__ */

-

-#include <string.h> /* needed for memmove */

-

-static __inline__ uint64_t ldq_u(uint64_t *p)

-{

-	uint64_t ret;

-	memmove(&ret, p, sizeof(*p));

-	return ret;

-}

-

-static __inline__ uint32_t ldl_u(uint32_t *p)

-{

-	uint32_t ret;

-	memmove(&ret, p, sizeof(*p));

-	return ret;

-}

-

-static __inline__ uint16_t ldw_u(uint16_t *p)

-{

-	uint16_t ret;

-	memmove(&ret, p, sizeof(*p));

-	return ret;

-}

-

-static __inline__ void stq_u(uint64_t val, uint64_t *p)

-{

-	uint64_t tmp = val;

-	memmove(p, &tmp, sizeof(*p));

-}

-

-static __inline__ void stl_u(uint32_t val, uint32_t *p)

-{

-	uint32_t tmp = val;

-	memmove(p, &tmp, sizeof(*p));

-}

-

-static __inline__ void stw_u(uint16_t val, uint16_t *p)

-{

-	uint16_t tmp = val;

-	memmove(p, &tmp, sizeof(*p));

-}

-

-#  endif /* __GNUC__ */

-# endif /* NO_INLINE */

-

-# ifndef NO_INLINE

-#  ifdef __GNUC__

-#   if (defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)) && (defined(__alpha__))

-

-#    ifdef linux

-/* for Linux on Alpha, we use the LIBC _inx/_outx routines */

-/* note that the appropriate setup via "ioperm" needs to be done */

-/*  *before* any inx/outx is done. */

-

-extern _X_EXPORT void _outb(unsigned char val, unsigned long port);

-extern _X_EXPORT void _outw(unsigned short val, unsigned long port);

-extern _X_EXPORT void _outl(unsigned int val, unsigned long port);

-extern _X_EXPORT unsigned int _inb(unsigned long port);

-extern _X_EXPORT unsigned int _inw(unsigned long port);

-extern _X_EXPORT unsigned int _inl(unsigned long port);

-

-static __inline__ void

-outb(unsigned long port, unsigned char val)

-{

-    _outb(val, port);

-}

-

-static __inline__ void

-outw(unsigned long port, unsigned short val)

-{

-    _outw(val, port);

-}

-

-static __inline__ void

-outl(unsigned long port, unsigned int val)

-{

-    _outl(val, port);

-}

-

-static __inline__ unsigned int

-inb(unsigned long port)

-{

-  return _inb(port);

-}

-

-static __inline__ unsigned int

-inw(unsigned long port)

-{

-  return _inw(port);

-}

-

-static __inline__ unsigned int

-inl(unsigned long port)

-{

-  return _inl(port);

-}

-

-#    endif /* linux */

-

-#    if (defined(__FreeBSD__) || defined(__OpenBSD__)) \

-      && !defined(DO_PROTOTYPES)

-

-/* for FreeBSD and OpenBSD on Alpha, we use the libio (resp. libalpha) */

-/*  inx/outx routines */

-/* note that the appropriate setup via "ioperm" needs to be done */

-/*  *before* any inx/outx is done. */

-

-extern _X_EXPORT void outb(unsigned int port, unsigned char val);

-extern _X_EXPORT void outw(unsigned int port, unsigned short val);

-extern _X_EXPORT void outl(unsigned int port, unsigned int val);

-extern _X_EXPORT unsigned char inb(unsigned int port);

-extern _X_EXPORT unsigned short inw(unsigned int port);

-extern _X_EXPORT unsigned int inl(unsigned int port);

-

-#    endif /* (__FreeBSD__ || __OpenBSD__ ) && !DO_PROTOTYPES */

-

-

-#if defined(__NetBSD__)

-#include <machine/pio.h>

-#endif /* __NetBSD__ */

-

-#   elif defined(linux) && defined(__ia64__) 

- 

-#    include <inttypes.h>

-

-#    include <sys/io.h>

-

-#    undef outb

-#    undef outw

-#    undef outl

-#    undef inb

-#    undef inw

-#    undef inl

-extern _X_EXPORT void outb(unsigned long port, unsigned char val);

-extern _X_EXPORT void outw(unsigned long port, unsigned short val);

-extern _X_EXPORT void outl(unsigned long port, unsigned int val);

-extern _X_EXPORT unsigned int inb(unsigned long port);

-extern _X_EXPORT unsigned int inw(unsigned long port);

-extern _X_EXPORT unsigned int inl(unsigned long port);

- 

-#   elif (defined(linux) || defined(__FreeBSD__)) && defined(__amd64__)

- 

-#    include <inttypes.h>

-

-static __inline__ void

-outb(unsigned short port, unsigned char val)

-{

-   __asm__ __volatile__("outb %0,%1" : :"a" (val), "d" (port));

-}

-

-

-static __inline__ void

-outw(unsigned short port, unsigned short val)

-{

-   __asm__ __volatile__("outw %0,%1" : :"a" (val), "d" (port));

-}

-

-static __inline__ void

-outl(unsigned short port, unsigned int val)

-{

-   __asm__ __volatile__("outl %0,%1" : :"a" (val), "d" (port));

-}

-

-static __inline__ unsigned int

-inb(unsigned short port)

-{

-   unsigned char ret;

-   __asm__ __volatile__("inb %1,%0" :

-       "=a" (ret) :

-       "d" (port));

-   return ret;

-}

-

-static __inline__ unsigned int

-inw(unsigned short port)

-{

-   unsigned short ret;

-   __asm__ __volatile__("inw %1,%0" :

-       "=a" (ret) :

-       "d" (port));

-   return ret;

-}

-

-static __inline__ unsigned int

-inl(unsigned short port)

-{

-   unsigned int ret;

-   __asm__ __volatile__("inl %1,%0" :

-       "=a" (ret) :

-       "d" (port));

-   return ret;

-}

-

-#   elif (defined(linux) || defined(sun) || defined(__OpenBSD__) || defined(__FreeBSD__)) && defined(__sparc__)

-

-#     ifndef ASI_PL

-#      define ASI_PL 0x88

-#     endif

-

-static __inline__ void

-outb(unsigned long port, unsigned char val)

-{

-	__asm__ __volatile__("stba %0, [%1] %2"

-			     : /* No outputs */

-			     : "r" (val), "r" (port), "i" (ASI_PL));

-	barrier();

-}

-

-static __inline__ void

-outw(unsigned long port, unsigned short val)

-{

-	__asm__ __volatile__("stha %0, [%1] %2"

-			     : /* No outputs */

-			     : "r" (val), "r" (port), "i" (ASI_PL));

-	barrier();

-}

-

-static __inline__ void

-outl(unsigned long port, unsigned int val)

-{

-	__asm__ __volatile__("sta %0, [%1] %2"

-			     : /* No outputs */

-			     : "r" (val), "r" (port), "i" (ASI_PL));

-	barrier();

-}

-

-static __inline__ unsigned int

-inb(unsigned long port)

-{

-	unsigned int ret;

-	__asm__ __volatile__("lduba [%1] %2, %0"

-			     : "=r" (ret)

-			     : "r" (port), "i" (ASI_PL));

-	return ret;

-}

-

-static __inline__ unsigned int

-inw(unsigned long port)

-{

-	unsigned int ret;

-	__asm__ __volatile__("lduha [%1] %2, %0"

-			     : "=r" (ret)

-			     : "r" (port), "i" (ASI_PL));

-	return ret;

-}

-

-static __inline__ unsigned int

-inl(unsigned long port)

-{

-	unsigned int ret;

-	__asm__ __volatile__("lda [%1] %2, %0"

-			     : "=r" (ret)

-			     : "r" (port), "i" (ASI_PL));

-	return ret;

-}

-

-static __inline__ unsigned char

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

-{

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

-	unsigned char ret;

-

-	__asm__ __volatile__("lduba [%1] %2, %0"

-			     : "=r" (ret)

-			     : "r" (addr), "i" (ASI_PL));

-	return ret;

-}

-

-static __inline__ unsigned short

-xf86ReadMmio16Be(__volatile__ void *base, const unsigned long offset)

-{

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

-	unsigned short ret;

-

-	__asm__ __volatile__("lduh [%1], %0"

-			     : "=r" (ret)

-			     : "r" (addr));

-	return ret;

-}

-

-static __inline__ unsigned short

-xf86ReadMmio16Le(__volatile__ void *base, const unsigned long offset)

-{

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

-	unsigned short ret;

-

-	__asm__ __volatile__("lduha [%1] %2, %0"

-			     : "=r" (ret)

-			     : "r" (addr), "i" (ASI_PL));

-	return ret;

-}

-

-static __inline__ unsigned int

-xf86ReadMmio32Be(__volatile__ void *base, const unsigned long offset)

-{

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

-	unsigned int ret;

-

-	__asm__ __volatile__("ld [%1], %0"

-			     : "=r" (ret)

-			     : "r" (addr));

-	return ret;

-}

-

-static __inline__ unsigned int

-xf86ReadMmio32Le(__volatile__ void *base, const unsigned long offset)

-{

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

-	unsigned int ret;

-

-	__asm__ __volatile__("lda [%1] %2, %0"

-			     : "=r" (ret)

-			     : "r" (addr), "i" (ASI_PL));

-	return ret;

-}

-

-static __inline__ void

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

-	       const unsigned int val)

-{

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

-

-	__asm__ __volatile__("stba %0, [%1] %2"

-			     : /* No outputs */

-			     : "r" (val), "r" (addr), "i" (ASI_PL));

-	barrier();

-}

-

-static __inline__ void

-xf86WriteMmio16Be(__volatile__ void *base, const unsigned long offset,

-		  const unsigned int val)

-{

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

-

-	__asm__ __volatile__("sth %0, [%1]"

-			     : /* No outputs */

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

-	barrier();

-}

-

-static __inline__ void

-xf86WriteMmio16Le(__volatile__ void *base, const unsigned long offset,

-		  const unsigned int val)

-{

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

-

-	__asm__ __volatile__("stha %0, [%1] %2"

-			     : /* No outputs */

-			     : "r" (val), "r" (addr), "i" (ASI_PL));

-	barrier();

-}

-

-static __inline__ void

-xf86WriteMmio32Be(__volatile__ void *base, const unsigned long offset,

-		  const unsigned int val)

-{

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

-

-	__asm__ __volatile__("st %0, [%1]"

-			     : /* No outputs */

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

-	barrier();

-}

-

-static __inline__ void

-xf86WriteMmio32Le(__volatile__ void *base, const unsigned long offset,

-		  const unsigned int val)

-{

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

-

-	__asm__ __volatile__("sta %0, [%1] %2"

-			     : /* No outputs */

-			     : "r" (val), "r" (addr), "i" (ASI_PL));

-	barrier();

-}

-

-static __inline__ void

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

-		 const unsigned int val)

-{

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

-

-	__asm__ __volatile__("stba %0, [%1] %2"

-			     : /* No outputs */

-			     : "r" (val), "r" (addr), "i" (ASI_PL));

-}

-

-static __inline__ void

-xf86WriteMmio16BeNB(__volatile__ void *base, const unsigned long offset,

-		    const unsigned int val)

-{

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

-

-	__asm__ __volatile__("sth %0, [%1]"

-			     : /* No outputs */

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

-}

-

-static __inline__ void

-xf86WriteMmio16LeNB(__volatile__ void *base, const unsigned long offset,

-		    const unsigned int val)

-{

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

-

-	__asm__ __volatile__("stha %0, [%1] %2"

-			     : /* No outputs */

-			     : "r" (val), "r" (addr), "i" (ASI_PL));

-}

-

-static __inline__ void

-xf86WriteMmio32BeNB(__volatile__ void *base, const unsigned long offset,

-		    const unsigned int val)

-{

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

-

-	__asm__ __volatile__("st %0, [%1]"

-			     : /* No outputs */

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

-}

-

-static __inline__ void

-xf86WriteMmio32LeNB(__volatile__ void *base, const unsigned long offset,

-		    const unsigned int val)

-{

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

-

-	__asm__ __volatile__("sta %0, [%1] %2"

-			     : /* No outputs */

-			     : "r" (val), "r" (addr), "i" (ASI_PL));

-}

-

-#   elif defined(__mips__) || (defined(__arm32__) && !defined(__linux__))

-#    ifdef __arm32__

-#     define PORT_SIZE long

-#    else

-#     define PORT_SIZE short

-#    endif

-

-_X_EXPORT unsigned int IOPortBase;  /* Memory mapped I/O port area */

-

-static __inline__ void

-outb(unsigned PORT_SIZE port, unsigned char val)

-{

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

-}

-

-static __inline__ void

-outw(unsigned PORT_SIZE port, unsigned short val)

-{

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

-}

-

-static __inline__ void

-outl(unsigned PORT_SIZE port, unsigned int val)

-{

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

-}

-

-static __inline__ unsigned int

-inb(unsigned PORT_SIZE port)

-{

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

-}

-

-static __inline__ unsigned int

-inw(unsigned PORT_SIZE port)

-{

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

-}

-

-static __inline__ unsigned int

-inl(unsigned PORT_SIZE port)

-{

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

-}

-

-

-#    if defined(__mips__)

-#     ifdef linux	/* don't mess with other OSs */

-#       if X_BYTE_ORDER == X_BIG_ENDIAN

-static __inline__ unsigned int

-xf86ReadMmio32Be(__volatile__ void *base, const unsigned long offset)

-{

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

-	unsigned int ret;

-

-	__asm__ __volatile__("lw %0, 0(%1)"

-			     : "=r" (ret)

-			     : "r" (addr));

-	return ret;

-}

-

-static __inline__ void

-xf86WriteMmio32Be(__volatile__ void *base, const unsigned long offset,

-		  const unsigned int val)

-{

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

-

-	__asm__ __volatile__("sw %0, 0(%1)"

-			     : /* No outputs */

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

-}

-#      endif

-#     endif /* !linux */

-#    endif /* __mips__ */

-

-#   elif (defined(linux) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__)) && defined(__powerpc__)

-

-#    ifndef MAP_FAILED

-#     define MAP_FAILED ((void *)-1)

-#    endif

-

-extern _X_EXPORT volatile unsigned char *ioBase;

-

-static __inline__ unsigned char

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

-{

-        register unsigned char val;

-        __asm__ __volatile__(

-                        "lbzx %0,%1,%2\n\t"

-                        "eieio"

-                        : "=r" (val)

-                        : "b" (base), "r" (offset),

-                        "m" (*((volatile unsigned char *)base+offset)));

-        return val;

-}

-

-static __inline__ unsigned short

-xf86ReadMmio16Be(__volatile__ void *base, const unsigned long offset)

-{

-        register unsigned short val;

-        __asm__ __volatile__(

-                        "lhzx %0,%1,%2\n\t"

-                        "eieio"

-                        : "=r" (val)

-                        : "b" (base), "r" (offset),

-                        "m" (*((volatile unsigned char *)base+offset)));

-        return val;

-}

-

-static __inline__ unsigned short

-xf86ReadMmio16Le(__volatile__ void *base, const unsigned long offset)

-{

-        register unsigned short val;

-        __asm__ __volatile__(

-                        "lhbrx %0,%1,%2\n\t"

-                        "eieio"

-                        : "=r" (val)

-                        : "b" (base), "r" (offset),

-                        "m" (*((volatile unsigned char *)base+offset)));

-        return val;

-}

-

-static __inline__ unsigned int

-xf86ReadMmio32Be(__volatile__ void *base, const unsigned long offset)

-{

-        register unsigned int val;

-        __asm__ __volatile__(

-                        "lwzx %0,%1,%2\n\t"

-                        "eieio"

-                        : "=r" (val)

-                        : "b" (base), "r" (offset),

-                        "m" (*((volatile unsigned char *)base+offset)));

-        return val;

-}

-

-static __inline__ unsigned int

-xf86ReadMmio32Le(__volatile__ void *base, const unsigned long offset)

-{

-        register unsigned int val;

-        __asm__ __volatile__(

-                        "lwbrx %0,%1,%2\n\t"

-                        "eieio"

-                        : "=r" (val)

-                        : "b" (base), "r" (offset),

-                        "m" (*((volatile unsigned char *)base+offset)));

-        return val;

-}

-

-static __inline__ void

-xf86WriteMmioNB8(__volatile__ void *base, const unsigned long offset,

-		 const unsigned char val)

-{

-        __asm__ __volatile__(

-                        "stbx %1,%2,%3\n\t"

-                        : "=m" (*((volatile unsigned char *)base+offset))

-                        : "r" (val), "b" (base), "r" (offset));

-}

-

-static __inline__ void

-xf86WriteMmioNB16Le(__volatile__ void *base, const unsigned long offset,

-		    const unsigned short val)

-{

-        __asm__ __volatile__(

-                        "sthbrx %1,%2,%3\n\t"

-                        : "=m" (*((volatile unsigned char *)base+offset))

-                        : "r" (val), "b" (base), "r" (offset));

-}

-

-static __inline__ void

-xf86WriteMmioNB16Be(__volatile__ void *base, const unsigned long offset,

-		    const unsigned short val)

-{

-        __asm__ __volatile__(

-                        "sthx %1,%2,%3\n\t"

-                        : "=m" (*((volatile unsigned char *)base+offset))

-                        : "r" (val), "b" (base), "r" (offset));

-}

-

-static __inline__ void

-xf86WriteMmioNB32Le(__volatile__ void *base, const unsigned long offset,

-		    const unsigned int val)

-{

-        __asm__ __volatile__(

-                        "stwbrx %1,%2,%3\n\t"

-                        : "=m" (*((volatile unsigned char *)base+offset))

-                        : "r" (val), "b" (base), "r" (offset));

-}

-

-static __inline__ void

-xf86WriteMmioNB32Be(__volatile__ void *base, const unsigned long offset,

-		    const unsigned int val)

-{

-        __asm__ __volatile__(

-                        "stwx %1,%2,%3\n\t"

-                        : "=m" (*((volatile unsigned char *)base+offset))

-                        : "r" (val), "b" (base), "r" (offset));

-}

-

-static __inline__ void

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

-               const unsigned char val)

-{

-        xf86WriteMmioNB8(base, offset, val);

-        eieio();

-}

-

-static __inline__ void

-xf86WriteMmio16Le(__volatile__ void *base, const unsigned long offset,

-                  const unsigned short val)

-{

-        xf86WriteMmioNB16Le(base, offset, val);

-        eieio();

-}

-

-static __inline__ void

-xf86WriteMmio16Be(__volatile__ void *base, const unsigned long offset,

-                  const unsigned short val)

-{

-        xf86WriteMmioNB16Be(base, offset, val);

-        eieio();

-}

-

-static __inline__ void

-xf86WriteMmio32Le(__volatile__ void *base, const unsigned long offset,

-                  const unsigned int val)

-{

-        xf86WriteMmioNB32Le(base, offset, val);

-        eieio();

-}

-

-static __inline__ void

-xf86WriteMmio32Be(__volatile__ void *base, const unsigned long offset,

-                  const unsigned int val)

-{

-        xf86WriteMmioNB32Be(base, offset, val);

-        eieio();

-}

-

-

-static __inline__ void

-outb(unsigned short port, unsigned char value)

-{

-        if(ioBase == MAP_FAILED) return;

-        xf86WriteMmio8((void *)ioBase, port, value);

-}

-

-static __inline__ void

-outw(unsigned short port, unsigned short value)

-{

-        if(ioBase == MAP_FAILED) return;

-        xf86WriteMmio16Le((void *)ioBase, port, value);

-}

-

-static __inline__ void

-outl(unsigned short port, unsigned int value)

-{

-        if(ioBase == MAP_FAILED) return;

-        xf86WriteMmio32Le((void *)ioBase, port, value);

-}

-

-static __inline__ unsigned int

-inb(unsigned short port)

-{

-        if(ioBase == MAP_FAILED) return 0;

-        return xf86ReadMmio8((void *)ioBase, port);

-}

-

-static __inline__ unsigned int

-inw(unsigned short port)

-{

-        if(ioBase == MAP_FAILED) return 0;

-        return xf86ReadMmio16Le((void *)ioBase, port);

-}

-

-static __inline__ unsigned int

-inl(unsigned short port)

-{

-        if(ioBase == MAP_FAILED) return 0;

-        return xf86ReadMmio32Le((void *)ioBase, port);

-}

-

-#elif defined(__arm__) && defined(__linux__)

-

-/* for Linux on ARM, we use the LIBC inx/outx routines */

-/* note that the appropriate setup via "ioperm" needs to be done */

-/*  *before* any inx/outx is done. */

-

-#include <sys/io.h>

-

-static __inline__ void

-xf_outb(unsigned short port, unsigned char val)

-{

-    outb(val, port);

-}

-

-static __inline__ void

-xf_outw(unsigned short port, unsigned short val)

-{

-    outw(val, port);

-}

-

-static __inline__ void

-xf_outl(unsigned short port, unsigned int val)

-{

-    outl(val, port);

-}

-

-#define outb xf_outb

-#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)

-#    if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__)

-#     ifdef GCCUSESGAS

-

-/*

- * If gcc uses gas rather than the native assembler, the syntax of these

- * inlines has to be different.		DHD

- */

-

-static __inline__ void

-outb(unsigned short port, unsigned char val)

-{

-   __asm__ __volatile__("outb %0,%1" : :"a" (val), "d" (port));

-}

-

-

-static __inline__ void

-outw(unsigned short port, unsigned short val)

-{

-   __asm__ __volatile__("outw %0,%1" : :"a" (val), "d" (port));

-}

-

-static __inline__ void

-outl(unsigned short port, unsigned int val)

-{

-   __asm__ __volatile__("outl %0,%1" : :"a" (val), "d" (port));

-}

-

-static __inline__ unsigned int

-inb(unsigned short port)

-{

-   unsigned char ret;

-   __asm__ __volatile__("inb %1,%0" :

-       "=a" (ret) :

-       "d" (port));

-   return ret;

-}

-

-static __inline__ unsigned int

-inw(unsigned short port)

-{

-   unsigned short ret;

-   __asm__ __volatile__("inw %1,%0" :

-       "=a" (ret) :

-       "d" (port));

-   return ret;

-}

-

-static __inline__ unsigned int

-inl(unsigned short port)

-{

-   unsigned int ret;

-   __asm__ __volatile__("inl %1,%0" :

-       "=a" (ret) :

-       "d" (port));

-   return ret;

-}

-

-#     else	/* GCCUSESGAS */

-

-static __inline__ void

-outb(unsigned short port, unsigned char val)

-{

-  __asm__ __volatile__("out%B0 (%1)" : :"a" (val), "d" (port));

-}

-

-static __inline__ void

-outw(unsigned short port, unsigned short val)

-{

-  __asm__ __volatile__("out%W0 (%1)" : :"a" (val), "d" (port));

-}

-

-static __inline__ void

-outl(unsigned short port, unsigned int val)

-{

-  __asm__ __volatile__("out%L0 (%1)" : :"a" (val), "d" (port));

-}

-

-static __inline__ unsigned int

-inb(unsigned short port)

-{

-  unsigned char ret;

-  __asm__ __volatile__("in%B0 (%1)" :

-		   "=a" (ret) :

-		   "d" (port));

-  return ret;

-}

-

-static __inline__ unsigned int

-inw(unsigned short port)

-{

-  unsigned short ret;

-  __asm__ __volatile__("in%W0 (%1)" :

-		   "=a" (ret) :

-		   "d" (port));

-  return ret;

-}

-

-static __inline__ unsigned int

-inl(unsigned short port)

-{

-  unsigned int ret;

-  __asm__ __volatile__("in%L0 (%1)" :

-                   "=a" (ret) :

-                   "d" (port));

-  return ret;

-}

-

-#     endif /* GCCUSESGAS */

-

-#    else /* !defined(FAKEIT) && !defined(__mc68000__)  && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__m32r__) */

-

-static __inline__ void

-outb(unsigned short port, unsigned char val)

-{

-}

-

-static __inline__ void

-outw(unsigned short port, unsigned short val)

-{

-}

-

-static __inline__ void

-outl(unsigned short port, unsigned int val)

-{

-}

-

-static __inline__ unsigned int

-inb(unsigned short port)

-{

-  return 0;

-}

-

-static __inline__ unsigned int

-inw(unsigned short port)

-{

-  return 0;

-}

-

-static __inline__ unsigned int

-inl(unsigned short port)

-{

-  return 0;

-}

-

-#    endif /* FAKEIT */

-#    endif /* __SUNPRO_C */

-

-#   endif /* ix86 */

-

-#  else /* !GNUC */

-#    if defined(__STDC__) && (__STDC__ == 1)

-#     ifndef asm

-#      define asm __asm

-#     endif

-#    endif

-#    ifndef SCO325

-#     if defined(__UNIXWARE__)

-#     /* avoid including <sys/types.h> for <sys/inline.h> on UnixWare */

-#      define ushort unsigned short

-#      define ushort_t unsigned short

-#      define ulong unsigned long

-#      define ulong_t unsigned long

-#      define uint_t unsigned int

-#      define uchar_t unsigned char

-#     endif /* __UNIXWARE__ */

-#     if !defined(__SUNPRO_C)

-#      include <sys/inline.h>

-#     endif

-#    else

-#     include "scoasm.h"

-#    endif

-#    if !defined(__HIGHC__) && !defined(__SUNPRO_C) || \

-	defined(__USLC__)

-#     pragma asm partial_optimization outl

-#     pragma asm partial_optimization outw

-#     pragma asm partial_optimization outb

-#     pragma asm partial_optimization inl

-#     pragma asm partial_optimization inw

-#     pragma asm partial_optimization inb

-#    endif

-#  endif /* __GNUC__ */

-

-# endif /* NO_INLINE */

-

-# ifdef __alpha__

-/* entry points for Mmio memory access routines */

-extern _X_EXPORT int (*xf86ReadMmio8)(void *, unsigned long);

-extern _X_EXPORT int (*xf86ReadMmio16)(void *, unsigned long);

-#  ifndef STANDALONE_MMIO

-extern _X_EXPORT int (*xf86ReadMmio32)(void *, unsigned long);

-#  else

-/* Some DRI 3D drivers need MMIO_IN32. */

-static __inline__ int

-xf86ReadMmio32(void *Base, unsigned long Offset)

-{

-	mem_barrier();

-	return *(volatile unsigned int*)((unsigned long)Base+(Offset));

-}

-#  endif

-extern _X_EXPORT void (*xf86WriteMmio8)(int, void *, unsigned long);

-extern _X_EXPORT void (*xf86WriteMmio16)(int, void *, unsigned long);

-extern _X_EXPORT void (*xf86WriteMmio32)(int, void *, unsigned long);

-extern _X_EXPORT void (*xf86WriteMmioNB8)(int, void *, unsigned long);

-extern _X_EXPORT void (*xf86WriteMmioNB16)(int, void *, unsigned long);

-extern _X_EXPORT void (*xf86WriteMmioNB32)(int, void *, unsigned long);

-extern _X_EXPORT void xf86SlowBCopyFromBus(unsigned char *, unsigned char *, int);

-extern _X_EXPORT void xf86SlowBCopyToBus(unsigned char *, unsigned char *, int);

-

-/* Some macros to hide the system dependencies for MMIO accesses */

-/* Changed to kill noise generated by gcc's -Wcast-align */

-#  define MMIO_IN8(base, offset) (*xf86ReadMmio8)(base, offset)

-#  define MMIO_IN16(base, offset) (*xf86ReadMmio16)(base, offset)

-#  ifndef STANDALONE_MMIO

-#   define MMIO_IN32(base, offset) (*xf86ReadMmio32)(base, offset)

-#  else

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

-#  endif

-

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

-    do { \

-	write_mem_barrier(); \

-	*(volatile CARD32 *)(void *)(((CARD8*)(base)) + (offset)) = (val); \

-    } while (0)

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

-	*(volatile CARD32 *)(void *)(((CARD8*)(base)) + (offset)) = (val)

-

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

-    (*xf86WriteMmio8)((CARD8)(val), base, offset)

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

-    (*xf86WriteMmio16)((CARD16)(val), base, offset)

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

-    (*xf86WriteMmioNB8)((CARD8)(val), base, offset)

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

-    (*xf86WriteMmioNB16)((CARD16)(val), base, offset)

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

-    MMIO_OUT32(base, offset, val)

-

-# elif defined(__powerpc__)  

- /* 

-  * we provide byteswapping and no byteswapping functions here

-  * with byteswapping as default, 

-  * drivers that don't need byteswapping should define PPC_MMIO_IS_BE 

-  */

-#  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(PPC_MMIO_IS_BE) /* No byteswapping */

-#   define MMIO_IN16(base, offset) xf86ReadMmio16Be(base, offset)

-#   define MMIO_IN32(base, offset) xf86ReadMmio32Be(base, offset)

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

-    xf86WriteMmio16Be(base, offset, (CARD16)(val))

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

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

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

-    xf86WriteMmioNB16Be(base, offset, (CARD16)(val))

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

-    xf86WriteMmioNB32Be(base, offset, (CARD32)(val))

-#  else /* byteswapping is the default */

-#   define MMIO_IN16(base, offset) xf86ReadMmio16Le(base, offset)

-#   define MMIO_IN32(base, offset) xf86ReadMmio32Le(base, offset)

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

-     xf86WriteMmio16Le(base, offset, (CARD16)(val))

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

-     xf86WriteMmio32Le(base, offset, (CARD32)(val))

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

-     xf86WriteMmioNB16Le(base, offset, (CARD16)(val))

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

-     xf86WriteMmioNB32Le(base, offset, (CARD32)(val))

-#  endif

-

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

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

-

-# elif defined(__sparc__) || defined(sparc) || defined(__sparc)

- /*

-  * Like powerpc, we provide byteswapping and no byteswapping functions

-  * here with byteswapping as default, drivers that don't need byteswapping

-  * should define SPARC_MMIO_IS_BE (perhaps create a generic macro so that we

-  * do not need to use PPC_MMIO_IS_BE and the sparc one in all the same places

-  * of drivers?).

-  */

-#  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) \

-    xf86WriteMmio8NB(base, offset, (CARD8)(val))

-

-#  if defined(SPARC_MMIO_IS_BE) /* No byteswapping */

-#   define MMIO_IN16(base, offset) xf86ReadMmio16Be(base, offset)

-#   define MMIO_IN32(base, offset) xf86ReadMmio32Be(base, offset)

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

-     xf86WriteMmio16Be(base, offset, (CARD16)(val))

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

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

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

-     xf86WriteMmio16BeNB(base, offset, (CARD16)(val))

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

-     xf86WriteMmio32BeNB(base, offset, (CARD32)(val))

-#  else /* byteswapping is the default */

-#   define MMIO_IN16(base, offset) xf86ReadMmio16Le(base, offset)

-#   define MMIO_IN32(base, offset) xf86ReadMmio32Le(base, offset)

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

-     xf86WriteMmio16Le(base, offset, (CARD16)(val))

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

-     xf86WriteMmio32Le(base, offset, (CARD32)(val))

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

-     xf86WriteMmio16LeNB(base, offset, (CARD16)(val))

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

-     xf86WriteMmio32LeNB(base, offset, (CARD32)(val))

-#  endif

-

-#  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) \

-	*(volatile CARD8 *)(((CARD8*)(base)) + (offset))

-#  define MMIO_IN16(base, offset) \

-	*(volatile CARD16 *)(void *)(((CARD8*)(base)) + (offset))

-#  define MMIO_IN32(base, offset) \

-	*(volatile CARD32 *)(void *)(((CARD8*)(base)) + (offset))

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

-	*(volatile CARD8 *)(((CARD8*)(base)) + (offset)) = (val)

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

-	*(volatile CARD16 *)(void *)(((CARD8*)(base)) + (offset)) = (val)

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

-	*(volatile CARD32 *)(void *)(((CARD8*)(base)) + (offset)) = (val)

-#  define MMIO_ONB8(base, offset, val) MMIO_OUT8(base, offset, val) 

-#  define MMIO_ONB16(base, offset, val) MMIO_OUT16(base, offset, val) 

-#  define MMIO_ONB32(base, offset, val) MMIO_OUT32(base, offset, val) 

-

-#  define MMIO_MOVE32(base, offset, val) MMIO_OUT32(base, offset, val)

-

-# endif /* __alpha__ */

-

-/*

- * With Intel, the version in os-support/misc/SlowBcopy.s is used.

- * This avoids port I/O during the copy (which causes problems with

- * some hardware).

- */

-# ifdef __alpha__

-#  define slowbcopy_tobus(src,dst,count) xf86SlowBCopyToBus(src,dst,count)

-#  define slowbcopy_frombus(src,dst,count) xf86SlowBCopyFromBus(src,dst,count)

-# else /* __alpha__ */

-#  define slowbcopy_tobus(src,dst,count) xf86SlowBcopy(src,dst,count)

-#  define slowbcopy_frombus(src,dst,count) xf86SlowBcopy(src,dst,count)

-# endif /* __alpha__ */

-

-#endif /* _COMPILER_H */

+/*
+ * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Thomas Roell not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Thomas Roell makes no representations
+ * about the suitability of this software for any purpose.  It is provided
+ * "as is" without express or implied warranty.
+ *
+ * THOMAS ROELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THOMAS ROELL BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+/*
+ * Copyright (c) 1994-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).
+ */
+
+#ifndef _COMPILER_H
+
+# define _COMPILER_H
+
+#if defined(__SUNPRO_C)
+# define DO_PROTOTYPES
+#endif
+
+/* Map Sun compiler platform defines to gcc-style used in the code */
+#if defined(__amd64) && !defined(__amd64__)
+# define __amd64__
+#endif
+#if defined(__i386) && !defined(__i386__)
+# define __i386__
+#endif
+#if defined(__sparc) && !defined(__sparc__)
+# define __sparc__
+#endif
+#if defined(__sparcv9) && !defined(__sparc64__)
+# define __sparc64__
+#endif
+
+#ifndef _X_EXPORT
+# include <X11/Xfuncproto.h>
+#endif
+
+# include <pixman.h> /* for uint*_t types */
+
+/* Allow drivers to use the GCC-supported __inline__ and/or __inline. */
+# ifndef __inline__
+#  if defined(__GNUC__)
+    /* gcc has __inline__ */
+#  elif defined(__HIGHC__)
+#   define __inline__ _Inline
+#  else
+#   define __inline__ /**/
+#  endif
+# endif /* __inline__ */
+# ifndef __inline
+#  if defined(__GNUC__)
+    /* gcc has __inline */
+#  elif defined(__HIGHC__)
+#   define __inline _Inline
+#  else
+#   define __inline /**/
+#  endif
+# endif /* __inline */
+
+/* Support gcc's __FUNCTION__ for people using other compilers */
+#if !defined(__GNUC__) && !defined(__FUNCTION__)
+# define __FUNCTION__ __func__ /* C99 */
+#endif
+
+# if defined(NO_INLINE) || defined(DO_PROTOTYPES)
+
+#  if !defined(__arm__)
+#   if !defined(__sparc__) && !defined(__sparc) && !defined(__arm32__) && !defined(__nds32__) \
+      && !(defined(__alpha__) && defined(linux)) \
+      && !(defined(__ia64__) && defined(linux)) \
+
+extern _X_EXPORT void outb(unsigned short, unsigned char);
+extern _X_EXPORT void outw(unsigned short, unsigned short);
+extern _X_EXPORT void outl(unsigned short, unsigned int);
+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__, __nds32__ */
+
+extern _X_EXPORT void outb(unsigned long, unsigned char);
+extern _X_EXPORT void outw(unsigned long, unsigned short);
+extern _X_EXPORT void outl(unsigned long, unsigned int);
+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__, __nds32__ */
+#  endif /* __arm__ */
+
+#  if defined(__powerpc__) && !defined(__OpenBSD__)
+extern unsigned long ldq_u(unsigned long *);
+extern unsigned long ldl_u(unsigned int *);
+extern unsigned long ldw_u(unsigned short *);
+extern void stq_u(unsigned long, unsigned long *);
+extern void stl_u(unsigned long, unsigned int *);
+extern void stw_u(unsigned long, unsigned short *);
+extern void mem_barrier(void);
+extern void write_mem_barrier(void);
+extern void stl_brx(unsigned long, volatile unsigned char *, int);
+extern void stw_brx(unsigned short, volatile unsigned char *, int);
+extern unsigned long ldl_brx(volatile unsigned char *, int);
+extern unsigned short ldw_brx(volatile unsigned char *, int);
+#  endif /* __powerpc__ && !__OpenBSD */
+
+# endif /* NO_INLINE || DO_PROTOTYPES */
+
+# ifndef NO_INLINE
+#  ifdef __GNUC__
+#   ifdef __i386__
+
+#    ifdef __SSE__
+#     define write_mem_barrier() __asm__ __volatile__ ("sfence" : : : "memory")
+#    else
+#     define write_mem_barrier() __asm__ __volatile__ ("lock; addl $0,0(%%esp)" : : : "memory")
+#    endif
+
+#    ifdef __SSE2__
+#     define mem_barrier() __asm__ __volatile__ ("mfence" : : : "memory")
+#    else
+#     define mem_barrier() __asm__ __volatile__ ("lock; addl $0,0(%%esp)" : : : "memory")
+#    endif
+
+#   elif defined __alpha__
+
+#    define mem_barrier() __asm__ __volatile__ ("mb" : : : "memory")
+#    define write_mem_barrier() __asm__ __volatile__ ("wmb" : : : "memory")
+
+#   elif defined __amd64__
+
+#    define mem_barrier() __asm__ __volatile__ ("mfence" : : : "memory")
+#    define write_mem_barrier() __asm__ __volatile__ ("sfence" : : : "memory")
+
+#   elif defined __ia64__
+
+#    ifndef __INTEL_COMPILER
+#     define mem_barrier()        __asm__ __volatile__ ("mf" : : : "memory")
+#     define write_mem_barrier()  __asm__ __volatile__ ("mf" : : : "memory")
+#    else
+#     include "ia64intrin.h"
+#     define mem_barrier() __mf()
+#     define write_mem_barrier() __mf()
+#    endif
+
+#   elif defined __mips__
+     /* Note: sync instruction requires MIPS II instruction set */
+#    define mem_barrier()		\
+	__asm__ __volatile__(		\
+		".set   push\n\t"	\
+		".set   noreorder\n\t"	\
+		".set   mips2\n\t"	\
+		"sync\n\t"		\
+		".set   pop"		\
+		: /* no output */	\
+		: /* no input */	\
+		: "memory")
+#    define write_mem_barrier() mem_barrier()
+
+#   elif defined __powerpc__
+
+#    if defined(linux) && defined(__powerpc64__)
+#     include <linux/version.h>
+#     if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
+#      include <asm/memory.h>
+#     endif
+#    endif /* defined(linux) && defined(__powerpc64__) */
+
+#    ifndef eieio /* We deal with arch-specific eieio() routines above... */
+#     define eieio() __asm__ __volatile__ ("eieio" ::: "memory")
+#    endif /* eieio */
+#    define mem_barrier()	eieio()
+#    define write_mem_barrier()	eieio()
+
+#   elif defined __sparc__
+
+#    define barrier() __asm__ __volatile__ (".word 0x8143e00a" : : : "memory")
+#    define mem_barrier()         /* XXX: nop for now */
+#    define write_mem_barrier()   /* XXX: nop for now */
+#   endif
+#  endif /* __GNUC__ */
+# endif /* NO_INLINE */
+
+# ifndef mem_barrier
+#  define mem_barrier() /* NOP */
+# endif
+
+# ifndef write_mem_barrier
+#  define write_mem_barrier() /* NOP */
+# endif
+
+
+# ifndef NO_INLINE
+#  ifdef __GNUC__
+
+/* Define some packed structures to use with unaligned accesses */
+
+struct __una_u64 { uint64_t x __attribute__((packed)); };
+struct __una_u32 { uint32_t x __attribute__((packed)); };
+struct __una_u16 { uint16_t x __attribute__((packed)); };
+
+/* Elemental unaligned loads */
+
+static __inline__ uint64_t ldq_u(uint64_t *p)
+{
+	const struct __una_u64 *ptr = (const struct __una_u64 *) p;
+	return ptr->x;
+}
+
+static __inline__ uint32_t ldl_u(uint32_t *p)
+{
+	const struct __una_u32 *ptr = (const struct __una_u32 *) p;
+	return ptr->x;
+}
+
+static __inline__ uint16_t ldw_u(uint16_t *p)
+{
+	const struct __una_u16 *ptr = (const struct __una_u16 *) p;
+	return ptr->x;
+}
+
+/* Elemental unaligned stores */
+
+static __inline__ void stq_u(uint64_t val, uint64_t *p)
+{
+	struct __una_u64 *ptr = (struct __una_u64 *) p;
+	ptr->x = val;
+}
+
+static __inline__ void stl_u(uint32_t val, uint32_t *p)
+{
+	struct __una_u32 *ptr = (struct __una_u32 *) p;
+	ptr->x = val;
+}
+
+static __inline__ void stw_u(uint16_t val, uint16_t *p)
+{
+	struct __una_u16 *ptr = (struct __una_u16 *) p;
+	ptr->x = val;
+}
+#  else /* !__GNUC__ */
+
+#include <string.h> /* needed for memmove */
+
+static __inline__ uint64_t ldq_u(uint64_t *p)
+{
+	uint64_t ret;
+	memmove(&ret, p, sizeof(*p));
+	return ret;
+}
+
+static __inline__ uint32_t ldl_u(uint32_t *p)
+{
+	uint32_t ret;
+	memmove(&ret, p, sizeof(*p));
+	return ret;
+}
+
+static __inline__ uint16_t ldw_u(uint16_t *p)
+{
+	uint16_t ret;
+	memmove(&ret, p, sizeof(*p));
+	return ret;
+}
+
+static __inline__ void stq_u(uint64_t val, uint64_t *p)
+{
+	uint64_t tmp = val;
+	memmove(p, &tmp, sizeof(*p));
+}
+
+static __inline__ void stl_u(uint32_t val, uint32_t *p)
+{
+	uint32_t tmp = val;
+	memmove(p, &tmp, sizeof(*p));
+}
+
+static __inline__ void stw_u(uint16_t val, uint16_t *p)
+{
+	uint16_t tmp = val;
+	memmove(p, &tmp, sizeof(*p));
+}
+
+#  endif /* __GNUC__ */
+# endif /* NO_INLINE */
+
+# ifndef NO_INLINE
+#  ifdef __GNUC__
+#   if (defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)) && (defined(__alpha__))
+
+#    ifdef linux
+/* for Linux on Alpha, we use the LIBC _inx/_outx routines */
+/* note that the appropriate setup via "ioperm" needs to be done */
+/*  *before* any inx/outx is done. */
+
+extern _X_EXPORT void _outb(unsigned char val, unsigned long port);
+extern _X_EXPORT void _outw(unsigned short val, unsigned long port);
+extern _X_EXPORT void _outl(unsigned int val, unsigned long port);
+extern _X_EXPORT unsigned int _inb(unsigned long port);
+extern _X_EXPORT unsigned int _inw(unsigned long port);
+extern _X_EXPORT unsigned int _inl(unsigned long port);
+
+static __inline__ void
+outb(unsigned long port, unsigned char val)
+{
+    _outb(val, port);
+}
+
+static __inline__ void
+outw(unsigned long port, unsigned short val)
+{
+    _outw(val, port);
+}
+
+static __inline__ void
+outl(unsigned long port, unsigned int val)
+{
+    _outl(val, port);
+}
+
+static __inline__ unsigned int
+inb(unsigned long port)
+{
+  return _inb(port);
+}
+
+static __inline__ unsigned int
+inw(unsigned long port)
+{
+  return _inw(port);
+}
+
+static __inline__ unsigned int
+inl(unsigned long port)
+{
+  return _inl(port);
+}
+
+#    endif /* linux */
+
+#    if (defined(__FreeBSD__) || defined(__OpenBSD__)) \
+      && !defined(DO_PROTOTYPES)
+
+/* for FreeBSD and OpenBSD on Alpha, we use the libio (resp. libalpha) */
+/*  inx/outx routines */
+/* note that the appropriate setup via "ioperm" needs to be done */
+/*  *before* any inx/outx is done. */
+
+extern _X_EXPORT void outb(unsigned int port, unsigned char val);
+extern _X_EXPORT void outw(unsigned int port, unsigned short val);
+extern _X_EXPORT void outl(unsigned int port, unsigned int val);
+extern _X_EXPORT unsigned char inb(unsigned int port);
+extern _X_EXPORT unsigned short inw(unsigned int port);
+extern _X_EXPORT unsigned int inl(unsigned int port);
+
+#    endif /* (__FreeBSD__ || __OpenBSD__ ) && !DO_PROTOTYPES */
+
+
+#if defined(__NetBSD__)
+#include <machine/pio.h>
+#endif /* __NetBSD__ */
+
+#   elif defined(linux) && defined(__ia64__) 
+ 
+#    include <inttypes.h>
+
+#    include <sys/io.h>
+
+#    undef outb
+#    undef outw
+#    undef outl
+#    undef inb
+#    undef inw
+#    undef inl
+extern _X_EXPORT void outb(unsigned long port, unsigned char val);
+extern _X_EXPORT void outw(unsigned long port, unsigned short val);
+extern _X_EXPORT void outl(unsigned long port, unsigned int val);
+extern _X_EXPORT unsigned int inb(unsigned long port);
+extern _X_EXPORT unsigned int inw(unsigned long port);
+extern _X_EXPORT unsigned int inl(unsigned long port);
+ 
+#   elif (defined(linux) || defined(__FreeBSD__)) && defined(__amd64__)
+ 
+#    include <inttypes.h>
+
+static __inline__ void
+outb(unsigned short port, unsigned char val)
+{
+   __asm__ __volatile__("outb %0,%1" : :"a" (val), "d" (port));
+}
+
+
+static __inline__ void
+outw(unsigned short port, unsigned short val)
+{
+   __asm__ __volatile__("outw %0,%1" : :"a" (val), "d" (port));
+}
+
+static __inline__ void
+outl(unsigned short port, unsigned int val)
+{
+   __asm__ __volatile__("outl %0,%1" : :"a" (val), "d" (port));
+}
+
+static __inline__ unsigned int
+inb(unsigned short port)
+{
+   unsigned char ret;
+   __asm__ __volatile__("inb %1,%0" :
+       "=a" (ret) :
+       "d" (port));
+   return ret;
+}
+
+static __inline__ unsigned int
+inw(unsigned short port)
+{
+   unsigned short ret;
+   __asm__ __volatile__("inw %1,%0" :
+       "=a" (ret) :
+       "d" (port));
+   return ret;
+}
+
+static __inline__ unsigned int
+inl(unsigned short port)
+{
+   unsigned int ret;
+   __asm__ __volatile__("inl %1,%0" :
+       "=a" (ret) :
+       "d" (port));
+   return ret;
+}
+
+#   elif (defined(linux) || defined(sun) || defined(__OpenBSD__) || defined(__FreeBSD__)) && defined(__sparc__)
+
+#     ifndef ASI_PL
+#      define ASI_PL 0x88
+#     endif
+
+static __inline__ void
+outb(unsigned long port, unsigned char val)
+{
+	__asm__ __volatile__("stba %0, [%1] %2"
+			     : /* No outputs */
+			     : "r" (val), "r" (port), "i" (ASI_PL));
+	barrier();
+}
+
+static __inline__ void
+outw(unsigned long port, unsigned short val)
+{
+	__asm__ __volatile__("stha %0, [%1] %2"
+			     : /* No outputs */
+			     : "r" (val), "r" (port), "i" (ASI_PL));
+	barrier();
+}
+
+static __inline__ void
+outl(unsigned long port, unsigned int val)
+{
+	__asm__ __volatile__("sta %0, [%1] %2"
+			     : /* No outputs */
+			     : "r" (val), "r" (port), "i" (ASI_PL));
+	barrier();
+}
+
+static __inline__ unsigned int
+inb(unsigned long port)
+{
+	unsigned int ret;
+	__asm__ __volatile__("lduba [%1] %2, %0"
+			     : "=r" (ret)
+			     : "r" (port), "i" (ASI_PL));
+	return ret;
+}
+
+static __inline__ unsigned int
+inw(unsigned long port)
+{
+	unsigned int ret;
+	__asm__ __volatile__("lduha [%1] %2, %0"
+			     : "=r" (ret)
+			     : "r" (port), "i" (ASI_PL));
+	return ret;
+}
+
+static __inline__ unsigned int
+inl(unsigned long port)
+{
+	unsigned int ret;
+	__asm__ __volatile__("lda [%1] %2, %0"
+			     : "=r" (ret)
+			     : "r" (port), "i" (ASI_PL));
+	return ret;
+}
+
+static __inline__ unsigned char
+xf86ReadMmio8(__volatile__ void *base, const unsigned long offset)
+{
+	unsigned long addr = ((unsigned long)base) + offset;
+	unsigned char ret;
+
+	__asm__ __volatile__("lduba [%1] %2, %0"
+			     : "=r" (ret)
+			     : "r" (addr), "i" (ASI_PL));
+	return ret;
+}
+
+static __inline__ unsigned short
+xf86ReadMmio16Be(__volatile__ void *base, const unsigned long offset)
+{
+	unsigned long addr = ((unsigned long)base) + offset;
+	unsigned short ret;
+
+	__asm__ __volatile__("lduh [%1], %0"
+			     : "=r" (ret)
+			     : "r" (addr));
+	return ret;
+}
+
+static __inline__ unsigned short
+xf86ReadMmio16Le(__volatile__ void *base, const unsigned long offset)
+{
+	unsigned long addr = ((unsigned long)base) + offset;
+	unsigned short ret;
+
+	__asm__ __volatile__("lduha [%1] %2, %0"
+			     : "=r" (ret)
+			     : "r" (addr), "i" (ASI_PL));
+	return ret;
+}
+
+static __inline__ unsigned int
+xf86ReadMmio32Be(__volatile__ void *base, const unsigned long offset)
+{
+	unsigned long addr = ((unsigned long)base) + offset;
+	unsigned int ret;
+
+	__asm__ __volatile__("ld [%1], %0"
+			     : "=r" (ret)
+			     : "r" (addr));
+	return ret;
+}
+
+static __inline__ unsigned int
+xf86ReadMmio32Le(__volatile__ void *base, const unsigned long offset)
+{
+	unsigned long addr = ((unsigned long)base) + offset;
+	unsigned int ret;
+
+	__asm__ __volatile__("lda [%1] %2, %0"
+			     : "=r" (ret)
+			     : "r" (addr), "i" (ASI_PL));
+	return ret;
+}
+
+static __inline__ void
+xf86WriteMmio8(__volatile__ void *base, const unsigned long offset,
+	       const unsigned int val)
+{
+	unsigned long addr = ((unsigned long)base) + offset;
+
+	__asm__ __volatile__("stba %0, [%1] %2"
+			     : /* No outputs */
+			     : "r" (val), "r" (addr), "i" (ASI_PL));
+	barrier();
+}
+
+static __inline__ void
+xf86WriteMmio16Be(__volatile__ void *base, const unsigned long offset,
+		  const unsigned int val)
+{
+	unsigned long addr = ((unsigned long)base) + offset;
+
+	__asm__ __volatile__("sth %0, [%1]"
+			     : /* No outputs */
+			     : "r" (val), "r" (addr));
+	barrier();
+}
+
+static __inline__ void
+xf86WriteMmio16Le(__volatile__ void *base, const unsigned long offset,
+		  const unsigned int val)
+{
+	unsigned long addr = ((unsigned long)base) + offset;
+
+	__asm__ __volatile__("stha %0, [%1] %2"
+			     : /* No outputs */
+			     : "r" (val), "r" (addr), "i" (ASI_PL));
+	barrier();
+}
+
+static __inline__ void
+xf86WriteMmio32Be(__volatile__ void *base, const unsigned long offset,
+		  const unsigned int val)
+{
+	unsigned long addr = ((unsigned long)base) + offset;
+
+	__asm__ __volatile__("st %0, [%1]"
+			     : /* No outputs */
+			     : "r" (val), "r" (addr));
+	barrier();
+}
+
+static __inline__ void
+xf86WriteMmio32Le(__volatile__ void *base, const unsigned long offset,
+		  const unsigned int val)
+{
+	unsigned long addr = ((unsigned long)base) + offset;
+
+	__asm__ __volatile__("sta %0, [%1] %2"
+			     : /* No outputs */
+			     : "r" (val), "r" (addr), "i" (ASI_PL));
+	barrier();
+}
+
+static __inline__ void
+xf86WriteMmio8NB(__volatile__ void *base, const unsigned long offset,
+		 const unsigned int val)
+{
+	unsigned long addr = ((unsigned long)base) + offset;
+
+	__asm__ __volatile__("stba %0, [%1] %2"
+			     : /* No outputs */
+			     : "r" (val), "r" (addr), "i" (ASI_PL));
+}
+
+static __inline__ void
+xf86WriteMmio16BeNB(__volatile__ void *base, const unsigned long offset,
+		    const unsigned int val)
+{
+	unsigned long addr = ((unsigned long)base) + offset;
+
+	__asm__ __volatile__("sth %0, [%1]"
+			     : /* No outputs */
+			     : "r" (val), "r" (addr));
+}
+
+static __inline__ void
+xf86WriteMmio16LeNB(__volatile__ void *base, const unsigned long offset,
+		    const unsigned int val)
+{
+	unsigned long addr = ((unsigned long)base) + offset;
+
+	__asm__ __volatile__("stha %0, [%1] %2"
+			     : /* No outputs */
+			     : "r" (val), "r" (addr), "i" (ASI_PL));
+}
+
+static __inline__ void
+xf86WriteMmio32BeNB(__volatile__ void *base, const unsigned long offset,
+		    const unsigned int val)
+{
+	unsigned long addr = ((unsigned long)base) + offset;
+
+	__asm__ __volatile__("st %0, [%1]"
+			     : /* No outputs */
+			     : "r" (val), "r" (addr));
+}
+
+static __inline__ void
+xf86WriteMmio32LeNB(__volatile__ void *base, const unsigned long offset,
+		    const unsigned int val)
+{
+	unsigned long addr = ((unsigned long)base) + offset;
+
+	__asm__ __volatile__("sta %0, [%1] %2"
+			     : /* No outputs */
+			     : "r" (val), "r" (addr), "i" (ASI_PL));
+}
+
+#   elif defined(__mips__) || (defined(__arm32__) && !defined(__linux__))
+#    ifdef __arm32__
+#     define PORT_SIZE long
+#    else
+#     define PORT_SIZE short
+#    endif
+
+_X_EXPORT unsigned int IOPortBase;  /* Memory mapped I/O port area */
+
+static __inline__ void
+outb(unsigned PORT_SIZE port, unsigned char val)
+{
+	*(volatile unsigned char*)(((unsigned PORT_SIZE)(port))+IOPortBase) = val;
+}
+
+static __inline__ void
+outw(unsigned PORT_SIZE port, unsigned short val)
+{
+	*(volatile unsigned short*)(((unsigned PORT_SIZE)(port))+IOPortBase) = val;
+}
+
+static __inline__ void
+outl(unsigned PORT_SIZE port, unsigned int val)
+{
+	*(volatile unsigned int*)(((unsigned PORT_SIZE)(port))+IOPortBase) = val;
+}
+
+static __inline__ unsigned int
+inb(unsigned PORT_SIZE port)
+{
+	return *(volatile unsigned char*)(((unsigned PORT_SIZE)(port))+IOPortBase);
+}
+
+static __inline__ unsigned int
+inw(unsigned PORT_SIZE port)
+{
+	return *(volatile unsigned short*)(((unsigned PORT_SIZE)(port))+IOPortBase);
+}
+
+static __inline__ unsigned int
+inl(unsigned PORT_SIZE port)
+{
+	return *(volatile unsigned int*)(((unsigned PORT_SIZE)(port))+IOPortBase);
+}
+
+
+#    if defined(__mips__)
+#     ifdef linux	/* don't mess with other OSs */
+#       if X_BYTE_ORDER == X_BIG_ENDIAN
+static __inline__ unsigned int
+xf86ReadMmio32Be(__volatile__ void *base, const unsigned long offset)
+{
+	unsigned long addr = ((unsigned long)base) + offset;
+	unsigned int ret;
+
+	__asm__ __volatile__("lw %0, 0(%1)"
+			     : "=r" (ret)
+			     : "r" (addr));
+	return ret;
+}
+
+static __inline__ void
+xf86WriteMmio32Be(__volatile__ void *base, const unsigned long offset,
+		  const unsigned int val)
+{
+	unsigned long addr = ((unsigned long)base) + offset;
+
+	__asm__ __volatile__("sw %0, 0(%1)"
+			     : /* No outputs */
+			     : "r" (val), "r" (addr));
+}
+#      endif
+#     endif /* !linux */
+#    endif /* __mips__ */
+
+#   elif (defined(linux) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__)) && defined(__powerpc__)
+
+#    ifndef MAP_FAILED
+#     define MAP_FAILED ((void *)-1)
+#    endif
+
+extern _X_EXPORT volatile unsigned char *ioBase;
+
+static __inline__ unsigned char
+xf86ReadMmio8(__volatile__ void *base, const unsigned long offset)
+{
+        register unsigned char val;
+        __asm__ __volatile__(
+                        "lbzx %0,%1,%2\n\t"
+                        "eieio"
+                        : "=r" (val)
+                        : "b" (base), "r" (offset),
+                        "m" (*((volatile unsigned char *)base+offset)));
+        return val;
+}
+
+static __inline__ unsigned short
+xf86ReadMmio16Be(__volatile__ void *base, const unsigned long offset)
+{
+        register unsigned short val;
+        __asm__ __volatile__(
+                        "lhzx %0,%1,%2\n\t"
+                        "eieio"
+                        : "=r" (val)
+                        : "b" (base), "r" (offset),
+                        "m" (*((volatile unsigned char *)base+offset)));
+        return val;
+}
+
+static __inline__ unsigned short
+xf86ReadMmio16Le(__volatile__ void *base, const unsigned long offset)
+{
+        register unsigned short val;
+        __asm__ __volatile__(
+                        "lhbrx %0,%1,%2\n\t"
+                        "eieio"
+                        : "=r" (val)
+                        : "b" (base), "r" (offset),
+                        "m" (*((volatile unsigned char *)base+offset)));
+        return val;
+}
+
+static __inline__ unsigned int
+xf86ReadMmio32Be(__volatile__ void *base, const unsigned long offset)
+{
+        register unsigned int val;
+        __asm__ __volatile__(
+                        "lwzx %0,%1,%2\n\t"
+                        "eieio"
+                        : "=r" (val)
+                        : "b" (base), "r" (offset),
+                        "m" (*((volatile unsigned char *)base+offset)));
+        return val;
+}
+
+static __inline__ unsigned int
+xf86ReadMmio32Le(__volatile__ void *base, const unsigned long offset)
+{
+        register unsigned int val;
+        __asm__ __volatile__(
+                        "lwbrx %0,%1,%2\n\t"
+                        "eieio"
+                        : "=r" (val)
+                        : "b" (base), "r" (offset),
+                        "m" (*((volatile unsigned char *)base+offset)));
+        return val;
+}
+
+static __inline__ void
+xf86WriteMmioNB8(__volatile__ void *base, const unsigned long offset,
+		 const unsigned char val)
+{
+        __asm__ __volatile__(
+                        "stbx %1,%2,%3\n\t"
+                        : "=m" (*((volatile unsigned char *)base+offset))
+                        : "r" (val), "b" (base), "r" (offset));
+}
+
+static __inline__ void
+xf86WriteMmioNB16Le(__volatile__ void *base, const unsigned long offset,
+		    const unsigned short val)
+{
+        __asm__ __volatile__(
+                        "sthbrx %1,%2,%3\n\t"
+                        : "=m" (*((volatile unsigned char *)base+offset))
+                        : "r" (val), "b" (base), "r" (offset));
+}
+
+static __inline__ void
+xf86WriteMmioNB16Be(__volatile__ void *base, const unsigned long offset,
+		    const unsigned short val)
+{
+        __asm__ __volatile__(
+                        "sthx %1,%2,%3\n\t"
+                        : "=m" (*((volatile unsigned char *)base+offset))
+                        : "r" (val), "b" (base), "r" (offset));
+}
+
+static __inline__ void
+xf86WriteMmioNB32Le(__volatile__ void *base, const unsigned long offset,
+		    const unsigned int val)
+{
+        __asm__ __volatile__(
+                        "stwbrx %1,%2,%3\n\t"
+                        : "=m" (*((volatile unsigned char *)base+offset))
+                        : "r" (val), "b" (base), "r" (offset));
+}
+
+static __inline__ void
+xf86WriteMmioNB32Be(__volatile__ void *base, const unsigned long offset,
+		    const unsigned int val)
+{
+        __asm__ __volatile__(
+                        "stwx %1,%2,%3\n\t"
+                        : "=m" (*((volatile unsigned char *)base+offset))
+                        : "r" (val), "b" (base), "r" (offset));
+}
+
+static __inline__ void
+xf86WriteMmio8(__volatile__ void *base, const unsigned long offset,
+               const unsigned char val)
+{
+        xf86WriteMmioNB8(base, offset, val);
+        eieio();
+}
+
+static __inline__ void
+xf86WriteMmio16Le(__volatile__ void *base, const unsigned long offset,
+                  const unsigned short val)
+{
+        xf86WriteMmioNB16Le(base, offset, val);
+        eieio();
+}
+
+static __inline__ void
+xf86WriteMmio16Be(__volatile__ void *base, const unsigned long offset,
+                  const unsigned short val)
+{
+        xf86WriteMmioNB16Be(base, offset, val);
+        eieio();
+}
+
+static __inline__ void
+xf86WriteMmio32Le(__volatile__ void *base, const unsigned long offset,
+                  const unsigned int val)
+{
+        xf86WriteMmioNB32Le(base, offset, val);
+        eieio();
+}
+
+static __inline__ void
+xf86WriteMmio32Be(__volatile__ void *base, const unsigned long offset,
+                  const unsigned int val)
+{
+        xf86WriteMmioNB32Be(base, offset, val);
+        eieio();
+}
+
+
+static __inline__ void
+outb(unsigned short port, unsigned char value)
+{
+        if(ioBase == MAP_FAILED) return;
+        xf86WriteMmio8((void *)ioBase, port, value);
+}
+
+static __inline__ void
+outw(unsigned short port, unsigned short value)
+{
+        if(ioBase == MAP_FAILED) return;
+        xf86WriteMmio16Le((void *)ioBase, port, value);
+}
+
+static __inline__ void
+outl(unsigned short port, unsigned int value)
+{
+        if(ioBase == MAP_FAILED) return;
+        xf86WriteMmio32Le((void *)ioBase, port, value);
+}
+
+static __inline__ unsigned int
+inb(unsigned short port)
+{
+        if(ioBase == MAP_FAILED) return 0;
+        return xf86ReadMmio8((void *)ioBase, port);
+}
+
+static __inline__ unsigned int
+inw(unsigned short port)
+{
+        if(ioBase == MAP_FAILED) return 0;
+        return xf86ReadMmio16Le((void *)ioBase, port);
+}
+
+static __inline__ unsigned int
+inl(unsigned short port)
+{
+        if(ioBase == MAP_FAILED) return 0;
+        return xf86ReadMmio32Le((void *)ioBase, port);
+}
+
+#elif defined(__arm__) && defined(__linux__)
+
+/* for Linux on ARM, we use the LIBC inx/outx routines */
+/* note that the appropriate setup via "ioperm" needs to be done */
+/*  *before* any inx/outx is done. */
+
+#include <sys/io.h>
+
+static __inline__ void
+xf_outb(unsigned short port, unsigned char val)
+{
+    outb(val, port);
+}
+
+static __inline__ void
+xf_outw(unsigned short port, unsigned short val)
+{
+    outw(val, port);
+}
+
+static __inline__ void
+xf_outl(unsigned short port, unsigned int val)
+{
+    outl(val, port);
+}
+
+#define outb xf_outb
+#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)
+#    if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__)
+#     ifdef GCCUSESGAS
+
+/*
+ * If gcc uses gas rather than the native assembler, the syntax of these
+ * inlines has to be different.		DHD
+ */
+
+static __inline__ void
+outb(unsigned short port, unsigned char val)
+{
+   __asm__ __volatile__("outb %0,%1" : :"a" (val), "d" (port));
+}
+
+
+static __inline__ void
+outw(unsigned short port, unsigned short val)
+{
+   __asm__ __volatile__("outw %0,%1" : :"a" (val), "d" (port));
+}
+
+static __inline__ void
+outl(unsigned short port, unsigned int val)
+{
+   __asm__ __volatile__("outl %0,%1" : :"a" (val), "d" (port));
+}
+
+static __inline__ unsigned int
+inb(unsigned short port)
+{
+   unsigned char ret;
+   __asm__ __volatile__("inb %1,%0" :
+       "=a" (ret) :
+       "d" (port));
+   return ret;
+}
+
+static __inline__ unsigned int
+inw(unsigned short port)
+{
+   unsigned short ret;
+   __asm__ __volatile__("inw %1,%0" :
+       "=a" (ret) :
+       "d" (port));
+   return ret;
+}
+
+static __inline__ unsigned int
+inl(unsigned short port)
+{
+   unsigned int ret;
+   __asm__ __volatile__("inl %1,%0" :
+       "=a" (ret) :
+       "d" (port));
+   return ret;
+}
+
+#     else	/* GCCUSESGAS */
+
+static __inline__ void
+outb(unsigned short port, unsigned char val)
+{
+  __asm__ __volatile__("out%B0 (%1)" : :"a" (val), "d" (port));
+}
+
+static __inline__ void
+outw(unsigned short port, unsigned short val)
+{
+  __asm__ __volatile__("out%W0 (%1)" : :"a" (val), "d" (port));
+}
+
+static __inline__ void
+outl(unsigned short port, unsigned int val)
+{
+  __asm__ __volatile__("out%L0 (%1)" : :"a" (val), "d" (port));
+}
+
+static __inline__ unsigned int
+inb(unsigned short port)
+{
+  unsigned char ret;
+  __asm__ __volatile__("in%B0 (%1)" :
+		   "=a" (ret) :
+		   "d" (port));
+  return ret;
+}
+
+static __inline__ unsigned int
+inw(unsigned short port)
+{
+  unsigned short ret;
+  __asm__ __volatile__("in%W0 (%1)" :
+		   "=a" (ret) :
+		   "d" (port));
+  return ret;
+}
+
+static __inline__ unsigned int
+inl(unsigned short port)
+{
+  unsigned int ret;
+  __asm__ __volatile__("in%L0 (%1)" :
+                   "=a" (ret) :
+                   "d" (port));
+  return ret;
+}
+
+#     endif /* GCCUSESGAS */
+
+#    else /* !defined(FAKEIT) && !defined(__mc68000__)  && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__m32r__) */
+
+static __inline__ void
+outb(unsigned short port, unsigned char val)
+{
+}
+
+static __inline__ void
+outw(unsigned short port, unsigned short val)
+{
+}
+
+static __inline__ void
+outl(unsigned short port, unsigned int val)
+{
+}
+
+static __inline__ unsigned int
+inb(unsigned short port)
+{
+  return 0;
+}
+
+static __inline__ unsigned int
+inw(unsigned short port)
+{
+  return 0;
+}
+
+static __inline__ unsigned int
+inl(unsigned short port)
+{
+  return 0;
+}
+
+#    endif /* FAKEIT */
+#    endif /* __SUNPRO_C */
+
+#   endif /* ix86 */
+
+#  else /* !GNUC */
+#    if defined(__STDC__) && (__STDC__ == 1)
+#     ifndef asm
+#      define asm __asm
+#     endif
+#    endif
+#     if !defined(__SUNPRO_C)
+#      include <sys/inline.h>
+#     endif
+#    if !defined(__HIGHC__) && !defined(__SUNPRO_C) || \
+	defined(__USLC__)
+#     pragma asm partial_optimization outl
+#     pragma asm partial_optimization outw
+#     pragma asm partial_optimization outb
+#     pragma asm partial_optimization inl
+#     pragma asm partial_optimization inw
+#     pragma asm partial_optimization inb
+#    endif
+#  endif /* __GNUC__ */
+
+# endif /* NO_INLINE */
+
+# ifdef __alpha__
+/* entry points for Mmio memory access routines */
+extern _X_EXPORT int (*xf86ReadMmio8)(void *, unsigned long);
+extern _X_EXPORT int (*xf86ReadMmio16)(void *, unsigned long);
+#  ifndef STANDALONE_MMIO
+extern _X_EXPORT int (*xf86ReadMmio32)(void *, unsigned long);
+#  else
+/* Some DRI 3D drivers need MMIO_IN32. */
+static __inline__ int
+xf86ReadMmio32(void *Base, unsigned long Offset)
+{
+	mem_barrier();
+	return *(volatile unsigned int*)((unsigned long)Base+(Offset));
+}
+#  endif
+extern _X_EXPORT void (*xf86WriteMmio8)(int, void *, unsigned long);
+extern _X_EXPORT void (*xf86WriteMmio16)(int, void *, unsigned long);
+extern _X_EXPORT void (*xf86WriteMmio32)(int, void *, unsigned long);
+extern _X_EXPORT void (*xf86WriteMmioNB8)(int, void *, unsigned long);
+extern _X_EXPORT void (*xf86WriteMmioNB16)(int, void *, unsigned long);
+extern _X_EXPORT void (*xf86WriteMmioNB32)(int, void *, unsigned long);
+extern _X_EXPORT void xf86SlowBCopyFromBus(unsigned char *, unsigned char *, int);
+extern _X_EXPORT void xf86SlowBCopyToBus(unsigned char *, unsigned char *, int);
+
+/* Some macros to hide the system dependencies for MMIO accesses */
+/* Changed to kill noise generated by gcc's -Wcast-align */
+#  define MMIO_IN8(base, offset) (*xf86ReadMmio8)(base, offset)
+#  define MMIO_IN16(base, offset) (*xf86ReadMmio16)(base, offset)
+#  ifndef STANDALONE_MMIO
+#   define MMIO_IN32(base, offset) (*xf86ReadMmio32)(base, offset)
+#  else
+#   define MMIO_IN32(base, offset) xf86ReadMmio32(base, offset)
+#  endif
+
+#  define MMIO_OUT32(base, offset, val) \
+    do { \
+	write_mem_barrier(); \
+	*(volatile CARD32 *)(void *)(((CARD8*)(base)) + (offset)) = (val); \
+    } while (0)
+#  define MMIO_ONB32(base, offset, val) \
+	*(volatile CARD32 *)(void *)(((CARD8*)(base)) + (offset)) = (val)
+
+#  define MMIO_OUT8(base, offset, val) \
+    (*xf86WriteMmio8)((CARD8)(val), base, offset)
+#  define MMIO_OUT16(base, offset, val) \
+    (*xf86WriteMmio16)((CARD16)(val), base, offset)
+#  define MMIO_ONB8(base, offset, val) \
+    (*xf86WriteMmioNB8)((CARD8)(val), base, offset)
+#  define MMIO_ONB16(base, offset, val) \
+    (*xf86WriteMmioNB16)((CARD16)(val), base, offset)
+#  define MMIO_MOVE32(base, offset, val) \
+    MMIO_OUT32(base, offset, val)
+
+# elif defined(__powerpc__)  
+ /* 
+  * we provide byteswapping and no byteswapping functions here
+  * with byteswapping as default, 
+  * drivers that don't need byteswapping should define PPC_MMIO_IS_BE 
+  */
+#  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(PPC_MMIO_IS_BE) /* No byteswapping */
+#   define MMIO_IN16(base, offset) xf86ReadMmio16Be(base, offset)
+#   define MMIO_IN32(base, offset) xf86ReadMmio32Be(base, offset)
+#   define MMIO_OUT16(base, offset, val) \
+    xf86WriteMmio16Be(base, offset, (CARD16)(val))
+#   define MMIO_OUT32(base, offset, val) \
+    xf86WriteMmio32Be(base, offset, (CARD32)(val))
+#   define MMIO_ONB16(base, offset, val) \
+    xf86WriteMmioNB16Be(base, offset, (CARD16)(val))
+#   define MMIO_ONB32(base, offset, val) \
+    xf86WriteMmioNB32Be(base, offset, (CARD32)(val))
+#  else /* byteswapping is the default */
+#   define MMIO_IN16(base, offset) xf86ReadMmio16Le(base, offset)
+#   define MMIO_IN32(base, offset) xf86ReadMmio32Le(base, offset)
+#   define MMIO_OUT16(base, offset, val) \
+     xf86WriteMmio16Le(base, offset, (CARD16)(val))
+#   define MMIO_OUT32(base, offset, val) \
+     xf86WriteMmio32Le(base, offset, (CARD32)(val))
+#   define MMIO_ONB16(base, offset, val) \
+     xf86WriteMmioNB16Le(base, offset, (CARD16)(val))
+#   define MMIO_ONB32(base, offset, val) \
+     xf86WriteMmioNB32Le(base, offset, (CARD32)(val))
+#  endif
+
+#  define MMIO_MOVE32(base, offset, val) \
+       xf86WriteMmio32Be(base, offset, (CARD32)(val))
+
+# elif defined(__sparc__) || defined(sparc) || defined(__sparc)
+ /*
+  * Like powerpc, we provide byteswapping and no byteswapping functions
+  * here with byteswapping as default, drivers that don't need byteswapping
+  * should define SPARC_MMIO_IS_BE (perhaps create a generic macro so that we
+  * do not need to use PPC_MMIO_IS_BE and the sparc one in all the same places
+  * of drivers?).
+  */
+#  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) \
+    xf86WriteMmio8NB(base, offset, (CARD8)(val))
+
+#  if defined(SPARC_MMIO_IS_BE) /* No byteswapping */
+#   define MMIO_IN16(base, offset) xf86ReadMmio16Be(base, offset)
+#   define MMIO_IN32(base, offset) xf86ReadMmio32Be(base, offset)
+#   define MMIO_OUT16(base, offset, val) \
+     xf86WriteMmio16Be(base, offset, (CARD16)(val))
+#   define MMIO_OUT32(base, offset, val) \
+     xf86WriteMmio32Be(base, offset, (CARD32)(val))
+#   define MMIO_ONB16(base, offset, val) \
+     xf86WriteMmio16BeNB(base, offset, (CARD16)(val))
+#   define MMIO_ONB32(base, offset, val) \
+     xf86WriteMmio32BeNB(base, offset, (CARD32)(val))
+#  else /* byteswapping is the default */
+#   define MMIO_IN16(base, offset) xf86ReadMmio16Le(base, offset)
+#   define MMIO_IN32(base, offset) xf86ReadMmio32Le(base, offset)
+#   define MMIO_OUT16(base, offset, val) \
+     xf86WriteMmio16Le(base, offset, (CARD16)(val))
+#   define MMIO_OUT32(base, offset, val) \
+     xf86WriteMmio32Le(base, offset, (CARD32)(val))
+#   define MMIO_ONB16(base, offset, val) \
+     xf86WriteMmio16LeNB(base, offset, (CARD16)(val))
+#   define MMIO_ONB32(base, offset, val) \
+     xf86WriteMmio32LeNB(base, offset, (CARD32)(val))
+#  endif
+
+#  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) \
+	*(volatile CARD8 *)(((CARD8*)(base)) + (offset))
+#  define MMIO_IN16(base, offset) \
+	*(volatile CARD16 *)(void *)(((CARD8*)(base)) + (offset))
+#  define MMIO_IN32(base, offset) \
+	*(volatile CARD32 *)(void *)(((CARD8*)(base)) + (offset))
+#  define MMIO_OUT8(base, offset, val) \
+	*(volatile CARD8 *)(((CARD8*)(base)) + (offset)) = (val)
+#  define MMIO_OUT16(base, offset, val) \
+	*(volatile CARD16 *)(void *)(((CARD8*)(base)) + (offset)) = (val)
+#  define MMIO_OUT32(base, offset, val) \
+	*(volatile CARD32 *)(void *)(((CARD8*)(base)) + (offset)) = (val)
+#  define MMIO_ONB8(base, offset, val) MMIO_OUT8(base, offset, val) 
+#  define MMIO_ONB16(base, offset, val) MMIO_OUT16(base, offset, val) 
+#  define MMIO_ONB32(base, offset, val) MMIO_OUT32(base, offset, val) 
+
+#  define MMIO_MOVE32(base, offset, val) MMIO_OUT32(base, offset, val)
+
+# endif /* __alpha__ */
+
+/*
+ * With Intel, the version in os-support/misc/SlowBcopy.s is used.
+ * This avoids port I/O during the copy (which causes problems with
+ * some hardware).
+ */
+# ifdef __alpha__
+#  define slowbcopy_tobus(src,dst,count) xf86SlowBCopyToBus(src,dst,count)
+#  define slowbcopy_frombus(src,dst,count) xf86SlowBCopyFromBus(src,dst,count)
+# else /* __alpha__ */
+#  define slowbcopy_tobus(src,dst,count) xf86SlowBcopy(src,dst,count)
+#  define slowbcopy_frombus(src,dst,count) xf86SlowBcopy(src,dst,count)
+# endif /* __alpha__ */
+
+#endif /* _COMPILER_H */
diff --git a/xorg-server/hw/xfree86/common/scoasm.h b/xorg-server/hw/xfree86/common/scoasm.h
deleted file mode 100644
index 8f80e7b1e..000000000
--- a/xorg-server/hw/xfree86/common/scoasm.h
+++ /dev/null
@@ -1,142 +0,0 @@
-
-/*
- * Copyright (c) 1996 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).
- */
-
-/*
- * scoasm.h - used to define inline versions of certain functions which
- * do NOT appear in sys/inline.h.
- */
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#if defined(__SCO__) && defined(__USLC__)
-#ifndef _SCOASM_HDR_INC
-#define _SCOASM_HDR_INC
-
-asm     void outl(port,val)
-{
-%reg	port,val;
-	movl	port, %edx
-	movl	val, %eax
-	outl	(%dx)
-%reg	port; mem	val;
-	movl	port, %edx
-	movl    val, %eax
-	outl	(%dx)
-%mem	port; reg	val;
-	movw	port, %dx
-	movl	val, %eax
-	outl	(%dx)
-%mem	port,val;
-	movw	port, %dx
-	movl    val, %eax
-	outl	(%dx)
-}
-
-asm	void outw(port,val)
-{
-%reg	port,val;
-	movl	port, %edx
-	movl	val, %eax
-	data16
-	outl	(%dx)
-%reg	port; mem	val;
-	movl	port, %edx
-	movw	val, %ax
-	data16
-	outl	(%dx)
-%mem	port; reg	val;
-	movw	port, %dx
-	movl	val, %eax
-	data16
-	outl	(%dx)
-%mem	port,val;
-	movw	port, %dx
-	movw	val, %ax
-	data16
-	outl	(%dx)
-}
-
-asm	void outb(port,val)
-{
-%reg	port,val;
-	movl	port, %edx
-	movl	val, %eax
-	outb	(%dx)
-%reg	port; mem	val;
-	movl	port, %edx
-	movb	val, %al
-	outb	(%dx)
-%mem	port; reg	val;
-	movw	port, %dx
-	movl	val, %eax
-	outb	(%dx)
-%mem	port,val;
-	movw	port, %dx
-	movb	val, %al
-	outb	(%dx)
-}
-
-asm     int inl(port)
-{
-%reg	port;
-	movl	port, %edx
-	inl	(%dx)
-%mem	port;
-	movw	port, %dx
-	inl	(%dx)
-}
-
-asm	int inw(port)
-{
-%reg	port;
-	subl    %eax, %eax
-	movl	port, %edx
-	data16
-	inl	(%dx)
-%mem	port;
-	subl    %eax, %eax
-	movw	port, %dx
-	data16
-	inl	(%dx)
-}
-
-asm	int inb(port)
-{
-%reg	port;
-	subl    %eax, %eax
-	movl	port, %edx
-	inb	(%dx)
-%mem	port;
-	subl    %eax, %eax
-	movw	port, %dx
-	inb	(%dx)
-}
-
-#endif /* _SCOASM_HDR_INC */
-#endif /* __SCO__ && __USLC__ */
diff --git a/xorg-server/hw/xfree86/common/xf86.h b/xorg-server/hw/xfree86/common/xf86.h
index c91020132..54332e381 100644
--- a/xorg-server/hw/xfree86/common/xf86.h
+++ b/xorg-server/hw/xfree86/common/xf86.h
@@ -1,355 +1,353 @@
-/*

- * 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 declarations for public XFree86 functions and variables,

- * and definitions of public macros.

- *

- * "public" means available to video drivers.

- */

-

-#ifndef _XF86_H

-#define _XF86_H

-

-#if HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#elif HAVE_DIX_CONFIG_H

-#include <dix-config.h>

-#endif

-

-#include "xf86str.h"

-#include "xf86Opt.h"

-#include <X11/Xfuncproto.h>

-#include <stdarg.h>

-#ifdef RANDR

-#include <X11/extensions/randr.h>

-#endif

-

-#include "propertyst.h"

-

-/* General parameters */

-extern _X_EXPORT int xf86DoConfigure;

-extern _X_EXPORT int xf86DoShowOptions;

-extern _X_EXPORT Bool xf86DoConfigurePass1;

-

-extern _X_EXPORT DevPrivateKeyRec xf86ScreenKeyRec;

-#define xf86ScreenKey (&xf86ScreenKeyRec)

-

-extern _X_EXPORT DevPrivateKeyRec xf86CreateRootWindowKeyRec;

-#define xf86CreateRootWindowKey (&xf86CreateRootWindowKeyRec)

-

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

-extern _X_EXPORT const unsigned char byte_reversed[256];

-extern _X_EXPORT Bool fbSlotClaimed;

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

-extern _X_EXPORT Bool sbusSlotClaimed;

-#endif

-extern _X_EXPORT confDRIRec xf86ConfigDRI;

-extern _X_EXPORT Bool xf86inSuspend;

-extern _X_EXPORT Bool xf86DRI2Enabled(void);

-

-extern _X_EXPORT Bool VTSwitchEnabled;	/* kbd driver */

-

-#define XF86SCRNINFO(p) ((ScrnInfoPtr)dixLookupPrivate(&(p)->devPrivates, \

-						       xf86ScreenKey))

-#define XF86FLIP_PIXELS() \

-	do { \

-	    if (xf86GetFlipPixels()) { \

-		pScreen->whitePixel = (pScreen->whitePixel) ? 0 : 1; \

-		pScreen->blackPixel = (pScreen->blackPixel) ? 0 : 1; \

-	   } \

-	while (0)

-

-#define BOOLTOSTRING(b) ((b) ? "TRUE" : "FALSE")

-

-#define PIX24TOBPP(p) (((p) == Pix24Use24) ? 24 : \

-			(((p) == Pix24Use32) ? 32 : 0))

-

-/* Function Prototypes */

-#ifndef _NO_XF86_PROTOTYPES

-

-/* 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 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 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 xf86DriverHasEntities(DriverPtr drvp);

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

-extern _X_EXPORT void xf86SetEntityInstanceForScreen(ScrnInfoPtr pScrn, int entityIndex,

-				    int instance);

-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 Bool xf86SetEntityFuncs(int entityIndex, EntityProc init,

-			EntityProc enter, EntityProc leave, pointer);

-extern _X_EXPORT Bool xf86IsEntityPrimary(int entityIndex);

-extern _X_EXPORT void xf86EnterServerState(xf86State state);

-extern _X_EXPORT ScrnInfoPtr xf86FindScreenForEntity(int entityIndex);

-

-extern _X_EXPORT int xf86GetLastScrnFlag(int entityIndex);

-extern _X_EXPORT void xf86SetLastScrnFlag(int entityIndex, int scrnIndex);

-extern _X_EXPORT Bool xf86IsEntityShared(int entityIndex);

-extern _X_EXPORT void xf86SetEntityShared(int entityIndex);

-extern _X_EXPORT Bool xf86IsEntitySharable(int entityIndex);

-extern _X_EXPORT void xf86SetEntitySharable(int entityIndex);

-extern _X_EXPORT Bool xf86IsPrimInitDone(int entityIndex);

-extern _X_EXPORT void xf86SetPrimInitDone(int entityIndex);

-extern _X_EXPORT void xf86ClearPrimInitDone(int entityIndex);

-extern _X_EXPORT int xf86AllocateEntityPrivateIndex(void);

-extern _X_EXPORT DevUnion *xf86GetEntityPrivate(int entityIndex, int privIndex);

-

-/* xf86Configure.c */

-extern _X_EXPORT GDevPtr xf86AddBusDeviceToConfigure(const char *driver, BusType bus,

-				    void *busData, int chipset);

-

-/* xf86Cursor.c */

-

-extern _X_EXPORT void xf86LockZoom(ScreenPtr pScreen, int lock);

-extern _X_EXPORT void xf86InitViewport(ScrnInfoPtr pScr);

-extern _X_EXPORT void xf86SetViewport(ScreenPtr pScreen, int x, int y);

-extern _X_EXPORT void xf86ZoomViewport(ScreenPtr pScreen, int zoom);

-extern _X_EXPORT Bool xf86SwitchMode(ScreenPtr pScreen, DisplayModePtr mode);

-extern _X_EXPORT void *xf86GetPointerScreenFuncs(void);

-extern _X_EXPORT void xf86InitOrigins(void);

-extern _X_EXPORT void xf86ReconfigureLayout(void);

-

-/* xf86cvt.c */

-extern _X_EXPORT DisplayModePtr xf86CVTMode(int HDisplay, int VDisplay, float VRefresh,

-                           Bool Reduced, Bool Interlaced);

-

-/* xf86DPMS.c */

-

-extern _X_EXPORT Bool xf86DPMSInit(ScreenPtr pScreen, DPMSSetProcPtr set, int flags);

-

-#ifdef DPMSExtension

-extern _X_EXPORT int DPMSSet(ClientPtr client, int level);

-extern _X_EXPORT Bool DPMSSupported(void);

-#endif

-

-

-/* xf86DGA.c */

-

-#ifdef XFreeXDGA

-extern _X_EXPORT Bool DGAInit(ScreenPtr pScreen, DGAFunctionPtr funcs, DGAModePtr modes,

-			int num);

-extern _X_EXPORT Bool DGAReInitModes(ScreenPtr pScreen, DGAModePtr modes, int num);

-extern _X_EXPORT xf86SetDGAModeProc xf86SetDGAMode;

-#endif

-

-/* xf86Events.c */

-

-extern _X_EXPORT void SetTimeSinceLastInputEvent(void);

-extern _X_EXPORT pointer xf86AddInputHandler(int fd, InputHandlerProc proc, pointer data);

-extern _X_EXPORT int xf86RemoveInputHandler(pointer handler);

-extern _X_EXPORT void xf86DisableInputHandler(pointer handler);

-extern _X_EXPORT void xf86EnableInputHandler(pointer handler);

-extern _X_EXPORT pointer xf86AddGeneralHandler(int fd, InputHandlerProc proc, pointer data);

-extern _X_EXPORT int xf86RemoveGeneralHandler(pointer handler);

-extern _X_EXPORT void xf86DisableGeneralHandler(pointer handler);

-extern _X_EXPORT void xf86EnableGeneralHandler(pointer handler);

-extern _X_EXPORT InputHandlerProc xf86SetConsoleHandler(InputHandlerProc handler, pointer data);

-extern _X_EXPORT void xf86InterceptSignals(int *signo);

-extern _X_EXPORT void xf86InterceptSigIll(void (*sigillhandler)(void));

-extern _X_EXPORT Bool xf86EnableVTSwitch(Bool new);

-extern _X_EXPORT void xf86ProcessActionEvent(ActionEvent action, void *arg);

-extern _X_EXPORT void xf86PrintBacktrace(void);

-

-/* xf86Helper.c */

-

-extern _X_EXPORT void xf86AddDriver(DriverPtr driver, pointer module, int flags);

-extern _X_EXPORT void xf86DeleteDriver(int drvIndex);

-extern _X_EXPORT ScrnInfoPtr xf86AllocateScreen(DriverPtr drv, int flags);

-extern _X_EXPORT void xf86DeleteScreen(int scrnIndex, int flags);

-extern _X_EXPORT int xf86AllocateScrnInfoPrivateIndex(void);

-extern _X_EXPORT Bool xf86AddPixFormat(ScrnInfoPtr pScrn, int depth, int bpp, int pad);

-extern _X_EXPORT Bool xf86SetDepthBpp(ScrnInfoPtr scrp, int depth, int bpp, int fbbpp,

-		     int depth24flags);

-extern _X_EXPORT void xf86PrintDepthBpp(ScrnInfoPtr scrp);

-extern _X_EXPORT Bool xf86SetWeight(ScrnInfoPtr scrp, rgb weight, rgb mask);

-extern _X_EXPORT Bool xf86SetDefaultVisual(ScrnInfoPtr scrp, int visual);

-extern _X_EXPORT Bool xf86SetGamma(ScrnInfoPtr scrp, Gamma newGamma);

-extern _X_EXPORT void xf86SetDpi(ScrnInfoPtr pScrn, int x, int y);

-extern _X_EXPORT void xf86SetBlackWhitePixels(ScreenPtr pScreen);

-extern _X_EXPORT void xf86EnableDisableFBAccess(int scrnIndex, Bool enable);

-extern _X_EXPORT void xf86VDrvMsgVerb(int scrnIndex, MessageType type, int verb,

-		     const char *format, va_list args);

-extern _X_EXPORT void xf86DrvMsgVerb(int scrnIndex, MessageType type, int verb,

-		    const char *format, ...) _X_ATTRIBUTE_PRINTF(4,5);

-extern _X_EXPORT void xf86DrvMsg(int scrnIndex, MessageType type, const char *format, ...)

-		_X_ATTRIBUTE_PRINTF(3,4);

-extern _X_EXPORT void xf86MsgVerb(MessageType type, int verb, const char *format, ...)

-		_X_ATTRIBUTE_PRINTF(3,4);

-extern _X_EXPORT void xf86Msg(MessageType type, const char *format, ...) _X_ATTRIBUTE_PRINTF(2,3);

-extern _X_EXPORT void xf86ErrorFVerb(int verb, const char *format, ...) _X_ATTRIBUTE_PRINTF(2,3);

-extern _X_EXPORT void xf86ErrorF(const char *format, ...) _X_ATTRIBUTE_PRINTF(1,2);

-extern _X_EXPORT const char *xf86TokenToString(SymTabPtr table, int token);

-extern _X_EXPORT int xf86StringToToken(SymTabPtr table, const char *string);

-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 void xf86GetClocks(ScrnInfoPtr pScrn, int num,

-		   Bool (*ClockFunc)(ScrnInfoPtr, int),

-		   void (*ProtectRegs)(ScrnInfoPtr, Bool),

-		   void (*BlankScreen)(ScrnInfoPtr, Bool),

-		   IOADDRESS vertsyncreg, int maskval,

-		   int knownclkindex, int knownclkvalue);

-extern _X_EXPORT const char *xf86GetVisualName(int visual);

-extern _X_EXPORT int xf86GetVerbosity(void);

-extern _X_EXPORT Pix24Flags xf86GetPix24(void);

-extern _X_EXPORT int xf86GetDepth(void);

-extern _X_EXPORT rgb xf86GetWeight(void);

-extern _X_EXPORT Gamma xf86GetGamma(void);

-extern _X_EXPORT Bool xf86GetFlipPixels(void);

-extern _X_EXPORT const char *xf86GetServerName(void);

-extern _X_EXPORT Bool xf86ServerIsExiting(void);

-extern _X_EXPORT Bool xf86ServerIsResetting(void);

-extern _X_EXPORT Bool xf86ServerIsInitialising(void);

-extern _X_EXPORT Bool xf86ServerIsOnlyDetecting(void);

-extern _X_EXPORT Bool xf86CaughtSignal(void);

-extern _X_EXPORT Bool xf86GetVidModeAllowNonLocal(void);

-extern _X_EXPORT Bool xf86GetVidModeEnabled(void);

-extern _X_EXPORT Bool xf86GetModInDevAllowNonLocal(void);

-extern _X_EXPORT Bool xf86GetModInDevEnabled(void);

-extern _X_EXPORT Bool xf86GetAllowMouseOpenFail(void);

-extern _X_EXPORT Bool xf86IsPc98(void);

-extern _X_EXPORT void xf86DisableRandR(void);

-extern _X_EXPORT CARD32 xorgGetVersion(void);

-extern _X_EXPORT CARD32 xf86GetModuleVersion(pointer module);

-extern _X_EXPORT pointer xf86LoadDrvSubModule(DriverPtr drv, const char *name);

-extern _X_EXPORT pointer xf86LoadSubModule(ScrnInfoPtr pScrn, const char *name);

-extern _X_EXPORT pointer xf86LoadOneModule(char *name, pointer optlist);

-extern _X_EXPORT void xf86UnloadSubModule(pointer mod);

-extern _X_EXPORT Bool xf86LoaderCheckSymbol(const char *name);

-extern _X_EXPORT void xf86SetBackingStore(ScreenPtr pScreen);

-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 xf86ConfigFbEntity(ScrnInfoPtr pScrn, int scrnFlag,

-			       int entityIndex, 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,

-				    pointer value);

-extern _X_EXPORT Bool xf86IsUnblank(int mode);

-

-/* xf86Init.c */

-

-extern _X_EXPORT PixmapFormatPtr xf86GetPixFormat(ScrnInfoPtr pScrn, int depth);

-extern _X_EXPORT int xf86GetBppFromDepth(ScrnInfoPtr pScrn, int depth);

-

-/* xf86Mode.c */

-

-extern _X_EXPORT int xf86GetNearestClock(ScrnInfoPtr scrp, int freq, Bool allowDiv2,

-			int DivFactor, int MulFactor, int *divider);

-extern _X_EXPORT const char *xf86ModeStatusToString(ModeStatus status);

-extern _X_EXPORT ModeStatus xf86LookupMode(ScrnInfoPtr scrp, DisplayModePtr modep,

-			  ClockRangePtr clockRanges, LookupModeFlags strategy);

-extern _X_EXPORT ModeStatus xf86CheckModeForMonitor(DisplayModePtr mode, MonPtr monitor);

-extern _X_EXPORT ModeStatus xf86InitialCheckModeForDriver(ScrnInfoPtr scrp, DisplayModePtr mode,

-					 ClockRangePtr clockRanges,

-					 LookupModeFlags strategy,

-					 int maxPitch, int virtualX,

-					 int virtualY);

-extern _X_EXPORT ModeStatus xf86CheckModeForDriver(ScrnInfoPtr scrp, DisplayModePtr mode,

-				  int flags);

-extern _X_EXPORT int xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,

-		      char **modeNames, ClockRangePtr clockRanges,

-		      int *linePitches, int minPitch, int maxPitch,

-		      int minHeight, int maxHeight, int pitchInc,

-		      int virtualX, int virtualY, int apertureSize,

-		      LookupModeFlags strategy);

-extern _X_EXPORT void xf86DeleteMode(DisplayModePtr *modeList, DisplayModePtr mode);

-extern _X_EXPORT void xf86PruneDriverModes(ScrnInfoPtr scrp);

-extern _X_EXPORT void xf86SetCrtcForModes(ScrnInfoPtr scrp, int adjustFlags);

-extern _X_EXPORT void xf86PrintModes(ScrnInfoPtr scrp);

-extern _X_EXPORT void xf86ShowClockRanges(ScrnInfoPtr scrp, ClockRangePtr clockRanges);

-extern _X_EXPORT double xf86ModeHSync(const DisplayModeRec *mode);

-extern _X_EXPORT double xf86ModeVRefresh(const DisplayModeRec *mode);

-extern _X_EXPORT void xf86SetModeDefaultName(DisplayModePtr mode);

-extern _X_EXPORT void xf86SetModeCrtc(DisplayModePtr p, int adjustFlags);

-extern _X_EXPORT DisplayModePtr xf86DuplicateMode(const DisplayModeRec *pMode);

-extern _X_EXPORT DisplayModePtr xf86DuplicateModes(ScrnInfoPtr pScrn, DisplayModePtr modeList);

-extern _X_EXPORT Bool xf86ModesEqual(const DisplayModeRec *pMode1,

-		    const DisplayModeRec *pMode2);

-extern _X_EXPORT void xf86PrintModeline(int scrnIndex,DisplayModePtr mode);

-extern _X_EXPORT DisplayModePtr xf86ModesAdd(DisplayModePtr modes, DisplayModePtr new);

-

-/* xf86Option.c */

-

-extern _X_EXPORT void xf86CollectOptions(ScrnInfoPtr pScrn, pointer extraOpts);

-

-

-/* xf86RandR.c */

-#ifdef RANDR

-extern _X_EXPORT Bool xf86RandRInit (ScreenPtr    pScreen);

-extern _X_EXPORT Rotation xf86GetRotation(ScreenPtr pScreen);

-extern _X_EXPORT Bool xf86RandRSetNewVirtualAndDimensions(ScreenPtr pScreen,

-			int newvirtX, int newvirtY,

-			int newmmWidth, int newmmHeight, Bool resetMode);

-#endif

-

-/* xf86VidModeExtentionInit.c */

-

-extern _X_EXPORT Bool VidModeExtensionInit(ScreenPtr pScreen);

-

-#endif /* _NO_XF86_PROTOTYPES */

-

-#endif /* _XF86_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 declarations for public XFree86 functions and variables,
+ * and definitions of public macros.
+ *
+ * "public" means available to video drivers.
+ */
+
+#ifndef _XF86_H
+#define _XF86_H
+
+#if HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#elif HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include "xf86str.h"
+#include "xf86Opt.h"
+#include <X11/Xfuncproto.h>
+#include <stdarg.h>
+#ifdef RANDR
+#include <X11/extensions/randr.h>
+#endif
+
+#include "propertyst.h"
+
+/* General parameters */
+extern _X_EXPORT int xf86DoConfigure;
+extern _X_EXPORT int xf86DoShowOptions;
+extern _X_EXPORT Bool xf86DoConfigurePass1;
+
+extern _X_EXPORT DevPrivateKeyRec xf86ScreenKeyRec;
+#define xf86ScreenKey (&xf86ScreenKeyRec)
+
+extern _X_EXPORT DevPrivateKeyRec xf86CreateRootWindowKeyRec;
+#define xf86CreateRootWindowKey (&xf86CreateRootWindowKeyRec)
+
+extern _X_EXPORT ScrnInfoPtr *xf86Screens;	/* List of pointers to ScrnInfoRecs */
+extern _X_EXPORT const unsigned char byte_reversed[256];
+extern _X_EXPORT Bool fbSlotClaimed;
+#if (defined(__sparc__) || defined(__sparc)) && !defined(__OpenBSD__)
+extern _X_EXPORT Bool sbusSlotClaimed;
+#endif
+extern _X_EXPORT confDRIRec xf86ConfigDRI;
+extern _X_EXPORT Bool xf86DRI2Enabled(void);
+
+extern _X_EXPORT Bool VTSwitchEnabled;	/* kbd driver */
+
+#define XF86SCRNINFO(p) ((ScrnInfoPtr)dixLookupPrivate(&(p)->devPrivates, \
+						       xf86ScreenKey))
+#define XF86FLIP_PIXELS() \
+	do { \
+	    if (xf86GetFlipPixels()) { \
+		pScreen->whitePixel = (pScreen->whitePixel) ? 0 : 1; \
+		pScreen->blackPixel = (pScreen->blackPixel) ? 0 : 1; \
+	   } \
+	while (0)
+
+#define BOOLTOSTRING(b) ((b) ? "TRUE" : "FALSE")
+
+#define PIX24TOBPP(p) (((p) == Pix24Use24) ? 24 : \
+			(((p) == Pix24Use32) ? 32 : 0))
+
+/* Function Prototypes */
+#ifndef _NO_XF86_PROTOTYPES
+
+/* 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 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 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 xf86DriverHasEntities(DriverPtr drvp);
+extern _X_EXPORT void xf86AddEntityToScreen(ScrnInfoPtr pScrn, int entityIndex);
+extern _X_EXPORT void xf86SetEntityInstanceForScreen(ScrnInfoPtr pScrn, int entityIndex,
+				    int instance);
+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 Bool xf86SetEntityFuncs(int entityIndex, EntityProc init,
+			EntityProc enter, EntityProc leave, pointer);
+extern _X_EXPORT Bool xf86IsEntityPrimary(int entityIndex);
+extern _X_EXPORT ScrnInfoPtr xf86FindScreenForEntity(int entityIndex);
+
+extern _X_EXPORT int xf86GetLastScrnFlag(int entityIndex);
+extern _X_EXPORT void xf86SetLastScrnFlag(int entityIndex, int scrnIndex);
+extern _X_EXPORT Bool xf86IsEntityShared(int entityIndex);
+extern _X_EXPORT void xf86SetEntityShared(int entityIndex);
+extern _X_EXPORT Bool xf86IsEntitySharable(int entityIndex);
+extern _X_EXPORT void xf86SetEntitySharable(int entityIndex);
+extern _X_EXPORT Bool xf86IsPrimInitDone(int entityIndex);
+extern _X_EXPORT void xf86SetPrimInitDone(int entityIndex);
+extern _X_EXPORT void xf86ClearPrimInitDone(int entityIndex);
+extern _X_EXPORT int xf86AllocateEntityPrivateIndex(void);
+extern _X_EXPORT DevUnion *xf86GetEntityPrivate(int entityIndex, int privIndex);
+
+/* xf86Configure.c */
+extern _X_EXPORT GDevPtr xf86AddBusDeviceToConfigure(const char *driver, BusType bus,
+				    void *busData, int chipset);
+
+/* xf86Cursor.c */
+
+extern _X_EXPORT void xf86LockZoom(ScreenPtr pScreen, int lock);
+extern _X_EXPORT void xf86InitViewport(ScrnInfoPtr pScr);
+extern _X_EXPORT void xf86SetViewport(ScreenPtr pScreen, int x, int y);
+extern _X_EXPORT void xf86ZoomViewport(ScreenPtr pScreen, int zoom);
+extern _X_EXPORT Bool xf86SwitchMode(ScreenPtr pScreen, DisplayModePtr mode);
+extern _X_EXPORT void *xf86GetPointerScreenFuncs(void);
+extern _X_EXPORT void xf86InitOrigins(void);
+extern _X_EXPORT void xf86ReconfigureLayout(void);
+
+/* xf86cvt.c */
+extern _X_EXPORT DisplayModePtr xf86CVTMode(int HDisplay, int VDisplay, float VRefresh,
+                           Bool Reduced, Bool Interlaced);
+
+/* xf86DPMS.c */
+
+extern _X_EXPORT Bool xf86DPMSInit(ScreenPtr pScreen, DPMSSetProcPtr set, int flags);
+
+#ifdef DPMSExtension
+extern _X_EXPORT int DPMSSet(ClientPtr client, int level);
+extern _X_EXPORT Bool DPMSSupported(void);
+#endif
+
+
+/* xf86DGA.c */
+
+#ifdef XFreeXDGA
+extern _X_EXPORT Bool DGAInit(ScreenPtr pScreen, DGAFunctionPtr funcs, DGAModePtr modes,
+			int num);
+extern _X_EXPORT Bool DGAReInitModes(ScreenPtr pScreen, DGAModePtr modes, int num);
+extern _X_EXPORT xf86SetDGAModeProc xf86SetDGAMode;
+#endif
+
+/* xf86Events.c */
+
+extern _X_EXPORT void SetTimeSinceLastInputEvent(void);
+extern _X_EXPORT pointer xf86AddInputHandler(int fd, InputHandlerProc proc, pointer data);
+extern _X_EXPORT int xf86RemoveInputHandler(pointer handler);
+extern _X_EXPORT void xf86DisableInputHandler(pointer handler);
+extern _X_EXPORT void xf86EnableInputHandler(pointer handler);
+extern _X_EXPORT pointer xf86AddGeneralHandler(int fd, InputHandlerProc proc, pointer data);
+extern _X_EXPORT int xf86RemoveGeneralHandler(pointer handler);
+extern _X_EXPORT void xf86DisableGeneralHandler(pointer handler);
+extern _X_EXPORT void xf86EnableGeneralHandler(pointer handler);
+extern _X_EXPORT InputHandlerProc xf86SetConsoleHandler(InputHandlerProc handler, pointer data);
+extern _X_EXPORT void xf86InterceptSignals(int *signo);
+extern _X_EXPORT void xf86InterceptSigIll(void (*sigillhandler)(void));
+extern _X_EXPORT Bool xf86EnableVTSwitch(Bool new);
+extern _X_EXPORT void xf86ProcessActionEvent(ActionEvent action, void *arg);
+extern _X_EXPORT void xf86PrintBacktrace(void);
+
+/* xf86Helper.c */
+
+extern _X_EXPORT void xf86AddDriver(DriverPtr driver, pointer module, int flags);
+extern _X_EXPORT void xf86DeleteDriver(int drvIndex);
+extern _X_EXPORT ScrnInfoPtr xf86AllocateScreen(DriverPtr drv, int flags);
+extern _X_EXPORT void xf86DeleteScreen(int scrnIndex, int flags);
+extern _X_EXPORT int xf86AllocateScrnInfoPrivateIndex(void);
+extern _X_EXPORT Bool xf86AddPixFormat(ScrnInfoPtr pScrn, int depth, int bpp, int pad);
+extern _X_EXPORT Bool xf86SetDepthBpp(ScrnInfoPtr scrp, int depth, int bpp, int fbbpp,
+		     int depth24flags);
+extern _X_EXPORT void xf86PrintDepthBpp(ScrnInfoPtr scrp);
+extern _X_EXPORT Bool xf86SetWeight(ScrnInfoPtr scrp, rgb weight, rgb mask);
+extern _X_EXPORT Bool xf86SetDefaultVisual(ScrnInfoPtr scrp, int visual);
+extern _X_EXPORT Bool xf86SetGamma(ScrnInfoPtr scrp, Gamma newGamma);
+extern _X_EXPORT void xf86SetDpi(ScrnInfoPtr pScrn, int x, int y);
+extern _X_EXPORT void xf86SetBlackWhitePixels(ScreenPtr pScreen);
+extern _X_EXPORT void xf86EnableDisableFBAccess(int scrnIndex, Bool enable);
+extern _X_EXPORT void xf86VDrvMsgVerb(int scrnIndex, MessageType type, int verb,
+		     const char *format, va_list args);
+extern _X_EXPORT void xf86DrvMsgVerb(int scrnIndex, MessageType type, int verb,
+		    const char *format, ...) _X_ATTRIBUTE_PRINTF(4,5);
+extern _X_EXPORT void xf86DrvMsg(int scrnIndex, MessageType type, const char *format, ...)
+		_X_ATTRIBUTE_PRINTF(3,4);
+extern _X_EXPORT void xf86MsgVerb(MessageType type, int verb, const char *format, ...)
+		_X_ATTRIBUTE_PRINTF(3,4);
+extern _X_EXPORT void xf86Msg(MessageType type, const char *format, ...) _X_ATTRIBUTE_PRINTF(2,3);
+extern _X_EXPORT void xf86ErrorFVerb(int verb, const char *format, ...) _X_ATTRIBUTE_PRINTF(2,3);
+extern _X_EXPORT void xf86ErrorF(const char *format, ...) _X_ATTRIBUTE_PRINTF(1,2);
+extern _X_EXPORT const char *xf86TokenToString(SymTabPtr table, int token);
+extern _X_EXPORT int xf86StringToToken(SymTabPtr table, const char *string);
+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 void xf86GetClocks(ScrnInfoPtr pScrn, int num,
+		   Bool (*ClockFunc)(ScrnInfoPtr, int),
+		   void (*ProtectRegs)(ScrnInfoPtr, Bool),
+		   void (*BlankScreen)(ScrnInfoPtr, Bool),
+		   IOADDRESS vertsyncreg, int maskval,
+		   int knownclkindex, int knownclkvalue);
+extern _X_EXPORT const char *xf86GetVisualName(int visual);
+extern _X_EXPORT int xf86GetVerbosity(void);
+extern _X_EXPORT Pix24Flags xf86GetPix24(void);
+extern _X_EXPORT int xf86GetDepth(void);
+extern _X_EXPORT rgb xf86GetWeight(void);
+extern _X_EXPORT Gamma xf86GetGamma(void);
+extern _X_EXPORT Bool xf86GetFlipPixels(void);
+extern _X_EXPORT const char *xf86GetServerName(void);
+extern _X_EXPORT Bool xf86ServerIsExiting(void);
+extern _X_EXPORT Bool xf86ServerIsResetting(void);
+extern _X_EXPORT Bool xf86ServerIsInitialising(void);
+extern _X_EXPORT Bool xf86ServerIsOnlyDetecting(void);
+extern _X_EXPORT Bool xf86CaughtSignal(void);
+extern _X_EXPORT Bool xf86GetVidModeAllowNonLocal(void);
+extern _X_EXPORT Bool xf86GetVidModeEnabled(void);
+extern _X_EXPORT Bool xf86GetModInDevAllowNonLocal(void);
+extern _X_EXPORT Bool xf86GetModInDevEnabled(void);
+extern _X_EXPORT Bool xf86GetAllowMouseOpenFail(void);
+extern _X_EXPORT Bool xf86IsPc98(void);
+extern _X_EXPORT void xf86DisableRandR(void);
+extern _X_EXPORT CARD32 xorgGetVersion(void);
+extern _X_EXPORT CARD32 xf86GetModuleVersion(pointer module);
+extern _X_EXPORT pointer xf86LoadDrvSubModule(DriverPtr drv, const char *name);
+extern _X_EXPORT pointer xf86LoadSubModule(ScrnInfoPtr pScrn, const char *name);
+extern _X_EXPORT pointer xf86LoadOneModule(char *name, pointer optlist);
+extern _X_EXPORT void xf86UnloadSubModule(pointer mod);
+extern _X_EXPORT Bool xf86LoaderCheckSymbol(const char *name);
+extern _X_EXPORT void xf86SetBackingStore(ScreenPtr pScreen);
+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 xf86ConfigFbEntity(ScrnInfoPtr pScrn, int scrnFlag,
+			       int entityIndex, 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,
+				    pointer value);
+extern _X_EXPORT Bool xf86IsUnblank(int mode);
+
+/* xf86Init.c */
+
+extern _X_EXPORT PixmapFormatPtr xf86GetPixFormat(ScrnInfoPtr pScrn, int depth);
+extern _X_EXPORT int xf86GetBppFromDepth(ScrnInfoPtr pScrn, int depth);
+
+/* xf86Mode.c */
+
+extern _X_EXPORT int xf86GetNearestClock(ScrnInfoPtr scrp, int freq, Bool allowDiv2,
+			int DivFactor, int MulFactor, int *divider);
+extern _X_EXPORT const char *xf86ModeStatusToString(ModeStatus status);
+extern _X_EXPORT ModeStatus xf86LookupMode(ScrnInfoPtr scrp, DisplayModePtr modep,
+			  ClockRangePtr clockRanges, LookupModeFlags strategy);
+extern _X_EXPORT ModeStatus xf86CheckModeForMonitor(DisplayModePtr mode, MonPtr monitor);
+extern _X_EXPORT ModeStatus xf86InitialCheckModeForDriver(ScrnInfoPtr scrp, DisplayModePtr mode,
+					 ClockRangePtr clockRanges,
+					 LookupModeFlags strategy,
+					 int maxPitch, int virtualX,
+					 int virtualY);
+extern _X_EXPORT ModeStatus xf86CheckModeForDriver(ScrnInfoPtr scrp, DisplayModePtr mode,
+				  int flags);
+extern _X_EXPORT int xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
+		      char **modeNames, ClockRangePtr clockRanges,
+		      int *linePitches, int minPitch, int maxPitch,
+		      int minHeight, int maxHeight, int pitchInc,
+		      int virtualX, int virtualY, int apertureSize,
+		      LookupModeFlags strategy);
+extern _X_EXPORT void xf86DeleteMode(DisplayModePtr *modeList, DisplayModePtr mode);
+extern _X_EXPORT void xf86PruneDriverModes(ScrnInfoPtr scrp);
+extern _X_EXPORT void xf86SetCrtcForModes(ScrnInfoPtr scrp, int adjustFlags);
+extern _X_EXPORT void xf86PrintModes(ScrnInfoPtr scrp);
+extern _X_EXPORT void xf86ShowClockRanges(ScrnInfoPtr scrp, ClockRangePtr clockRanges);
+extern _X_EXPORT double xf86ModeHSync(const DisplayModeRec *mode);
+extern _X_EXPORT double xf86ModeVRefresh(const DisplayModeRec *mode);
+extern _X_EXPORT void xf86SetModeDefaultName(DisplayModePtr mode);
+extern _X_EXPORT void xf86SetModeCrtc(DisplayModePtr p, int adjustFlags);
+extern _X_EXPORT DisplayModePtr xf86DuplicateMode(const DisplayModeRec *pMode);
+extern _X_EXPORT DisplayModePtr xf86DuplicateModes(ScrnInfoPtr pScrn, DisplayModePtr modeList);
+extern _X_EXPORT Bool xf86ModesEqual(const DisplayModeRec *pMode1,
+		    const DisplayModeRec *pMode2);
+extern _X_EXPORT void xf86PrintModeline(int scrnIndex,DisplayModePtr mode);
+extern _X_EXPORT DisplayModePtr xf86ModesAdd(DisplayModePtr modes, DisplayModePtr new);
+
+/* xf86Option.c */
+
+extern _X_EXPORT void xf86CollectOptions(ScrnInfoPtr pScrn, pointer extraOpts);
+
+
+/* xf86RandR.c */
+#ifdef RANDR
+extern _X_EXPORT Bool xf86RandRInit (ScreenPtr    pScreen);
+extern _X_EXPORT Rotation xf86GetRotation(ScreenPtr pScreen);
+extern _X_EXPORT Bool xf86RandRSetNewVirtualAndDimensions(ScreenPtr pScreen,
+			int newvirtX, int newvirtY,
+			int newmmWidth, int newmmHeight, Bool resetMode);
+#endif
+
+/* xf86VidModeExtentionInit.c */
+
+extern _X_EXPORT Bool VidModeExtensionInit(ScreenPtr pScreen);
+
+#endif /* _NO_XF86_PROTOTYPES */
+
+#endif /* _XF86_H */
diff --git a/xorg-server/hw/xfree86/common/xf86Bus.c b/xorg-server/hw/xfree86/common/xf86Bus.c
index bec2343b2..3b0896863 100644
--- a/xorg-server/hw/xfree86/common/xf86Bus.c
+++ b/xorg-server/hw/xfree86/common/xf86Bus.c
@@ -1,671 +1,636 @@
-/*

- * 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 the interfaces to the bus-specific code

- */

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include <ctype.h>

-#include <stdlib.h>

-#include <unistd.h>

-#include <X11/X.h>

-#include "os.h"

-#include "xf86.h"

-#include "xf86Priv.h"

-

-/* Bus-specific headers */

-

-#include "xf86Bus.h"

-

-#define XF86_OS_PRIVS

-#include "xf86_OSproc.h"

-#include "xf86VGAarbiter.h"

-

-/* Entity data */

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

-int xf86NumEntities = 0;

-static int xf86EntityPrivateCount = 0;

-

-BusRec primaryBus = { BUS_NONE, { 0 } };

-

-/**

- * Call the driver's correct probe function.

- *

- * If the driver implements the \c DriverRec::PciProbe entry-point and an

- * appropriate PCI device (with matching Device section in the xorg.conf file)

- * is found, it is called.  If \c DriverRec::PciProbe or no devices can be

- * successfully probed with it (e.g., only non-PCI devices are available),

- * the driver's \c DriverRec::Probe function is called.

- *

- * \param drv   Driver to probe

- *

- * \return

- * If a device can be successfully probed by the driver, \c TRUE is

- * returned.  Otherwise, \c FALSE is returned.

- */

-Bool

-xf86CallDriverProbe( DriverPtr drv, Bool detect_only )

-{

-    Bool     foundScreen = FALSE;

-

-    if (drv->PciProbe != NULL) {

-        if (xf86DoConfigure && xf86DoConfigurePass1) {

-            assert(detect_only);

-            foundScreen = xf86PciAddMatchingDev(drv);

-        }

-        else {

-            assert(! detect_only);

-            foundScreen = xf86PciProbeDev(drv);

-        }

-    }

-

-    if (!foundScreen && (drv->Probe != NULL)) {

-        xf86Msg( X_WARNING, "Falling back to old probe method for %s\n",

-                             drv->driverName);

-        foundScreen = (*drv->Probe)(drv, (detect_only) ? PROBE_DETECT

-                                    : PROBE_DEFAULT);

-    }

-

-    return foundScreen;

-}

-

-/**

- * @return TRUE if all buses are configured and set up correctly and FALSE

- * otherwise.

- */

-Bool

-xf86BusConfig(void)

-{

-    screenLayoutPtr layout;

-    int i, j;

-

-    /* Enable full I/O access */

-    if (xorgHWAccess)

-        xorgHWAccess = xf86EnableIO();

-

-    /*

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

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

-     * instance of the hardware found.

-     */

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

-        xorgHWFlags flags;

-        if (!xorgHWAccess) {

-            if (!xf86DriverList[i]->driverFunc

-            || !xf86DriverList[i]->driverFunc(NULL,

-                             GET_REQUIRED_HW_INTERFACES,

-                              &flags)

-            || NEED_IO_ENABLED(flags))

-            continue;

-        }

-

-        xf86CallDriverProbe(xf86DriverList[i], FALSE);

-    }

-

-    /* If nothing was detected, return now */

-    if (xf86NumScreens == 0) {

-        xf86Msg(X_ERROR, "No devices detected.\n");

-        return FALSE;

-    }

-

-    xf86VGAarbiterInit();

-

-    /*

-     * Match up the screens found by the probes against those specified

-     * in the config file.  Remove the ones that won't be used.  Sort

-     * them in the order specified.

-     *

-     * What is the best way to do this?

-     *

-     * For now, go through the screens allocated by the probes, and

-     * look for screen config entry which refers to the same device

-     * section as picked out by the probe.

-     *

-     */

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

-        for (layout = xf86ConfigLayout.screens; layout->screen != NULL;

-             layout++) {

-            Bool found = FALSE;

-            for (j = 0; j < xf86Screens[i]->numEntities; j++) {

-

-                GDevPtr dev = xf86GetDevFromEntity(

-                                xf86Screens[i]->entityList[j],

-                                xf86Screens[i]->entityInstanceList[j]);

-                if (dev == layout->screen->device) {

-                    /* A match has been found */

-                    xf86Screens[i]->confScreen = layout->screen;

-                    found = TRUE;

-                    break;

-                }

-            }

-            if (found) break;

-        }

-        if (layout->screen == NULL) {

-            /* No match found */

-            xf86Msg(X_ERROR,

-            "Screen %d deleted because of no matching config section.\n", i);

-            xf86DeleteScreen(i--, 0);

-        }

-    }

-

-    /* If no screens left, return now.  */

-    if (xf86NumScreens == 0) {

-        xf86Msg(X_ERROR,

-        "Device(s) detected, but none match those in the config file.\n");

-        return FALSE;

-    }

-

-    return TRUE;

-}

-

-/*

- * Call the bus probes relevant to the architecture.

- *

- * The only one available so far is for PCI and SBUS.

- */

-

-void

-xf86BusProbe(void)

-{

-    xf86PciProbe();

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

-    xf86SbusProbe();

-#endif

-}

-

-/*

- * Determine what bus type the busID string represents.  The start of the

- * bus-dependent part of the string is returned as retID.

- */

-

-BusType

-StringToBusType(const char* busID, const char **retID)

-{

-    char *p, *s;

-    BusType ret = BUS_NONE;

-

-    /* If no type field, Default to PCI */

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

-	if (retID)

-	    *retID = busID;

-	return BUS_PCI;

-    }

-

-    s = xstrdup(busID);

-    p = strtok(s, ":");

-    if (p == NULL || *p == 0) {

-	free(s);

-	return BUS_NONE;

-    }

-    if (!xf86NameCmp(p, "pci") || !xf86NameCmp(p, "agp"))

-	ret = BUS_PCI; 

-    if (!xf86NameCmp(p, "sbus"))

-	ret = BUS_SBUS;

-    if (ret != BUS_NONE)

-	if (retID)

-	    *retID = busID + strlen(p) + 1;

-    free(s);

-    return ret;

-}

-

-int

-xf86AllocateEntity(void)

-{

-    xf86NumEntities++;

-    xf86Entities = xnfrealloc(xf86Entities,

-			      sizeof(EntityPtr) * xf86NumEntities);

-    xf86Entities[xf86NumEntities - 1] = xnfcalloc(1,sizeof(EntityRec));

-    xf86Entities[xf86NumEntities - 1]->entityPrivates =

-               xnfcalloc(sizeof(DevUnion) * xf86EntityPrivateCount, 1);

-    return xf86NumEntities - 1;

-}

-

-Bool

-xf86IsEntityPrimary(int entityIndex)

-{

-    EntityPtr pEnt = xf86Entities[entityIndex];

-    

-    if (primaryBus.type != pEnt->bus.type) return FALSE;

-

-    switch (pEnt->bus.type) {

-    case BUS_PCI:

-	return pEnt->bus.id.pci == primaryBus.id.pci;

-    case BUS_SBUS:

-	return pEnt->bus.id.sbus.fbNum == primaryBus.id.sbus.fbNum;

-    default:

-	return FALSE;

-    }

-}

-	

-Bool

-xf86SetEntityFuncs(int entityIndex, EntityProc init, EntityProc enter,

-		   EntityProc leave, pointer private)

-{

-    if (entityIndex >= xf86NumEntities)

-	return FALSE;

-    xf86Entities[entityIndex]->entityInit = init;

-    xf86Entities[entityIndex]->entityEnter = enter;

-    xf86Entities[entityIndex]->entityLeave = leave;

-    xf86Entities[entityIndex]->private = private;

-    return TRUE;

-}

-

-Bool

-xf86DriverHasEntities(DriverPtr drvp)

-{

-    int i;

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

-	if (xf86Entities[i]->driver == drvp) 

-	    return TRUE;

-    }

-    return FALSE;

-}

-

-void

-xf86AddEntityToScreen(ScrnInfoPtr pScrn, int entityIndex)

-{

-    if (entityIndex == -1)

-	return;

-    if (xf86Entities[entityIndex]->inUse &&

-	!(xf86Entities[entityIndex]->entityProp & IS_SHARED_ACCEL)) {

-	ErrorF("Requested Entity already in use!\n");

-	return;

-    }

-

-    pScrn->numEntities++;

-    pScrn->entityList = xnfrealloc(pScrn->entityList,

-				    pScrn->numEntities * sizeof(int));

-    pScrn->entityList[pScrn->numEntities - 1] = entityIndex;

-    xf86Entities[entityIndex]->inUse = TRUE;

-    pScrn->entityInstanceList = xnfrealloc(pScrn->entityInstanceList,

-				    pScrn->numEntities * sizeof(int));

-    pScrn->entityInstanceList[pScrn->numEntities - 1] = 0;

-    pScrn->domainIOBase = xf86Entities[entityIndex]->domainIO;

-}

-

-void

-xf86SetEntityInstanceForScreen(ScrnInfoPtr pScrn, int entityIndex, int instance)

-{

-    int i;

-

-    if (entityIndex == -1 || entityIndex >= xf86NumEntities)

-	return;

-

-    for (i = 0; i < pScrn->numEntities; i++) {

-	if (pScrn->entityList[i] == entityIndex) {

-	    pScrn->entityInstanceList[i] = instance;

-	    break;

-	}

-    }

-}

-

-/*

- * XXX  This needs to be updated for the case where a single entity may have

- * instances associated with more than one screen.

- */

-ScrnInfoPtr

-xf86FindScreenForEntity(int entityIndex)

-{

-    int i,j;

-

-    if (entityIndex == -1) return NULL;

-    

-    if (xf86Screens) {

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

-	    for (j = 0; j < xf86Screens[i]->numEntities; j++) {

-		if ( xf86Screens[i]->entityList[j] == entityIndex )

-		    return xf86Screens[i];

-	    }

-	}

-    }

-    return NULL;

-}

-

-void

-xf86RemoveEntityFromScreen(ScrnInfoPtr pScrn, int entityIndex)

-{

-    int i;

-    

-    for (i = 0; i < pScrn->numEntities; i++) {

-	if (pScrn->entityList[i] == entityIndex) {

-	    for (i++; i < pScrn->numEntities; i++)

-		pScrn->entityList[i-1] = pScrn->entityList[i];

-	    pScrn->numEntities--;

-	    xf86Entities[entityIndex]->inUse = FALSE;

-	    break;

-	}

-    }

-}

-

-/*

- * xf86ClearEntitiesForScreen() - called when a screen is deleted

- * to mark it's entities unused. Called by xf86DeleteScreen().

- */

-void

-xf86ClearEntityListForScreen(int scrnIndex)

-{

-    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];

-    int i, entityIndex;

-    

-    if (pScrn->entityList == NULL || pScrn->numEntities == 0) return;

-	

-    for (i = 0; i < pScrn->numEntities; i++) {

-	entityIndex = pScrn->entityList[i];

-	xf86Entities[entityIndex]->inUse = FALSE;

-	/* disable resource: call the disable function */

-    }

-    free(pScrn->entityList);

-    free(pScrn->entityInstanceList);

-    pScrn->entityList = NULL;

-    pScrn->entityInstanceList = NULL;

-}

-

-/*

- * Add an extra device section (GDevPtr) to an entity.

- */

-

-void

-xf86AddDevToEntity(int entityIndex, GDevPtr dev)

-{

-    EntityPtr pEnt;

-    

-    if (entityIndex >= xf86NumEntities)

-	return;

-    

-    pEnt = xf86Entities[entityIndex];

-    pEnt->numInstances++;

-    pEnt->devices = xnfrealloc(pEnt->devices,

-				pEnt->numInstances * sizeof(GDevPtr));

-    pEnt->devices[pEnt->numInstances - 1] = dev;

-    dev->claimed = TRUE;

-}

-

-/*

- * xf86GetEntityInfo() -- This function hands information from the

- * EntityRec struct to the drivers. The EntityRec structure itself

- * remains invisible to the driver.

- */

-EntityInfoPtr

-xf86GetEntityInfo(int entityIndex)

-{

-    EntityInfoPtr pEnt;

-    int i;

-    

-    if (entityIndex == -1)

-	return NULL;

-

-    if (entityIndex >= xf86NumEntities)

-	return NULL;

-    

-    pEnt = xnfcalloc(1,sizeof(EntityInfoRec));

-    pEnt->index = entityIndex;

-    pEnt->location = xf86Entities[entityIndex]->bus;

-    pEnt->active = xf86Entities[entityIndex]->active;

-    pEnt->chipset = xf86Entities[entityIndex]->chipset;

-    pEnt->driver = xf86Entities[entityIndex]->driver;

-    if ( (xf86Entities[entityIndex]->devices) &&

-         (xf86Entities[entityIndex]->devices[0]) ) {

-	for (i = 0; i < xf86Entities[entityIndex]->numInstances; i++)

-	    if (xf86Entities[entityIndex]->devices[i]->screen == 0)

-	        break;

-	pEnt->device = xf86Entities[entityIndex]->devices[i];

-    } else

-	pEnt->device = NULL;

-    

-    return pEnt;

-}

-

-int

-xf86GetNumEntityInstances(int entityIndex)

-{

-    if (entityIndex >= xf86NumEntities)

-	return -1;

-    

-    return xf86Entities[entityIndex]->numInstances;

-}

-

-GDevPtr

-xf86GetDevFromEntity(int entityIndex, int instance)

-{

-    int i;

-  

-    /* We might not use AddDevtoEntity */

-    if ( (!xf86Entities[entityIndex]->devices) ||

-         (!xf86Entities[entityIndex]->devices[0]) ) 

-	return NULL;

-

-    if (entityIndex >= xf86NumEntities ||

-	instance >= xf86Entities[entityIndex]->numInstances)

-	return NULL;

-    

-    for (i = 0; i < xf86Entities[entityIndex]->numInstances; i++)

-	if (xf86Entities[entityIndex]->devices[i]->screen == instance)

-	    break;

-    return xf86Entities[entityIndex]->devices[i];

-}

-

-/*

- * xf86AccessEnter() -- gets called to save the text mode VGA IO 

- * resources when reentering the server after a VT switch.

- */

-void

-xf86AccessEnter(void)

-{

-    int i;

-

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

-        if (xf86Entities[i]->entityEnter)

-		xf86Entities[i]->entityEnter(i,xf86Entities[i]->private);

-

-    xf86EnterServerState(SETUP);

-}

-

-void

-xf86AccessLeave(void)

-{

-    int i;

-

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

-        if (xf86Entities[i]->entityLeave)

-		xf86Entities[i]->entityLeave(i,xf86Entities[i]->private);

-}

-

-/*

- * xf86EnterServerState() -- set state the server is in.

- */

-

-typedef enum { TRI_UNSET, TRI_TRUE, TRI_FALSE } TriState;

-

-void

-xf86EnterServerState(xf86State state)

-{

-    static int sigio_state;

-    static TriState sigio_blocked = TRI_UNSET;

-

-    /*

-     * This is a good place to block SIGIO during SETUP state. SIGIO should be

-     * blocked in SETUP state otherwise (u)sleep() might get interrupted

-     * early. We take care not to call xf86BlockSIGIO() twice.

-     */

-    if ((state == SETUP) && (sigio_blocked != TRI_TRUE)) {

-        sigio_state = xf86BlockSIGIO();

-	sigio_blocked = TRI_TRUE;

-    } else if ((state == OPERATING) && (sigio_blocked != TRI_UNSET)) {

-        xf86UnblockSIGIO(sigio_state);

-        sigio_blocked = TRI_FALSE;

-    }

-}

-

-/*

- * xf86PostProbe() -- Allocate all non conflicting resources

- * This function gets called by xf86Init().

- */

-void

-xf86PostProbe(void)

-{

-    int i;

-

-    if (fbSlotClaimed && (pciSlotClaimed

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

-	    || sbusSlotClaimed

-#endif

-	    ))

-	    FatalError("Cannot run in framebuffer mode. Please specify busIDs "

-		       "       for all framebuffer devices\n");

-

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

-        if (xf86Entities[i]->entityInit)

-	    xf86Entities[i]->entityInit(i,xf86Entities[i]->private);

-}

-

-void

-xf86PostScreenInit(void)

-{

-    xf86VGAarbiterWrapFunctions();

-    xf86EnterServerState(OPERATING);

-}

-

-int

-xf86GetLastScrnFlag(int entityIndex)

-{

-    if(entityIndex < xf86NumEntities) {

-        return xf86Entities[entityIndex]->lastScrnFlag;

-    } else {

-        return -1;

-    }

-}

-

-void

-xf86SetLastScrnFlag(int entityIndex, int scrnIndex)

-{

-    if(entityIndex < xf86NumEntities) {

-        xf86Entities[entityIndex]->lastScrnFlag = scrnIndex;

-    }

-}

-

-Bool

-xf86IsEntityShared(int entityIndex)

-{

-    if(entityIndex < xf86NumEntities) {

-        if(xf86Entities[entityIndex]->entityProp & IS_SHARED_ACCEL) {

-	    return TRUE;

-	}

-    }

-    return FALSE;

-}

-

-void

-xf86SetEntityShared(int entityIndex)

-{

-    if(entityIndex < xf86NumEntities) {

-        xf86Entities[entityIndex]->entityProp |= IS_SHARED_ACCEL;

-    }

-}

-

-Bool

-xf86IsEntitySharable(int entityIndex)

-{

-    if(entityIndex < xf86NumEntities) {

-        if(xf86Entities[entityIndex]->entityProp & ACCEL_IS_SHARABLE) {

-	    return TRUE;

-	}

-    }

-    return FALSE;

-}

-

-void

-xf86SetEntitySharable(int entityIndex)

-{

-    if(entityIndex < xf86NumEntities) {

-        xf86Entities[entityIndex]->entityProp |= ACCEL_IS_SHARABLE;

-    }

-}

-

-Bool

-xf86IsPrimInitDone(int entityIndex)

-{

-    if(entityIndex < xf86NumEntities) {

-        if(xf86Entities[entityIndex]->entityProp & SA_PRIM_INIT_DONE) {

-	    return TRUE;

-	}

-    }

-    return FALSE;

-}

-

-void

-xf86SetPrimInitDone(int entityIndex)

-{

-    if(entityIndex < xf86NumEntities) {

-        xf86Entities[entityIndex]->entityProp |= SA_PRIM_INIT_DONE;

-    }

-}

-

-void

-xf86ClearPrimInitDone(int entityIndex)

-{

-    if(entityIndex < xf86NumEntities) {

-        xf86Entities[entityIndex]->entityProp &= ~SA_PRIM_INIT_DONE;

-    }

-}

-

-

-/*

- * Allocate a private in the entities.

- */

-

-int

-xf86AllocateEntityPrivateIndex(void)

-{

-    int idx, i;

-    EntityPtr pEnt;

-    DevUnion *nprivs;

-

-    idx = xf86EntityPrivateCount++;

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

-	pEnt = xf86Entities[i];

-	nprivs = xnfrealloc(pEnt->entityPrivates,

-			    xf86EntityPrivateCount * sizeof(DevUnion));

-	/* Zero the new private */

-	memset(&nprivs[idx], 0, sizeof(DevUnion));

-	pEnt->entityPrivates = nprivs;

-    }

-    return idx;

-}

-

-DevUnion *

-xf86GetEntityPrivate(int entityIndex, int privIndex)

-{

-    if (entityIndex >= xf86NumEntities || privIndex >= xf86EntityPrivateCount)

-	return NULL;

-

-    return &(xf86Entities[entityIndex]->entityPrivates[privIndex]);

-}

-

+/*
+ * 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 the interfaces to the bus-specific code
+ */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include <ctype.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <X11/X.h>
+#include "os.h"
+#include "xf86.h"
+#include "xf86Priv.h"
+
+/* Bus-specific headers */
+
+#include "xf86Bus.h"
+
+#define XF86_OS_PRIVS
+#include "xf86_OSproc.h"
+#include "xf86VGAarbiter.h"
+
+/* Entity data */
+EntityPtr *xf86Entities = NULL;	/* Bus slots claimed by drivers */
+int xf86NumEntities = 0;
+static int xf86EntityPrivateCount = 0;
+
+BusRec primaryBus = { BUS_NONE, { 0 } };
+
+/**
+ * Call the driver's correct probe function.
+ *
+ * If the driver implements the \c DriverRec::PciProbe entry-point and an
+ * appropriate PCI device (with matching Device section in the xorg.conf file)
+ * is found, it is called.  If \c DriverRec::PciProbe or no devices can be
+ * successfully probed with it (e.g., only non-PCI devices are available),
+ * the driver's \c DriverRec::Probe function is called.
+ *
+ * \param drv   Driver to probe
+ *
+ * \return
+ * If a device can be successfully probed by the driver, \c TRUE is
+ * returned.  Otherwise, \c FALSE is returned.
+ */
+Bool
+xf86CallDriverProbe( DriverPtr drv, Bool detect_only )
+{
+    Bool     foundScreen = FALSE;
+
+    if (drv->PciProbe != NULL) {
+        if (xf86DoConfigure && xf86DoConfigurePass1) {
+            assert(detect_only);
+            foundScreen = xf86PciAddMatchingDev(drv);
+        }
+        else {
+            assert(! detect_only);
+            foundScreen = xf86PciProbeDev(drv);
+        }
+    }
+
+    if (!foundScreen && (drv->Probe != NULL)) {
+        xf86Msg( X_WARNING, "Falling back to old probe method for %s\n",
+                             drv->driverName);
+        foundScreen = (*drv->Probe)(drv, (detect_only) ? PROBE_DETECT
+                                    : PROBE_DEFAULT);
+    }
+
+    return foundScreen;
+}
+
+/**
+ * @return TRUE if all buses are configured and set up correctly and FALSE
+ * otherwise.
+ */
+Bool
+xf86BusConfig(void)
+{
+    screenLayoutPtr layout;
+    int i, j;
+
+    /* Enable full I/O access */
+    if (xorgHWAccess)
+        xorgHWAccess = xf86EnableIO();
+
+    /*
+     * Now call each of the Probe functions.  Each successful probe will
+     * result in an extra entry added to the xf86Screens[] list for each
+     * instance of the hardware found.
+     */
+    for (i = 0; i < xf86NumDrivers; i++) {
+        xorgHWFlags flags;
+        if (!xorgHWAccess) {
+            if (!xf86DriverList[i]->driverFunc
+            || !xf86DriverList[i]->driverFunc(NULL,
+                             GET_REQUIRED_HW_INTERFACES,
+                              &flags)
+            || NEED_IO_ENABLED(flags))
+            continue;
+        }
+
+        xf86CallDriverProbe(xf86DriverList[i], FALSE);
+    }
+
+    /* If nothing was detected, return now */
+    if (xf86NumScreens == 0) {
+        xf86Msg(X_ERROR, "No devices detected.\n");
+        return FALSE;
+    }
+
+    xf86VGAarbiterInit();
+
+    /*
+     * Match up the screens found by the probes against those specified
+     * in the config file.  Remove the ones that won't be used.  Sort
+     * them in the order specified.
+     *
+     * What is the best way to do this?
+     *
+     * For now, go through the screens allocated by the probes, and
+     * look for screen config entry which refers to the same device
+     * section as picked out by the probe.
+     *
+     */
+    for (i = 0; i < xf86NumScreens; i++) {
+        for (layout = xf86ConfigLayout.screens; layout->screen != NULL;
+             layout++) {
+            Bool found = FALSE;
+            for (j = 0; j < xf86Screens[i]->numEntities; j++) {
+
+                GDevPtr dev = xf86GetDevFromEntity(
+                                xf86Screens[i]->entityList[j],
+                                xf86Screens[i]->entityInstanceList[j]);
+                if (dev == layout->screen->device) {
+                    /* A match has been found */
+                    xf86Screens[i]->confScreen = layout->screen;
+                    found = TRUE;
+                    break;
+                }
+            }
+            if (found) break;
+        }
+        if (layout->screen == NULL) {
+            /* No match found */
+            xf86Msg(X_ERROR,
+            "Screen %d deleted because of no matching config section.\n", i);
+            xf86DeleteScreen(i--, 0);
+        }
+    }
+
+    /* If no screens left, return now.  */
+    if (xf86NumScreens == 0) {
+        xf86Msg(X_ERROR,
+        "Device(s) detected, but none match those in the config file.\n");
+        return FALSE;
+    }
+
+    return TRUE;
+}
+
+/*
+ * Call the bus probes relevant to the architecture.
+ *
+ * The only one available so far is for PCI and SBUS.
+ */
+
+void
+xf86BusProbe(void)
+{
+    xf86PciProbe();
+#if (defined(__sparc__) || defined(__sparc)) && !defined(__OpenBSD__)
+    xf86SbusProbe();
+#endif
+}
+
+/*
+ * Determine what bus type the busID string represents.  The start of the
+ * bus-dependent part of the string is returned as retID.
+ */
+
+BusType
+StringToBusType(const char* busID, const char **retID)
+{
+    char *p, *s;
+    BusType ret = BUS_NONE;
+
+    /* If no type field, Default to PCI */
+    if (isdigit(busID[0])) {
+	if (retID)
+	    *retID = busID;
+	return BUS_PCI;
+    }
+
+    s = xstrdup(busID);
+    p = strtok(s, ":");
+    if (p == NULL || *p == 0) {
+	free(s);
+	return BUS_NONE;
+    }
+    if (!xf86NameCmp(p, "pci") || !xf86NameCmp(p, "agp"))
+	ret = BUS_PCI; 
+    if (!xf86NameCmp(p, "sbus"))
+	ret = BUS_SBUS;
+    if (ret != BUS_NONE)
+	if (retID)
+	    *retID = busID + strlen(p) + 1;
+    free(s);
+    return ret;
+}
+
+int
+xf86AllocateEntity(void)
+{
+    xf86NumEntities++;
+    xf86Entities = xnfrealloc(xf86Entities,
+			      sizeof(EntityPtr) * xf86NumEntities);
+    xf86Entities[xf86NumEntities - 1] = xnfcalloc(1,sizeof(EntityRec));
+    xf86Entities[xf86NumEntities - 1]->entityPrivates =
+               xnfcalloc(sizeof(DevUnion) * xf86EntityPrivateCount, 1);
+    return xf86NumEntities - 1;
+}
+
+Bool
+xf86IsEntityPrimary(int entityIndex)
+{
+    EntityPtr pEnt = xf86Entities[entityIndex];
+    
+    if (primaryBus.type != pEnt->bus.type) return FALSE;
+
+    switch (pEnt->bus.type) {
+    case BUS_PCI:
+	return pEnt->bus.id.pci == primaryBus.id.pci;
+    case BUS_SBUS:
+	return pEnt->bus.id.sbus.fbNum == primaryBus.id.sbus.fbNum;
+    default:
+	return FALSE;
+    }
+}
+	
+Bool
+xf86SetEntityFuncs(int entityIndex, EntityProc init, EntityProc enter,
+		   EntityProc leave, pointer private)
+{
+    if (entityIndex >= xf86NumEntities)
+	return FALSE;
+    xf86Entities[entityIndex]->entityInit = init;
+    xf86Entities[entityIndex]->entityEnter = enter;
+    xf86Entities[entityIndex]->entityLeave = leave;
+    xf86Entities[entityIndex]->private = private;
+    return TRUE;
+}
+
+Bool
+xf86DriverHasEntities(DriverPtr drvp)
+{
+    int i;
+    for (i = 0; i < xf86NumEntities; i++) {
+	if (xf86Entities[i]->driver == drvp) 
+	    return TRUE;
+    }
+    return FALSE;
+}
+
+void
+xf86AddEntityToScreen(ScrnInfoPtr pScrn, int entityIndex)
+{
+    if (entityIndex == -1)
+	return;
+    if (xf86Entities[entityIndex]->inUse &&
+	!(xf86Entities[entityIndex]->entityProp & IS_SHARED_ACCEL)) {
+	ErrorF("Requested Entity already in use!\n");
+	return;
+    }
+
+    pScrn->numEntities++;
+    pScrn->entityList = xnfrealloc(pScrn->entityList,
+				    pScrn->numEntities * sizeof(int));
+    pScrn->entityList[pScrn->numEntities - 1] = entityIndex;
+    xf86Entities[entityIndex]->inUse = TRUE;
+    pScrn->entityInstanceList = xnfrealloc(pScrn->entityInstanceList,
+				    pScrn->numEntities * sizeof(int));
+    pScrn->entityInstanceList[pScrn->numEntities - 1] = 0;
+    pScrn->domainIOBase = xf86Entities[entityIndex]->domainIO;
+}
+
+void
+xf86SetEntityInstanceForScreen(ScrnInfoPtr pScrn, int entityIndex, int instance)
+{
+    int i;
+
+    if (entityIndex == -1 || entityIndex >= xf86NumEntities)
+	return;
+
+    for (i = 0; i < pScrn->numEntities; i++) {
+	if (pScrn->entityList[i] == entityIndex) {
+	    pScrn->entityInstanceList[i] = instance;
+	    break;
+	}
+    }
+}
+
+/*
+ * XXX  This needs to be updated for the case where a single entity may have
+ * instances associated with more than one screen.
+ */
+ScrnInfoPtr
+xf86FindScreenForEntity(int entityIndex)
+{
+    int i,j;
+
+    if (entityIndex == -1) return NULL;
+    
+    if (xf86Screens) {
+	for (i = 0; i < xf86NumScreens; i++) {
+	    for (j = 0; j < xf86Screens[i]->numEntities; j++) {
+		if ( xf86Screens[i]->entityList[j] == entityIndex )
+		    return xf86Screens[i];
+	    }
+	}
+    }
+    return NULL;
+}
+
+void
+xf86RemoveEntityFromScreen(ScrnInfoPtr pScrn, int entityIndex)
+{
+    int i;
+    
+    for (i = 0; i < pScrn->numEntities; i++) {
+	if (pScrn->entityList[i] == entityIndex) {
+	    for (i++; i < pScrn->numEntities; i++)
+		pScrn->entityList[i-1] = pScrn->entityList[i];
+	    pScrn->numEntities--;
+	    xf86Entities[entityIndex]->inUse = FALSE;
+	    break;
+	}
+    }
+}
+
+/*
+ * xf86ClearEntitiesForScreen() - called when a screen is deleted
+ * to mark it's entities unused. Called by xf86DeleteScreen().
+ */
+void
+xf86ClearEntityListForScreen(int scrnIndex)
+{
+    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+    int i, entityIndex;
+    
+    if (pScrn->entityList == NULL || pScrn->numEntities == 0) return;
+	
+    for (i = 0; i < pScrn->numEntities; i++) {
+	entityIndex = pScrn->entityList[i];
+	xf86Entities[entityIndex]->inUse = FALSE;
+	/* disable resource: call the disable function */
+    }
+    free(pScrn->entityList);
+    free(pScrn->entityInstanceList);
+    pScrn->entityList = NULL;
+    pScrn->entityInstanceList = NULL;
+}
+
+/*
+ * Add an extra device section (GDevPtr) to an entity.
+ */
+
+void
+xf86AddDevToEntity(int entityIndex, GDevPtr dev)
+{
+    EntityPtr pEnt;
+    
+    if (entityIndex >= xf86NumEntities)
+	return;
+    
+    pEnt = xf86Entities[entityIndex];
+    pEnt->numInstances++;
+    pEnt->devices = xnfrealloc(pEnt->devices,
+				pEnt->numInstances * sizeof(GDevPtr));
+    pEnt->devices[pEnt->numInstances - 1] = dev;
+    dev->claimed = TRUE;
+}
+
+/*
+ * xf86GetEntityInfo() -- This function hands information from the
+ * EntityRec struct to the drivers. The EntityRec structure itself
+ * remains invisible to the driver.
+ */
+EntityInfoPtr
+xf86GetEntityInfo(int entityIndex)
+{
+    EntityInfoPtr pEnt;
+    int i;
+    
+    if (entityIndex == -1)
+	return NULL;
+
+    if (entityIndex >= xf86NumEntities)
+	return NULL;
+    
+    pEnt = xnfcalloc(1,sizeof(EntityInfoRec));
+    pEnt->index = entityIndex;
+    pEnt->location = xf86Entities[entityIndex]->bus;
+    pEnt->active = xf86Entities[entityIndex]->active;
+    pEnt->chipset = xf86Entities[entityIndex]->chipset;
+    pEnt->driver = xf86Entities[entityIndex]->driver;
+    if ( (xf86Entities[entityIndex]->devices) &&
+         (xf86Entities[entityIndex]->devices[0]) ) {
+	for (i = 0; i < xf86Entities[entityIndex]->numInstances; i++)
+	    if (xf86Entities[entityIndex]->devices[i]->screen == 0)
+	        break;
+	pEnt->device = xf86Entities[entityIndex]->devices[i];
+    } else
+	pEnt->device = NULL;
+    
+    return pEnt;
+}
+
+int
+xf86GetNumEntityInstances(int entityIndex)
+{
+    if (entityIndex >= xf86NumEntities)
+	return -1;
+    
+    return xf86Entities[entityIndex]->numInstances;
+}
+
+GDevPtr
+xf86GetDevFromEntity(int entityIndex, int instance)
+{
+    int i;
+  
+    /* We might not use AddDevtoEntity */
+    if ( (!xf86Entities[entityIndex]->devices) ||
+         (!xf86Entities[entityIndex]->devices[0]) ) 
+	return NULL;
+
+    if (entityIndex >= xf86NumEntities ||
+	instance >= xf86Entities[entityIndex]->numInstances)
+	return NULL;
+    
+    for (i = 0; i < xf86Entities[entityIndex]->numInstances; i++)
+	if (xf86Entities[entityIndex]->devices[i]->screen == instance)
+	    break;
+    return xf86Entities[entityIndex]->devices[i];
+}
+
+/*
+ * xf86AccessEnter() -- gets called to save the text mode VGA IO 
+ * resources when reentering the server after a VT switch.
+ */
+void
+xf86AccessEnter(void)
+{
+    int i;
+
+    for (i = 0; i < xf86NumEntities; i++)
+        if (xf86Entities[i]->entityEnter)
+		xf86Entities[i]->entityEnter(i,xf86Entities[i]->private);
+}
+
+void
+xf86AccessLeave(void)
+{
+    int i;
+
+    for (i = 0; i < xf86NumEntities; i++)
+        if (xf86Entities[i]->entityLeave)
+		xf86Entities[i]->entityLeave(i,xf86Entities[i]->private);
+}
+
+/*
+ * xf86PostProbe() -- Allocate all non conflicting resources
+ * This function gets called by xf86Init().
+ */
+void
+xf86PostProbe(void)
+{
+    int i;
+
+    if (fbSlotClaimed && (pciSlotClaimed
+#if (defined(__sparc__) || defined(__sparc)) && !defined(__OpenBSD__)
+	    || sbusSlotClaimed
+#endif
+	    ))
+	    FatalError("Cannot run in framebuffer mode. Please specify busIDs "
+		       "       for all framebuffer devices\n");
+
+    for (i = 0; i < xf86NumEntities; i++)
+        if (xf86Entities[i]->entityInit)
+	    xf86Entities[i]->entityInit(i,xf86Entities[i]->private);
+}
+
+int
+xf86GetLastScrnFlag(int entityIndex)
+{
+    if(entityIndex < xf86NumEntities) {
+        return xf86Entities[entityIndex]->lastScrnFlag;
+    } else {
+        return -1;
+    }
+}
+
+void
+xf86SetLastScrnFlag(int entityIndex, int scrnIndex)
+{
+    if(entityIndex < xf86NumEntities) {
+        xf86Entities[entityIndex]->lastScrnFlag = scrnIndex;
+    }
+}
+
+Bool
+xf86IsEntityShared(int entityIndex)
+{
+    if(entityIndex < xf86NumEntities) {
+        if(xf86Entities[entityIndex]->entityProp & IS_SHARED_ACCEL) {
+	    return TRUE;
+	}
+    }
+    return FALSE;
+}
+
+void
+xf86SetEntityShared(int entityIndex)
+{
+    if(entityIndex < xf86NumEntities) {
+        xf86Entities[entityIndex]->entityProp |= IS_SHARED_ACCEL;
+    }
+}
+
+Bool
+xf86IsEntitySharable(int entityIndex)
+{
+    if(entityIndex < xf86NumEntities) {
+        if(xf86Entities[entityIndex]->entityProp & ACCEL_IS_SHARABLE) {
+	    return TRUE;
+	}
+    }
+    return FALSE;
+}
+
+void
+xf86SetEntitySharable(int entityIndex)
+{
+    if(entityIndex < xf86NumEntities) {
+        xf86Entities[entityIndex]->entityProp |= ACCEL_IS_SHARABLE;
+    }
+}
+
+Bool
+xf86IsPrimInitDone(int entityIndex)
+{
+    if(entityIndex < xf86NumEntities) {
+        if(xf86Entities[entityIndex]->entityProp & SA_PRIM_INIT_DONE) {
+	    return TRUE;
+	}
+    }
+    return FALSE;
+}
+
+void
+xf86SetPrimInitDone(int entityIndex)
+{
+    if(entityIndex < xf86NumEntities) {
+        xf86Entities[entityIndex]->entityProp |= SA_PRIM_INIT_DONE;
+    }
+}
+
+void
+xf86ClearPrimInitDone(int entityIndex)
+{
+    if(entityIndex < xf86NumEntities) {
+        xf86Entities[entityIndex]->entityProp &= ~SA_PRIM_INIT_DONE;
+    }
+}
+
+
+/*
+ * Allocate a private in the entities.
+ */
+
+int
+xf86AllocateEntityPrivateIndex(void)
+{
+    int idx, i;
+    EntityPtr pEnt;
+    DevUnion *nprivs;
+
+    idx = xf86EntityPrivateCount++;
+    for (i = 0; i < xf86NumEntities; i++) {
+	pEnt = xf86Entities[i];
+	nprivs = xnfrealloc(pEnt->entityPrivates,
+			    xf86EntityPrivateCount * sizeof(DevUnion));
+	/* Zero the new private */
+	memset(&nprivs[idx], 0, sizeof(DevUnion));
+	pEnt->entityPrivates = nprivs;
+    }
+    return idx;
+}
+
+DevUnion *
+xf86GetEntityPrivate(int entityIndex, int privIndex)
+{
+    if (entityIndex >= xf86NumEntities || privIndex >= xf86EntityPrivateCount)
+	return NULL;
+
+    return &(xf86Entities[entityIndex]->entityPrivates[privIndex]);
+}
+
diff --git a/xorg-server/hw/xfree86/common/xf86Configure.c b/xorg-server/hw/xfree86/common/xf86Configure.c
index c106f3754..883c48cc0 100644
--- a/xorg-server/hw/xfree86/common/xf86Configure.c
+++ b/xorg-server/hw/xfree86/common/xf86Configure.c
@@ -1,784 +1,765 @@
-/*

- * Copyright 2000-2002 by Alan Hourihane, Flint Mountain, North Wales.

- *

- * Permission to use, copy, modify, distribute, and sell this software and its

- * documentation for any purpose is hereby granted without fee, provided that

- * the above copyright notice appear in all copies and that both that

- * copyright notice and this permission notice appear in supporting

- * documentation, and that the name of Alan Hourihane not be used in

- * advertising or publicity pertaining to distribution of the software without

- * specific, written prior permission.  Alan Hourihane makes no representations

- * about the suitability of this software for any purpose.  It is provided

- * "as is" without express or implied warranty.

- *

- * ALAN HOURIHANE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

- * EVENT SHALL ALAN HOURIHANE BE LIABLE FOR ANY SPECIAL, INDIRECT OR

- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

- * PERFORMANCE OF THIS SOFTWARE.

- *

- * Author:  Alan Hourihane, alanh@fairlite.demon.co.uk

- *

- */

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include "xf86.h"

-#include "xf86Config.h"

-#include "xf86_OSlib.h"

-#include "xf86Priv.h"

-#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"

-#endif

-

-typedef struct _DevToConfig {

-    GDevRec GDev;

-    struct pci_device * pVideo;

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

-    sbusDevicePtr sVideo;

-#endif

-    int iDriver;

-} DevToConfigRec, *DevToConfigPtr;

-

-static DevToConfigPtr DevToConfig = NULL;

-static int nDevToConfig = 0, CurrentDriver;

-

-xf86MonPtr ConfiguredMonitor;

-Bool xf86DoConfigurePass1 = TRUE;

-static Bool foundMouse = FALSE;

-

-#if defined(__SCO__)

-static char *DFLT_MOUSE_PROTO = "OSMouse";

-#elif defined(__UNIXWARE__)

-static char *DFLT_MOUSE_PROTO = "OSMouse";

-static char *DFLT_MOUSE_DEV = "/dev/mouse";

-#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)

-static char *DFLT_MOUSE_DEV = "/dev/sysmouse";

-static char *DFLT_MOUSE_PROTO = "auto";

-#elif defined(linux)

-static char DFLT_MOUSE_DEV[] = "/dev/input/mice";

-static char DFLT_MOUSE_PROTO[] = "auto";

-#else

-static char *DFLT_MOUSE_DEV = "/dev/mouse";

-static char *DFLT_MOUSE_PROTO = "auto";

-#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

- * the caller fill in the rest and/or change it as it sees fit.

- */

-GDevPtr

-xf86AddBusDeviceToConfigure(const char *driver, BusType bus, void *busData, int chipset)

-{

-    int ret, i, j;

-

-    if (!xf86DoConfigure || !xf86DoConfigurePass1)

-	return NULL;

-

-    /* Check for duplicates */

-    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;

-    }

-

-    /* Allocate new structure occurrence */

-    i = nDevToConfig++;

-    DevToConfig =

-	xnfrealloc(DevToConfig, nDevToConfig * sizeof(DevToConfigRec));

-    memset(DevToConfig + i, 0, sizeof(DevToConfigRec));

-

-    DevToConfig[i].GDev.chipID =

-            DevToConfig[i].GDev.chipRev = DevToConfig[i].GDev.irq = -1;

-

-    DevToConfig[i].iDriver = CurrentDriver;

-

-    /* Fill in what we know, converting the driver name to lower case */

-    DevToConfig[i].GDev.driver = xnfalloc(strlen(driver) + 1);

-    for (j = 0;  (DevToConfig[i].GDev.driver[j] = tolower(driver[j]));  j++);

-

-    switch (bus) {

-        case BUS_PCI:

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

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

-	        break;

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

-        case BUS_SBUS:

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

-                                    &DevToConfig[i].GDev);

-	        break;

-#endif

-        default:

-	        break;

-    }

-

-    /* Get driver's available options */

-    if (xf86DriverList[CurrentDriver]->AvailableOptions)

-	DevToConfig[i].GDev.options = (OptionInfoPtr)

-	    (*xf86DriverList[CurrentDriver]->AvailableOptions)(chipset,

-							       bus);

-

-    return &DevToConfig[i].GDev;

-

-out:

-    return NULL;

-}

-

-static XF86ConfInputPtr

-configureInputSection (void)

-{

-    XF86ConfInputPtr mouse = NULL;

-    parsePrologue (XF86ConfInputPtr, XF86ConfInputRec)

-

-    ptr->inp_identifier = "Keyboard0";

-    ptr->inp_driver = "kbd";

-    ptr->list.next = NULL;

-

-    /* Crude mechanism to auto-detect mouse (os dependent) */

-    { 

-	int fd;

-#ifdef WSCONS_SUPPORT

-	fd = open("/dev/wsmouse", 0);

-	if (fd >= 0) {

-	    DFLT_MOUSE_DEV = "/dev/wsmouse";

-	    DFLT_MOUSE_PROTO = "wsmouse";

-	    close(fd);

-	} else {

-	    ErrorF("cannot open /dev/wsmouse\n");

-	}

-#endif

-

-#ifndef __SCO__

-	fd = open(DFLT_MOUSE_DEV, 0);

-	if (fd != -1) {

-	    foundMouse = TRUE;

-	    close(fd);

-	}

-#else

-	foundMouse = TRUE;

-#endif

-    }

-

-    mouse = calloc(1, sizeof(XF86ConfInputRec));

-    mouse->inp_identifier = "Mouse0";

-    mouse->inp_driver = "mouse";

-    mouse->inp_option_lst = 

-		xf86addNewOption(mouse->inp_option_lst, strdup("Protocol"),

-				strdup(DFLT_MOUSE_PROTO));

-#ifndef __SCO__

-    mouse->inp_option_lst = 

-		xf86addNewOption(mouse->inp_option_lst, strdup("Device"),

-				strdup(DFLT_MOUSE_DEV));

-#endif

-    mouse->inp_option_lst = 

-		xf86addNewOption(mouse->inp_option_lst, strdup("ZAxisMapping"),

-				strdup("4 5 6 7"));

-    ptr = (XF86ConfInputPtr)xf86addListItem((glp)ptr, (glp)mouse);

-    return ptr;

-}

-

-static XF86ConfScreenPtr

-configureScreenSection (int screennum)

-{

-    int i;

-    int depths[] = { 1, 4, 8, 15, 16, 24/*, 32*/ };

-    parsePrologue (XF86ConfScreenPtr, XF86ConfScreenRec)

-

-    XNFasprintf(&ptr->scrn_identifier, "Screen%d", screennum);

-    XNFasprintf(&ptr->scrn_monitor_str, "Monitor%d", screennum);

-    XNFasprintf(&ptr->scrn_device_str, "Card%d", screennum);

-

-    for (i=0; i<sizeof(depths)/sizeof(depths[0]); i++)

-    {

-	XF86ConfDisplayPtr display;

-

-	display = calloc(1, sizeof(XF86ConfDisplayRec));

-	display->disp_depth = depths[i];

-	display->disp_black.red = display->disp_white.red = -1;

-	display->disp_black.green = display->disp_white.green = -1;

-	display->disp_black.blue = display->disp_white.blue = -1;

-	ptr->scrn_display_lst = (XF86ConfDisplayPtr)xf86addListItem(

-				     (glp)ptr->scrn_display_lst, (glp)display);

-    }

-

-    return ptr;

-}

-

-static const char* 

-optionTypeToString(OptionValueType type)

-{

-    switch (type) {

-    case OPTV_NONE:

-        return "";

-    case OPTV_INTEGER:

-        return "<i>";

-    case OPTV_STRING:

-        return "<str>";

-    case OPTV_ANYSTR:

-       return "[<str>]";

-    case OPTV_REAL:

-        return "<f>";

-    case OPTV_BOOLEAN:

-        return "[<bool>]";

-    case OPTV_FREQ:

-        return "<freq>";

-    case OPTV_PERCENT:

-        return "<percent>";

-    default:

-        return "";

-    }

-}

-

-static XF86ConfDevicePtr

-configureDeviceSection (int screennum)

-{

-    OptionInfoPtr p;

-    int i = 0;

-    parsePrologue (XF86ConfDevicePtr, XF86ConfDeviceRec)

-

-    /* Move device info to parser structure */

-    if (asprintf(&ptr->dev_identifier, "Card%d", screennum) == -1)

-        ptr->dev_identifier = NULL;

-    ptr->dev_chipset = DevToConfig[screennum].GDev.chipset;

-    ptr->dev_busid = DevToConfig[screennum].GDev.busID;

-    ptr->dev_driver = DevToConfig[screennum].GDev.driver;

-    ptr->dev_ramdac = DevToConfig[screennum].GDev.ramdac;

-    for (i = 0;  (i < MAXDACSPEEDS) && (i < CONF_MAXDACSPEEDS);  i++)

-        ptr->dev_dacSpeeds[i] = DevToConfig[screennum].GDev.dacSpeeds[i];

-    ptr->dev_videoram = DevToConfig[screennum].GDev.videoRam;

-    ptr->dev_textclockfreq = DevToConfig[screennum].GDev.textClockFreq;

-    ptr->dev_bios_base = DevToConfig[screennum].GDev.BiosBase;

-    ptr->dev_mem_base = DevToConfig[screennum].GDev.MemBase;

-    ptr->dev_io_base = DevToConfig[screennum].GDev.IOBase;

-    ptr->dev_clockchip = DevToConfig[screennum].GDev.clockchip;

-    for (i = 0;  (i < MAXCLOCKS) && (i < DevToConfig[screennum].GDev.numclocks);  i++)

-        ptr->dev_clock[i] = DevToConfig[screennum].GDev.clock[i];

-    ptr->dev_clocks = i;

-    ptr->dev_chipid = DevToConfig[screennum].GDev.chipID;

-    ptr->dev_chiprev = DevToConfig[screennum].GDev.chipRev;

-    ptr->dev_irq = DevToConfig[screennum].GDev.irq;

-

-    /* Make sure older drivers don't segv */

-    if (DevToConfig[screennum].GDev.options) {

-    	/* Fill in the available driver options for people to use */

-	const char *descrip =

-	    "        ### Available Driver options are:-\n"

-	    "        ### Values: <i>: integer, <f>: float, "

-			"<bool>: \"True\"/\"False\",\n"

-	    "        ### <string>: \"String\", <freq>: \"<f> Hz/kHz/MHz\",\n"

-	    "        ### <percent>: \"<f>%\"\n"

-	    "        ### [arg]: arg optional\n";

-	ptr->dev_comment = strdup(descrip);

-	if (ptr->dev_comment) {

-    	    for (p = DevToConfig[screennum].GDev.options;

-		 p->name != NULL; p++) {

-		char *p_e;

-		const char *prefix = "        #Option     ";

-		const char *middle = " \t# ";

-		const char *suffix = "\n";

-		const char *opttype = optionTypeToString(p->type);

-		char *optname;

-		int len = strlen(ptr->dev_comment) + strlen(prefix) +

-			  strlen(middle) + strlen(suffix) + 1;

-		

-		if (asprintf(&optname, "\"%s\"", p->name) == -1)

-		    break;

-

-		len += max(20, strlen(optname));

-		len += strlen(opttype);

-

-		ptr->dev_comment = realloc(ptr->dev_comment, len);

-		if (!ptr->dev_comment)

-		    break;

-		p_e = ptr->dev_comment + strlen(ptr->dev_comment);

-		sprintf(p_e, "%s%-20s%s%s%s", prefix, optname, middle,

-			opttype, suffix);

-		free(optname);

-	    }

-    	}

-    }

-

-    return ptr;

-}

-

-static XF86ConfLayoutPtr

-configureLayoutSection (void)

-{

-    int scrnum = 0;

-    parsePrologue (XF86ConfLayoutPtr, XF86ConfLayoutRec)

-

-    ptr->lay_identifier = "X.org Configured";

-

-    {

-	XF86ConfInputrefPtr iptr;

-

-	iptr = malloc (sizeof (XF86ConfInputrefRec));

-	iptr->list.next = NULL;

-	iptr->iref_option_lst = NULL;

-	iptr->iref_inputdev_str = "Mouse0";

-	iptr->iref_option_lst =

-		xf86addNewOption (iptr->iref_option_lst, strdup("CorePointer"), NULL);

-	ptr->lay_input_lst = (XF86ConfInputrefPtr)

-		xf86addListItem ((glp) ptr->lay_input_lst, (glp) iptr);

-    }

-

-    {

-	XF86ConfInputrefPtr iptr;

-

-	iptr = malloc (sizeof (XF86ConfInputrefRec));

-	iptr->list.next = NULL;

-	iptr->iref_option_lst = NULL;

-	iptr->iref_inputdev_str = "Keyboard0";

-	iptr->iref_option_lst =

-		xf86addNewOption (iptr->iref_option_lst, strdup("CoreKeyboard"), NULL);

-	ptr->lay_input_lst = (XF86ConfInputrefPtr)

-		xf86addListItem ((glp) ptr->lay_input_lst, (glp) iptr);

-    }

-

-    for (scrnum = 0;  scrnum < nDevToConfig;  scrnum++) {

-	XF86ConfAdjacencyPtr aptr;

-

-	aptr = malloc (sizeof (XF86ConfAdjacencyRec));

-	aptr->list.next = NULL;

-	aptr->adj_x = 0;

-	aptr->adj_y = 0;

-	aptr->adj_scrnum = scrnum;

-	XNFasprintf(&aptr->adj_screen_str, "Screen%d", scrnum);

-	if (scrnum == 0) {

-	    aptr->adj_where = CONF_ADJ_ABSOLUTE;

-	    aptr->adj_refscreen = NULL;

-	}

-	else {

-	    aptr->adj_where = CONF_ADJ_RIGHTOF;

-	    XNFasprintf(&aptr->adj_refscreen, "Screen%d", scrnum - 1);

-	}

-    	ptr->lay_adjacency_lst =

-	    (XF86ConfAdjacencyPtr)xf86addListItem((glp)ptr->lay_adjacency_lst,

-					      (glp)aptr);

-    }

-

-    return ptr;

-}

-

-static XF86ConfFlagsPtr

-configureFlagsSection (void)

-{

-    parsePrologue (XF86ConfFlagsPtr, XF86ConfFlagsRec)

-

-    return ptr;

-}

-

-static XF86ConfModulePtr

-configureModuleSection (void)

-{

-    char **elist, **el;

-    /* Find the list of extension & font modules. */

-    const char *esubdirs[] = {

-	"extensions",

-	"fonts",

-	NULL

-    };

-    parsePrologue (XF86ConfModulePtr, XF86ConfModuleRec)

-

-    elist = LoaderListDirs(esubdirs, NULL);

-    if (elist) {

-	for (el = elist; *el; el++) {

-	    XF86LoadPtr module;

-

-    	    module = calloc(1, sizeof(XF86LoadRec));

-    	    module->load_name = *el;

-            ptr->mod_load_lst = (XF86LoadPtr)xf86addListItem(

-                                (glp)ptr->mod_load_lst, (glp)module);

-    	}

-	free(elist);

-    }

-

-    return ptr;

-}

-

-static XF86ConfFilesPtr

-configureFilesSection (void)

-{

-    parsePrologue (XF86ConfFilesPtr, XF86ConfFilesRec)

-

-   if (xf86ModulePath)

-       ptr->file_modulepath = strdup(xf86ModulePath);

-   if (defaultFontPath)

-       ptr->file_fontpath = strdup(defaultFontPath);

-   

-    return ptr;

-}

-

-static XF86ConfMonitorPtr

-configureMonitorSection (int screennum)

-{

-    parsePrologue (XF86ConfMonitorPtr, XF86ConfMonitorRec)

-

-    XNFasprintf(&ptr->mon_identifier, "Monitor%d", screennum);

-    ptr->mon_vendor = strdup("Monitor Vendor");

-    ptr->mon_modelname = strdup("Monitor Model");

-

-    return ptr;

-}

-

-/* Initialize Configure Monitor from Detailed Timing Block */

-static void handle_detailed_input(struct detailed_monitor_section *det_mon,

-                                  void *data)

-{

-    XF86ConfMonitorPtr ptr = (XF86ConfMonitorPtr) data;

-

-    switch (det_mon->type) {

-    case DS_NAME:

-        ptr->mon_modelname = realloc(ptr->mon_modelname,

-                                     strlen((char*)(det_mon->section.name)) +

-                                     1);

-        strcpy(ptr->mon_modelname,

-	      (char*)(det_mon->section.name));

-        break;

-    case DS_RANGES:

-        ptr->mon_hsync[ptr->mon_n_hsync].lo =

-            det_mon->section.ranges.min_h;

-        ptr->mon_hsync[ptr->mon_n_hsync].hi =

-            det_mon->section.ranges.max_h;

-        ptr->mon_n_vrefresh = 1;

-        ptr->mon_vrefresh[ptr->mon_n_hsync].lo =

-            det_mon->section.ranges.min_v;

-        ptr->mon_vrefresh[ptr->mon_n_hsync].hi =

-            det_mon->section.ranges.max_v;

-        ptr->mon_n_hsync++;

-    default:

-        break;

-    }

-}

-

-static XF86ConfMonitorPtr

-configureDDCMonitorSection (int screennum)

-{

-    int len, mon_width, mon_height;

-#define displaySizeMaxLen 80

-    char displaySize_string[displaySizeMaxLen];

-    int displaySizeLen;

-

-    parsePrologue (XF86ConfMonitorPtr, XF86ConfMonitorRec)

-

-    XNFasprintf(&ptr->mon_identifier, "Monitor%d", screennum);

-    ptr->mon_vendor = strdup(ConfiguredMonitor->vendor.name);

-    XNFasprintf(&ptr->mon_modelname, "%x", ConfiguredMonitor->vendor.prod_id);

-

-    /* features in centimetres, we want millimetres */

-    mon_width  = 10 * ConfiguredMonitor->features.hsize ;

-    mon_height = 10 * ConfiguredMonitor->features.vsize ;

-

-#ifdef CONFIGURE_DISPLAYSIZE

-    ptr->mon_width  = mon_width;

-    ptr->mon_height = mon_height;

-#else

-    if (mon_width && mon_height) {

-      /* when values available add DisplaySize option AS A COMMENT */

-

-      displaySizeLen = snprintf(displaySize_string, displaySizeMaxLen,

-				"\t#DisplaySize\t%5d %5d\t# mm\n",

-				mon_width, mon_height);

-

-      if (displaySizeLen>0 && displaySizeLen<displaySizeMaxLen) {

-	if (ptr->mon_comment) {

-	  len = strlen(ptr->mon_comment);

-	} else {

-	  len = 0;

-	}

-	if ((ptr->mon_comment =

-	     realloc(ptr->mon_comment, len + strlen(displaySize_string) + 1))) {

-	  strcpy(ptr->mon_comment + len, displaySize_string);

-	}

-      }

-    }

-#endif /* def CONFIGURE_DISPLAYSIZE */

-

-    xf86ForEachDetailedBlock(ConfiguredMonitor, handle_detailed_input,

-                             ptr);

-

-    if (ConfiguredMonitor->features.dpms) {

-      ptr->mon_option_lst = xf86addNewOption(ptr->mon_option_lst, strdup("DPMS"), NULL);

-    }

-

-    return ptr;

-}

-

-#if !defined(PATH_MAX)

-# define PATH_MAX 1024

-#endif

-

-void

-DoConfigure(void)

-{

-    int i,j, screennum = -1;

-    char *home = NULL;

-    char filename[PATH_MAX];

-    char *addslash = "";

-    XF86ConfigPtr xf86config = NULL;

-    char **vlist, **vl;

-    int *dev2screen;

-

-    vlist = xf86DriverlistFromCompile();

-

-    if (!vlist) {

-	ErrorF("Missing output drivers.  Configuration failed.\n");

-	goto bail;

-    }

-

-    ErrorF("List of video drivers:\n");

-    for (vl = vlist; *vl; vl++)

-	ErrorF("\t%s\n", *vl);

-

-    /* Load all the drivers that were found. */

-    xf86LoadModules(vlist, NULL);

-

-    free(vlist);

-

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

-	xorgHWFlags flags;

-	if (!xf86DriverList[i]->driverFunc

-	    || !xf86DriverList[i]->driverFunc(NULL,

-					      GET_REQUIRED_HW_INTERFACES,

-					      &flags)

-	    || NEED_IO_ENABLED(flags)) {

-	    xorgHWAccess = TRUE;

-	    break;

-	}

-    }

-    /* Enable full I/O access */

-    if (xorgHWAccess) {

-	if(!xf86EnableIO())

-	    /* oops, we have failed */

-	    xorgHWAccess = FALSE;

-    }

-

-    /* Create XF86Config file structure */

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

-

-    /* Call all of the probe functions, reporting the results. */

-    for (CurrentDriver = 0;  CurrentDriver < xf86NumDrivers;  CurrentDriver++) {

-	xorgHWFlags flags;

-	Bool found_screen;

-	DriverRec * const drv = xf86DriverList[CurrentDriver];

-

-	if (!xorgHWAccess) {

-	    if (!drv->driverFunc

-		|| !drv->driverFunc( NULL, GET_REQUIRED_HW_INTERFACES, &flags )

-		|| NEED_IO_ENABLED(flags)) 

-		continue;

-	}

-	

-	found_screen = xf86CallDriverProbe( drv, TRUE );

-	if ( found_screen && drv->Identify ) {

-	    (*drv->Identify)(0);

-	}

-    }

-

-    if (nDevToConfig <= 0) {

-	ErrorF("No devices to configure.  Configuration failed.\n");

-	goto bail;

-    }

-

-    /* Add device, monitor and screen sections for detected devices */

-    for (screennum = 0;  screennum < nDevToConfig;  screennum++) {

-    	XF86ConfDevicePtr DevicePtr;

-	XF86ConfMonitorPtr MonitorPtr;

-	XF86ConfScreenPtr ScreenPtr;

-

-	DevicePtr = configureDeviceSection(screennum);

-    	xf86config->conf_device_lst = (XF86ConfDevicePtr)xf86addListItem(

-			    (glp)xf86config->conf_device_lst, (glp)DevicePtr);

-	MonitorPtr = configureMonitorSection(screennum);

-    	xf86config->conf_monitor_lst = (XF86ConfMonitorPtr)xf86addListItem(

-			    (glp)xf86config->conf_monitor_lst, (glp)MonitorPtr);

-	ScreenPtr = configureScreenSection(screennum);

-    	xf86config->conf_screen_lst = (XF86ConfScreenPtr)xf86addListItem(

-			    (glp)xf86config->conf_screen_lst, (glp)ScreenPtr);

-    }

-

-    xf86config->conf_files = configureFilesSection();

-    xf86config->conf_modules = configureModuleSection();

-    xf86config->conf_flags = configureFlagsSection();

-    xf86config->conf_videoadaptor_lst = NULL;

-    xf86config->conf_modes_lst = NULL;

-    xf86config->conf_vendor_lst = NULL;

-    xf86config->conf_dri = NULL;

-    xf86config->conf_input_lst = configureInputSection();

-    xf86config->conf_layout_lst = configureLayoutSection();

-

-    home = getenv("HOME");

-    if ((home == NULL) || (home[0] == '\0')) {

-    	home = "/";

-    } else {

-	/* Determine if trailing slash is present or needed */

-	int l = strlen(home);

-

-	if (home[l-1] != '/') {

-	    addslash = "/";

-	}

-    }

-

-    snprintf(filename, sizeof(filename), "%s%s" XF86CONFIGFILE ".new",

-	     home, addslash);

-

-    if (xf86writeConfigFile(filename, xf86config) == 0) {

-	xf86Msg(X_ERROR, "Unable to write config file: \"%s\": %s\n",

-		filename, strerror(errno));

-	goto bail;

-    }

-

-    xf86DoConfigurePass1 = FALSE;

-    /* Try to get DDC information filled in */

-    xf86ConfigFile = filename;

-    if (xf86HandleConfigFile(FALSE) != CONFIG_OK) {

-	goto bail;

-    }

-

-    xf86DoConfigurePass1 = FALSE;

-    

-    dev2screen = xnfcalloc(1,xf86NumDrivers*sizeof(int));

-

-    {

-	Bool *driverProbed = xnfcalloc(1,xf86NumDrivers*sizeof(Bool));

-	for (screennum = 0;  screennum < nDevToConfig;  screennum++) {

-	    int k,l,n,oldNumScreens;

-

-	    i = DevToConfig[screennum].iDriver;

-

-	    if (driverProbed[i]) continue;

-	    driverProbed[i] = TRUE;

-	    

-	    oldNumScreens = xf86NumScreens;

-

-	    xf86CallDriverProbe( xf86DriverList[i], FALSE );

-

-	    /* reorder */

-	    k = screennum > 0 ? screennum : 1;

-	    for (l = oldNumScreens; l < xf86NumScreens; l++) {

-	        /* is screen primary? */

-	        Bool primary = FALSE;

-		for (n = 0; n<xf86Screens[l]->numEntities; n++) {

-	            if (xf86IsEntityPrimary(xf86Screens[l]->entityList[n])) {

-		        dev2screen[0] = l;

-			primary = TRUE;

-			break;

-		    }

-		}

-		if (primary) continue;

-		/* not primary: assign it to next device of same driver */

-		/* 

-		 * NOTE: we assume that devices in DevToConfig 

-		 * and xf86Screens[] have the same order except

-		 * for the primary device which always comes first.

-		 */

-		for (; k < nDevToConfig; k++) {

-		    if (DevToConfig[k].iDriver == i) {

-		        dev2screen[k++] = l;

-			break;

-		    }

-		}

-	    }

-	}

-	free(driverProbed);

-    }

-    

-

-    if (nDevToConfig != xf86NumScreens) {

-	ErrorF("Number of created screens does not match number of detected"

-	       " devices.\n  Configuration failed.\n");

-	goto bail;

-    }

-

-    xf86PostProbe();

-

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

-	xf86Screens[j]->scrnIndex = j;

-    }

-

-    xf86freeMonitorList(xf86config->conf_monitor_lst);

-    xf86config->conf_monitor_lst = NULL;

-    xf86freeScreenList(xf86config->conf_screen_lst);

-    xf86config->conf_screen_lst = NULL;

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

-	XF86ConfMonitorPtr MonitorPtr;

-	XF86ConfScreenPtr ScreenPtr;

-

-	ConfiguredMonitor = NULL;

-

-	if ((*xf86Screens[dev2screen[j]]->PreInit)(xf86Screens[dev2screen[j]], 

-						   PROBE_DETECT) &&

-	    ConfiguredMonitor) {

-	    MonitorPtr = configureDDCMonitorSection(j);

-	} else {

-	    MonitorPtr = configureMonitorSection(j);

-	}

-	ScreenPtr = configureScreenSection(j);

-	xf86config->conf_monitor_lst = (XF86ConfMonitorPtr)xf86addListItem(

-		(glp)xf86config->conf_monitor_lst, (glp)MonitorPtr);

-	xf86config->conf_screen_lst = (XF86ConfScreenPtr)xf86addListItem(

-		(glp)xf86config->conf_screen_lst, (glp)ScreenPtr);

-    }

-

-    if (xf86writeConfigFile(filename, xf86config) == 0) {

-	xf86Msg(X_ERROR, "Unable to write config file: \"%s\": %s\n",

-		filename, strerror(errno));

-	goto bail;

-    }

-

-    ErrorF("\n");

-

-#ifdef __SCO__

-    ErrorF("\n"__XSERVERNAME__

-	   " is using the kernel event driver to access the mouse.\n"

-	    "If you wish to use the internal "__XSERVERNAME__

-	   " mouse drivers, please\n"

-	    "edit the file and correct the Device.\n");

-#else /* !__SCO__ */

-    if (!foundMouse) {

-	ErrorF("\n"__XSERVERNAME__" is not able to detect your mouse.\n"

-		"Edit the file and correct the Device.\n");

-    } else {

-	ErrorF("\n"__XSERVERNAME__" detected your mouse at device %s.\n"

-		"Please check your config if the mouse is still not\n"

-		"operational, as by default "__XSERVERNAME__

-	       " tries to autodetect\n"

-		"the protocol.\n",DFLT_MOUSE_DEV);

-    }

-#endif /* !__SCO__ */

-

-    if (xf86NumScreens > 1) {

-	ErrorF("\n"__XSERVERNAME__

-	       " has configured a multihead system, please check your config.\n");

-    }

-

-    ErrorF("\nYour %s file is %s\n\n", XF86CONFIGFILE ,filename);

-    ErrorF("To test the server, run 'X -config %s'\n\n", filename);

-

-bail:

-    OsCleanup(TRUE);

-    AbortDDX();

-    fflush(stderr);

-    exit(0);

-}

+/*
+ * Copyright 2000-2002 by Alan Hourihane, Flint Mountain, North Wales.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Alan Hourihane not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Alan Hourihane makes no representations
+ * about the suitability of this software for any purpose.  It is provided
+ * "as is" without express or implied warranty.
+ *
+ * ALAN HOURIHANE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL ALAN HOURIHANE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Author:  Alan Hourihane, alanh@fairlite.demon.co.uk
+ *
+ */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "xf86.h"
+#include "xf86Config.h"
+#include "xf86_OSlib.h"
+#include "xf86Priv.h"
+#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"
+#endif
+
+typedef struct _DevToConfig {
+    GDevRec GDev;
+    struct pci_device * pVideo;
+#if (defined(__sparc__) || defined(__sparc)) && !defined(__OpenBSD__)
+    sbusDevicePtr sVideo;
+#endif
+    int iDriver;
+} DevToConfigRec, *DevToConfigPtr;
+
+static DevToConfigPtr DevToConfig = NULL;
+static int nDevToConfig = 0, CurrentDriver;
+
+xf86MonPtr ConfiguredMonitor;
+Bool xf86DoConfigurePass1 = TRUE;
+static Bool foundMouse = FALSE;
+
+#if   defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
+static char *DFLT_MOUSE_DEV = "/dev/sysmouse";
+static char *DFLT_MOUSE_PROTO = "auto";
+#elif defined(linux)
+static char DFLT_MOUSE_DEV[] = "/dev/input/mice";
+static char DFLT_MOUSE_PROTO[] = "auto";
+#else
+static char *DFLT_MOUSE_DEV = "/dev/mouse";
+static char *DFLT_MOUSE_PROTO = "auto";
+#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
+ * the caller fill in the rest and/or change it as it sees fit.
+ */
+GDevPtr
+xf86AddBusDeviceToConfigure(const char *driver, BusType bus, void *busData, int chipset)
+{
+    int ret, i, j;
+
+    if (!xf86DoConfigure || !xf86DoConfigurePass1)
+	return NULL;
+
+    /* Check for duplicates */
+    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;
+    }
+
+    /* Allocate new structure occurrence */
+    i = nDevToConfig++;
+    DevToConfig =
+	xnfrealloc(DevToConfig, nDevToConfig * sizeof(DevToConfigRec));
+    memset(DevToConfig + i, 0, sizeof(DevToConfigRec));
+
+    DevToConfig[i].GDev.chipID =
+            DevToConfig[i].GDev.chipRev = DevToConfig[i].GDev.irq = -1;
+
+    DevToConfig[i].iDriver = CurrentDriver;
+
+    /* Fill in what we know, converting the driver name to lower case */
+    DevToConfig[i].GDev.driver = xnfalloc(strlen(driver) + 1);
+    for (j = 0;  (DevToConfig[i].GDev.driver[j] = tolower(driver[j]));  j++);
+
+    switch (bus) {
+        case BUS_PCI:
+            xf86PciConfigureNewDev(busData, DevToConfig[i].pVideo,
+                                   &DevToConfig[i].GDev, &chipset);
+	        break;
+#if (defined(__sparc__) || defined(__sparc)) && !defined(__OpenBSD__)
+        case BUS_SBUS:
+            xf86SbusConfigureNewDev(busData, DevToConfig[i].sVideo,
+                                    &DevToConfig[i].GDev);
+	        break;
+#endif
+        default:
+	        break;
+    }
+
+    /* Get driver's available options */
+    if (xf86DriverList[CurrentDriver]->AvailableOptions)
+	DevToConfig[i].GDev.options = (OptionInfoPtr)
+	    (*xf86DriverList[CurrentDriver]->AvailableOptions)(chipset,
+							       bus);
+
+    return &DevToConfig[i].GDev;
+
+out:
+    return NULL;
+}
+
+static XF86ConfInputPtr
+configureInputSection (void)
+{
+    XF86ConfInputPtr mouse = NULL;
+    parsePrologue (XF86ConfInputPtr, XF86ConfInputRec)
+
+    ptr->inp_identifier = "Keyboard0";
+    ptr->inp_driver = "kbd";
+    ptr->list.next = NULL;
+
+    /* Crude mechanism to auto-detect mouse (os dependent) */
+    { 
+	int fd;
+#ifdef WSCONS_SUPPORT
+	fd = open("/dev/wsmouse", 0);
+	if (fd >= 0) {
+	    DFLT_MOUSE_DEV = "/dev/wsmouse";
+	    DFLT_MOUSE_PROTO = "wsmouse";
+	    close(fd);
+	} else {
+	    ErrorF("cannot open /dev/wsmouse\n");
+	}
+#endif
+
+	fd = open(DFLT_MOUSE_DEV, 0);
+	if (fd != -1) {
+	    foundMouse = TRUE;
+	    close(fd);
+	}
+    }
+
+    mouse = calloc(1, sizeof(XF86ConfInputRec));
+    mouse->inp_identifier = "Mouse0";
+    mouse->inp_driver = "mouse";
+    mouse->inp_option_lst = 
+		xf86addNewOption(mouse->inp_option_lst, strdup("Protocol"),
+				strdup(DFLT_MOUSE_PROTO));
+    mouse->inp_option_lst = 
+		xf86addNewOption(mouse->inp_option_lst, strdup("Device"),
+				strdup(DFLT_MOUSE_DEV));
+    mouse->inp_option_lst = 
+		xf86addNewOption(mouse->inp_option_lst, strdup("ZAxisMapping"),
+				strdup("4 5 6 7"));
+    ptr = (XF86ConfInputPtr)xf86addListItem((glp)ptr, (glp)mouse);
+    return ptr;
+}
+
+static XF86ConfScreenPtr
+configureScreenSection (int screennum)
+{
+    int i;
+    int depths[] = { 1, 4, 8, 15, 16, 24/*, 32*/ };
+    parsePrologue (XF86ConfScreenPtr, XF86ConfScreenRec)
+
+    XNFasprintf(&ptr->scrn_identifier, "Screen%d", screennum);
+    XNFasprintf(&ptr->scrn_monitor_str, "Monitor%d", screennum);
+    XNFasprintf(&ptr->scrn_device_str, "Card%d", screennum);
+
+    for (i=0; i<sizeof(depths)/sizeof(depths[0]); i++)
+    {
+	XF86ConfDisplayPtr display;
+
+	display = calloc(1, sizeof(XF86ConfDisplayRec));
+	display->disp_depth = depths[i];
+	display->disp_black.red = display->disp_white.red = -1;
+	display->disp_black.green = display->disp_white.green = -1;
+	display->disp_black.blue = display->disp_white.blue = -1;
+	ptr->scrn_display_lst = (XF86ConfDisplayPtr)xf86addListItem(
+				     (glp)ptr->scrn_display_lst, (glp)display);
+    }
+
+    return ptr;
+}
+
+static const char* 
+optionTypeToString(OptionValueType type)
+{
+    switch (type) {
+    case OPTV_NONE:
+        return "";
+    case OPTV_INTEGER:
+        return "<i>";
+    case OPTV_STRING:
+        return "<str>";
+    case OPTV_ANYSTR:
+       return "[<str>]";
+    case OPTV_REAL:
+        return "<f>";
+    case OPTV_BOOLEAN:
+        return "[<bool>]";
+    case OPTV_FREQ:
+        return "<freq>";
+    case OPTV_PERCENT:
+        return "<percent>";
+    default:
+        return "";
+    }
+}
+
+static XF86ConfDevicePtr
+configureDeviceSection (int screennum)
+{
+    OptionInfoPtr p;
+    int i = 0;
+    parsePrologue (XF86ConfDevicePtr, XF86ConfDeviceRec)
+
+    /* Move device info to parser structure */
+    if (asprintf(&ptr->dev_identifier, "Card%d", screennum) == -1)
+        ptr->dev_identifier = NULL;
+    ptr->dev_chipset = DevToConfig[screennum].GDev.chipset;
+    ptr->dev_busid = DevToConfig[screennum].GDev.busID;
+    ptr->dev_driver = DevToConfig[screennum].GDev.driver;
+    ptr->dev_ramdac = DevToConfig[screennum].GDev.ramdac;
+    for (i = 0;  (i < MAXDACSPEEDS) && (i < CONF_MAXDACSPEEDS);  i++)
+        ptr->dev_dacSpeeds[i] = DevToConfig[screennum].GDev.dacSpeeds[i];
+    ptr->dev_videoram = DevToConfig[screennum].GDev.videoRam;
+    ptr->dev_textclockfreq = DevToConfig[screennum].GDev.textClockFreq;
+    ptr->dev_bios_base = DevToConfig[screennum].GDev.BiosBase;
+    ptr->dev_mem_base = DevToConfig[screennum].GDev.MemBase;
+    ptr->dev_io_base = DevToConfig[screennum].GDev.IOBase;
+    ptr->dev_clockchip = DevToConfig[screennum].GDev.clockchip;
+    for (i = 0;  (i < MAXCLOCKS) && (i < DevToConfig[screennum].GDev.numclocks);  i++)
+        ptr->dev_clock[i] = DevToConfig[screennum].GDev.clock[i];
+    ptr->dev_clocks = i;
+    ptr->dev_chipid = DevToConfig[screennum].GDev.chipID;
+    ptr->dev_chiprev = DevToConfig[screennum].GDev.chipRev;
+    ptr->dev_irq = DevToConfig[screennum].GDev.irq;
+
+    /* Make sure older drivers don't segv */
+    if (DevToConfig[screennum].GDev.options) {
+    	/* Fill in the available driver options for people to use */
+	const char *descrip =
+	    "        ### Available Driver options are:-\n"
+	    "        ### Values: <i>: integer, <f>: float, "
+			"<bool>: \"True\"/\"False\",\n"
+	    "        ### <string>: \"String\", <freq>: \"<f> Hz/kHz/MHz\",\n"
+	    "        ### <percent>: \"<f>%\"\n"
+	    "        ### [arg]: arg optional\n";
+	ptr->dev_comment = strdup(descrip);
+	if (ptr->dev_comment) {
+    	    for (p = DevToConfig[screennum].GDev.options;
+		 p->name != NULL; p++) {
+		char *p_e;
+		const char *prefix = "        #Option     ";
+		const char *middle = " \t# ";
+		const char *suffix = "\n";
+		const char *opttype = optionTypeToString(p->type);
+		char *optname;
+		int len = strlen(ptr->dev_comment) + strlen(prefix) +
+			  strlen(middle) + strlen(suffix) + 1;
+		
+		if (asprintf(&optname, "\"%s\"", p->name) == -1)
+		    break;
+
+		len += max(20, strlen(optname));
+		len += strlen(opttype);
+
+		ptr->dev_comment = realloc(ptr->dev_comment, len);
+		if (!ptr->dev_comment)
+		    break;
+		p_e = ptr->dev_comment + strlen(ptr->dev_comment);
+		sprintf(p_e, "%s%-20s%s%s%s", prefix, optname, middle,
+			opttype, suffix);
+		free(optname);
+	    }
+    	}
+    }
+
+    return ptr;
+}
+
+static XF86ConfLayoutPtr
+configureLayoutSection (void)
+{
+    int scrnum = 0;
+    parsePrologue (XF86ConfLayoutPtr, XF86ConfLayoutRec)
+
+    ptr->lay_identifier = "X.org Configured";
+
+    {
+	XF86ConfInputrefPtr iptr;
+
+	iptr = malloc (sizeof (XF86ConfInputrefRec));
+	iptr->list.next = NULL;
+	iptr->iref_option_lst = NULL;
+	iptr->iref_inputdev_str = "Mouse0";
+	iptr->iref_option_lst =
+		xf86addNewOption (iptr->iref_option_lst, strdup("CorePointer"), NULL);
+	ptr->lay_input_lst = (XF86ConfInputrefPtr)
+		xf86addListItem ((glp) ptr->lay_input_lst, (glp) iptr);
+    }
+
+    {
+	XF86ConfInputrefPtr iptr;
+
+	iptr = malloc (sizeof (XF86ConfInputrefRec));
+	iptr->list.next = NULL;
+	iptr->iref_option_lst = NULL;
+	iptr->iref_inputdev_str = "Keyboard0";
+	iptr->iref_option_lst =
+		xf86addNewOption (iptr->iref_option_lst, strdup("CoreKeyboard"), NULL);
+	ptr->lay_input_lst = (XF86ConfInputrefPtr)
+		xf86addListItem ((glp) ptr->lay_input_lst, (glp) iptr);
+    }
+
+    for (scrnum = 0;  scrnum < nDevToConfig;  scrnum++) {
+	XF86ConfAdjacencyPtr aptr;
+
+	aptr = malloc (sizeof (XF86ConfAdjacencyRec));
+	aptr->list.next = NULL;
+	aptr->adj_x = 0;
+	aptr->adj_y = 0;
+	aptr->adj_scrnum = scrnum;
+	XNFasprintf(&aptr->adj_screen_str, "Screen%d", scrnum);
+	if (scrnum == 0) {
+	    aptr->adj_where = CONF_ADJ_ABSOLUTE;
+	    aptr->adj_refscreen = NULL;
+	}
+	else {
+	    aptr->adj_where = CONF_ADJ_RIGHTOF;
+	    XNFasprintf(&aptr->adj_refscreen, "Screen%d", scrnum - 1);
+	}
+    	ptr->lay_adjacency_lst =
+	    (XF86ConfAdjacencyPtr)xf86addListItem((glp)ptr->lay_adjacency_lst,
+					      (glp)aptr);
+    }
+
+    return ptr;
+}
+
+static XF86ConfFlagsPtr
+configureFlagsSection (void)
+{
+    parsePrologue (XF86ConfFlagsPtr, XF86ConfFlagsRec)
+
+    return ptr;
+}
+
+static XF86ConfModulePtr
+configureModuleSection (void)
+{
+    char **elist, **el;
+    /* Find the list of extension & font modules. */
+    const char *esubdirs[] = {
+	"extensions",
+	"fonts",
+	NULL
+    };
+    parsePrologue (XF86ConfModulePtr, XF86ConfModuleRec)
+
+    elist = LoaderListDirs(esubdirs, NULL);
+    if (elist) {
+	for (el = elist; *el; el++) {
+	    XF86LoadPtr module;
+
+    	    module = calloc(1, sizeof(XF86LoadRec));
+    	    module->load_name = *el;
+            ptr->mod_load_lst = (XF86LoadPtr)xf86addListItem(
+                                (glp)ptr->mod_load_lst, (glp)module);
+    	}
+	free(elist);
+    }
+
+    return ptr;
+}
+
+static XF86ConfFilesPtr
+configureFilesSection (void)
+{
+    parsePrologue (XF86ConfFilesPtr, XF86ConfFilesRec)
+
+   if (xf86ModulePath)
+       ptr->file_modulepath = strdup(xf86ModulePath);
+   if (defaultFontPath)
+       ptr->file_fontpath = strdup(defaultFontPath);
+   
+    return ptr;
+}
+
+static XF86ConfMonitorPtr
+configureMonitorSection (int screennum)
+{
+    parsePrologue (XF86ConfMonitorPtr, XF86ConfMonitorRec)
+
+    XNFasprintf(&ptr->mon_identifier, "Monitor%d", screennum);
+    ptr->mon_vendor = strdup("Monitor Vendor");
+    ptr->mon_modelname = strdup("Monitor Model");
+
+    return ptr;
+}
+
+/* Initialize Configure Monitor from Detailed Timing Block */
+static void handle_detailed_input(struct detailed_monitor_section *det_mon,
+                                  void *data)
+{
+    XF86ConfMonitorPtr ptr = (XF86ConfMonitorPtr) data;
+
+    switch (det_mon->type) {
+    case DS_NAME:
+        ptr->mon_modelname = realloc(ptr->mon_modelname,
+                                     strlen((char*)(det_mon->section.name)) +
+                                     1);
+        strcpy(ptr->mon_modelname,
+	      (char*)(det_mon->section.name));
+        break;
+    case DS_RANGES:
+        ptr->mon_hsync[ptr->mon_n_hsync].lo =
+            det_mon->section.ranges.min_h;
+        ptr->mon_hsync[ptr->mon_n_hsync].hi =
+            det_mon->section.ranges.max_h;
+        ptr->mon_n_vrefresh = 1;
+        ptr->mon_vrefresh[ptr->mon_n_hsync].lo =
+            det_mon->section.ranges.min_v;
+        ptr->mon_vrefresh[ptr->mon_n_hsync].hi =
+            det_mon->section.ranges.max_v;
+        ptr->mon_n_hsync++;
+    default:
+        break;
+    }
+}
+
+static XF86ConfMonitorPtr
+configureDDCMonitorSection (int screennum)
+{
+    int len, mon_width, mon_height;
+#define displaySizeMaxLen 80
+    char displaySize_string[displaySizeMaxLen];
+    int displaySizeLen;
+
+    parsePrologue (XF86ConfMonitorPtr, XF86ConfMonitorRec)
+
+    XNFasprintf(&ptr->mon_identifier, "Monitor%d", screennum);
+    ptr->mon_vendor = strdup(ConfiguredMonitor->vendor.name);
+    XNFasprintf(&ptr->mon_modelname, "%x", ConfiguredMonitor->vendor.prod_id);
+
+    /* features in centimetres, we want millimetres */
+    mon_width  = 10 * ConfiguredMonitor->features.hsize ;
+    mon_height = 10 * ConfiguredMonitor->features.vsize ;
+
+#ifdef CONFIGURE_DISPLAYSIZE
+    ptr->mon_width  = mon_width;
+    ptr->mon_height = mon_height;
+#else
+    if (mon_width && mon_height) {
+      /* when values available add DisplaySize option AS A COMMENT */
+
+      displaySizeLen = snprintf(displaySize_string, displaySizeMaxLen,
+				"\t#DisplaySize\t%5d %5d\t# mm\n",
+				mon_width, mon_height);
+
+      if (displaySizeLen>0 && displaySizeLen<displaySizeMaxLen) {
+	if (ptr->mon_comment) {
+	  len = strlen(ptr->mon_comment);
+	} else {
+	  len = 0;
+	}
+	if ((ptr->mon_comment =
+	     realloc(ptr->mon_comment, len + strlen(displaySize_string) + 1))) {
+	  strcpy(ptr->mon_comment + len, displaySize_string);
+	}
+      }
+    }
+#endif /* def CONFIGURE_DISPLAYSIZE */
+
+    xf86ForEachDetailedBlock(ConfiguredMonitor, handle_detailed_input,
+                             ptr);
+
+    if (ConfiguredMonitor->features.dpms) {
+      ptr->mon_option_lst = xf86addNewOption(ptr->mon_option_lst, strdup("DPMS"), NULL);
+    }
+
+    return ptr;
+}
+
+#if !defined(PATH_MAX)
+# define PATH_MAX 1024
+#endif
+
+void
+DoConfigure(void)
+{
+    int i,j, screennum = -1;
+    char *home = NULL;
+    char filename[PATH_MAX];
+    char *addslash = "";
+    XF86ConfigPtr xf86config = NULL;
+    char **vlist, **vl;
+    int *dev2screen;
+
+    vlist = xf86DriverlistFromCompile();
+
+    if (!vlist) {
+	ErrorF("Missing output drivers.  Configuration failed.\n");
+	goto bail;
+    }
+
+    ErrorF("List of video drivers:\n");
+    for (vl = vlist; *vl; vl++)
+	ErrorF("\t%s\n", *vl);
+
+    /* Load all the drivers that were found. */
+    xf86LoadModules(vlist, NULL);
+
+    free(vlist);
+
+    for (i = 0; i < xf86NumDrivers; i++) {
+	xorgHWFlags flags;
+	if (!xf86DriverList[i]->driverFunc
+	    || !xf86DriverList[i]->driverFunc(NULL,
+					      GET_REQUIRED_HW_INTERFACES,
+					      &flags)
+	    || NEED_IO_ENABLED(flags)) {
+	    xorgHWAccess = TRUE;
+	    break;
+	}
+    }
+    /* Enable full I/O access */
+    if (xorgHWAccess) {
+	if(!xf86EnableIO())
+	    /* oops, we have failed */
+	    xorgHWAccess = FALSE;
+    }
+
+    /* Create XF86Config file structure */
+    xf86config = calloc(1, sizeof(XF86ConfigRec));
+
+    /* Call all of the probe functions, reporting the results. */
+    for (CurrentDriver = 0;  CurrentDriver < xf86NumDrivers;  CurrentDriver++) {
+	xorgHWFlags flags;
+	Bool found_screen;
+	DriverRec * const drv = xf86DriverList[CurrentDriver];
+
+	if (!xorgHWAccess) {
+	    if (!drv->driverFunc
+		|| !drv->driverFunc( NULL, GET_REQUIRED_HW_INTERFACES, &flags )
+		|| NEED_IO_ENABLED(flags)) 
+		continue;
+	}
+	
+	found_screen = xf86CallDriverProbe( drv, TRUE );
+	if ( found_screen && drv->Identify ) {
+	    (*drv->Identify)(0);
+	}
+    }
+
+    if (nDevToConfig <= 0) {
+	ErrorF("No devices to configure.  Configuration failed.\n");
+	goto bail;
+    }
+
+    /* Add device, monitor and screen sections for detected devices */
+    for (screennum = 0;  screennum < nDevToConfig;  screennum++) {
+    	XF86ConfDevicePtr DevicePtr;
+	XF86ConfMonitorPtr MonitorPtr;
+	XF86ConfScreenPtr ScreenPtr;
+
+	DevicePtr = configureDeviceSection(screennum);
+    	xf86config->conf_device_lst = (XF86ConfDevicePtr)xf86addListItem(
+			    (glp)xf86config->conf_device_lst, (glp)DevicePtr);
+	MonitorPtr = configureMonitorSection(screennum);
+    	xf86config->conf_monitor_lst = (XF86ConfMonitorPtr)xf86addListItem(
+			    (glp)xf86config->conf_monitor_lst, (glp)MonitorPtr);
+	ScreenPtr = configureScreenSection(screennum);
+    	xf86config->conf_screen_lst = (XF86ConfScreenPtr)xf86addListItem(
+			    (glp)xf86config->conf_screen_lst, (glp)ScreenPtr);
+    }
+
+    xf86config->conf_files = configureFilesSection();
+    xf86config->conf_modules = configureModuleSection();
+    xf86config->conf_flags = configureFlagsSection();
+    xf86config->conf_videoadaptor_lst = NULL;
+    xf86config->conf_modes_lst = NULL;
+    xf86config->conf_vendor_lst = NULL;
+    xf86config->conf_dri = NULL;
+    xf86config->conf_input_lst = configureInputSection();
+    xf86config->conf_layout_lst = configureLayoutSection();
+
+    home = getenv("HOME");
+    if ((home == NULL) || (home[0] == '\0')) {
+    	home = "/";
+    } else {
+	/* Determine if trailing slash is present or needed */
+	int l = strlen(home);
+
+	if (home[l-1] != '/') {
+	    addslash = "/";
+	}
+    }
+
+    snprintf(filename, sizeof(filename), "%s%s" XF86CONFIGFILE ".new",
+	     home, addslash);
+
+    if (xf86writeConfigFile(filename, xf86config) == 0) {
+	xf86Msg(X_ERROR, "Unable to write config file: \"%s\": %s\n",
+		filename, strerror(errno));
+	goto bail;
+    }
+
+    xf86DoConfigurePass1 = FALSE;
+    /* Try to get DDC information filled in */
+    xf86ConfigFile = filename;
+    if (xf86HandleConfigFile(FALSE) != CONFIG_OK) {
+	goto bail;
+    }
+
+    xf86DoConfigurePass1 = FALSE;
+    
+    dev2screen = xnfcalloc(1,xf86NumDrivers*sizeof(int));
+
+    {
+	Bool *driverProbed = xnfcalloc(1,xf86NumDrivers*sizeof(Bool));
+	for (screennum = 0;  screennum < nDevToConfig;  screennum++) {
+	    int k,l,n,oldNumScreens;
+
+	    i = DevToConfig[screennum].iDriver;
+
+	    if (driverProbed[i]) continue;
+	    driverProbed[i] = TRUE;
+	    
+	    oldNumScreens = xf86NumScreens;
+
+	    xf86CallDriverProbe( xf86DriverList[i], FALSE );
+
+	    /* reorder */
+	    k = screennum > 0 ? screennum : 1;
+	    for (l = oldNumScreens; l < xf86NumScreens; l++) {
+	        /* is screen primary? */
+	        Bool primary = FALSE;
+		for (n = 0; n<xf86Screens[l]->numEntities; n++) {
+	            if (xf86IsEntityPrimary(xf86Screens[l]->entityList[n])) {
+		        dev2screen[0] = l;
+			primary = TRUE;
+			break;
+		    }
+		}
+		if (primary) continue;
+		/* not primary: assign it to next device of same driver */
+		/* 
+		 * NOTE: we assume that devices in DevToConfig 
+		 * and xf86Screens[] have the same order except
+		 * for the primary device which always comes first.
+		 */
+		for (; k < nDevToConfig; k++) {
+		    if (DevToConfig[k].iDriver == i) {
+		        dev2screen[k++] = l;
+			break;
+		    }
+		}
+	    }
+	}
+	free(driverProbed);
+    }
+    
+
+    if (nDevToConfig != xf86NumScreens) {
+	ErrorF("Number of created screens does not match number of detected"
+	       " devices.\n  Configuration failed.\n");
+	goto bail;
+    }
+
+    xf86PostProbe();
+
+    for (j = 0; j < xf86NumScreens; j++) {
+	xf86Screens[j]->scrnIndex = j;
+    }
+
+    xf86freeMonitorList(xf86config->conf_monitor_lst);
+    xf86config->conf_monitor_lst = NULL;
+    xf86freeScreenList(xf86config->conf_screen_lst);
+    xf86config->conf_screen_lst = NULL;
+    for (j = 0; j < xf86NumScreens; j++) {
+	XF86ConfMonitorPtr MonitorPtr;
+	XF86ConfScreenPtr ScreenPtr;
+
+	ConfiguredMonitor = NULL;
+
+	if ((*xf86Screens[dev2screen[j]]->PreInit)(xf86Screens[dev2screen[j]], 
+						   PROBE_DETECT) &&
+	    ConfiguredMonitor) {
+	    MonitorPtr = configureDDCMonitorSection(j);
+	} else {
+	    MonitorPtr = configureMonitorSection(j);
+	}
+	ScreenPtr = configureScreenSection(j);
+	xf86config->conf_monitor_lst = (XF86ConfMonitorPtr)xf86addListItem(
+		(glp)xf86config->conf_monitor_lst, (glp)MonitorPtr);
+	xf86config->conf_screen_lst = (XF86ConfScreenPtr)xf86addListItem(
+		(glp)xf86config->conf_screen_lst, (glp)ScreenPtr);
+    }
+
+    if (xf86writeConfigFile(filename, xf86config) == 0) {
+	xf86Msg(X_ERROR, "Unable to write config file: \"%s\": %s\n",
+		filename, strerror(errno));
+	goto bail;
+    }
+
+    ErrorF("\n");
+
+    if (!foundMouse) {
+	ErrorF("\n"__XSERVERNAME__" is not able to detect your mouse.\n"
+		"Edit the file and correct the Device.\n");
+    } else {
+	ErrorF("\n"__XSERVERNAME__" detected your mouse at device %s.\n"
+		"Please check your config if the mouse is still not\n"
+		"operational, as by default "__XSERVERNAME__
+	       " tries to autodetect\n"
+		"the protocol.\n",DFLT_MOUSE_DEV);
+    }
+
+    if (xf86NumScreens > 1) {
+	ErrorF("\n"__XSERVERNAME__
+	       " has configured a multihead system, please check your config.\n");
+    }
+
+    ErrorF("\nYour %s file is %s\n\n", XF86CONFIGFILE ,filename);
+    ErrorF("To test the server, run 'X -config %s'\n\n", filename);
+
+bail:
+    OsCleanup(TRUE);
+    AbortDDX();
+    fflush(stderr);
+    exit(0);
+}
diff --git a/xorg-server/hw/xfree86/common/xf86Cursor.c b/xorg-server/hw/xfree86/common/xf86Cursor.c
index acfa79f10..929f047cc 100644
--- a/xorg-server/hw/xfree86/common/xf86Cursor.c
+++ b/xorg-server/hw/xfree86/common/xf86Cursor.c
@@ -1,860 +1,860 @@
-/*

- * Copyright (c) 1994-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).

- */

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include <X11/X.h>

-#include <X11/Xmd.h>

-#include "input.h"

-#include "cursor.h"

-#include "mipointer.h"

-#include "scrnintstr.h"

-#include "globals.h"

-

-#include "compiler.h"

-

-#include "xf86.h"

-#include "xf86Priv.h"

-#include "xf86_OSproc.h"

-

-#include <X11/extensions/XIproto.h>

-#include "xf86Xinput.h"

-

-#ifdef XFreeXDGA

-#include "dgaproc.h"

-#endif

-

-typedef struct _xf86EdgeRec {

-   short screen;

-   short start;

-   short end;

-   DDXPointRec offset;

-   struct _xf86EdgeRec *next;

-} xf86EdgeRec, *xf86EdgePtr;

-

-typedef struct {

-    xf86EdgePtr	left, right, up, down;

-} xf86ScreenLayoutRec, *xf86ScreenLayoutPtr;

-

-static Bool xf86CursorOffScreen(ScreenPtr *pScreen, int *x, int *y);

-static void xf86CrossScreen(ScreenPtr pScreen, Bool entering);

-static void xf86WarpCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y);

-

-static void xf86PointerMoved(int scrnIndex, int x, int y);

-

-static miPointerScreenFuncRec xf86PointerScreenFuncs = {

-  xf86CursorOffScreen,

-  xf86CrossScreen,

-  xf86WarpCursor,

-  /* let miPointerInitialize take care of these */

-  NULL,

-  NULL

-};

-

-static xf86ScreenLayoutRec xf86ScreenLayout[MAXSCREENS];

-

-static Bool HardEdges;

-

-/*

- * xf86InitViewport --

- *      Initialize paning & zooming parameters, so that a driver must only

- *      check what resolutions are possible and whether the virtual area

- *      is valid if specified.

- */

-

-void

-xf86InitViewport(ScrnInfoPtr pScr)

-{

-

-  pScr->PointerMoved = xf86PointerMoved;

-

-  /*

-   * Compute the initial Viewport if necessary

-   */

-  if (pScr->display) {

-    if (pScr->display->frameX0 < 0) {

-      pScr->frameX0 = (pScr->virtualX - pScr->modes->HDisplay) / 2;

-      pScr->frameY0 = (pScr->virtualY - pScr->modes->VDisplay) / 2;

-    } else {

-      pScr->frameX0 = pScr->display->frameX0;

-      pScr->frameY0 = pScr->display->frameY0;

-    }

-  }

-

-  pScr->frameX1 = pScr->frameX0 + pScr->modes->HDisplay - 1;

-  pScr->frameY1 = pScr->frameY0 + pScr->modes->VDisplay - 1;

-

-  /*

-   * Now adjust the initial Viewport, so it lies within the virtual area

-   */

-  if (pScr->frameX1 >= pScr->virtualX)

-    {

-	pScr->frameX0 = pScr->virtualX - pScr->modes->HDisplay;

-	pScr->frameX1 = pScr->frameX0 + pScr->modes->HDisplay - 1;

-    }

-

-  if (pScr->frameY1 >= pScr->virtualY)

-    {

-	pScr->frameY0 = pScr->virtualY - pScr->modes->VDisplay;

-	pScr->frameY1 = pScr->frameY0 + pScr->modes->VDisplay - 1;

-    }

-}

-

-

-/*

- * xf86SetViewport --

- *      Scroll the visual part of the screen so the pointer is visible.

- */

-

-void

-xf86SetViewport(ScreenPtr pScreen, int x, int y)

-{

-  ScrnInfoPtr   pScr = XF86SCRNINFO(pScreen);

-

-  (*pScr->PointerMoved)(pScreen->myNum, x, y);

-}

-

-

-static void 

-xf86PointerMoved(int scrnIndex, int x, int y)

-{

-  Bool          frameChanged = FALSE;

-  ScrnInfoPtr   pScr = xf86Screens[scrnIndex];

-

-  /*

-   * check wether (x,y) belongs to the visual part of the screen

-   * if not, change the base of the displayed frame accoring

-   */

-  if ( pScr->frameX0 > x) { 

-    pScr->frameX0 = x;

-    pScr->frameX1 = x + pScr->currentMode->HDisplay - 1;

-    frameChanged = TRUE ;

-  }

-  

-  if ( pScr->frameX1 < x) { 

-    pScr->frameX1 = x + 1;

-    pScr->frameX0 = x - pScr->currentMode->HDisplay + 1;

-    frameChanged = TRUE ;

-  }

-  

-  if ( pScr->frameY0 > y) { 

-    pScr->frameY0 = y;

-    pScr->frameY1 = y + pScr->currentMode->VDisplay - 1;

-    frameChanged = TRUE;

-  }

-  

-  if ( pScr->frameY1 < y) { 

-    pScr->frameY1 = y;

-    pScr->frameY0 = y - pScr->currentMode->VDisplay + 1;

-    frameChanged = TRUE; 

-  }

-  

-  if (frameChanged && pScr->AdjustFrame != NULL)

-    pScr->AdjustFrame(pScr->scrnIndex, pScr->frameX0, pScr->frameY0, 0);

-}

-

-/*

- * xf86LockZoom --

- *	Enable/disable ZoomViewport

- */

-

-void

-xf86LockZoom(ScreenPtr pScreen, Bool lock)

-{

-  XF86SCRNINFO(pScreen)->zoomLocked = lock;

-}

-

-/*

- * xf86SwitchMode --

- *	This is called by both keyboard processing and the VidMode extension to

- *	set a new mode.

- */

-

-Bool

-xf86SwitchMode(ScreenPtr pScreen, DisplayModePtr mode)

-{

-  ScrnInfoPtr pScr = XF86SCRNINFO(pScreen);

-  ScreenPtr   pCursorScreen;

-  Bool        Switched;

-  int         px, py;

-  DeviceIntPtr dev, it;

-

-  if (!pScr->vtSema || !mode || !pScr->SwitchMode)

-    return FALSE;

-

-#ifdef XFreeXDGA

-  if (DGAActive(pScr->scrnIndex))

-    return FALSE;

-#endif

-

-  if (mode == pScr->currentMode)

-    return TRUE;

-

-  if (mode->HDisplay > pScr->virtualX || mode->VDisplay > pScr->virtualY)

-    return FALSE;

-

-  /* Let's take an educated guess for which pointer to take here. And about as

-     educated as it gets is to take the first pointer we find.

-   */

-  for (dev = inputInfo.devices; dev; dev = dev->next)

-  {

-      if (IsPointerDevice(dev) && dev->spriteInfo->spriteOwner)

-          break;

-  }

-

-  pCursorScreen = miPointerGetScreen(dev);

-  if (pScreen == pCursorScreen)

-    miPointerGetPosition(dev, &px, &py);

-

-  xf86EnterServerState(SETUP);

-  Switched = (*pScr->SwitchMode)(pScr->scrnIndex, mode, 0);

-  if (Switched) {

-    pScr->currentMode = mode;

-

-    /*

-     * Adjust frame for new display size.

-     * Frame is centered around cursor position if cursor is on same screen.

-     */

-    if (pScreen == pCursorScreen)

-      pScr->frameX0 = px - (mode->HDisplay / 2) + 1;

-    else

-      pScr->frameX0 = (pScr->frameX0 + pScr->frameX1 + 1 - mode->HDisplay) / 2;

-

-    if (pScr->frameX0 < 0)

-      pScr->frameX0 = 0;

-

-    pScr->frameX1 = pScr->frameX0 + mode->HDisplay - 1;

-    if (pScr->frameX1 >= pScr->virtualX) {

-      pScr->frameX0 = pScr->virtualX - mode->HDisplay;

-      pScr->frameX1 = pScr->virtualX - 1;

-    }

-

-    if (pScreen == pCursorScreen)

-      pScr->frameY0 = py - (mode->VDisplay / 2) + 1;

-    else

-      pScr->frameY0 = (pScr->frameY0 + pScr->frameY1 + 1 - mode->VDisplay) / 2;

-

-    if (pScr->frameY0 < 0)

-      pScr->frameY0 = 0;

-

-    pScr->frameY1 = pScr->frameY0 + mode->VDisplay - 1;

-    if (pScr->frameY1 >= pScr->virtualY) {

-      pScr->frameY0 = pScr->virtualY - mode->VDisplay;

-      pScr->frameY1 = pScr->virtualY - 1;

-    }

-  }

-  xf86EnterServerState(OPERATING);

-

-  if (pScr->AdjustFrame)

-    (*pScr->AdjustFrame)(pScr->scrnIndex, pScr->frameX0, pScr->frameY0, 0);

-

-  /* The original code centered the frame around the cursor if possible.

-   * Since this is hard to achieve with multiple cursors, we do the following:

-   *   - center around the first pointer

-   *   - move all other pointers to the nearest edge on the screen (or leave

-   *   them unmodified if they are within the boundaries).

-   */

-  if (pScreen == pCursorScreen)

-  {

-      xf86WarpCursor(dev, pScreen, px, py);

-  }

-

-  for (it = inputInfo.devices; it; it = it->next)

-  {

-      if (it == dev)

-          continue;

-

-      if (IsPointerDevice(it) && it->spriteInfo->spriteOwner)

-      {

-          pCursorScreen = miPointerGetScreen(it);

-          if (pScreen == pCursorScreen)

-          {

-              miPointerGetPosition(it, &px, &py);

-              if (px < pScr->frameX0)

-                  px = pScr->frameX0;

-              else if (px > pScr->frameX1)

-                  px = pScr->frameX1;

-

-              if(py < pScr->frameY0)

-                  py = pScr->frameY0;

-              else if(py > pScr->frameY1)

-                  py = pScr->frameY1;

-

-              xf86WarpCursor(it, pScreen, px, py);

-          }

-      }

-  }

-

-  return Switched;

-}

-    

-/*

- * xf86ZoomViewport --

- *      Reinitialize the visual part of the screen for another mode.

- */

-

-void

-xf86ZoomViewport(ScreenPtr pScreen, int zoom)

-{

-  ScrnInfoPtr    pScr = XF86SCRNINFO(pScreen);

-  DisplayModePtr mode;

-

-  if (pScr->zoomLocked || !(mode = pScr->currentMode))

-    return;

-

-  do {

-    if (zoom > 0)

-      mode = mode->next;

-    else

-      mode = mode->prev;

-  } while (mode != pScr->currentMode && !(mode->type & M_T_USERDEF));

-

-  (void)xf86SwitchMode(pScreen, mode);

-}

-

-

-static xf86EdgePtr

-FindEdge(xf86EdgePtr edge, int val)

-{

-    while(edge && (edge->end <= val))

-	edge = edge->next;

-

-    if(edge && (edge->start <= val))

-	return edge;

-

-    return NULL;

-}

-

-/*

- * xf86CursorOffScreen --

- *      Check whether it is necessary to switch to another screen

- */

-

-static Bool

-xf86CursorOffScreen(ScreenPtr *pScreen, int *x, int *y)

-{

-    xf86EdgePtr edge;

-    int tmp;

-

-    if(screenInfo.numScreens == 1)

-	return FALSE;

-

-    if(*x < 0) {

-        tmp = *y;

-	if(tmp < 0) tmp = 0;

-	if(tmp >= (*pScreen)->height) tmp = (*pScreen)->height - 1;

-

-	if((edge = xf86ScreenLayout[(*pScreen)->myNum].left))

-	   edge = FindEdge(edge, tmp);

-

-	if(!edge) *x = 0;

-	else {

-	    *x += edge->offset.x;

-	    *y += edge->offset.y;

-	    *pScreen = xf86Screens[edge->screen]->pScreen;

-	}

-    }

-

-    if(*x >= (*pScreen)->width) {

-        tmp = *y;

-	if(tmp < 0) tmp = 0;

-	if(tmp >= (*pScreen)->height) tmp = (*pScreen)->height - 1;

-

-	if((edge = xf86ScreenLayout[(*pScreen)->myNum].right))

-	   edge = FindEdge(edge, tmp);

-

-	if(!edge) *x = (*pScreen)->width - 1;

-	else {

-	    *x += edge->offset.x;

-	    *y += edge->offset.y;

-	    *pScreen = xf86Screens[edge->screen]->pScreen;

-	}

-    }

-

-    if(*y < 0) {

-        tmp = *x;

-	if(tmp < 0) tmp = 0;

-	if(tmp >= (*pScreen)->width) tmp = (*pScreen)->width - 1;

-

-	if((edge = xf86ScreenLayout[(*pScreen)->myNum].up))

-	   edge = FindEdge(edge, tmp);

-

-	if(!edge) *y = 0;

-	else {

-	    *x += edge->offset.x;

-	    *y += edge->offset.y;

-	    *pScreen = xf86Screens[edge->screen]->pScreen;

-	}

-    }

-

-    if(*y >= (*pScreen)->height) {

-        tmp = *x;

-	if(tmp < 0) tmp = 0;

-	if(tmp >= (*pScreen)->width) tmp = (*pScreen)->width - 1;

-

-	if((edge = xf86ScreenLayout[(*pScreen)->myNum].down))

-	   edge = FindEdge(edge, tmp);

-

-	if(!edge) *y = (*pScreen)->height - 1;

-	else {

-	    *x += edge->offset.x;

-	    *y += edge->offset.y;

-	    (*pScreen) = xf86Screens[edge->screen]->pScreen;

-	}

-    }

-

-

-#if 0

-    /* This presents problems for overlapping screens when

- 	HardEdges is used.  Have to think about the logic more */

-    if((*x < 0) || (*x >= (*pScreen)->width) || 

-       (*y < 0) || (*y >= (*pScreen)->height)) {

-	/* We may have crossed more than one screen */

-	xf86CursorOffScreen(pScreen, x, y);

-    }

-#endif

-

-    return TRUE;

-}

-

-

-

-/*

- * xf86CrossScreen --

- *      Switch to another screen

- *

- *	Currently nothing special happens, but mi assumes the CrossScreen

- *	method exists.

- */

-

-static void

-xf86CrossScreen (ScreenPtr pScreen, Bool entering)

-{

-}

-

-

-/*

- * xf86WarpCursor --

- *      Warp possible to another screen

- */

-

-/* ARGSUSED */

-static void

-xf86WarpCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)

-{

-    int    sigstate;

-    sigstate = xf86BlockSIGIO ();

-    miPointerWarpCursor(pDev, pScreen, x, y);

-

-    xf86Info.currentScreen = pScreen;

-    xf86UnblockSIGIO (sigstate);

-}

-

-

-void *

-xf86GetPointerScreenFuncs(void)

-{

-    return (void *)&xf86PointerScreenFuncs;

-}

-

-

-static xf86EdgePtr

-AddEdge(

-   xf86EdgePtr edge, 

-   short min, 

-   short max,

-   short dx,

-   short dy,

-   short screen

-){

-   xf86EdgePtr pEdge = edge, pPrev = NULL, pNew;

-

-   while(1) {

-	while(pEdge && (min >= pEdge->end)) {

-	    pPrev = pEdge;

-	    pEdge = pEdge->next;

-	}  

-

-	if(!pEdge) {

-	    if(!(pNew = malloc(sizeof(xf86EdgeRec))))

-		break;

-

-	    pNew->screen = screen;

-	    pNew->start = min;  

-	    pNew->end = max;   

-	    pNew->offset.x = dx;

-	    pNew->offset.y = dy;

-	    pNew->next = NULL;

-

-	    if(pPrev)

-		pPrev->next = pNew;

-	    else

-		edge = pNew;

-	    

-	    break;

-	} else if (min < pEdge->start) {

-	    if(!(pNew = malloc(sizeof(xf86EdgeRec))))

-		break;

-

-	    pNew->screen = screen;

-	    pNew->start = min;  

-	    pNew->offset.x = dx;

-	    pNew->offset.y = dy;

-	    pNew->next = pEdge;

-

-	    if(pPrev) pPrev->next = pNew;

-	    else edge = pNew;

-

-	    if(max <= pEdge->start) {

-		pNew->end = max;   

-		break;

-	    } else {

-		pNew->end = pEdge->start;

-		min = pEdge->end;

-	    }

-	} else

-	    min = pEdge->end;

-

-	pPrev = pEdge;

-	pEdge = pEdge->next;

-

-	if(max <= min) break;

-   }

-	

-   return edge;

-}

-

-static void

-FillOutEdge(xf86EdgePtr pEdge, int limit)

-{

-    xf86EdgePtr pNext;

-    int diff;

-

-    if(pEdge->start > 0) pEdge->start = 0;

-

-    while((pNext = pEdge->next)) {

-	diff = pNext->start - pEdge->end;

-	if(diff > 0) {	

-	    pEdge->end += diff >> 1;

-	    pNext->start -= diff - (diff >> 1);

-	}

-	pEdge = pNext;

-    }

-

-    if(pEdge->end < limit)

-	pEdge->end = limit;    

-}

-

-/*

- * xf86InitOrigins() can deal with a maximum of 32 screens

- * on 32 bit architectures, 64 on 64 bit architectures.

- */

-

-void

-xf86InitOrigins(void)

-{

-    unsigned long screensLeft, prevScreensLeft, mask;

-    screenLayoutPtr screen;

-    ScreenPtr pScreen, refScreen;

-    int x1, x2, y1, y2, left, right, top, bottom;

-    int i, j, ref, minX, minY, min, max;

-    xf86ScreenLayoutPtr pLayout;

-    Bool OldStyleConfig = FALSE;

-

-    /* need to have this set up with a config file option */

-    HardEdges = FALSE;

-

-    memset(xf86ScreenLayout, 0, MAXSCREENS * sizeof(xf86ScreenLayoutRec));

-	

-    screensLeft = prevScreensLeft = (1 << xf86NumScreens) - 1;

-

-    while(1) {

-	for(mask = screensLeft, i = 0; mask; mask >>= 1, i++) {

-	    if(!(mask & 1L)) continue;

-

-	    screen = &xf86ConfigLayout.screens[i];

-

-	    if (screen->refscreen != NULL &&

-		screen->refscreen->screennum >= xf86NumScreens) {

-		screensLeft &= ~(1 << i);

-	        xf86Msg(X_WARNING, "Not including screen \"%s\" in origins calculation.\n",

-			screen->screen->id);

-	        continue;

-	    }

-

-	    pScreen = xf86Screens[i]->pScreen;

-	    switch(screen->where) {

-	    case PosObsolete:

-		OldStyleConfig = TRUE;

-		pLayout = &xf86ScreenLayout[i];

-		/* force edge lists */

-		if(screen->left) {

-		    ref = screen->left->screennum;

-		    if (! xf86Screens[ref] || ! xf86Screens[ref]->pScreen) {

-			ErrorF("Referenced uninitialized screen in Layout!\n");

-			break;

-		    }

-		    pLayout->left = AddEdge(pLayout->left, 

-			0, pScreen->height,

-			xf86Screens[ref]->pScreen->width, 0, ref);

-		}

-		if(screen->right) {

-		    ref = screen->right->screennum;

-		    if (! xf86Screens[ref] || ! xf86Screens[ref]->pScreen) {

-			ErrorF("Referenced uninitialized screen in Layout!\n");

-			break;

-		    }

-		    pLayout->right = AddEdge(pLayout->right, 

-			0, pScreen->height, -pScreen->width, 0, ref);

-		}

-		if(screen->top) {

-		    ref = screen->top->screennum;

-		    if (! xf86Screens[ref] || ! xf86Screens[ref]->pScreen) {

-			ErrorF("Referenced uninitialized screen in Layout!\n");

-			break;

-		    }

-		    pLayout->up = AddEdge(pLayout->up, 

-			0, pScreen->width,

-			0, xf86Screens[ref]->pScreen->height, ref);

-		}

-		if(screen->bottom) {

-		    ref = screen->bottom->screennum;

-		    if (! xf86Screens[ref] || ! xf86Screens[ref]->pScreen) {

-			ErrorF("Referenced uninitialized screen in Layout!\n");

-			break;

-		    }

-		    pLayout->down = AddEdge(pLayout->down, 

-			0, pScreen->width, 0, -pScreen->height, ref);

-		}

-	        /* we could also try to place it based on those

-		   relative locations if we wanted to */

-		screen->x = screen->y = 0;

-		/* FALLTHROUGH */

-	    case PosAbsolute:

-		pScreen->x = screen->x;

-		pScreen->y = screen->y;

-		screensLeft &= ~(1 << i);

-		break;

-	    case PosRelative:

-		ref = screen->refscreen->screennum;

-		if (! xf86Screens[ref] || ! xf86Screens[ref]->pScreen) {

-		    ErrorF("Referenced uninitialized screen in Layout!\n");

-		    break;

-		}

-		if(screensLeft & (1 << ref)) break;

-		refScreen = xf86Screens[ref]->pScreen;

-		pScreen->x = refScreen->x + screen->x;

-		pScreen->y = refScreen->y + screen->y;

-		screensLeft &= ~(1 << i);

-		break;

-	    case PosRightOf:

-		ref = screen->refscreen->screennum;

-		if (! xf86Screens[ref] || ! xf86Screens[ref]->pScreen) {

-		    ErrorF("Referenced uninitialized screen in Layout!\n");

-		    break;

-		}

-		if(screensLeft & (1 << ref)) break;

-		refScreen = xf86Screens[ref]->pScreen;

-		pScreen->x = refScreen->x + refScreen->width;

-		pScreen->y = refScreen->y;

-		screensLeft &= ~(1 << i);

-		break;

-	    case PosLeftOf:

-		ref = screen->refscreen->screennum;

-		if (! xf86Screens[ref] || ! xf86Screens[ref]->pScreen) {

-		    ErrorF("Referenced uninitialized screen in Layout!\n");

-		    break;

-		}

-		if(screensLeft & (1 << ref)) break;

-		refScreen = xf86Screens[ref]->pScreen;

-		pScreen->x = refScreen->x - pScreen->width;

-		pScreen->y = refScreen->y;

-		screensLeft &= ~(1 << i);

-		break;

-	    case PosBelow:

-		ref = screen->refscreen->screennum;

-		if (! xf86Screens[ref] || ! xf86Screens[ref]->pScreen) {

-		    ErrorF("Referenced uninitialized screen in Layout!\n");

-		    break;

-		}

-		if(screensLeft & (1 << ref)) break;

-		refScreen = xf86Screens[ref]->pScreen;

-		pScreen->x = refScreen->x;

-		pScreen->y = refScreen->y + refScreen->height;

-		screensLeft &= ~(1 << i);

-		break;

-	    case PosAbove:

-		ref = screen->refscreen->screennum;

-		if (! xf86Screens[ref] || ! xf86Screens[ref]->pScreen) {

-		    ErrorF("Referenced uninitialized screen in Layout!\n");

-		    break;

-		}

-		if(screensLeft & (1 << ref)) break;

-		refScreen = xf86Screens[ref]->pScreen;

-		pScreen->x = refScreen->x;

-		pScreen->y = refScreen->y - pScreen->height;

-		screensLeft &= ~(1 << i);

-		break;

-	    default:

-		ErrorF("Illegal placement keyword in Layout!\n");

-		break;

-	    }

-

-	}

-

-	if(!screensLeft) break;

-

-	if(screensLeft == prevScreensLeft) {

-	/* All the remaining screens are referencing each other.

-	   Assign a value to one of them and go through again */

-	    i = 0;

-	    while(!((1 << i) & screensLeft)){ i++; }

-

-	    ref = xf86ConfigLayout.screens[i].refscreen->screennum;

-	    xf86Screens[ref]->pScreen->x = xf86Screens[ref]->pScreen->y = 0;

-	    screensLeft &= ~(1 << ref);

-	}

-

-	prevScreensLeft = screensLeft;

-    }

-

-    /* justify the topmost and leftmost to (0,0) */

-    minX = xf86Screens[0]->pScreen->x;

-    minY = xf86Screens[0]->pScreen->y;

-

-    for(i = 1; i < xf86NumScreens; i++) {

-	if(xf86Screens[i]->pScreen->x < minX)

-	  minX = xf86Screens[i]->pScreen->x;

-	if(xf86Screens[i]->pScreen->y < minY)

-	  minY = xf86Screens[i]->pScreen->y;

-    }

-

-    if (minX || minY) {

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

-	   xf86Screens[i]->pScreen->x -= minX;

-	   xf86Screens[i]->pScreen->y -= minY;

-	}

-    }

-

-

-    /* Create the edge lists */

-

-    if(!OldStyleConfig) {

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

-	pLayout = &xf86ScreenLayout[i];

-

-	pScreen = xf86Screens[i]->pScreen;

-

-	left = pScreen->x;

-	right = left + pScreen->width;

-	top = pScreen->y;

-	bottom = top + pScreen->height;

-

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

-	    if(i == j) continue;

-

-	    refScreen = xf86Screens[j]->pScreen;

-

-	    x1 = refScreen->x;

-	    x2 = x1 + refScreen->width;

-	    y1 = refScreen->y;

-	    y2 = y1 + refScreen->height;

-

-	    if((bottom > y1) && (top < y2)) {

-		min = y1 - top;

-		if(min < 0) min = 0;

-		max = pScreen->height - (bottom - y2);

-		if(max > pScreen->height) max = pScreen->height;

-

-		if(((left - 1) >= x1) && ((left - 1) < x2))

-		    pLayout->left = AddEdge(pLayout->left, min, max,

-			pScreen->x - refScreen->x,

-			pScreen->y - refScreen->y, j);

-

-		if((right >= x1) && (right < x2))	

-		    pLayout->right = AddEdge(pLayout->right, min, max,

-			pScreen->x - refScreen->x,

-			pScreen->y - refScreen->y, j);

-	    }

-

-

-	    if((left < x2) && (right > x1)) {

-		min = x1 - left;

-		if(min < 0) min = 0;

-		max = pScreen->width - (right - x2);

-		if(max > pScreen->width) max = pScreen->width;

-

-		if(((top - 1) >= y1) && ((top - 1) < y2))

-		    pLayout->up = AddEdge(pLayout->up, min, max,

-			pScreen->x - refScreen->x,

-			pScreen->y - refScreen->y, j);

-

-		if((bottom >= y1) && (bottom < y2))

-		    pLayout->down = AddEdge(pLayout->down, min, max,

-			pScreen->x - refScreen->x,

-			pScreen->y - refScreen->y, j);

-	    }

-	}

-      }

-    }

-

-    if(!HardEdges && !OldStyleConfig) {

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

-	    pLayout = &xf86ScreenLayout[i];

-	    pScreen = xf86Screens[i]->pScreen;

-	    if(pLayout->left) 

-		FillOutEdge(pLayout->left, pScreen->height);

-	    if(pLayout->right) 

-		FillOutEdge(pLayout->right, pScreen->height);

-	    if(pLayout->up) 

-		FillOutEdge(pLayout->up, pScreen->width);

-	    if(pLayout->down) 

-		FillOutEdge(pLayout->down, pScreen->width);

-	}

-    }

-}

-

-void

-xf86ReconfigureLayout(void)

-{

-    int i;

-

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

-	xf86ScreenLayoutPtr sl = &xf86ScreenLayout[i];

-	/* we don't have to zero these, xf86InitOrigins() takes care of that */

-	free(sl->left);

-	free(sl->right);

-	free(sl->up);

-	free(sl->down);

-    }

-

-    xf86InitOrigins();

-}

-

-	

+/*
+ * Copyright (c) 1994-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).
+ */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include <X11/X.h>
+#include <X11/Xmd.h>
+#include "input.h"
+#include "cursor.h"
+#include "mipointer.h"
+#include "scrnintstr.h"
+#include "globals.h"
+
+#include "compiler.h"
+
+#include "xf86.h"
+#include "xf86Priv.h"
+#include "xf86_OSproc.h"
+
+#include <X11/extensions/XIproto.h>
+#include "xf86Xinput.h"
+
+#ifdef XFreeXDGA
+#include "dgaproc.h"
+#endif
+
+typedef struct _xf86EdgeRec {
+   short screen;
+   short start;
+   short end;
+   DDXPointRec offset;
+   struct _xf86EdgeRec *next;
+} xf86EdgeRec, *xf86EdgePtr;
+
+typedef struct {
+    xf86EdgePtr	left, right, up, down;
+} xf86ScreenLayoutRec, *xf86ScreenLayoutPtr;
+
+static Bool xf86CursorOffScreen(ScreenPtr *pScreen, int *x, int *y);
+static void xf86CrossScreen(ScreenPtr pScreen, Bool entering);
+static void xf86WarpCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y);
+
+static void xf86PointerMoved(int scrnIndex, int x, int y);
+
+static miPointerScreenFuncRec xf86PointerScreenFuncs = {
+  xf86CursorOffScreen,
+  xf86CrossScreen,
+  xf86WarpCursor,
+  /* let miPointerInitialize take care of these */
+  NULL,
+  NULL
+};
+
+static xf86ScreenLayoutRec xf86ScreenLayout[MAXSCREENS];
+
+static Bool HardEdges;
+
+/*
+ * xf86InitViewport --
+ *      Initialize paning & zooming parameters, so that a driver must only
+ *      check what resolutions are possible and whether the virtual area
+ *      is valid if specified.
+ */
+
+void
+xf86InitViewport(ScrnInfoPtr pScr)
+{
+
+  pScr->PointerMoved = xf86PointerMoved;
+
+  /*
+   * Compute the initial Viewport if necessary
+   */
+  if (pScr->display) {
+    if (pScr->display->frameX0 < 0) {
+      pScr->frameX0 = (pScr->virtualX - pScr->modes->HDisplay) / 2;
+      pScr->frameY0 = (pScr->virtualY - pScr->modes->VDisplay) / 2;
+    } else {
+      pScr->frameX0 = pScr->display->frameX0;
+      pScr->frameY0 = pScr->display->frameY0;
+    }
+  }
+
+  pScr->frameX1 = pScr->frameX0 + pScr->modes->HDisplay - 1;
+  pScr->frameY1 = pScr->frameY0 + pScr->modes->VDisplay - 1;
+
+  /*
+   * Now adjust the initial Viewport, so it lies within the virtual area
+   */
+  if (pScr->frameX1 >= pScr->virtualX)
+    {
+	pScr->frameX0 = pScr->virtualX - pScr->modes->HDisplay;
+	pScr->frameX1 = pScr->frameX0 + pScr->modes->HDisplay - 1;
+    }
+
+  if (pScr->frameY1 >= pScr->virtualY)
+    {
+	pScr->frameY0 = pScr->virtualY - pScr->modes->VDisplay;
+	pScr->frameY1 = pScr->frameY0 + pScr->modes->VDisplay - 1;
+    }
+}
+
+
+/*
+ * xf86SetViewport --
+ *      Scroll the visual part of the screen so the pointer is visible.
+ */
+
+void
+xf86SetViewport(ScreenPtr pScreen, int x, int y)
+{
+  ScrnInfoPtr   pScr = XF86SCRNINFO(pScreen);
+
+  (*pScr->PointerMoved)(pScreen->myNum, x, y);
+}
+
+
+static void 
+xf86PointerMoved(int scrnIndex, int x, int y)
+{
+  Bool          frameChanged = FALSE;
+  ScrnInfoPtr   pScr = xf86Screens[scrnIndex];
+
+  /*
+   * check wether (x,y) belongs to the visual part of the screen
+   * if not, change the base of the displayed frame accoring
+   */
+  if ( pScr->frameX0 > x) { 
+    pScr->frameX0 = x;
+    pScr->frameX1 = x + pScr->currentMode->HDisplay - 1;
+    frameChanged = TRUE ;
+  }
+  
+  if ( pScr->frameX1 < x) { 
+    pScr->frameX1 = x + 1;
+    pScr->frameX0 = x - pScr->currentMode->HDisplay + 1;
+    frameChanged = TRUE ;
+  }
+  
+  if ( pScr->frameY0 > y) { 
+    pScr->frameY0 = y;
+    pScr->frameY1 = y + pScr->currentMode->VDisplay - 1;
+    frameChanged = TRUE;
+  }
+  
+  if ( pScr->frameY1 < y) { 
+    pScr->frameY1 = y;
+    pScr->frameY0 = y - pScr->currentMode->VDisplay + 1;
+    frameChanged = TRUE; 
+  }
+  
+  if (frameChanged && pScr->AdjustFrame != NULL)
+    pScr->AdjustFrame(pScr->scrnIndex, pScr->frameX0, pScr->frameY0, 0);
+}
+
+/*
+ * xf86LockZoom --
+ *	Enable/disable ZoomViewport
+ */
+
+void
+xf86LockZoom(ScreenPtr pScreen, Bool lock)
+{
+  XF86SCRNINFO(pScreen)->zoomLocked = lock;
+}
+
+/*
+ * xf86SwitchMode --
+ *	This is called by both keyboard processing and the VidMode extension to
+ *	set a new mode.
+ */
+
+Bool
+xf86SwitchMode(ScreenPtr pScreen, DisplayModePtr mode)
+{
+  ScrnInfoPtr pScr = XF86SCRNINFO(pScreen);
+  ScreenPtr   pCursorScreen;
+  Bool        Switched;
+  int         px, py, was_blocked;
+  DeviceIntPtr dev, it;
+
+  if (!pScr->vtSema || !mode || !pScr->SwitchMode)
+    return FALSE;
+
+#ifdef XFreeXDGA
+  if (DGAActive(pScr->scrnIndex))
+    return FALSE;
+#endif
+
+  if (mode == pScr->currentMode)
+    return TRUE;
+
+  if (mode->HDisplay > pScr->virtualX || mode->VDisplay > pScr->virtualY)
+    return FALSE;
+
+  /* Let's take an educated guess for which pointer to take here. And about as
+     educated as it gets is to take the first pointer we find.
+   */
+  for (dev = inputInfo.devices; dev; dev = dev->next)
+  {
+      if (IsPointerDevice(dev) && dev->spriteInfo->spriteOwner)
+          break;
+  }
+
+  pCursorScreen = miPointerGetScreen(dev);
+  if (pScreen == pCursorScreen)
+    miPointerGetPosition(dev, &px, &py);
+
+  was_blocked = xf86BlockSIGIO();
+  Switched = (*pScr->SwitchMode)(pScr->scrnIndex, mode, 0);
+  if (Switched) {
+    pScr->currentMode = mode;
+
+    /*
+     * Adjust frame for new display size.
+     * Frame is centered around cursor position if cursor is on same screen.
+     */
+    if (pScreen == pCursorScreen)
+      pScr->frameX0 = px - (mode->HDisplay / 2) + 1;
+    else
+      pScr->frameX0 = (pScr->frameX0 + pScr->frameX1 + 1 - mode->HDisplay) / 2;
+
+    if (pScr->frameX0 < 0)
+      pScr->frameX0 = 0;
+
+    pScr->frameX1 = pScr->frameX0 + mode->HDisplay - 1;
+    if (pScr->frameX1 >= pScr->virtualX) {
+      pScr->frameX0 = pScr->virtualX - mode->HDisplay;
+      pScr->frameX1 = pScr->virtualX - 1;
+    }
+
+    if (pScreen == pCursorScreen)
+      pScr->frameY0 = py - (mode->VDisplay / 2) + 1;
+    else
+      pScr->frameY0 = (pScr->frameY0 + pScr->frameY1 + 1 - mode->VDisplay) / 2;
+
+    if (pScr->frameY0 < 0)
+      pScr->frameY0 = 0;
+
+    pScr->frameY1 = pScr->frameY0 + mode->VDisplay - 1;
+    if (pScr->frameY1 >= pScr->virtualY) {
+      pScr->frameY0 = pScr->virtualY - mode->VDisplay;
+      pScr->frameY1 = pScr->virtualY - 1;
+    }
+  }
+  xf86UnblockSIGIO(was_blocked);
+
+  if (pScr->AdjustFrame)
+    (*pScr->AdjustFrame)(pScr->scrnIndex, pScr->frameX0, pScr->frameY0, 0);
+
+  /* The original code centered the frame around the cursor if possible.
+   * Since this is hard to achieve with multiple cursors, we do the following:
+   *   - center around the first pointer
+   *   - move all other pointers to the nearest edge on the screen (or leave
+   *   them unmodified if they are within the boundaries).
+   */
+  if (pScreen == pCursorScreen)
+  {
+      xf86WarpCursor(dev, pScreen, px, py);
+  }
+
+  for (it = inputInfo.devices; it; it = it->next)
+  {
+      if (it == dev)
+          continue;
+
+      if (IsPointerDevice(it) && it->spriteInfo->spriteOwner)
+      {
+          pCursorScreen = miPointerGetScreen(it);
+          if (pScreen == pCursorScreen)
+          {
+              miPointerGetPosition(it, &px, &py);
+              if (px < pScr->frameX0)
+                  px = pScr->frameX0;
+              else if (px > pScr->frameX1)
+                  px = pScr->frameX1;
+
+              if(py < pScr->frameY0)
+                  py = pScr->frameY0;
+              else if(py > pScr->frameY1)
+                  py = pScr->frameY1;
+
+              xf86WarpCursor(it, pScreen, px, py);
+          }
+      }
+  }
+
+  return Switched;
+}
+    
+/*
+ * xf86ZoomViewport --
+ *      Reinitialize the visual part of the screen for another mode.
+ */
+
+void
+xf86ZoomViewport(ScreenPtr pScreen, int zoom)
+{
+  ScrnInfoPtr    pScr = XF86SCRNINFO(pScreen);
+  DisplayModePtr mode;
+
+  if (pScr->zoomLocked || !(mode = pScr->currentMode))
+    return;
+
+  do {
+    if (zoom > 0)
+      mode = mode->next;
+    else
+      mode = mode->prev;
+  } while (mode != pScr->currentMode && !(mode->type & M_T_USERDEF));
+
+  (void)xf86SwitchMode(pScreen, mode);
+}
+
+
+static xf86EdgePtr
+FindEdge(xf86EdgePtr edge, int val)
+{
+    while(edge && (edge->end <= val))
+	edge = edge->next;
+
+    if(edge && (edge->start <= val))
+	return edge;
+
+    return NULL;
+}
+
+/*
+ * xf86CursorOffScreen --
+ *      Check whether it is necessary to switch to another screen
+ */
+
+static Bool
+xf86CursorOffScreen(ScreenPtr *pScreen, int *x, int *y)
+{
+    xf86EdgePtr edge;
+    int tmp;
+
+    if(screenInfo.numScreens == 1)
+	return FALSE;
+
+    if(*x < 0) {
+        tmp = *y;
+	if(tmp < 0) tmp = 0;
+	if(tmp >= (*pScreen)->height) tmp = (*pScreen)->height - 1;
+
+	if((edge = xf86ScreenLayout[(*pScreen)->myNum].left))
+	   edge = FindEdge(edge, tmp);
+
+	if(!edge) *x = 0;
+	else {
+	    *x += edge->offset.x;
+	    *y += edge->offset.y;
+	    *pScreen = xf86Screens[edge->screen]->pScreen;
+	}
+    }
+
+    if(*x >= (*pScreen)->width) {
+        tmp = *y;
+	if(tmp < 0) tmp = 0;
+	if(tmp >= (*pScreen)->height) tmp = (*pScreen)->height - 1;
+
+	if((edge = xf86ScreenLayout[(*pScreen)->myNum].right))
+	   edge = FindEdge(edge, tmp);
+
+	if(!edge) *x = (*pScreen)->width - 1;
+	else {
+	    *x += edge->offset.x;
+	    *y += edge->offset.y;
+	    *pScreen = xf86Screens[edge->screen]->pScreen;
+	}
+    }
+
+    if(*y < 0) {
+        tmp = *x;
+	if(tmp < 0) tmp = 0;
+	if(tmp >= (*pScreen)->width) tmp = (*pScreen)->width - 1;
+
+	if((edge = xf86ScreenLayout[(*pScreen)->myNum].up))
+	   edge = FindEdge(edge, tmp);
+
+	if(!edge) *y = 0;
+	else {
+	    *x += edge->offset.x;
+	    *y += edge->offset.y;
+	    *pScreen = xf86Screens[edge->screen]->pScreen;
+	}
+    }
+
+    if(*y >= (*pScreen)->height) {
+        tmp = *x;
+	if(tmp < 0) tmp = 0;
+	if(tmp >= (*pScreen)->width) tmp = (*pScreen)->width - 1;
+
+	if((edge = xf86ScreenLayout[(*pScreen)->myNum].down))
+	   edge = FindEdge(edge, tmp);
+
+	if(!edge) *y = (*pScreen)->height - 1;
+	else {
+	    *x += edge->offset.x;
+	    *y += edge->offset.y;
+	    (*pScreen) = xf86Screens[edge->screen]->pScreen;
+	}
+    }
+
+
+#if 0
+    /* This presents problems for overlapping screens when
+ 	HardEdges is used.  Have to think about the logic more */
+    if((*x < 0) || (*x >= (*pScreen)->width) || 
+       (*y < 0) || (*y >= (*pScreen)->height)) {
+	/* We may have crossed more than one screen */
+	xf86CursorOffScreen(pScreen, x, y);
+    }
+#endif
+
+    return TRUE;
+}
+
+
+
+/*
+ * xf86CrossScreen --
+ *      Switch to another screen
+ *
+ *	Currently nothing special happens, but mi assumes the CrossScreen
+ *	method exists.
+ */
+
+static void
+xf86CrossScreen (ScreenPtr pScreen, Bool entering)
+{
+}
+
+
+/*
+ * xf86WarpCursor --
+ *      Warp possible to another screen
+ */
+
+/* ARGSUSED */
+static void
+xf86WarpCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
+{
+    int    sigstate;
+    sigstate = xf86BlockSIGIO ();
+    miPointerWarpCursor(pDev, pScreen, x, y);
+
+    xf86Info.currentScreen = pScreen;
+    xf86UnblockSIGIO (sigstate);
+}
+
+
+void *
+xf86GetPointerScreenFuncs(void)
+{
+    return (void *)&xf86PointerScreenFuncs;
+}
+
+
+static xf86EdgePtr
+AddEdge(
+   xf86EdgePtr edge, 
+   short min, 
+   short max,
+   short dx,
+   short dy,
+   short screen
+){
+   xf86EdgePtr pEdge = edge, pPrev = NULL, pNew;
+
+   while(1) {
+	while(pEdge && (min >= pEdge->end)) {
+	    pPrev = pEdge;
+	    pEdge = pEdge->next;
+	}  
+
+	if(!pEdge) {
+	    if(!(pNew = malloc(sizeof(xf86EdgeRec))))
+		break;
+
+	    pNew->screen = screen;
+	    pNew->start = min;  
+	    pNew->end = max;   
+	    pNew->offset.x = dx;
+	    pNew->offset.y = dy;
+	    pNew->next = NULL;
+
+	    if(pPrev)
+		pPrev->next = pNew;
+	    else
+		edge = pNew;
+	    
+	    break;
+	} else if (min < pEdge->start) {
+	    if(!(pNew = malloc(sizeof(xf86EdgeRec))))
+		break;
+
+	    pNew->screen = screen;
+	    pNew->start = min;  
+	    pNew->offset.x = dx;
+	    pNew->offset.y = dy;
+	    pNew->next = pEdge;
+
+	    if(pPrev) pPrev->next = pNew;
+	    else edge = pNew;
+
+	    if(max <= pEdge->start) {
+		pNew->end = max;   
+		break;
+	    } else {
+		pNew->end = pEdge->start;
+		min = pEdge->end;
+	    }
+	} else
+	    min = pEdge->end;
+
+	pPrev = pEdge;
+	pEdge = pEdge->next;
+
+	if(max <= min) break;
+   }
+	
+   return edge;
+}
+
+static void
+FillOutEdge(xf86EdgePtr pEdge, int limit)
+{
+    xf86EdgePtr pNext;
+    int diff;
+
+    if(pEdge->start > 0) pEdge->start = 0;
+
+    while((pNext = pEdge->next)) {
+	diff = pNext->start - pEdge->end;
+	if(diff > 0) {	
+	    pEdge->end += diff >> 1;
+	    pNext->start -= diff - (diff >> 1);
+	}
+	pEdge = pNext;
+    }
+
+    if(pEdge->end < limit)
+	pEdge->end = limit;    
+}
+
+/*
+ * xf86InitOrigins() can deal with a maximum of 32 screens
+ * on 32 bit architectures, 64 on 64 bit architectures.
+ */
+
+void
+xf86InitOrigins(void)
+{
+    unsigned long screensLeft, prevScreensLeft, mask;
+    screenLayoutPtr screen;
+    ScreenPtr pScreen, refScreen;
+    int x1, x2, y1, y2, left, right, top, bottom;
+    int i, j, ref, minX, minY, min, max;
+    xf86ScreenLayoutPtr pLayout;
+    Bool OldStyleConfig = FALSE;
+
+    /* need to have this set up with a config file option */
+    HardEdges = FALSE;
+
+    memset(xf86ScreenLayout, 0, MAXSCREENS * sizeof(xf86ScreenLayoutRec));
+	
+    screensLeft = prevScreensLeft = (1 << xf86NumScreens) - 1;
+
+    while(1) {
+	for(mask = screensLeft, i = 0; mask; mask >>= 1, i++) {
+	    if(!(mask & 1L)) continue;
+
+	    screen = &xf86ConfigLayout.screens[i];
+
+	    if (screen->refscreen != NULL &&
+		screen->refscreen->screennum >= xf86NumScreens) {
+		screensLeft &= ~(1 << i);
+	        xf86Msg(X_WARNING, "Not including screen \"%s\" in origins calculation.\n",
+			screen->screen->id);
+	        continue;
+	    }
+
+	    pScreen = xf86Screens[i]->pScreen;
+	    switch(screen->where) {
+	    case PosObsolete:
+		OldStyleConfig = TRUE;
+		pLayout = &xf86ScreenLayout[i];
+		/* force edge lists */
+		if(screen->left) {
+		    ref = screen->left->screennum;
+		    if (! xf86Screens[ref] || ! xf86Screens[ref]->pScreen) {
+			ErrorF("Referenced uninitialized screen in Layout!\n");
+			break;
+		    }
+		    pLayout->left = AddEdge(pLayout->left, 
+			0, pScreen->height,
+			xf86Screens[ref]->pScreen->width, 0, ref);
+		}
+		if(screen->right) {
+		    ref = screen->right->screennum;
+		    if (! xf86Screens[ref] || ! xf86Screens[ref]->pScreen) {
+			ErrorF("Referenced uninitialized screen in Layout!\n");
+			break;
+		    }
+		    pLayout->right = AddEdge(pLayout->right, 
+			0, pScreen->height, -pScreen->width, 0, ref);
+		}
+		if(screen->top) {
+		    ref = screen->top->screennum;
+		    if (! xf86Screens[ref] || ! xf86Screens[ref]->pScreen) {
+			ErrorF("Referenced uninitialized screen in Layout!\n");
+			break;
+		    }
+		    pLayout->up = AddEdge(pLayout->up, 
+			0, pScreen->width,
+			0, xf86Screens[ref]->pScreen->height, ref);
+		}
+		if(screen->bottom) {
+		    ref = screen->bottom->screennum;
+		    if (! xf86Screens[ref] || ! xf86Screens[ref]->pScreen) {
+			ErrorF("Referenced uninitialized screen in Layout!\n");
+			break;
+		    }
+		    pLayout->down = AddEdge(pLayout->down, 
+			0, pScreen->width, 0, -pScreen->height, ref);
+		}
+	        /* we could also try to place it based on those
+		   relative locations if we wanted to */
+		screen->x = screen->y = 0;
+		/* FALLTHROUGH */
+	    case PosAbsolute:
+		pScreen->x = screen->x;
+		pScreen->y = screen->y;
+		screensLeft &= ~(1 << i);
+		break;
+	    case PosRelative:
+		ref = screen->refscreen->screennum;
+		if (! xf86Screens[ref] || ! xf86Screens[ref]->pScreen) {
+		    ErrorF("Referenced uninitialized screen in Layout!\n");
+		    break;
+		}
+		if(screensLeft & (1 << ref)) break;
+		refScreen = xf86Screens[ref]->pScreen;
+		pScreen->x = refScreen->x + screen->x;
+		pScreen->y = refScreen->y + screen->y;
+		screensLeft &= ~(1 << i);
+		break;
+	    case PosRightOf:
+		ref = screen->refscreen->screennum;
+		if (! xf86Screens[ref] || ! xf86Screens[ref]->pScreen) {
+		    ErrorF("Referenced uninitialized screen in Layout!\n");
+		    break;
+		}
+		if(screensLeft & (1 << ref)) break;
+		refScreen = xf86Screens[ref]->pScreen;
+		pScreen->x = refScreen->x + refScreen->width;
+		pScreen->y = refScreen->y;
+		screensLeft &= ~(1 << i);
+		break;
+	    case PosLeftOf:
+		ref = screen->refscreen->screennum;
+		if (! xf86Screens[ref] || ! xf86Screens[ref]->pScreen) {
+		    ErrorF("Referenced uninitialized screen in Layout!\n");
+		    break;
+		}
+		if(screensLeft & (1 << ref)) break;
+		refScreen = xf86Screens[ref]->pScreen;
+		pScreen->x = refScreen->x - pScreen->width;
+		pScreen->y = refScreen->y;
+		screensLeft &= ~(1 << i);
+		break;
+	    case PosBelow:
+		ref = screen->refscreen->screennum;
+		if (! xf86Screens[ref] || ! xf86Screens[ref]->pScreen) {
+		    ErrorF("Referenced uninitialized screen in Layout!\n");
+		    break;
+		}
+		if(screensLeft & (1 << ref)) break;
+		refScreen = xf86Screens[ref]->pScreen;
+		pScreen->x = refScreen->x;
+		pScreen->y = refScreen->y + refScreen->height;
+		screensLeft &= ~(1 << i);
+		break;
+	    case PosAbove:
+		ref = screen->refscreen->screennum;
+		if (! xf86Screens[ref] || ! xf86Screens[ref]->pScreen) {
+		    ErrorF("Referenced uninitialized screen in Layout!\n");
+		    break;
+		}
+		if(screensLeft & (1 << ref)) break;
+		refScreen = xf86Screens[ref]->pScreen;
+		pScreen->x = refScreen->x;
+		pScreen->y = refScreen->y - pScreen->height;
+		screensLeft &= ~(1 << i);
+		break;
+	    default:
+		ErrorF("Illegal placement keyword in Layout!\n");
+		break;
+	    }
+
+	}
+
+	if(!screensLeft) break;
+
+	if(screensLeft == prevScreensLeft) {
+	/* All the remaining screens are referencing each other.
+	   Assign a value to one of them and go through again */
+	    i = 0;
+	    while(!((1 << i) & screensLeft)){ i++; }
+
+	    ref = xf86ConfigLayout.screens[i].refscreen->screennum;
+	    xf86Screens[ref]->pScreen->x = xf86Screens[ref]->pScreen->y = 0;
+	    screensLeft &= ~(1 << ref);
+	}
+
+	prevScreensLeft = screensLeft;
+    }
+
+    /* justify the topmost and leftmost to (0,0) */
+    minX = xf86Screens[0]->pScreen->x;
+    minY = xf86Screens[0]->pScreen->y;
+
+    for(i = 1; i < xf86NumScreens; i++) {
+	if(xf86Screens[i]->pScreen->x < minX)
+	  minX = xf86Screens[i]->pScreen->x;
+	if(xf86Screens[i]->pScreen->y < minY)
+	  minY = xf86Screens[i]->pScreen->y;
+    }
+
+    if (minX || minY) {
+	for(i = 0; i < xf86NumScreens; i++) {
+	   xf86Screens[i]->pScreen->x -= minX;
+	   xf86Screens[i]->pScreen->y -= minY;
+	}
+    }
+
+
+    /* Create the edge lists */
+
+    if(!OldStyleConfig) {
+      for(i = 0; i < xf86NumScreens; i++) {
+	pLayout = &xf86ScreenLayout[i];
+
+	pScreen = xf86Screens[i]->pScreen;
+
+	left = pScreen->x;
+	right = left + pScreen->width;
+	top = pScreen->y;
+	bottom = top + pScreen->height;
+
+	for(j = 0; j < xf86NumScreens; j++) {
+	    if(i == j) continue;
+
+	    refScreen = xf86Screens[j]->pScreen;
+
+	    x1 = refScreen->x;
+	    x2 = x1 + refScreen->width;
+	    y1 = refScreen->y;
+	    y2 = y1 + refScreen->height;
+
+	    if((bottom > y1) && (top < y2)) {
+		min = y1 - top;
+		if(min < 0) min = 0;
+		max = pScreen->height - (bottom - y2);
+		if(max > pScreen->height) max = pScreen->height;
+
+		if(((left - 1) >= x1) && ((left - 1) < x2))
+		    pLayout->left = AddEdge(pLayout->left, min, max,
+			pScreen->x - refScreen->x,
+			pScreen->y - refScreen->y, j);
+
+		if((right >= x1) && (right < x2))	
+		    pLayout->right = AddEdge(pLayout->right, min, max,
+			pScreen->x - refScreen->x,
+			pScreen->y - refScreen->y, j);
+	    }
+
+
+	    if((left < x2) && (right > x1)) {
+		min = x1 - left;
+		if(min < 0) min = 0;
+		max = pScreen->width - (right - x2);
+		if(max > pScreen->width) max = pScreen->width;
+
+		if(((top - 1) >= y1) && ((top - 1) < y2))
+		    pLayout->up = AddEdge(pLayout->up, min, max,
+			pScreen->x - refScreen->x,
+			pScreen->y - refScreen->y, j);
+
+		if((bottom >= y1) && (bottom < y2))
+		    pLayout->down = AddEdge(pLayout->down, min, max,
+			pScreen->x - refScreen->x,
+			pScreen->y - refScreen->y, j);
+	    }
+	}
+      }
+    }
+
+    if(!HardEdges && !OldStyleConfig) {
+	for(i = 0; i < xf86NumScreens; i++) {
+	    pLayout = &xf86ScreenLayout[i];
+	    pScreen = xf86Screens[i]->pScreen;
+	    if(pLayout->left) 
+		FillOutEdge(pLayout->left, pScreen->height);
+	    if(pLayout->right) 
+		FillOutEdge(pLayout->right, pScreen->height);
+	    if(pLayout->up) 
+		FillOutEdge(pLayout->up, pScreen->width);
+	    if(pLayout->down) 
+		FillOutEdge(pLayout->down, pScreen->width);
+	}
+    }
+}
+
+void
+xf86ReconfigureLayout(void)
+{
+    int i;
+
+    for (i = 0; i < MAXSCREENS; i++) {
+	xf86ScreenLayoutPtr sl = &xf86ScreenLayout[i];
+	/* we don't have to zero these, xf86InitOrigins() takes care of that */
+	free(sl->left);
+	free(sl->right);
+	free(sl->up);
+	free(sl->down);
+    }
+
+    xf86InitOrigins();
+}
+
+	
diff --git a/xorg-server/hw/xfree86/common/xf86Events.c b/xorg-server/hw/xfree86/common/xf86Events.c
index 004807483..84c0d182a 100644
--- a/xorg-server/hw/xfree86/common/xf86Events.c
+++ b/xorg-server/hw/xfree86/common/xf86Events.c
@@ -1,758 +1,753 @@
-/*

- * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.

- *

- * Permission to use, copy, modify, distribute, and sell this software and its

- * documentation for any purpose is hereby granted without fee, provided that

- * the above copyright notice appear in all copies and that both that

- * copyright notice and this permission notice appear in supporting

- * documentation, and that the name of Thomas Roell not be used in

- * advertising or publicity pertaining to distribution of the software without

- * specific, written prior permission.  Thomas Roell makes no representations

- * about the suitability of this software for any purpose.  It is provided

- * "as is" without express or implied warranty.

- *

- * THOMAS ROELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

- * EVENT SHALL THOMAS ROELL BE LIABLE FOR ANY SPECIAL, INDIRECT OR

- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

- * PERFORMANCE OF THIS SOFTWARE.

- *

- */

-/*

- * Copyright (c) 1994-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).

- */

-

-/* [JCH-96/01/21] Extended std reverse map to four buttons. */

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include <X11/X.h>

-#include <X11/Xpoll.h>

-#include <X11/Xproto.h>

-#include "misc.h"

-#include "compiler.h"

-#include "xf86.h"

-#include "xf86Priv.h"

-#define XF86_OS_PRIVS

-#include "xf86_OSlib.h"

-#include <X11/keysym.h>

-

-#ifdef XFreeXDGA

-#include "dgaproc.h"

-#endif

-

-#include <X11/extensions/XI.h>

-#include <X11/extensions/XIproto.h>

-#include "inputstr.h"

-#include "xf86Xinput.h"

-

-#include "mi.h"

-#include "mipointer.h"

-

-#include "xkbsrv.h"

-#include "xkbstr.h"

-

-#ifdef DPMSExtension

-#include <X11/extensions/dpmsconst.h>

-#include "dpmsproc.h"

-#endif

-

-/*

- * This is a toggling variable:

- *  FALSE = No VT switching keys have been pressed last time around

- *  TRUE  = Possible VT switch Pending

- * (DWH - 12/2/93)

- *

- * This has been generalised to work with Linux and *BSD+syscons (DHD)

- */

-

-Bool VTSwitchEnabled = TRUE;		/* Allows run-time disabling for

-                                         *BSD and for avoiding VT

-                                         switches when using the DRI

-                                         automatic full screen mode.*/

-

-extern fd_set EnabledDevices;

-

-#ifdef XF86PM

-extern void (*xf86OSPMClose)(void);

-#endif

-

-static void xf86VTSwitch(void);

-

-/*

- * Allow arbitrary drivers or other XFree86 code to register with our main

- * Wakeup handler.

- */

-typedef struct x_IHRec {

-    int			fd;

-    InputHandlerProc	ihproc;

-    pointer		data;

-    Bool		enabled;

-    struct x_IHRec *	next;

-} IHRec, *IHPtr;

-

-static IHPtr InputHandlers = NULL;

-

-

-Bool

-LegalModifier(unsigned int key, DeviceIntPtr pDev)

-{

-    return TRUE;

-}

-

-/*

- * TimeSinceLastInputEvent --

- *      Function used for screensaver purposes by the os module. Returns the

- *      time in milliseconds since there last was any input.

- */

-int

-TimeSinceLastInputEvent(void)

-{

-  if (xf86Info.lastEventTime == 0) {

-    xf86Info.lastEventTime = GetTimeInMillis();

-  }

-  return GetTimeInMillis() - xf86Info.lastEventTime;

-}

-

-/*

- * SetTimeSinceLastInputEvent --

- *      Set the lastEventTime to now.

- */

-void

-SetTimeSinceLastInputEvent(void)

-{

-  xf86Info.lastEventTime = GetTimeInMillis();

-}

-

-/*

- * ProcessInputEvents --

- *      Retrieve all waiting input events and pass them to DIX in their

- *      correct chronological order. Only reads from the system pointer

- *      and keyboard.

- */

-void

-ProcessInputEvents (void)

-{

-  int x, y;

-

-  mieqProcessInputEvents();

-

-  /* FIXME: This is a problem if we have multiple pointers */

-  miPointerGetPosition(inputInfo.pointer, &x, &y);

-  xf86SetViewport(xf86Info.currentScreen, x, y);

-}

-

-/*

- * Handle keyboard events that cause some kind of "action"

- * (i.e., server termination, video mode changes, VT switches, etc.)

- */

-void

-xf86ProcessActionEvent(ActionEvent action, void *arg)

-{

-    DebugF("ProcessActionEvent(%d,%x)\n", (int) action, arg);

-    switch (action) {

-    case ACTION_TERMINATE:

-	if (!xf86Info.dontZap) {

-#ifdef XFreeXDGA

-	    DGAShutdown();

-#endif

-	    GiveUp(0);

-	}

-	break;

-    case ACTION_NEXT_MODE:

-	if (!xf86Info.dontZoom)

-	    xf86ZoomViewport(xf86Info.currentScreen,  1);

-	break;

-    case ACTION_PREV_MODE:

-	if (!xf86Info.dontZoom)

-	    xf86ZoomViewport(xf86Info.currentScreen, -1);

-	break;

-    case ACTION_SWITCHSCREEN:

-	if (VTSwitchEnabled && !xf86Info.dontVTSwitch && arg) {

-	    int vtno = *((int *) arg);

-

-	    if (vtno != xf86Info.vtno) {

-		if (!xf86VTActivate(vtno)) {

-		    ErrorF("Failed to switch from vt%02d to vt%02d: %s\n",

-			   xf86Info.vtno, vtno, strerror(errno));

-		}

-	    }

-	}

-	break;

-    case ACTION_SWITCHSCREEN_NEXT:

-	if (VTSwitchEnabled && !xf86Info.dontVTSwitch) {

-	    if (!xf86VTActivate(xf86Info.vtno + 1)) {

-		/* If first try failed, assume this is the last VT and

-		 * try wrapping around to the first vt.

-		 */

-		if (!xf86VTActivate(1)) {

-		    ErrorF("Failed to switch from vt%02d to next vt: %s\n",

-			   xf86Info.vtno, strerror(errno));

-		}

-	    }

-	}

-	break;

-    case ACTION_SWITCHSCREEN_PREV:

-	if (VTSwitchEnabled && !xf86Info.dontVTSwitch && xf86Info.vtno > 0) {

-	    if (!xf86VTActivate(xf86Info.vtno - 1)) {

-		/* Don't know what the maximum VT is, so can't wrap around */

-		ErrorF("Failed to switch from vt%02d to previous vt: %s\n",

-		       xf86Info.vtno, strerror(errno));

-	    }

-	}

-	break;

-    default:

-	break;

-    }

-}

-

-/*

- * xf86Wakeup --

- *      Os wakeup handler.

- */

-

-/* ARGSUSED */

-void

-xf86Wakeup(pointer blockData, int err, pointer pReadmask)

-{

-    fd_set* LastSelectMask = (fd_set*)pReadmask;

-    fd_set devicesWithInput;

-    InputInfoPtr pInfo;

-

-    if (err >= 0) {

-

-	XFD_ANDSET(&devicesWithInput, LastSelectMask, &EnabledDevices);

-	if (XFD_ANYSET(&devicesWithInput)) {

-	    pInfo = xf86InputDevs;

-	    while (pInfo) {

-		if (pInfo->read_input && pInfo->fd >= 0 &&

-		    (FD_ISSET(pInfo->fd, &devicesWithInput) != 0)) {

-		    int sigstate = xf86BlockSIGIO();

-

-		    /*

-		     * Remove the descriptior from the set because more than one

-		     * device may share the same file descriptor.

-		     */

-		    FD_CLR(pInfo->fd, &devicesWithInput);

-

-		    pInfo->read_input(pInfo);

-		    xf86UnblockSIGIO(sigstate);

-		}

-		pInfo = pInfo->next;

-	    }

-	}

-    }

-

-    if (err >= 0) { /* we don't want the handlers called if select() */

-	IHPtr ih;   /* returned with an error condition, do we?      */

-	

-	for (ih = InputHandlers; ih; ih = ih->next) {

-	    if (ih->enabled && ih->fd >= 0 && ih->ihproc &&

-		(FD_ISSET(ih->fd, ((fd_set *)pReadmask)) != 0)) {

-		ih->ihproc(ih->fd, ih->data);

-	    }

-	}

-    }

-

-    if (xf86VTSwitchPending()) xf86VTSwitch();

-}

-

-

-/*

- * xf86SigioReadInput --

- *    signal handler for the SIGIO signal.

- */

-static void

-xf86SigioReadInput(int fd, void *closure)

-{

-    int errno_save = errno;

-    InputInfoPtr pInfo = closure;

-

-    pInfo->read_input(pInfo);

-

-    errno = errno_save;

-}

-

-/*

- * xf86AddEnabledDevice --

- *

- */

-void

-xf86AddEnabledDevice(InputInfoPtr pInfo)

-{

-    if (!xf86InstallSIGIOHandler (pInfo->fd, xf86SigioReadInput, pInfo)) {

-	AddEnabledDevice(pInfo->fd);

-    }

-}

-

-/*

- * xf86RemoveEnabledDevice --

- *

- */

-void

-xf86RemoveEnabledDevice(InputInfoPtr pInfo)

-{

-    if (!xf86RemoveSIGIOHandler (pInfo->fd)) {

-	RemoveEnabledDevice(pInfo->fd);

-    }

-}

-

-static int *xf86SignalIntercept = NULL;

-

-void

-xf86InterceptSignals(int *signo)

-{

-    if ((xf86SignalIntercept = signo))

-	*signo = -1;

-}

-

-static void (*xf86SigIllHandler)(void) = NULL;

-

-void

-xf86InterceptSigIll(void (*sigillhandler)(void))

-{

-    xf86SigIllHandler = sigillhandler;

-}

-

-/*

- * xf86SigWrapper --

- *    Catch unexpected signals and exit or continue cleanly.

- */

-int

-xf86SigWrapper(int signo)

-{

-  if ((signo == SIGILL) && xf86SigIllHandler) {

-    (*xf86SigIllHandler)();

-    return 0; /* continue */

-  }

-

-  if (xf86SignalIntercept && (*xf86SignalIntercept < 0)) {

-    *xf86SignalIntercept = signo;

-    return 0; /* continue */

-  }

-

-  xf86Info.caughtSignal = TRUE;

-  return 1; /* abort */

-}

-

-/*

- * xf86PrintBacktrace --

- *    Print a stack backtrace for debugging purposes.

- */

-void

-xf86PrintBacktrace(void)

-{

-    xorg_backtrace();

-}

-

-static void

-xf86ReleaseKeys(DeviceIntPtr pDev)

-{

-    KeyClassPtr keyc;

-    int i, j, nevents, sigstate;

-

-    if (!pDev || !pDev->key)

-        return;

-

-    keyc = pDev->key;

-

-    /*

-     * Hmm... here is the biggest hack of every time !

-     * It may be possible that a switch-vt procedure has finished BEFORE

-     * you released all keys neccessary to do this. That peculiar behavior

-     * can fool the X-server pretty much, cause it assumes that some keys

-     * were not released. TWM may stuck alsmost completly....

-     * OK, what we are doing here is after returning from the vt-switch

-     * exeplicitely unrelease all keyboard keys before the input-devices

-     * are reenabled.

-     */

-

-    for (i = keyc->xkbInfo->desc->min_key_code;

-         i < keyc->xkbInfo->desc->max_key_code;

-         i++) {

-        if (key_is_down(pDev, i, KEY_POSTED)) {

-            sigstate = xf86BlockSIGIO ();

-            nevents = GetKeyboardEvents(xf86Events, pDev, KeyRelease, i);

-            for (j = 0; j < nevents; j++)

-                mieqEnqueue(pDev, (InternalEvent*)(xf86Events + j)->event);

-            xf86UnblockSIGIO(sigstate);

-        }

-    }

-}

-

-/*

- * xf86VTSwitch --

- *      Handle requests for switching the vt.

- */

-static void

-xf86VTSwitch(void)

-{

-  int i, prevSIGIO;

-  InputInfoPtr pInfo;

-  IHPtr ih;

-

-  DebugF("xf86VTSwitch()\n");

-

-#ifdef XFreeXDGA

-  if(!DGAVTSwitch())

-	return;

-#endif

-

-  /*

-   * Since all screens are currently all in the same state it is sufficient

-   * check the first.  This might change in future.

-   */

-  if (xf86Screens[0]->vtSema) {

-

-    DebugF("xf86VTSwitch: Leaving, xf86Exiting is %s\n",

-	   BOOLTOSTRING((dispatchException & DE_TERMINATE) ? TRUE : FALSE));

-#ifdef DPMSExtension

-    if (DPMSPowerLevel != DPMSModeOn)

-	DPMSSet(serverClient, DPMSModeOn);

-#endif

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

-      if (!(dispatchException & DE_TERMINATE))

-	if (xf86Screens[i]->EnableDisableFBAccess)

-	  (*xf86Screens[i]->EnableDisableFBAccess) (i, FALSE);

-    }

-

-    /*

-     * Keep the order: Disable Device > LeaveVT

-     *                        EnterVT > EnableDevice

-     */

-    for (ih = InputHandlers; ih; ih = ih->next)

-      xf86DisableInputHandler(ih);

-    for (pInfo = xf86InputDevs; pInfo; pInfo = pInfo->next) {

-      if (pInfo->dev) {

-          xf86ReleaseKeys(pInfo->dev);

-          ProcessInputEvents();

-          DisableDevice(pInfo->dev, TRUE);

-      }

-    }

-    xf86EnterServerState(SETUP);

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

-	xf86Screens[i]->LeaveVT(i, 0);

-

-    xf86AccessLeave();      /* We need this here, otherwise */

-

-    if (!xf86VTSwitchAway()) {

-      /*

-       * switch failed

-       */

-

-      DebugF("xf86VTSwitch: Leave failed\n");

-      prevSIGIO = xf86BlockSIGIO();

-      xf86AccessEnter();

-      xf86EnterServerState(SETUP);

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

-	if (!xf86Screens[i]->EnterVT(i, 0))

-	  FatalError("EnterVT failed for screen %d\n", i);

-      }

-      xf86EnterServerState(OPERATING);

-      if (!(dispatchException & DE_TERMINATE)) {

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

-	  if (xf86Screens[i]->EnableDisableFBAccess)

-	    (*xf86Screens[i]->EnableDisableFBAccess) (i, TRUE);

-	}

-      }

-      dixSaveScreens(serverClient, SCREEN_SAVER_FORCER, ScreenSaverReset);

-

-      pInfo = xf86InputDevs;

-      while (pInfo) {

-        if (pInfo->dev)

-            EnableDevice(pInfo->dev, TRUE);

-	pInfo = pInfo->next;

-      }

-      for (ih = InputHandlers; ih; ih = ih->next)

-        xf86EnableInputHandler(ih);

-

-      xf86UnblockSIGIO(prevSIGIO);

-

-    } else {

-#ifdef XF86PM

-	  if (xf86OSPMClose)

-	      xf86OSPMClose();

-	  xf86OSPMClose = NULL;

-#endif

-

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

- 	    /*

- 	     * zero all access functions to

- 	     * trap calls when switched away.

- 	     */

-	    xf86Screens[i]->vtSema = FALSE;

-	}

-	if (xorgHWAccess)

-	    xf86DisableIO();

-    }

-  } else {

-

-    DebugF("xf86VTSwitch: Entering\n");

-    if (!xf86VTSwitchTo()) return;

-

-    prevSIGIO = xf86BlockSIGIO();

-#ifdef XF86PM

-    xf86OSPMClose = xf86OSPMOpen();

-#endif

-

-    if (xorgHWAccess)

-	xf86EnableIO();

-    xf86AccessEnter();

-    xf86EnterServerState(SETUP);

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

-      xf86Screens[i]->vtSema = TRUE;

-      if (!xf86Screens[i]->EnterVT(i, 0))

-	  FatalError("EnterVT failed for screen %d\n", i);

-    }

-    xf86EnterServerState(OPERATING);

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

-      if (xf86Screens[i]->EnableDisableFBAccess)

-	(*xf86Screens[i]->EnableDisableFBAccess)(i, TRUE);

-    }

-

-    /* Turn screen saver off when switching back */

-    dixSaveScreens(serverClient, SCREEN_SAVER_FORCER, ScreenSaverReset);

-

-    pInfo = xf86InputDevs;

-    while (pInfo) {

-      if (pInfo->dev)

-          EnableDevice(pInfo->dev, TRUE);

-      pInfo = pInfo->next;

-    }

-

-    for (ih = InputHandlers; ih; ih = ih->next)

-      xf86EnableInputHandler(ih);

-

-    xf86UnblockSIGIO(prevSIGIO);

-  }

-}

-

-

-/* Input handler registration */

-

-static pointer

-addInputHandler(int fd, InputHandlerProc proc, pointer data)

-{

-    IHPtr ih;

-

-    if (fd < 0 || !proc)

-	return NULL;

-

-    ih = calloc(sizeof(*ih), 1);

-    if (!ih)

-	return NULL;

-

-    ih->fd = fd;

-    ih->ihproc = proc;

-    ih->data = data;

-    ih->enabled = TRUE;

-

-    ih->next = InputHandlers;

-    InputHandlers = ih;

-

-    return ih;

-}

-

-pointer

-xf86AddInputHandler(int fd, InputHandlerProc proc, pointer data)

-{

-    IHPtr ih = addInputHandler(fd, proc, data);

-

-    if (ih)

-        AddEnabledDevice(fd);

-    return ih;

-}

-

-pointer

-xf86AddGeneralHandler(int fd, InputHandlerProc proc, pointer data)

-{

-    IHPtr ih = addInputHandler(fd, proc, data);

-

-    if (ih)

-        AddGeneralSocket(fd);

-    return ih;

-}

-

-/**

- * Set the handler for the console's fd. Replaces (and returns) the previous

- * handler or NULL, whichever appropriate.

- * proc may be NULL if the server should not handle events on the console.

- */

-InputHandlerProc

-xf86SetConsoleHandler(InputHandlerProc proc, pointer data)

-{

-    static InputHandlerProc handler = NULL;

-    InputHandlerProc old_handler = handler;

-

-    if (old_handler)

-        xf86RemoveGeneralHandler(old_handler);

-

-    xf86AddGeneralHandler(xf86Info.consoleFd, proc, data);

-    handler = proc;

-

-    return old_handler;

-}

-

-static void

-removeInputHandler(IHPtr ih)

-{

-    IHPtr p;

-

-    if (ih == InputHandlers)

-	InputHandlers = ih->next;

-    else {

-	p = InputHandlers;

-	while (p && p->next != ih)

-	    p = p->next;

-	if (ih)

-	    p->next = ih->next;

-    }

-    free(ih);

-}

-

-int

-xf86RemoveInputHandler(pointer handler)

-{

-    IHPtr ih;

-    int fd;

-

-    if (!handler)

-	return -1;

-

-    ih = handler;

-    fd = ih->fd;

-

-    if (ih->fd >= 0)

-	RemoveEnabledDevice(ih->fd);

-    removeInputHandler(ih);

-

-    return fd;

-}

-

-int

-xf86RemoveGeneralHandler(pointer handler)

-{

-    IHPtr ih;

-    int fd;

-

-    if (!handler)

-	return -1;

-

-    ih = handler;

-    fd = ih->fd;

-

-    if (ih->fd >= 0)

-	RemoveGeneralSocket(ih->fd);

-    removeInputHandler(ih);

-

-    return fd;

-}

-

-void

-xf86DisableInputHandler(pointer handler)

-{

-    IHPtr ih;

-

-    if (!handler)

-	return;

-

-    ih = handler;

-    ih->enabled = FALSE;

-    if (ih->fd >= 0)

-	RemoveEnabledDevice(ih->fd);

-}

-

-void

-xf86DisableGeneralHandler(pointer handler)

-{

-    IHPtr ih;

-

-    if (!handler)

-	return;

-

-    ih = handler;

-    ih->enabled = FALSE;

-    if (ih->fd >= 0)

-	RemoveGeneralSocket(ih->fd);

-}

-

-void

-xf86EnableInputHandler(pointer handler)

-{

-    IHPtr ih;

-

-    if (!handler)

-	return;

-

-    ih = handler;

-    ih->enabled = TRUE;

-    if (ih->fd >= 0)

-	AddEnabledDevice(ih->fd);

-}

-

-void

-xf86EnableGeneralHandler(pointer handler)

-{

-    IHPtr ih;

-

-    if (!handler)

-	return;

-

-    ih = handler;

-    ih->enabled = TRUE;

-    if (ih->fd >= 0)

-	AddGeneralSocket(ih->fd);

-}

-

-/*

- * As used currently by the DRI, the return value is ignored.

- */

-Bool

-xf86EnableVTSwitch(Bool new)

-{

-    static Bool def = TRUE;

-    Bool old;

-

-    old = VTSwitchEnabled;

-    if (!new) {

-	/* Disable VT switching */

-	def = VTSwitchEnabled;

-	VTSwitchEnabled = FALSE;

-    } else {

-	/* Restore VT switching to default */

-	VTSwitchEnabled = def;

-    }

-    return old;

-}

-

-void

-DDXRingBell(int volume, int pitch, int duration) {

-    xf86OSRingBell(volume, pitch, duration);

-}

+/*
+ * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Thomas Roell not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Thomas Roell makes no representations
+ * about the suitability of this software for any purpose.  It is provided
+ * "as is" without express or implied warranty.
+ *
+ * THOMAS ROELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THOMAS ROELL BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+/*
+ * Copyright (c) 1994-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).
+ */
+
+/* [JCH-96/01/21] Extended std reverse map to four buttons. */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include <X11/X.h>
+#include <X11/Xpoll.h>
+#include <X11/Xproto.h>
+#include "misc.h"
+#include "compiler.h"
+#include "xf86.h"
+#include "xf86Priv.h"
+#define XF86_OS_PRIVS
+#include "xf86_OSlib.h"
+#include <X11/keysym.h>
+
+#ifdef XFreeXDGA
+#include "dgaproc.h"
+#endif
+
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+#include "inputstr.h"
+#include "xf86Xinput.h"
+
+#include "mi.h"
+#include "mipointer.h"
+
+#include "xkbsrv.h"
+#include "xkbstr.h"
+
+#ifdef DPMSExtension
+#include <X11/extensions/dpmsconst.h>
+#include "dpmsproc.h"
+#endif
+
+/*
+ * This is a toggling variable:
+ *  FALSE = No VT switching keys have been pressed last time around
+ *  TRUE  = Possible VT switch Pending
+ * (DWH - 12/2/93)
+ *
+ * This has been generalised to work with Linux and *BSD+syscons (DHD)
+ */
+
+Bool VTSwitchEnabled = TRUE;		/* Allows run-time disabling for
+                                         *BSD and for avoiding VT
+                                         switches when using the DRI
+                                         automatic full screen mode.*/
+
+extern fd_set EnabledDevices;
+
+#ifdef XF86PM
+extern void (*xf86OSPMClose)(void);
+#endif
+
+static void xf86VTSwitch(void);
+
+/*
+ * Allow arbitrary drivers or other XFree86 code to register with our main
+ * Wakeup handler.
+ */
+typedef struct x_IHRec {
+    int			fd;
+    InputHandlerProc	ihproc;
+    pointer		data;
+    Bool		enabled;
+    struct x_IHRec *	next;
+} IHRec, *IHPtr;
+
+static IHPtr InputHandlers = NULL;
+
+
+Bool
+LegalModifier(unsigned int key, DeviceIntPtr pDev)
+{
+    return TRUE;
+}
+
+/*
+ * TimeSinceLastInputEvent --
+ *      Function used for screensaver purposes by the os module. Returns the
+ *      time in milliseconds since there last was any input.
+ */
+int
+TimeSinceLastInputEvent(void)
+{
+  if (xf86Info.lastEventTime == 0) {
+    xf86Info.lastEventTime = GetTimeInMillis();
+  }
+  return GetTimeInMillis() - xf86Info.lastEventTime;
+}
+
+/*
+ * SetTimeSinceLastInputEvent --
+ *      Set the lastEventTime to now.
+ */
+void
+SetTimeSinceLastInputEvent(void)
+{
+  xf86Info.lastEventTime = GetTimeInMillis();
+}
+
+/*
+ * ProcessInputEvents --
+ *      Retrieve all waiting input events and pass them to DIX in their
+ *      correct chronological order. Only reads from the system pointer
+ *      and keyboard.
+ */
+void
+ProcessInputEvents (void)
+{
+  int x, y;
+
+  mieqProcessInputEvents();
+
+  /* FIXME: This is a problem if we have multiple pointers */
+  miPointerGetPosition(inputInfo.pointer, &x, &y);
+  xf86SetViewport(xf86Info.currentScreen, x, y);
+}
+
+/*
+ * Handle keyboard events that cause some kind of "action"
+ * (i.e., server termination, video mode changes, VT switches, etc.)
+ */
+void
+xf86ProcessActionEvent(ActionEvent action, void *arg)
+{
+    DebugF("ProcessActionEvent(%d,%x)\n", (int) action, arg);
+    switch (action) {
+    case ACTION_TERMINATE:
+	if (!xf86Info.dontZap) {
+#ifdef XFreeXDGA
+	    DGAShutdown();
+#endif
+	    GiveUp(0);
+	}
+	break;
+    case ACTION_NEXT_MODE:
+	if (!xf86Info.dontZoom)
+	    xf86ZoomViewport(xf86Info.currentScreen,  1);
+	break;
+    case ACTION_PREV_MODE:
+	if (!xf86Info.dontZoom)
+	    xf86ZoomViewport(xf86Info.currentScreen, -1);
+	break;
+    case ACTION_SWITCHSCREEN:
+	if (VTSwitchEnabled && !xf86Info.dontVTSwitch && arg) {
+	    int vtno = *((int *) arg);
+
+	    if (vtno != xf86Info.vtno) {
+		if (!xf86VTActivate(vtno)) {
+		    ErrorF("Failed to switch from vt%02d to vt%02d: %s\n",
+			   xf86Info.vtno, vtno, strerror(errno));
+		}
+	    }
+	}
+	break;
+    case ACTION_SWITCHSCREEN_NEXT:
+	if (VTSwitchEnabled && !xf86Info.dontVTSwitch) {
+	    if (!xf86VTActivate(xf86Info.vtno + 1)) {
+		/* If first try failed, assume this is the last VT and
+		 * try wrapping around to the first vt.
+		 */
+		if (!xf86VTActivate(1)) {
+		    ErrorF("Failed to switch from vt%02d to next vt: %s\n",
+			   xf86Info.vtno, strerror(errno));
+		}
+	    }
+	}
+	break;
+    case ACTION_SWITCHSCREEN_PREV:
+	if (VTSwitchEnabled && !xf86Info.dontVTSwitch && xf86Info.vtno > 0) {
+	    if (!xf86VTActivate(xf86Info.vtno - 1)) {
+		/* Don't know what the maximum VT is, so can't wrap around */
+		ErrorF("Failed to switch from vt%02d to previous vt: %s\n",
+		       xf86Info.vtno, strerror(errno));
+	    }
+	}
+	break;
+    default:
+	break;
+    }
+}
+
+/*
+ * xf86Wakeup --
+ *      Os wakeup handler.
+ */
+
+/* ARGSUSED */
+void
+xf86Wakeup(pointer blockData, int err, pointer pReadmask)
+{
+    fd_set* LastSelectMask = (fd_set*)pReadmask;
+    fd_set devicesWithInput;
+    InputInfoPtr pInfo;
+
+    if (err >= 0) {
+
+	XFD_ANDSET(&devicesWithInput, LastSelectMask, &EnabledDevices);
+	if (XFD_ANYSET(&devicesWithInput)) {
+	    pInfo = xf86InputDevs;
+	    while (pInfo) {
+		if (pInfo->read_input && pInfo->fd >= 0 &&
+		    (FD_ISSET(pInfo->fd, &devicesWithInput) != 0)) {
+		    int sigstate = xf86BlockSIGIO();
+
+		    /*
+		     * Remove the descriptior from the set because more than one
+		     * device may share the same file descriptor.
+		     */
+		    FD_CLR(pInfo->fd, &devicesWithInput);
+
+		    pInfo->read_input(pInfo);
+		    xf86UnblockSIGIO(sigstate);
+		}
+		pInfo = pInfo->next;
+	    }
+	}
+    }
+
+    if (err >= 0) { /* we don't want the handlers called if select() */
+	IHPtr ih;   /* returned with an error condition, do we?      */
+	
+	for (ih = InputHandlers; ih; ih = ih->next) {
+	    if (ih->enabled && ih->fd >= 0 && ih->ihproc &&
+		(FD_ISSET(ih->fd, ((fd_set *)pReadmask)) != 0)) {
+		ih->ihproc(ih->fd, ih->data);
+	    }
+	}
+    }
+
+    if (xf86VTSwitchPending()) xf86VTSwitch();
+}
+
+
+/*
+ * xf86SigioReadInput --
+ *    signal handler for the SIGIO signal.
+ */
+static void
+xf86SigioReadInput(int fd, void *closure)
+{
+    int errno_save = errno;
+    InputInfoPtr pInfo = closure;
+
+    pInfo->read_input(pInfo);
+
+    errno = errno_save;
+}
+
+/*
+ * xf86AddEnabledDevice --
+ *
+ */
+void
+xf86AddEnabledDevice(InputInfoPtr pInfo)
+{
+    if (!xf86InstallSIGIOHandler (pInfo->fd, xf86SigioReadInput, pInfo)) {
+	AddEnabledDevice(pInfo->fd);
+    }
+}
+
+/*
+ * xf86RemoveEnabledDevice --
+ *
+ */
+void
+xf86RemoveEnabledDevice(InputInfoPtr pInfo)
+{
+    if (!xf86RemoveSIGIOHandler (pInfo->fd)) {
+	RemoveEnabledDevice(pInfo->fd);
+    }
+}
+
+static int *xf86SignalIntercept = NULL;
+
+void
+xf86InterceptSignals(int *signo)
+{
+    if ((xf86SignalIntercept = signo))
+	*signo = -1;
+}
+
+static void (*xf86SigIllHandler)(void) = NULL;
+
+void
+xf86InterceptSigIll(void (*sigillhandler)(void))
+{
+    xf86SigIllHandler = sigillhandler;
+}
+
+/*
+ * xf86SigWrapper --
+ *    Catch unexpected signals and exit or continue cleanly.
+ */
+int
+xf86SigWrapper(int signo)
+{
+  if ((signo == SIGILL) && xf86SigIllHandler) {
+    (*xf86SigIllHandler)();
+    return 0; /* continue */
+  }
+
+  if (xf86SignalIntercept && (*xf86SignalIntercept < 0)) {
+    *xf86SignalIntercept = signo;
+    return 0; /* continue */
+  }
+
+  xf86Info.caughtSignal = TRUE;
+  return 1; /* abort */
+}
+
+/*
+ * xf86PrintBacktrace --
+ *    Print a stack backtrace for debugging purposes.
+ */
+void
+xf86PrintBacktrace(void)
+{
+    xorg_backtrace();
+}
+
+static void
+xf86ReleaseKeys(DeviceIntPtr pDev)
+{
+    KeyClassPtr keyc;
+    int i, j, nevents, sigstate;
+
+    if (!pDev || !pDev->key)
+        return;
+
+    keyc = pDev->key;
+
+    /*
+     * Hmm... here is the biggest hack of every time !
+     * It may be possible that a switch-vt procedure has finished BEFORE
+     * you released all keys neccessary to do this. That peculiar behavior
+     * can fool the X-server pretty much, cause it assumes that some keys
+     * were not released. TWM may stuck alsmost completly....
+     * OK, what we are doing here is after returning from the vt-switch
+     * exeplicitely unrelease all keyboard keys before the input-devices
+     * are reenabled.
+     */
+
+    for (i = keyc->xkbInfo->desc->min_key_code;
+         i < keyc->xkbInfo->desc->max_key_code;
+         i++) {
+        if (key_is_down(pDev, i, KEY_POSTED)) {
+            sigstate = xf86BlockSIGIO ();
+            nevents = GetKeyboardEvents(xf86Events, pDev, KeyRelease, i);
+            for (j = 0; j < nevents; j++)
+                mieqEnqueue(pDev, (InternalEvent*)(xf86Events + j)->event);
+            xf86UnblockSIGIO(sigstate);
+        }
+    }
+}
+
+/*
+ * xf86VTSwitch --
+ *      Handle requests for switching the vt.
+ */
+static void
+xf86VTSwitch(void)
+{
+  int i;
+  static int prevSIGIO;
+  InputInfoPtr pInfo;
+  IHPtr ih;
+
+  DebugF("xf86VTSwitch()\n");
+
+#ifdef XFreeXDGA
+  if(!DGAVTSwitch())
+	return;
+#endif
+
+  /*
+   * Since all screens are currently all in the same state it is sufficient
+   * check the first.  This might change in future.
+   */
+  if (xf86Screens[0]->vtSema) {
+
+    DebugF("xf86VTSwitch: Leaving, xf86Exiting is %s\n",
+	   BOOLTOSTRING((dispatchException & DE_TERMINATE) ? TRUE : FALSE));
+#ifdef DPMSExtension
+    if (DPMSPowerLevel != DPMSModeOn)
+	DPMSSet(serverClient, DPMSModeOn);
+#endif
+    for (i = 0; i < xf86NumScreens; i++) {
+      if (!(dispatchException & DE_TERMINATE))
+	if (xf86Screens[i]->EnableDisableFBAccess)
+	  (*xf86Screens[i]->EnableDisableFBAccess) (i, FALSE);
+    }
+
+    /*
+     * Keep the order: Disable Device > LeaveVT
+     *                        EnterVT > EnableDevice
+     */
+    for (ih = InputHandlers; ih; ih = ih->next)
+      xf86DisableInputHandler(ih);
+    for (pInfo = xf86InputDevs; pInfo; pInfo = pInfo->next) {
+      if (pInfo->dev) {
+          xf86ReleaseKeys(pInfo->dev);
+          ProcessInputEvents();
+          DisableDevice(pInfo->dev, TRUE);
+      }
+    }
+
+    prevSIGIO = xf86BlockSIGIO();
+    for (i = 0; i < xf86NumScreens; i++)
+	xf86Screens[i]->LeaveVT(i, 0);
+
+    xf86AccessLeave();      /* We need this here, otherwise */
+
+    if (!xf86VTSwitchAway()) {
+      /*
+       * switch failed
+       */
+
+      DebugF("xf86VTSwitch: Leave failed\n");
+      xf86AccessEnter();
+      for (i = 0; i < xf86NumScreens; i++) {
+	if (!xf86Screens[i]->EnterVT(i, 0))
+	  FatalError("EnterVT failed for screen %d\n", i);
+      }
+      if (!(dispatchException & DE_TERMINATE)) {
+	for (i = 0; i < xf86NumScreens; i++) {
+	  if (xf86Screens[i]->EnableDisableFBAccess)
+	    (*xf86Screens[i]->EnableDisableFBAccess) (i, TRUE);
+	}
+      }
+      dixSaveScreens(serverClient, SCREEN_SAVER_FORCER, ScreenSaverReset);
+
+      pInfo = xf86InputDevs;
+      while (pInfo) {
+        if (pInfo->dev)
+            EnableDevice(pInfo->dev, TRUE);
+	pInfo = pInfo->next;
+      }
+      for (ih = InputHandlers; ih; ih = ih->next)
+        xf86EnableInputHandler(ih);
+
+      xf86UnblockSIGIO(prevSIGIO);
+
+    } else {
+#ifdef XF86PM
+	  if (xf86OSPMClose)
+	      xf86OSPMClose();
+	  xf86OSPMClose = NULL;
+#endif
+
+	for (i = 0; i < xf86NumScreens; i++) {
+ 	    /*
+ 	     * zero all access functions to
+ 	     * trap calls when switched away.
+ 	     */
+	    xf86Screens[i]->vtSema = FALSE;
+	}
+	if (xorgHWAccess)
+	    xf86DisableIO();
+    }
+  } else {
+    DebugF("xf86VTSwitch: Entering\n");
+    if (!xf86VTSwitchTo()) return;
+
+#ifdef XF86PM
+    xf86OSPMClose = xf86OSPMOpen();
+#endif
+
+    if (xorgHWAccess)
+	xf86EnableIO();
+    xf86AccessEnter();
+    for (i = 0; i < xf86NumScreens; i++) {
+      xf86Screens[i]->vtSema = TRUE;
+      if (!xf86Screens[i]->EnterVT(i, 0))
+	  FatalError("EnterVT failed for screen %d\n", i);
+    }
+    for (i = 0; i < xf86NumScreens; i++) {
+      if (xf86Screens[i]->EnableDisableFBAccess)
+	(*xf86Screens[i]->EnableDisableFBAccess)(i, TRUE);
+    }
+
+    /* Turn screen saver off when switching back */
+    dixSaveScreens(serverClient, SCREEN_SAVER_FORCER, ScreenSaverReset);
+
+    pInfo = xf86InputDevs;
+    while (pInfo) {
+      if (pInfo->dev)
+          EnableDevice(pInfo->dev, TRUE);
+      pInfo = pInfo->next;
+    }
+
+    for (ih = InputHandlers; ih; ih = ih->next)
+      xf86EnableInputHandler(ih);
+
+    xf86UnblockSIGIO(prevSIGIO);
+  }
+}
+
+
+/* Input handler registration */
+
+static pointer
+addInputHandler(int fd, InputHandlerProc proc, pointer data)
+{
+    IHPtr ih;
+
+    if (fd < 0 || !proc)
+	return NULL;
+
+    ih = calloc(sizeof(*ih), 1);
+    if (!ih)
+	return NULL;
+
+    ih->fd = fd;
+    ih->ihproc = proc;
+    ih->data = data;
+    ih->enabled = TRUE;
+
+    ih->next = InputHandlers;
+    InputHandlers = ih;
+
+    return ih;
+}
+
+pointer
+xf86AddInputHandler(int fd, InputHandlerProc proc, pointer data)
+{
+    IHPtr ih = addInputHandler(fd, proc, data);
+
+    if (ih)
+        AddEnabledDevice(fd);
+    return ih;
+}
+
+pointer
+xf86AddGeneralHandler(int fd, InputHandlerProc proc, pointer data)
+{
+    IHPtr ih = addInputHandler(fd, proc, data);
+
+    if (ih)
+        AddGeneralSocket(fd);
+    return ih;
+}
+
+/**
+ * Set the handler for the console's fd. Replaces (and returns) the previous
+ * handler or NULL, whichever appropriate.
+ * proc may be NULL if the server should not handle events on the console.
+ */
+InputHandlerProc
+xf86SetConsoleHandler(InputHandlerProc proc, pointer data)
+{
+    static InputHandlerProc handler = NULL;
+    InputHandlerProc old_handler = handler;
+
+    if (old_handler)
+        xf86RemoveGeneralHandler(old_handler);
+
+    xf86AddGeneralHandler(xf86Info.consoleFd, proc, data);
+    handler = proc;
+
+    return old_handler;
+}
+
+static void
+removeInputHandler(IHPtr ih)
+{
+    IHPtr p;
+
+    if (ih == InputHandlers)
+	InputHandlers = ih->next;
+    else {
+	p = InputHandlers;
+	while (p && p->next != ih)
+	    p = p->next;
+	if (ih)
+	    p->next = ih->next;
+    }
+    free(ih);
+}
+
+int
+xf86RemoveInputHandler(pointer handler)
+{
+    IHPtr ih;
+    int fd;
+
+    if (!handler)
+	return -1;
+
+    ih = handler;
+    fd = ih->fd;
+
+    if (ih->fd >= 0)
+	RemoveEnabledDevice(ih->fd);
+    removeInputHandler(ih);
+
+    return fd;
+}
+
+int
+xf86RemoveGeneralHandler(pointer handler)
+{
+    IHPtr ih;
+    int fd;
+
+    if (!handler)
+	return -1;
+
+    ih = handler;
+    fd = ih->fd;
+
+    if (ih->fd >= 0)
+	RemoveGeneralSocket(ih->fd);
+    removeInputHandler(ih);
+
+    return fd;
+}
+
+void
+xf86DisableInputHandler(pointer handler)
+{
+    IHPtr ih;
+
+    if (!handler)
+	return;
+
+    ih = handler;
+    ih->enabled = FALSE;
+    if (ih->fd >= 0)
+	RemoveEnabledDevice(ih->fd);
+}
+
+void
+xf86DisableGeneralHandler(pointer handler)
+{
+    IHPtr ih;
+
+    if (!handler)
+	return;
+
+    ih = handler;
+    ih->enabled = FALSE;
+    if (ih->fd >= 0)
+	RemoveGeneralSocket(ih->fd);
+}
+
+void
+xf86EnableInputHandler(pointer handler)
+{
+    IHPtr ih;
+
+    if (!handler)
+	return;
+
+    ih = handler;
+    ih->enabled = TRUE;
+    if (ih->fd >= 0)
+	AddEnabledDevice(ih->fd);
+}
+
+void
+xf86EnableGeneralHandler(pointer handler)
+{
+    IHPtr ih;
+
+    if (!handler)
+	return;
+
+    ih = handler;
+    ih->enabled = TRUE;
+    if (ih->fd >= 0)
+	AddGeneralSocket(ih->fd);
+}
+
+/*
+ * As used currently by the DRI, the return value is ignored.
+ */
+Bool
+xf86EnableVTSwitch(Bool new)
+{
+    static Bool def = TRUE;
+    Bool old;
+
+    old = VTSwitchEnabled;
+    if (!new) {
+	/* Disable VT switching */
+	def = VTSwitchEnabled;
+	VTSwitchEnabled = FALSE;
+    } else {
+	/* Restore VT switching to default */
+	VTSwitchEnabled = def;
+    }
+    return old;
+}
+
+void
+DDXRingBell(int volume, int pitch, int duration) {
+    xf86OSRingBell(volume, pitch, duration);
+}
diff --git a/xorg-server/hw/xfree86/common/xf86Globals.c b/xorg-server/hw/xfree86/common/xf86Globals.c
index 02f20f690..16d55577e 100644
--- a/xorg-server/hw/xfree86/common/xf86Globals.c
+++ b/xorg-server/hw/xfree86/common/xf86Globals.c
@@ -1,198 +1,197 @@
-

-/*

- * 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 all the XFree86 global variables.

- */

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include <X11/X.h>

-#include "os.h"

-#include "windowstr.h"

-#include "propertyst.h"

-#include "xf86.h"

-#include "xf86Priv.h"

-#include "xf86Parser.h"

-#include "xf86Xinput.h"

-#include "xf86InPriv.h"

-#include "xf86Config.h"

-

-/* Globals that video drivers may access */

-

-DevPrivateKeyRec xf86CreateRootWindowKeyRec;

-DevPrivateKeyRec xf86ScreenKeyRec;

-

-ScrnInfoPtr *xf86Screens = NULL;	/* List of ScrnInfos */

-const unsigned char byte_reversed[256] =

-{

-    0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0,

-    0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0,

-    0x08, 0x88, 0x48, 0xc8, 0x28, 0xa8, 0x68, 0xe8,

-    0x18, 0x98, 0x58, 0xd8, 0x38, 0xb8, 0x78, 0xf8,

-    0x04, 0x84, 0x44, 0xc4, 0x24, 0xa4, 0x64, 0xe4,

-    0x14, 0x94, 0x54, 0xd4, 0x34, 0xb4, 0x74, 0xf4,

-    0x0c, 0x8c, 0x4c, 0xcc, 0x2c, 0xac, 0x6c, 0xec,

-    0x1c, 0x9c, 0x5c, 0xdc, 0x3c, 0xbc, 0x7c, 0xfc,

-    0x02, 0x82, 0x42, 0xc2, 0x22, 0xa2, 0x62, 0xe2,

-    0x12, 0x92, 0x52, 0xd2, 0x32, 0xb2, 0x72, 0xf2,

-    0x0a, 0x8a, 0x4a, 0xca, 0x2a, 0xaa, 0x6a, 0xea,

-    0x1a, 0x9a, 0x5a, 0xda, 0x3a, 0xba, 0x7a, 0xfa,

-    0x06, 0x86, 0x46, 0xc6, 0x26, 0xa6, 0x66, 0xe6,

-    0x16, 0x96, 0x56, 0xd6, 0x36, 0xb6, 0x76, 0xf6,

-    0x0e, 0x8e, 0x4e, 0xce, 0x2e, 0xae, 0x6e, 0xee,

-    0x1e, 0x9e, 0x5e, 0xde, 0x3e, 0xbe, 0x7e, 0xfe,

-    0x01, 0x81, 0x41, 0xc1, 0x21, 0xa1, 0x61, 0xe1,

-    0x11, 0x91, 0x51, 0xd1, 0x31, 0xb1, 0x71, 0xf1,

-    0x09, 0x89, 0x49, 0xc9, 0x29, 0xa9, 0x69, 0xe9,

-    0x19, 0x99, 0x59, 0xd9, 0x39, 0xb9, 0x79, 0xf9,

-    0x05, 0x85, 0x45, 0xc5, 0x25, 0xa5, 0x65, 0xe5,

-    0x15, 0x95, 0x55, 0xd5, 0x35, 0xb5, 0x75, 0xf5,

-    0x0d, 0x8d, 0x4d, 0xcd, 0x2d, 0xad, 0x6d, 0xed,

-    0x1d, 0x9d, 0x5d, 0xdd, 0x3d, 0xbd, 0x7d, 0xfd,

-    0x03, 0x83, 0x43, 0xc3, 0x23, 0xa3, 0x63, 0xe3,

-    0x13, 0x93, 0x53, 0xd3, 0x33, 0xb3, 0x73, 0xf3,

-    0x0b, 0x8b, 0x4b, 0xcb, 0x2b, 0xab, 0x6b, 0xeb,

-    0x1b, 0x9b, 0x5b, 0xdb, 0x3b, 0xbb, 0x7b, 0xfb,

-    0x07, 0x87, 0x47, 0xc7, 0x27, 0xa7, 0x67, 0xe7,

-    0x17, 0x97, 0x57, 0xd7, 0x37, 0xb7, 0x77, 0xf7,

-    0x0f, 0x8f, 0x4f, 0xcf, 0x2f, 0xaf, 0x6f, 0xef,

-    0x1f, 0x9f, 0x5f, 0xdf, 0x3f, 0xbf, 0x7f, 0xff,

-};

-

-/* Globals that input drivers may access */

-InputInfoPtr xf86InputDevs = NULL;

-

-

-/* Globals that video drivers may not access */

-

-xf86InfoRec xf86Info = {

-    .consoleFd                  = -1,

-    .vtno                       = -1,

-    .vtSysreq                   = FALSE,

-    .lastEventTime              = -1,

-    .vtRequestsPending          = FALSE,

-#ifdef sun

-    .vtPendingNum               = -1,

-#endif

-    .dontVTSwitch               = FALSE,

-    .dontZap                    = FALSE,

-    .dontZoom                   = FALSE,

-    .notrapSignals              = FALSE,

-    .caughtSignal               = FALSE,

-    .currentScreen              = NULL,

-#ifdef CSRG_BASED

-    .screenFd                   = -1,

-    .consType                   = -1,

-#endif

-    .allowMouseOpenFail         = FALSE,

-    .vidModeEnabled             = TRUE,

-    .vidModeAllowNonLocal       = FALSE,

-    .miscModInDevEnabled        = TRUE,

-    .miscModInDevAllowNonLocal  = FALSE,

-    .pixmap24                   = Pix24DontCare,

-    .pix24From                  = X_DEFAULT,

-#ifdef SUPPORT_PC98

-    .pc98                       = FALSE,

-#endif

-    .pmFlag                     = TRUE,

-    .log                        = LogNone,

-    .disableRandR               = FALSE,

-    .randRFrom                  = X_DEFAULT,

-#if defined(CONFIG_HAL) || defined(CONFIG_UDEV)

-    .forceInputDevices          = FALSE,

-    .autoAddDevices             = TRUE,

-    .autoEnableDevices          = TRUE

-#else

-    .forceInputDevices          = TRUE,

-    .autoAddDevices             = FALSE,

-    .autoEnableDevices          = FALSE

-#endif

-};

-const char *xf86ConfigFile = NULL;

-const char *xf86ConfigDir = NULL;

-const char *xf86ModulePath = DEFAULT_MODULE_PATH;

-MessageType xf86ModPathFrom = X_DEFAULT;

-const char *xf86LogFile = DEFAULT_LOGPREFIX;

-MessageType xf86LogFileFrom = X_DEFAULT;

-Bool xf86LogFileWasOpened = FALSE;

-serverLayoutRec xf86ConfigLayout = {NULL, };

-confDRIRec xf86ConfigDRI = {0, };

-XF86ConfigPtr xf86configptr = NULL;

-Bool xf86Resetting = FALSE;

-Bool xf86Initialising = FALSE;

-Bool xf86DoConfigure = FALSE;

-Bool xf86DoShowOptions = FALSE;

-DriverPtr *xf86DriverList = NULL;

-int xf86NumDrivers = 0;

-InputDriverPtr *xf86InputDriverList = NULL;

-int xf86NumInputDrivers = 0;

-int xf86NumScreens = 0;

-

-const char *xf86VisualNames[] = {

-	"StaticGray",

-	"GrayScale",

-	"StaticColor",

-	"PseudoColor",

-	"TrueColor",

-	"DirectColor"

-};

-

-/* Parameters set only from the command line */

-char *xf86ServerName = "no-name";

-Bool xf86fpFlag = FALSE;

-Bool xf86sFlag = FALSE;

-Bool xf86bsEnableFlag = FALSE;

-Bool xf86bsDisableFlag = FALSE;

-Bool xf86silkenMouseDisableFlag = FALSE;

-Bool xf86xkbdirFlag = FALSE;

-#ifdef HAVE_ACPI

-Bool xf86acpiDisableFlag = FALSE;

-#endif

-char *xf86LayoutName = NULL;

-char *xf86ScreenName = NULL;

-char *xf86PointerName = NULL;

-char *xf86KeyboardName = NULL;

-int xf86Verbose = DEFAULT_VERBOSE;

-int xf86LogVerbose = DEFAULT_LOG_VERBOSE;

-int xf86FbBpp = -1;

-Pix24Flags xf86Pix24 = Pix24DontCare;

-int xf86Depth = -1;

-rgb xf86Weight = {0, 0, 0};

-Bool xf86FlipPixels = FALSE;

-Gamma xf86Gamma = {0.0, 0.0, 0.0};

-Bool xf86AllowMouseOpenFail = FALSE;

-#ifdef XF86VIDMODE

-Bool xf86VidModeDisabled = FALSE;

-Bool xf86VidModeAllowNonLocal = FALSE;

-#endif

-RootWinPropPtr *xf86RegisteredPropertiesTable = NULL;

-Bool xf86inSuspend = FALSE;

-Bool xorgHWAccess = FALSE;

+
+/*
+ * 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 all the XFree86 global variables.
+ */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include <X11/X.h>
+#include "os.h"
+#include "windowstr.h"
+#include "propertyst.h"
+#include "xf86.h"
+#include "xf86Priv.h"
+#include "xf86Parser.h"
+#include "xf86Xinput.h"
+#include "xf86InPriv.h"
+#include "xf86Config.h"
+
+/* Globals that video drivers may access */
+
+DevPrivateKeyRec xf86CreateRootWindowKeyRec;
+DevPrivateKeyRec xf86ScreenKeyRec;
+
+ScrnInfoPtr *xf86Screens = NULL;	/* List of ScrnInfos */
+const unsigned char byte_reversed[256] =
+{
+    0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0,
+    0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0,
+    0x08, 0x88, 0x48, 0xc8, 0x28, 0xa8, 0x68, 0xe8,
+    0x18, 0x98, 0x58, 0xd8, 0x38, 0xb8, 0x78, 0xf8,
+    0x04, 0x84, 0x44, 0xc4, 0x24, 0xa4, 0x64, 0xe4,
+    0x14, 0x94, 0x54, 0xd4, 0x34, 0xb4, 0x74, 0xf4,
+    0x0c, 0x8c, 0x4c, 0xcc, 0x2c, 0xac, 0x6c, 0xec,
+    0x1c, 0x9c, 0x5c, 0xdc, 0x3c, 0xbc, 0x7c, 0xfc,
+    0x02, 0x82, 0x42, 0xc2, 0x22, 0xa2, 0x62, 0xe2,
+    0x12, 0x92, 0x52, 0xd2, 0x32, 0xb2, 0x72, 0xf2,
+    0x0a, 0x8a, 0x4a, 0xca, 0x2a, 0xaa, 0x6a, 0xea,
+    0x1a, 0x9a, 0x5a, 0xda, 0x3a, 0xba, 0x7a, 0xfa,
+    0x06, 0x86, 0x46, 0xc6, 0x26, 0xa6, 0x66, 0xe6,
+    0x16, 0x96, 0x56, 0xd6, 0x36, 0xb6, 0x76, 0xf6,
+    0x0e, 0x8e, 0x4e, 0xce, 0x2e, 0xae, 0x6e, 0xee,
+    0x1e, 0x9e, 0x5e, 0xde, 0x3e, 0xbe, 0x7e, 0xfe,
+    0x01, 0x81, 0x41, 0xc1, 0x21, 0xa1, 0x61, 0xe1,
+    0x11, 0x91, 0x51, 0xd1, 0x31, 0xb1, 0x71, 0xf1,
+    0x09, 0x89, 0x49, 0xc9, 0x29, 0xa9, 0x69, 0xe9,
+    0x19, 0x99, 0x59, 0xd9, 0x39, 0xb9, 0x79, 0xf9,
+    0x05, 0x85, 0x45, 0xc5, 0x25, 0xa5, 0x65, 0xe5,
+    0x15, 0x95, 0x55, 0xd5, 0x35, 0xb5, 0x75, 0xf5,
+    0x0d, 0x8d, 0x4d, 0xcd, 0x2d, 0xad, 0x6d, 0xed,
+    0x1d, 0x9d, 0x5d, 0xdd, 0x3d, 0xbd, 0x7d, 0xfd,
+    0x03, 0x83, 0x43, 0xc3, 0x23, 0xa3, 0x63, 0xe3,
+    0x13, 0x93, 0x53, 0xd3, 0x33, 0xb3, 0x73, 0xf3,
+    0x0b, 0x8b, 0x4b, 0xcb, 0x2b, 0xab, 0x6b, 0xeb,
+    0x1b, 0x9b, 0x5b, 0xdb, 0x3b, 0xbb, 0x7b, 0xfb,
+    0x07, 0x87, 0x47, 0xc7, 0x27, 0xa7, 0x67, 0xe7,
+    0x17, 0x97, 0x57, 0xd7, 0x37, 0xb7, 0x77, 0xf7,
+    0x0f, 0x8f, 0x4f, 0xcf, 0x2f, 0xaf, 0x6f, 0xef,
+    0x1f, 0x9f, 0x5f, 0xdf, 0x3f, 0xbf, 0x7f, 0xff,
+};
+
+/* Globals that input drivers may access */
+InputInfoPtr xf86InputDevs = NULL;
+
+
+/* Globals that video drivers may not access */
+
+xf86InfoRec xf86Info = {
+    .consoleFd                  = -1,
+    .vtno                       = -1,
+    .vtSysreq                   = FALSE,
+    .lastEventTime              = -1,
+    .vtRequestsPending          = FALSE,
+#ifdef sun
+    .vtPendingNum               = -1,
+#endif
+    .dontVTSwitch               = FALSE,
+    .dontZap                    = FALSE,
+    .dontZoom                   = FALSE,
+    .notrapSignals              = FALSE,
+    .caughtSignal               = FALSE,
+    .currentScreen              = NULL,
+#ifdef CSRG_BASED
+    .screenFd                   = -1,
+    .consType                   = -1,
+#endif
+    .allowMouseOpenFail         = FALSE,
+    .vidModeEnabled             = TRUE,
+    .vidModeAllowNonLocal       = FALSE,
+    .miscModInDevEnabled        = TRUE,
+    .miscModInDevAllowNonLocal  = FALSE,
+    .pixmap24                   = Pix24DontCare,
+    .pix24From                  = X_DEFAULT,
+#ifdef SUPPORT_PC98
+    .pc98                       = FALSE,
+#endif
+    .pmFlag                     = TRUE,
+    .log                        = LogNone,
+    .disableRandR               = FALSE,
+    .randRFrom                  = X_DEFAULT,
+#if defined(CONFIG_HAL) || defined(CONFIG_UDEV)
+    .forceInputDevices          = FALSE,
+    .autoAddDevices             = TRUE,
+    .autoEnableDevices          = TRUE
+#else
+    .forceInputDevices          = TRUE,
+    .autoAddDevices             = FALSE,
+    .autoEnableDevices          = FALSE
+#endif
+};
+const char *xf86ConfigFile = NULL;
+const char *xf86ConfigDir = NULL;
+const char *xf86ModulePath = DEFAULT_MODULE_PATH;
+MessageType xf86ModPathFrom = X_DEFAULT;
+const char *xf86LogFile = DEFAULT_LOGPREFIX;
+MessageType xf86LogFileFrom = X_DEFAULT;
+Bool xf86LogFileWasOpened = FALSE;
+serverLayoutRec xf86ConfigLayout = {NULL, };
+confDRIRec xf86ConfigDRI = {0, };
+XF86ConfigPtr xf86configptr = NULL;
+Bool xf86Resetting = FALSE;
+Bool xf86Initialising = FALSE;
+Bool xf86DoConfigure = FALSE;
+Bool xf86DoShowOptions = FALSE;
+DriverPtr *xf86DriverList = NULL;
+int xf86NumDrivers = 0;
+InputDriverPtr *xf86InputDriverList = NULL;
+int xf86NumInputDrivers = 0;
+int xf86NumScreens = 0;
+
+const char *xf86VisualNames[] = {
+	"StaticGray",
+	"GrayScale",
+	"StaticColor",
+	"PseudoColor",
+	"TrueColor",
+	"DirectColor"
+};
+
+/* Parameters set only from the command line */
+char *xf86ServerName = "no-name";
+Bool xf86fpFlag = FALSE;
+Bool xf86sFlag = FALSE;
+Bool xf86bsEnableFlag = FALSE;
+Bool xf86bsDisableFlag = FALSE;
+Bool xf86silkenMouseDisableFlag = FALSE;
+Bool xf86xkbdirFlag = FALSE;
+#ifdef HAVE_ACPI
+Bool xf86acpiDisableFlag = FALSE;
+#endif
+char *xf86LayoutName = NULL;
+char *xf86ScreenName = NULL;
+char *xf86PointerName = NULL;
+char *xf86KeyboardName = NULL;
+int xf86Verbose = DEFAULT_VERBOSE;
+int xf86LogVerbose = DEFAULT_LOG_VERBOSE;
+int xf86FbBpp = -1;
+Pix24Flags xf86Pix24 = Pix24DontCare;
+int xf86Depth = -1;
+rgb xf86Weight = {0, 0, 0};
+Bool xf86FlipPixels = FALSE;
+Gamma xf86Gamma = {0.0, 0.0, 0.0};
+Bool xf86AllowMouseOpenFail = FALSE;
+#ifdef XF86VIDMODE
+Bool xf86VidModeDisabled = FALSE;
+Bool xf86VidModeAllowNonLocal = FALSE;
+#endif
+RootWinPropPtr *xf86RegisteredPropertiesTable = NULL;
+Bool xorgHWAccess = FALSE;
diff --git a/xorg-server/hw/xfree86/common/xf86Init.c b/xorg-server/hw/xfree86/common/xf86Init.c
index f3ce3f696..a1fda54cd 100644
--- a/xorg-server/hw/xfree86/common/xf86Init.c
+++ b/xorg-server/hw/xfree86/common/xf86Init.c
@@ -1,1510 +1,1497 @@
-/*

- * Loosely based on code bearing the following copyright:

- *

- *   Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.

- */

-/*

- * Copyright (c) 1992-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).

- */

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include <stdlib.h>

-#include <errno.h>

-

-#undef HAS_UTSNAME

-#if !defined(WIN32)

-#define HAS_UTSNAME 1

-#include <sys/utsname.h>

-#endif

-

-#include <X11/X.h>

-#include <X11/Xmd.h>

-#include <X11/Xproto.h>

-#include <X11/Xatom.h>

-#include "input.h"

-#include "servermd.h"

-#include "windowstr.h"

-#include "scrnintstr.h"

-#include "site.h"

-#include "mi.h"

-

-#include "compiler.h"

-

-#include "loaderProcs.h"

-#ifdef XFreeXDGA

-#include "dgaproc.h"

-#endif

-

-#define XF86_OS_PRIVS

-#include "xf86.h"

-#include "xf86Priv.h"

-#include "xf86Config.h"

-#include "xf86_OSlib.h"

-#include "xf86cmap.h"

-#include "xorgVersion.h"

-#include "xf86Build.h"

-#include "mipointer.h"

-#include <X11/extensions/XI.h>

-#include <X11/extensions/XIproto.h>

-#include "xf86DDC.h"

-#include "xf86Xinput.h"

-#include "xf86InPriv.h"

-#include "picturestr.h"

-

-#include "xf86Bus.h"

-#include "xf86VGAarbiter.h"

-#include "globals.h"

-

-#ifdef DPMSExtension

-#include <X11/extensions/dpmsconst.h>

-#include "dpmsproc.h"

-#endif

-#include <hotplug.h>

-

-

-#ifdef XF86PM

-void (*xf86OSPMClose)(void) = NULL;

-#endif

-static Bool xorgHWOpenConsole = FALSE;

-

-/* Common pixmap formats */

-

-static PixmapFormatRec formats[MAXFORMATS] = {

-	{ 1,	1,	BITMAP_SCANLINE_PAD },

-	{ 4,	8,	BITMAP_SCANLINE_PAD },

-	{ 8,	8,	BITMAP_SCANLINE_PAD },

-	{ 15,	16,	BITMAP_SCANLINE_PAD },

-	{ 16,	16,	BITMAP_SCANLINE_PAD },

-	{ 24,	32,	BITMAP_SCANLINE_PAD },

-	{ 32,	32,	BITMAP_SCANLINE_PAD },

-};

-static int numFormats = 7;

-static Bool formatsDone = FALSE;

-

-#ifndef OSNAME

-#define OSNAME " unknown"

-#endif

-#ifndef OSVENDOR

-#define OSVENDOR ""

-#endif

-#ifndef PRE_RELEASE

-#define PRE_RELEASE XORG_VERSION_SNAP

-#endif

-

-static void

-xf86PrintBanner(void)

-{

-#if PRE_RELEASE

-  xf86ErrorFVerb(0, "\n"

-    "This is a pre-release version of the X server from " XVENDORNAME ".\n"

-    "It is not supported in any way.\n"

-    "Bugs may be filed in the bugzilla at http://bugs.freedesktop.org/.\n"

-    "Select the \"xorg\" product for bugs you find in this release.\n"

-    "Before reporting bugs in pre-release versions please check the\n"

-    "latest version in the X.Org Foundation git repository.\n"

-    "See http://wiki.x.org/wiki/GitPage for git access instructions.\n");

-#endif

-  xf86ErrorFVerb(0, "\nX.Org X Server %d.%d.%d",

-	 XORG_VERSION_MAJOR,

-	 XORG_VERSION_MINOR,

-	 XORG_VERSION_PATCH);

-#if XORG_VERSION_SNAP > 0

-  xf86ErrorFVerb(0, ".%d", XORG_VERSION_SNAP);

-#endif

-

-#if XORG_VERSION_SNAP >= 900

-  /* When the minor number is 99, that signifies that the we are making

-   * a release candidate for a major version.  (X.0.0)

-   * When the patch number is 99, that signifies that the we are making

-   * a release candidate for a minor version.  (X.Y.0)

-   * When the patch number is < 99, then we are making a release

-   * candidate for the next point release.  (X.Y.Z)

-   */

-#if XORG_VERSION_MINOR >= 99

-  xf86ErrorFVerb(0, " (%d.0.0 RC %d)", XORG_VERSION_MAJOR+1,

-                 XORG_VERSION_SNAP - 900);

-#elif XORG_VERSION_PATCH == 99

-  xf86ErrorFVerb(0, " (%d.%d.0 RC %d)", XORG_VERSION_MAJOR,

-                 XORG_VERSION_MINOR + 1, XORG_VERSION_SNAP - 900);

-#else

-  xf86ErrorFVerb(0, " (%d.%d.%d RC %d)", XORG_VERSION_MAJOR,

-                 XORG_VERSION_MINOR, XORG_VERSION_PATCH + 1,

-                 XORG_VERSION_SNAP - 900);

-#endif

-#endif

-

-#ifdef XORG_CUSTOM_VERSION

-  xf86ErrorFVerb(0, " (%s)", XORG_CUSTOM_VERSION);

-#endif

-#ifndef XORG_DATE

-# define XORG_DATE "Unknown"

-#endif

-  xf86ErrorFVerb(0, "\nRelease Date: %s\n", XORG_DATE);

-  xf86ErrorFVerb(0, "X Protocol Version %d, Revision %d\n",

-         X_PROTOCOL, X_PROTOCOL_REVISION);

-  xf86ErrorFVerb(0, "Build Operating System: %s %s\n", OSNAME, OSVENDOR);

-#ifdef HAS_UTSNAME

-  {

-    struct utsname name;

-

-    /* Linux & BSD state that 0 is success, SysV (including Solaris, HP-UX,

-       and Irix) and Single Unix Spec 3 just say that non-negative is success.

-       All agree that failure is represented by a negative number.

-     */

-    if (uname(&name) >= 0) {

-      xf86ErrorFVerb(0, "Current Operating System: %s %s %s %s %s\n",

-	name.sysname, name.nodename, name.release, name.version, name.machine);

-#ifdef linux

-      do {

-	  char buf[80];

-	  int fd = open("/proc/cmdline", O_RDONLY);

-	  if (fd != -1) {

-	    xf86ErrorFVerb(0, "Kernel command line: ");

-	    memset(buf, 0, 80);

-	    while (read(fd, buf, 80) > 0) {

-		xf86ErrorFVerb(0, "%.80s", buf);

-		memset(buf, 0, 80);

-	    }

-	    close(fd);

-	  } 

-      } while (0);

-#endif

-    }

-  }

-#endif

-#if defined(BUILD_DATE) && (BUILD_DATE > 19000000)

-  {

-    struct tm t;

-    char buf[100];

-

-    memset(&t, 0, sizeof(t));

-    memset(buf, 0, sizeof(buf));

-    t.tm_mday = BUILD_DATE % 100;

-    t.tm_mon = (BUILD_DATE / 100) % 100 - 1;

-    t.tm_year = BUILD_DATE / 10000 - 1900;

-#if defined(BUILD_TIME)

-    t.tm_sec = BUILD_TIME % 100;

-    t.tm_min = (BUILD_TIME / 100) % 100;

-    t.tm_hour = (BUILD_TIME / 10000) % 100;

-    if (strftime(buf, sizeof(buf), "%d %B %Y  %I:%M:%S%p", &t))

-       xf86ErrorFVerb(0, "Build Date: %s\n", buf);

-#else

-    if (strftime(buf, sizeof(buf), "%d %B %Y", &t))

-       xf86ErrorFVerb(0, "Build Date: %s\n", buf);

-#endif

-  }

-#endif

-#if defined(BUILDERSTRING)

-  xf86ErrorFVerb(0, "%s \n", BUILDERSTRING);

-#endif

-  xf86ErrorFVerb(0, "Current version of pixman: %s\n",

-                 pixman_version_string());

-  xf86ErrorFVerb(0, "\tBefore reporting problems, check "

-                 ""__VENDORDWEBSUPPORT__"\n"

-                 "\tto make sure that you have the latest version.\n");

-}

-

-static void

-xf86PrintMarkers(void)

-{

-  LogPrintMarkers();

-}

-

-static Bool

-xf86CreateRootWindow(WindowPtr pWin)

-{

-  int ret = TRUE;

-  int err = Success;

-  ScreenPtr pScreen = pWin->drawable.pScreen;

-  RootWinPropPtr pProp;

-  CreateWindowProcPtr CreateWindow = (CreateWindowProcPtr)

-      dixLookupPrivate(&pScreen->devPrivates, xf86CreateRootWindowKey);

-

-  DebugF("xf86CreateRootWindow(%p)\n", pWin);

-

-  if ( pScreen->CreateWindow != xf86CreateRootWindow ) {

-    /* Can't find hook we are hung on */

-	xf86DrvMsg(pScreen->myNum, X_WARNING /* X_ERROR */,

-		  "xf86CreateRootWindow %p called when not in pScreen->CreateWindow %p n",

-		   (void *)xf86CreateRootWindow,

-		   (void *)pScreen->CreateWindow );

-  }

-

-  /* Unhook this function ... */

-  pScreen->CreateWindow = CreateWindow;

-  dixSetPrivate(&pScreen->devPrivates, xf86CreateRootWindowKey, NULL);

-

-  /* ... and call the previous CreateWindow fuction, if any */

-  if (NULL!=pScreen->CreateWindow) {

-    ret = (*pScreen->CreateWindow)(pWin);

-  }

-

-  /* Now do our stuff */

-  if (xf86RegisteredPropertiesTable != NULL) {

-    if (pWin->parent == NULL && xf86RegisteredPropertiesTable != NULL) {

-      for (pProp = xf86RegisteredPropertiesTable[pScreen->myNum];

-	   pProp != NULL && err==Success;

-	   pProp = pProp->next )

-	{

-	  Atom prop;

-

-	  prop = MakeAtom(pProp->name, strlen(pProp->name), TRUE);

-	  err = dixChangeWindowProperty(serverClient, pWin,

-					prop, pProp->type,

-					pProp->format, PropModeReplace,

-					pProp->size, pProp->data,

-					FALSE);

-	}

-

-      /* Look at err */

-      ret &= (err==Success);

-

-    } else {

-      xf86Msg(X_ERROR, "xf86CreateRootWindow unexpectedly called with "

-	      "non-root window %p (parent %p)\n",

-	      (void *)pWin, (void *)pWin->parent);

-      ret = FALSE;

-    }

-  }

-

-  DebugF("xf86CreateRootWindow() returns %d\n", ret);

-  return ret;

-}

-

-

-static void

-InstallSignalHandlers(void)

-{

-    /*

-     * Install signal handler for unexpected signals

-     */

-    xf86Info.caughtSignal=FALSE;

-    if (!xf86Info.notrapSignals) {

-	OsRegisterSigWrapper(xf86SigWrapper);

-    } else {

-	signal(SIGSEGV, SIG_DFL);

-	signal(SIGILL, SIG_DFL);

-#ifdef SIGEMT

-	signal(SIGEMT, SIG_DFL);

-#endif

-	signal(SIGFPE, SIG_DFL);

-	signal(SIGBUS, SIG_DFL);

-	signal(SIGSYS, SIG_DFL);

-	signal(SIGXCPU, SIG_DFL);

-	signal(SIGXFSZ, SIG_DFL);

-    }

-}

-

-/*

- * InitOutput --

- *	Initialize screenInfo for all actually accessible framebuffers.

- *      That includes vt-manager setup, querying all possible devices and

- *      collecting the pixmap formats.

- */

-void

-InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)

-{

-  int                    i, j, k, scr_index;

-  char                   **modulelist;

-  pointer                *optionlist;

-  Pix24Flags		 screenpix24, pix24;

-  MessageType		 pix24From = X_DEFAULT;

-  Bool			 pix24Fail = FALSE;

-  Bool			 autoconfig = FALSE;

-  GDevPtr		 configured_device;

-

-  xf86Initialising = TRUE;

-

-  if (serverGeneration == 1) {

-    if ((xf86ServerName = strrchr(argv[0], '/')) != 0)

-      xf86ServerName++;

-    else

-      xf86ServerName = argv[0];

-

-	xf86PrintBanner();

-	xf86PrintMarkers();

-	if (xf86LogFile)  {

-	    time_t t;

-	    const char *ct;

-	    t = time(NULL);

-	    ct = ctime(&t);

-	    xf86MsgVerb(xf86LogFileFrom, 0, "Log file: \"%s\", Time: %s",

-			xf86LogFile, ct);

-	}

-

-    /* Read and parse the config file */

-    if (!xf86DoConfigure && !xf86DoShowOptions) {

-      switch (xf86HandleConfigFile(FALSE)) {

-      case CONFIG_OK:

-	break;

-      case CONFIG_PARSE_ERROR:

-	xf86Msg(X_ERROR, "Error parsing the config file\n");

-	return;

-      case CONFIG_NOFILE:

-	autoconfig = TRUE;

-	break;

-      }

-    }

-

-    InstallSignalHandlers();

-

-    /* Initialise the loader */

-    LoaderInit();

-

-    /* Tell the loader the default module search path */

-    LoaderSetPath(xf86ModulePath);

-

-    if (xf86Info.ignoreABI) {

-        LoaderSetOptions(LDR_OPT_ABI_MISMATCH_NONFATAL);

-    }

-

-    if (xf86DoShowOptions)

-        DoShowOptions();

-

-    /* Do a general bus probe.  This will be a PCI probe for x86 platforms */

-    xf86BusProbe();

-

-    if (xf86DoConfigure)

-	DoConfigure();

-

-    if (autoconfig) {

-	if (!xf86AutoConfig()) {

-	    xf86Msg(X_ERROR, "Auto configuration failed\n");

-	    return;

-	}

-    }

-

-#ifdef XF86PM

-    xf86OSPMClose = xf86OSPMOpen();

-#endif

-

-    /* Load all modules specified explicitly in the config file */

-    if ((modulelist = xf86ModulelistFromConfig(&optionlist))) {

-      xf86LoadModules(modulelist, optionlist);

-      free(modulelist);

-      free(optionlist);

-    }

-

-    /* Load all driver modules specified in the config file */

-    /* If there aren't any specified in the config file, autoconfig them */

-    /* FIXME: Does not handle multiple active screen sections, but I'm not

-     * sure if we really want to handle that case*/

-    configured_device = xf86ConfigLayout.screens->screen->device;

-    if ((!configured_device) || (!configured_device->driver)) {

-        if (!autoConfigDevice(configured_device)) {

-            xf86Msg(X_ERROR, "Automatic driver configuration failed\n");

-            return ;

-        }

-    }

-    if ((modulelist = xf86DriverlistFromConfig())) {

-      xf86LoadModules(modulelist, NULL);

-      free(modulelist);

-    }

-

-    /* Load all input driver modules specified in the config file. */

-    if ((modulelist = xf86InputDriverlistFromConfig())) {

-      xf86LoadModules(modulelist, NULL);

-      free(modulelist);

-    }

-

-    /*

-     * It is expected that xf86AddDriver()/xf86AddInputDriver will be

-     * called for each driver as it is loaded.  Those functions save the

-     * module pointers for drivers.

-     * XXX Nothing keeps track of them for other modules.

-     */

-    /* XXX What do we do if not all of these could be loaded? */

-

-    /*

-     * At this point, xf86DriverList[] is all filled in with entries for

-     * each of the drivers to try and xf86NumDrivers has the number of

-     * drivers.  If there are none, return now.

-     */

-

-    if (xf86NumDrivers == 0) {

-      xf86Msg(X_ERROR, "No drivers available.\n");

-      return;

-    }

-

-    /*

-     * Call each of the Identify functions and call the driverFunc to check

-     * if HW access is required.  The Identify functions print out some

-     * identifying information, and anything else that might be

-     * needed at this early stage.

-     */

-

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

-	if (xf86DriverList[i]->Identify != NULL)

-	    xf86DriverList[i]->Identify(0);

-

-	if (!xorgHWAccess || !xorgHWOpenConsole) {

-	    xorgHWFlags flags;

-	    if(!xf86DriverList[i]->driverFunc

-		|| !xf86DriverList[i]->driverFunc(NULL,

-						  GET_REQUIRED_HW_INTERFACES,

-						  &flags))

-		flags = HW_IO;

-

-	    if(NEED_IO_ENABLED(flags))

-		xorgHWAccess = TRUE;

-	    if(!(flags & HW_SKIP_CONSOLE))

-		xorgHWOpenConsole = TRUE;

-	}

-    }

-

-    if (xorgHWOpenConsole)

-	xf86OpenConsole();

-    else

-	xf86Info.dontVTSwitch = TRUE;

-

-    if (xf86BusConfig() == FALSE)

-        return;

-

-    xf86PostProbe();

-

-    /*

-     * Sort the drivers to match the requested ording.  Using a slow

-     * bubble sort.

-     */

-    for (j = 0; j < xf86NumScreens - 1; j++) {

-	for (i = 0; i < xf86NumScreens - j - 1; i++) {

-	    if (xf86Screens[i + 1]->confScreen->screennum <

-		xf86Screens[i]->confScreen->screennum) {

-		ScrnInfoPtr tmpScrn = xf86Screens[i + 1];

-		xf86Screens[i + 1] = xf86Screens[i];

-		xf86Screens[i] = tmpScrn;

-	    }

-	}

-    }

-    /* Fix up the indexes */

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

-	xf86Screens[i]->scrnIndex = i;

-    }

-

-    /*

-     * Call the driver's PreInit()'s to complete initialisation for the first

-     * generation.

-     */

-

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

-	xf86VGAarbiterScrnInit(xf86Screens[i]);

-	xf86VGAarbiterLock(xf86Screens[i]);

-	if (xf86Screens[i]->PreInit &&

-	    xf86Screens[i]->PreInit(xf86Screens[i], 0))

-	    xf86Screens[i]->configured = TRUE;

-	xf86VGAarbiterUnlock(xf86Screens[i]);

-    }

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

-	if (!xf86Screens[i]->configured)

-	    xf86DeleteScreen(i--, 0);

-

-    /*

-     * If no screens left, return now.

-     */

-

-    if (xf86NumScreens == 0) {

-      xf86Msg(X_ERROR,

-	      "Screen(s) found, but none have a usable configuration.\n");

-      return;

-    }

-

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

-      if (xf86Screens[i]->name == NULL) {

-	XNFasprintf(&xf86Screens[i]->name, "screen%d", i);

-	xf86MsgVerb(X_WARNING, 0,

-		    "Screen driver %d has no name set, using `%s'.\n",

-		    i, xf86Screens[i]->name);

-      }

-    }

-

-    /* Remove (unload) drivers that are not required */

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

-	if (xf86DriverList[i] && xf86DriverList[i]->refCount <= 0)

-	    xf86DeleteDriver(i);

-

-    /*

-     * At this stage we know how many screens there are.

-     */

-

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

-      xf86InitViewport(xf86Screens[i]);

-

-    /*

-     * Collect all pixmap formats and check for conflicts at the display

-     * level.  Should we die here?  Or just delete the offending screens?

-     */

-    screenpix24 = Pix24DontCare;

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

-	if (xf86Screens[i]->imageByteOrder !=

-	    xf86Screens[0]->imageByteOrder)

-	    FatalError("Inconsistent display bitmapBitOrder.  Exiting\n");

-	if (xf86Screens[i]->bitmapScanlinePad !=

-	    xf86Screens[0]->bitmapScanlinePad)

-	    FatalError("Inconsistent display bitmapScanlinePad.  Exiting\n");

-	if (xf86Screens[i]->bitmapScanlineUnit !=

-	    xf86Screens[0]->bitmapScanlineUnit)

-	    FatalError("Inconsistent display bitmapScanlineUnit.  Exiting\n");

-	if (xf86Screens[i]->bitmapBitOrder !=

-	    xf86Screens[0]->bitmapBitOrder)

-	    FatalError("Inconsistent display bitmapBitOrder.  Exiting\n");

-

-	/* Determine the depth 24 pixmap format the screens would like */

-	if (xf86Screens[i]->pixmap24 != Pix24DontCare) {

-	    if (screenpix24 == Pix24DontCare)

-		screenpix24 = xf86Screens[i]->pixmap24;

-	    else if (screenpix24 != xf86Screens[i]->pixmap24)

-		FatalError("Inconsistent depth 24 pixmap format.  Exiting\n");

-	}

-    }

-    /* check if screenpix24 is consistent with the config/cmdline */

-    if (xf86Info.pixmap24 != Pix24DontCare) {

-	pix24 = xf86Info.pixmap24;

-	pix24From = xf86Info.pix24From;

-	if (screenpix24 != Pix24DontCare && screenpix24 != xf86Info.pixmap24)

-	    pix24Fail = TRUE;

-    } else if (screenpix24 != Pix24DontCare) {

-	pix24 = screenpix24;

-	pix24From = X_PROBED;

-    } else

-	pix24 = Pix24Use32;

-

-    if (pix24Fail)

-	FatalError("Screen(s) can't use the required depth 24 pixmap format"

-		   " (%d).  Exiting\n", PIX24TOBPP(pix24));

-

-    /* Initialise the depth 24 format */

-    for (j = 0; j < numFormats && formats[j].depth != 24; j++)

-	;

-    formats[j].bitsPerPixel = PIX24TOBPP(pix24);

-

-    /* Collect additional formats */

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

-	for (j = 0; j < xf86Screens[i]->numFormats; j++) {

-	    for (k = 0; ; k++) {

-		if (k >= numFormats) {

-		    if (k >= MAXFORMATS)

-			FatalError("Too many pixmap formats!  Exiting\n");

-		    formats[k] = xf86Screens[i]->formats[j];

-		    numFormats++;

-		    break;

-		}

-		if (formats[k].depth == xf86Screens[i]->formats[j].depth) {

-		    if ((formats[k].bitsPerPixel ==

-			 xf86Screens[i]->formats[j].bitsPerPixel) &&

-		        (formats[k].scanlinePad ==

-			 xf86Screens[i]->formats[j].scanlinePad))

-			break;

-		    FatalError("Inconsistent pixmap format for depth %d."

-			       "  Exiting\n", formats[k].depth);

-		}

-	    }

-	}

-    }

-    formatsDone = TRUE;

-

-    if (xf86Info.vtno >= 0 ) {

-#define VT_ATOM_NAME         "XFree86_VT"

-      Atom VTAtom=-1;

-      CARD32  *VT = NULL;

-      int  ret;

-

-      /* This memory needs to stay available until the screen has been

-	 initialized, and we can create the property for real.

-      */

-      if ( (VT = malloc(sizeof(CARD32)))==NULL ) {

-	FatalError("Unable to make VT property - out of memory. Exiting...\n");

-      }

-      *VT = xf86Info.vtno;

-

-      VTAtom = MakeAtom(VT_ATOM_NAME, sizeof(VT_ATOM_NAME) - 1, TRUE);

-

-      for (i = 0, ret = Success; i < xf86NumScreens && ret == Success; i++) {

-	ret = xf86RegisterRootWindowProperty(xf86Screens[i]->scrnIndex,

-					     VTAtom, XA_INTEGER, 32,

-					     1, VT );

-	if (ret != Success)

-	  xf86DrvMsg(xf86Screens[i]->scrnIndex, X_WARNING,

-		     "Failed to register VT property\n");

-      }

-    }

-

-    /* If a screen uses depth 24, show what the pixmap format is */

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

-	if (xf86Screens[i]->depth == 24) {

-	    xf86Msg(pix24From, "Depth 24 pixmap format is %d bpp\n",

-		    PIX24TOBPP(pix24));

-	    break;

-	}

-    }

-  } else {

-    /*

-     * serverGeneration != 1; some OSs have to do things here, too.

-     */

-    if (xorgHWOpenConsole)

-	xf86OpenConsole();

-

-#ifdef XF86PM

-    /*

-      should we reopen it here? We need to deal with an already opened

-      device. We could leave this to the OS layer. For now we simply

-      close it here

-    */

-    if (xf86OSPMClose)

-        xf86OSPMClose();

-    if ((xf86OSPMClose = xf86OSPMOpen()) != NULL)

-	xf86MsgVerb(X_INFO, 3, "APM registered successfully\n");

-#endif

-

-    /* Make sure full I/O access is enabled */

-    if (xorgHWAccess)

-	xf86EnableIO();

-  }

-

-  /*

-   * Use the previously collected parts to setup pScreenInfo

-   */

-

-  pScreenInfo->imageByteOrder = xf86Screens[0]->imageByteOrder;

-  pScreenInfo->bitmapScanlinePad = xf86Screens[0]->bitmapScanlinePad;

-  pScreenInfo->bitmapScanlineUnit = xf86Screens[0]->bitmapScanlineUnit;

-  pScreenInfo->bitmapBitOrder = xf86Screens[0]->bitmapBitOrder;

-  pScreenInfo->numPixmapFormats = numFormats;

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

-    pScreenInfo->formats[i] = formats[i];

-

-  /* Make sure the server's VT is active */

-

-  if (serverGeneration != 1) {

-    xf86Resetting = TRUE;

-    /* All screens are in the same state, so just check the first */

-    if (!xf86Screens[0]->vtSema) {

-#ifdef HAS_USL_VTS

-      ioctl(xf86Info.consoleFd, VT_RELDISP, VT_ACKACQ);

-#endif

-      xf86AccessEnter();

-      xf86EnterServerState(SETUP);

-    }

-  }

-#ifdef SCO325

-  else {

-    /*

-     * Under SCO we must ack that we got the console at startup,

-     * I think this is the safest way to assure it.

-     */

-    static int once = 1;

-    if (once) {

-      once = 0;

-      if (ioctl(xf86Info.consoleFd, VT_RELDISP, VT_ACKACQ) < 0)

-        xf86Msg(X_WARNING, "VT_ACKACQ failed");

-    }

-  }

-#endif /* SCO325 */

-

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

-      if (!xf86ColormapAllocatePrivates(xf86Screens[i]))

-	  FatalError("Cannot register DDX private keys");

-

-  if (!dixRegisterPrivateKey(&xf86ScreenKeyRec, PRIVATE_SCREEN, 0) ||

-      !dixRegisterPrivateKey(&xf86CreateRootWindowKeyRec, PRIVATE_SCREEN, 0))

-      FatalError("Cannot register DDX private keys");

-

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

-	xf86VGAarbiterLock(xf86Screens[i]);

-	/*

-	 * Almost everything uses these defaults, and many of those that

-	 * don't, will wrap them.

-	 */

-	xf86Screens[i]->EnableDisableFBAccess = xf86EnableDisableFBAccess;

-#ifdef XFreeXDGA

-	xf86Screens[i]->SetDGAMode = xf86SetDGAMode;

-#endif

-	xf86Screens[i]->DPMSSet = NULL;

-	xf86Screens[i]->LoadPalette = NULL;

-	xf86Screens[i]->SetOverscan = NULL;

-	xf86Screens[i]->DriverFunc = NULL;

-	xf86Screens[i]->pScreen = NULL;

-	scr_index = AddScreen(xf86Screens[i]->ScreenInit, argc, argv);

-	xf86VGAarbiterUnlock(xf86Screens[i]);

-      if (scr_index == i) {

-	/*

-	 * Hook in our ScrnInfoRec, and initialise some other pScreen

-	 * fields.

-	 */

-	dixSetPrivate(&screenInfo.screens[scr_index]->devPrivates,

-		      xf86ScreenKey, xf86Screens[i]);

-	xf86Screens[i]->pScreen = screenInfo.screens[scr_index];

-	/* The driver should set this, but make sure it is set anyway */

-	xf86Screens[i]->vtSema = TRUE;

-      } else {

-	/* This shouldn't normally happen */

-	FatalError("AddScreen/ScreenInit failed for driver %d\n", i);

-      }

-

-      DebugF("InitOutput - xf86Screens[%d]->pScreen = %p\n",

-	     i, xf86Screens[i]->pScreen );

-      DebugF("xf86Screens[%d]->pScreen->CreateWindow = %p\n",

-	     i, xf86Screens[i]->pScreen->CreateWindow );

-

-      dixSetPrivate(&screenInfo.screens[scr_index]->devPrivates,

-		    xf86CreateRootWindowKey,

-		    xf86Screens[i]->pScreen->CreateWindow);

-      xf86Screens[i]->pScreen->CreateWindow = xf86CreateRootWindow;

-

-    if (PictureGetSubpixelOrder (xf86Screens[i]->pScreen) == SubPixelUnknown)

-    {

-	xf86MonPtr DDC = (xf86MonPtr)(xf86Screens[i]->monitor->DDC);

-	PictureSetSubpixelOrder (xf86Screens[i]->pScreen,

-				 DDC ?

-				 (DDC->features.input_type ?

-				  SubPixelHorizontalRGB : SubPixelNone) :

-				 SubPixelUnknown);

-    }

-#ifdef RANDR

-    if (!xf86Info.disableRandR)

-	xf86RandRInit (screenInfo.screens[scr_index]);

-    xf86Msg(xf86Info.randRFrom, "RandR %s\n",

-	    xf86Info.disableRandR ? "disabled" : "enabled");

-#endif

-  }

-

-  xf86PostScreenInit();

-

-  xf86InitOrigins();

-

-  xf86Resetting = FALSE;

-  xf86Initialising = FALSE;

-

-  RegisterBlockAndWakeupHandlers((BlockHandlerProcPtr)NoopDDA, xf86Wakeup,

-				 NULL);

-}

-

-/*

- * InitInput --

- *      Initialize all supported input devices.

- */

-

-void

-InitInput(int argc, char **argv)

-{

-    InputInfoPtr* pDev;

-    DeviceIntPtr dev;

-

-    xf86Info.vtRequestsPending = FALSE;

-

-    mieqInit();

-

-    GetEventList(&xf86Events);

-

-    /* Call the PreInit function for each input device instance. */

-    for (pDev = xf86ConfigLayout.inputs; pDev && *pDev; pDev++) {

-        /* Replace obsolete keyboard driver with kbd */

-        if (!xf86NameCmp((*pDev)->driver, "keyboard")) {

-            strcpy((*pDev)->driver, "kbd");

-        }

-

-        /* If one fails, the others will too */

-        if (xf86NewInputDevice(*pDev, &dev, TRUE) == BadAlloc)

-            break;

-    }

-

-    config_init();

-}

-

-void

-CloseInput (void)

-{

-    config_fini();

-}

-

-/*

- * OsVendorInit --

- *      OS/Vendor-specific initialisations.  Called from OsInit(), which

- *      is called by dix before establishing the well known sockets.

- */

-

-void

-OsVendorInit(void)

-{

-  static Bool beenHere = FALSE;

-

-  signal(SIGCHLD, SIG_DFL);	/* Need to wait for child processes */

-

-  if (!beenHere) {

-    umask(022);

-    xf86LogInit();

-  }

-

-        /* Set stderr to non-blocking. */

-#ifndef O_NONBLOCK

-#if defined(FNDELAY)

-#define O_NONBLOCK FNDELAY

-#elif defined(O_NDELAY)

-#define O_NONBLOCK O_NDELAY

-#endif

-

-#ifdef O_NONBLOCK

-  if (!beenHere) {

-    if (geteuid() == 0 && getuid() != geteuid())

-    {

-      int status;

-

-      status = fcntl(fileno(stderr), F_GETFL, 0);

-      if (status != -1) {

-	fcntl(fileno(stderr), F_SETFL, status | O_NONBLOCK);

-      }

-    }

-  }

-#endif

-#endif

-

-  beenHere = TRUE;

-}

-

-/*

- * ddxGiveUp --

- *      Device dependent cleanup. Called by by dix before normal server death.

- *      For SYSV386 we must switch the terminal back to normal mode. No error-

- *      checking here, since there should be restored as much as possible.

- */

-

-void

-ddxGiveUp(void)

-{

-    int i;

-

-    xf86VGAarbiterFini();

-

-#ifdef XF86PM

-    if (xf86OSPMClose)

-	xf86OSPMClose();

-    xf86OSPMClose = NULL;

-#endif

-

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

-	/*

-	 * zero all access functions to

-	 * trap calls when switched away.

-	 */

-	xf86Screens[i]->vtSema = FALSE;

-    }

-

-#ifdef XFreeXDGA

-    DGAShutdown();

-#endif

-

-    if (xorgHWOpenConsole)

-	xf86CloseConsole();

-

-    xf86CloseLog();

-

-    /* If an unexpected signal was caught, dump a core for debugging */

-    if (xf86Info.caughtSignal)

-	OsAbort();

-}

-

-

-

-/*

- * AbortDDX --

- *      DDX - specific abort routine.  Called by AbortServer(). The attempt is

- *      made to restore all original setting of the displays. Also all devices

- *      are closed.

- */

-

-void

-AbortDDX(void)

-{

-  int i;

-

-  /*

-   * try to restore the original video state

-   */

-#ifdef DPMSExtension /* Turn screens back on */

-  if (DPMSPowerLevel != DPMSModeOn)

-      DPMSSet(serverClient, DPMSModeOn);

-#endif

-  if (xf86Screens) {

-      if (xf86Screens[0]->vtSema)

-	  xf86EnterServerState(SETUP);

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

-	  if (xf86Screens[i]->vtSema) {

-	      /*

-	       * if we are aborting before ScreenInit() has finished

-	       * we might not have been wrapped yet. Therefore enable

-	       * screen explicitely.

-	       */

-	      xf86VGAarbiterLock(xf86Screens[i]);

-	      (xf86Screens[i]->LeaveVT)(i, 0);

-	      xf86VGAarbiterUnlock(xf86Screens[i]);

-	  }

-  }

-

-  xf86AccessLeave();

-

-  /*

-   * This is needed for an abnormal server exit, since the normal exit stuff

-   * MUST also be performed (i.e. the vt must be left in a defined state)

-   */

-  ddxGiveUp();

-}

-

-void

-OsVendorFatalError(void)

-{

-#ifdef VENDORSUPPORT

-    ErrorF("\nPlease refer to your Operating System Vendor support pages\n"

-	   "at %s for support on this crash.\n",VENDORSUPPORT);

-#else

-    ErrorF("\nPlease consult the "XVENDORNAME" support \n"

-	   "\t at "__VENDORDWEBSUPPORT__"\n for help. \n");

-#endif

-    if (xf86LogFile && xf86LogFileWasOpened)

-	ErrorF("Please also check the log file at \"%s\" for additional "

-              "information.\n", xf86LogFile);

-    ErrorF("\n");

-}

-

-int

-xf86SetVerbosity(int verb)

-{

-    int save = xf86Verbose;

-

-    xf86Verbose = verb;

-    LogSetParameter(XLOG_VERBOSITY, verb);

-    return save;

-}

-

-int

-xf86SetLogVerbosity(int verb)

-{

-    int save = xf86LogVerbose;

-

-    xf86LogVerbose = verb;

-    LogSetParameter(XLOG_FILE_VERBOSITY, verb);

-    return save;

-}

-

-static void

-xf86PrintDefaultModulePath(void)

-{

-  ErrorF("%s\n", DEFAULT_MODULE_PATH);

-}

-

-static void

-xf86PrintDefaultLibraryPath(void)

-{

-  ErrorF("%s\n", DEFAULT_LIBRARY_PATH);

-}

-

-/*

- * ddxProcessArgument --

- *	Process device-dependent command line args. Returns 0 if argument is

- *      not device dependent, otherwise Count of number of elements of argv

- *      that are part of a device dependent commandline option.

- *

- */

-

-/* ARGSUSED */

-int

-ddxProcessArgument(int argc, char **argv, int i)

-{

-#define CHECK_FOR_REQUIRED_ARGUMENT() \

-    if (((i + 1) >= argc) || (!argv[i + 1])) { 				\

-      ErrorF("Required argument to %s not specified\n", argv[i]); 	\

-      UseMsg(); 							\

-      FatalError("Required argument to %s not specified\n", argv[i]);	\

-    }

-

-  /* First the options that are only allowed for root */

-  if (!strcmp(argv[i], "-modulepath") || !strcmp(argv[i], "-logfile")) {

-    if ( (geteuid() == 0) && (getuid() != 0) ) {

-      FatalError("The '%s' option can only be used by root.\n", argv[i]);

-    }

-    else if (!strcmp(argv[i], "-modulepath"))

-    {

-      char *mp;

-      CHECK_FOR_REQUIRED_ARGUMENT();

-      mp = strdup(argv[i + 1]);

-      if (!mp)

-	FatalError("Can't allocate memory for ModulePath\n");

-      xf86ModulePath = mp;

-      xf86ModPathFrom = X_CMDLINE;

-      return 2;

-    }

-    else if (!strcmp(argv[i], "-logfile"))

-    {

-      char *lf;

-      CHECK_FOR_REQUIRED_ARGUMENT();

-      lf = strdup(argv[i + 1]);

-      if (!lf)

-	FatalError("Can't allocate memory for LogFile\n");

-      xf86LogFile = lf;

-      xf86LogFileFrom = X_CMDLINE;

-      return 2;

-    }

-  }

-  if (!strcmp(argv[i], "-config") || !strcmp(argv[i], "-xf86config"))

-  {

-    CHECK_FOR_REQUIRED_ARGUMENT();

-    if (getuid() != 0 && !xf86PathIsSafe(argv[i + 1])) {

-      FatalError("\nInvalid argument for %s\n"

-	  "\tFor non-root users, the file specified with %s must be\n"

-	  "\ta relative path and must not contain any \"..\" elements.\n"

-	  "\tUsing default "__XCONFIGFILE__" search path.\n\n",

-	  argv[i], argv[i]);

-    }

-    xf86ConfigFile = argv[i + 1];

-    return 2;

-  }

-  if (!strcmp(argv[i], "-configdir"))

-  {

-    CHECK_FOR_REQUIRED_ARGUMENT();

-    if (getuid() != 0 && !xf86PathIsSafe(argv[i + 1])) {

-      FatalError("\nInvalid argument for %s\n"

-	  "\tFor non-root users, the file specified with %s must be\n"

-	  "\ta relative path and must not contain any \"..\" elements.\n"

-	  "\tUsing default "__XCONFIGDIR__" search path.\n\n",

-	  argv[i], argv[i]);

-    }

-    xf86ConfigDir = argv[i + 1];

-    return 2;

-  }

-  if (!strcmp(argv[i],"-flipPixels"))

-  {

-    xf86FlipPixels = TRUE;

-    return 1;

-  }

-#ifdef XF86VIDMODE

-  if (!strcmp(argv[i],"-disableVidMode"))

-  {

-    xf86VidModeDisabled = TRUE;

-    return 1;

-  }

-  if (!strcmp(argv[i],"-allowNonLocalXvidtune"))

-  {

-    xf86VidModeAllowNonLocal = TRUE;

-    return 1;

-  }

-#endif

-  if (!strcmp(argv[i],"-allowMouseOpenFail"))

-  {

-    xf86AllowMouseOpenFail = TRUE;

-    return 1;

-  }

-  if (!strcmp(argv[i],"-ignoreABI"))

-  {

-    LoaderSetOptions(LDR_OPT_ABI_MISMATCH_NONFATAL);

-    return 1;

-  }

-  if (!strcmp(argv[i],"-verbose"))

-  {

-    if (++i < argc && argv[i])

-    {

-      char *end;

-      long val;

-      val = strtol(argv[i], &end, 0);

-      if (*end == '\0')

-      {

-	xf86SetVerbosity(val);

-	return 2;

-      }

-    }

-    xf86SetVerbosity(++xf86Verbose);

-    return 1;

-  }

-  if (!strcmp(argv[i],"-logverbose"))

-  {

-    if (++i < argc && argv[i])

-    {

-      char *end;

-      long val;

-      val = strtol(argv[i], &end, 0);

-      if (*end == '\0')

-      {

-	xf86SetLogVerbosity(val);

-	return 2;

-      }

-    }

-    xf86SetLogVerbosity(++xf86LogVerbose);

-    return 1;

-  }

-  if (!strcmp(argv[i],"-quiet"))

-  {

-    xf86SetVerbosity(-1);

-    return 1;

-  }

-  if (!strcmp(argv[i],"-showconfig") || !strcmp(argv[i],"-version"))

-  {

-    xf86PrintBanner();

-    exit(0);

-  }

-  if (!strcmp(argv[i],"-showDefaultModulePath"))

-  {

-    xf86PrintDefaultModulePath();

-    exit(0);

-  }

-  if (!strcmp(argv[i],"-showDefaultLibPath"))

-  {

-    xf86PrintDefaultLibraryPath();

-    exit(0);

-  }

-  /* Notice the -fp flag, but allow it to pass to the dix layer */

-  if (!strcmp(argv[i], "-fp"))

-  {

-    xf86fpFlag = TRUE;

-    return 0;

-  }

-  /* Notice the -bs flag, but allow it to pass to the dix layer */

-  if (!strcmp(argv[i], "-bs"))

-  {

-    xf86bsDisableFlag = TRUE;

-    return 0;

-  }

-  /* Notice the +bs flag, but allow it to pass to the dix layer */

-  if (!strcmp(argv[i], "+bs"))

-  {

-    xf86bsEnableFlag = TRUE;

-    return 0;

-  }

-  /* Notice the -s flag, but allow it to pass to the dix layer */

-  if (!strcmp(argv[i], "-s"))

-  {

-    xf86sFlag = TRUE;

-    return 0;

-  }

-  if (!strcmp(argv[i], "-pixmap24"))

-  {

-    xf86Pix24 = Pix24Use24;

-    return 1;

-  }

-  if (!strcmp(argv[i], "-pixmap32"))

-  {

-    xf86Pix24 = Pix24Use32;

-    return 1;

-  }

-  if (!strcmp(argv[i], "-fbbpp"))

-  {

-    int bpp;

-    CHECK_FOR_REQUIRED_ARGUMENT();

-    if (sscanf(argv[++i], "%d", &bpp) == 1)

-    {

-      xf86FbBpp = bpp;

-      return 2;

-    }

-    else

-    {

-      ErrorF("Invalid fbbpp\n");

-      return 0;

-    }

-  }

-  if (!strcmp(argv[i], "-depth"))

-  {

-    int depth;

-    CHECK_FOR_REQUIRED_ARGUMENT();

-    if (sscanf(argv[++i], "%d", &depth) == 1)

-    {

-      xf86Depth = depth;

-      return 2;

-    }

-    else

-    {

-      ErrorF("Invalid depth\n");

-      return 0;

-    }

-  }

-  if (!strcmp(argv[i], "-weight"))

-  {

-    int red, green, blue;

-    CHECK_FOR_REQUIRED_ARGUMENT();

-    if (sscanf(argv[++i], "%1d%1d%1d", &red, &green, &blue) == 3)

-    {

-      xf86Weight.red = red;

-      xf86Weight.green = green;

-      xf86Weight.blue = blue;

-      return 2;

-    }

-    else

-    {

-      ErrorF("Invalid weighting\n");

-      return 0;

-    }

-  }

-  if (!strcmp(argv[i], "-gamma")  || !strcmp(argv[i], "-rgamma") ||

-      !strcmp(argv[i], "-ggamma") || !strcmp(argv[i], "-bgamma"))

-  {

-    double gamma;

-    CHECK_FOR_REQUIRED_ARGUMENT();

-    if (sscanf(argv[++i], "%lf", &gamma) == 1) {

-       if (gamma < GAMMA_MIN || gamma > GAMMA_MAX) {

-	  ErrorF("gamma out of range, only  %.2f <= gamma_value <= %.1f"

-		 " is valid\n", GAMMA_MIN, GAMMA_MAX);

-	  return 0;

-       }

-       if (!strcmp(argv[i-1], "-gamma"))

-	  xf86Gamma.red = xf86Gamma.green = xf86Gamma.blue = gamma;

-       else if (!strcmp(argv[i-1], "-rgamma")) xf86Gamma.red = gamma;

-       else if (!strcmp(argv[i-1], "-ggamma")) xf86Gamma.green = gamma;

-       else if (!strcmp(argv[i-1], "-bgamma")) xf86Gamma.blue = gamma;

-       return 2;

-    }

-  }

-  if (!strcmp(argv[i], "-layout"))

-  {

-    CHECK_FOR_REQUIRED_ARGUMENT();

-    xf86LayoutName = argv[++i];

-    return 2;

-  }

-  if (!strcmp(argv[i], "-screen"))

-  {

-    CHECK_FOR_REQUIRED_ARGUMENT();

-    xf86ScreenName = argv[++i];

-    return 2;

-  }

-  if (!strcmp(argv[i], "-pointer"))

-  {

-    CHECK_FOR_REQUIRED_ARGUMENT();

-    xf86PointerName = argv[++i];

-    return 2;

-  }

-  if (!strcmp(argv[i], "-keyboard"))

-  {

-    CHECK_FOR_REQUIRED_ARGUMENT();

-    xf86KeyboardName = argv[++i];

-    return 2;

-  }

-  if (!strcmp(argv[i], "-nosilk"))

-  {

-    xf86silkenMouseDisableFlag = TRUE;

-    return 1;

-  }

-#ifdef HAVE_ACPI

-  if (!strcmp(argv[i], "-noacpi"))

-  {

-    xf86acpiDisableFlag = TRUE;

-    return 1;

-  }

-#endif

-  if (!strcmp(argv[i], "-configure"))

-  {

-    if (getuid() != 0 && geteuid() == 0) {

-	ErrorF("The '-configure' option can only be used by root.\n");

-	exit(1);

-    }

-    xf86DoConfigure = TRUE;

-    xf86AllowMouseOpenFail = TRUE;

-    return 1;

-  }

-  if (!strcmp(argv[i], "-showopts"))

-  {

-    if (getuid() != 0 && geteuid() == 0) {

-    ErrorF("The '-showopts' option can only be used by root.\n");

-    exit(1);

-    }

-    xf86DoShowOptions = TRUE;

-    return 1;

-  }

-  if (!strcmp(argv[i], "-isolateDevice"))

-  {

-    CHECK_FOR_REQUIRED_ARGUMENT();

-    if (strncmp(argv[++i], "PCI:", 4)) {

-       FatalError("Bus types other than PCI not yet isolable\n");

-    }

-    xf86PciIsolateDevice(argv[i]);

-    return 2;

-  }

-  /* Notice cmdline xkbdir, but pass to dix as well */

-  if (!strcmp(argv[i], "-xkbdir"))

-  {

-    xf86xkbdirFlag = TRUE;

-    return 0;

-  }

-

-  /* OS-specific processing */

-  return xf86ProcessArgument(argc, argv, i);

-}

-

-/*

- * ddxUseMsg --

- *	Print out correct use of device dependent commandline options.

- *      Maybe the user now knows what really to do ...

- */

-

-void

-ddxUseMsg(void)

-{

-  ErrorF("\n");

-  ErrorF("\n");

-  ErrorF("Device Dependent Usage\n");

-  if (getuid() == 0 || geteuid() != 0)

-  {

-    ErrorF("-modulepath paths      specify the module search path\n");

-    ErrorF("-logfile file          specify a log file name\n");

-    ErrorF("-configure             probe for devices and write an "__XCONFIGFILE__"\n");

-    ErrorF("-showopts              print available options for all installed drivers\n");

-  }

-  ErrorF("-config file           specify a configuration file, relative to the\n");

-  ErrorF("                       "__XCONFIGFILE__" search path, only root can use absolute\n");

-  ErrorF("-configdir dir         specify a configuration directory, relative to the\n");

-  ErrorF("                       "__XCONFIGDIR__" search path, only root can use absolute\n");

-  ErrorF("-verbose [n]           verbose startup messages\n");

-  ErrorF("-logverbose [n]        verbose log messages\n");

-  ErrorF("-quiet                 minimal startup messages\n");

-  ErrorF("-pixmap24              use 24bpp pixmaps for depth 24\n");

-  ErrorF("-pixmap32              use 32bpp pixmaps for depth 24\n");

-  ErrorF("-fbbpp n               set bpp for the framebuffer. Default: 8\n");

-  ErrorF("-depth n               set colour depth. Default: 8\n");

-  ErrorF("-gamma f               set gamma value (0.1 < f < 10.0) Default: 1.0\n");

-  ErrorF("-rgamma f              set gamma value for red phase\n");

-  ErrorF("-ggamma f              set gamma value for green phase\n");

-  ErrorF("-bgamma f              set gamma value for blue phase\n");

-  ErrorF("-weight nnn            set RGB weighting at 16 bpp.  Default: 565\n");

-  ErrorF("-layout name           specify the ServerLayout section name\n");

-  ErrorF("-screen name           specify the Screen section name\n");

-  ErrorF("-keyboard name         specify the core keyboard InputDevice name\n");

-  ErrorF("-pointer name          specify the core pointer InputDevice name\n");

-  ErrorF("-nosilk                disable Silken Mouse\n");

-  ErrorF("-flipPixels            swap default black/white Pixel values\n");

-#ifdef XF86VIDMODE

-  ErrorF("-disableVidMode        disable mode adjustments with xvidtune\n");

-  ErrorF("-allowNonLocalXvidtune allow xvidtune to be run as a non-local client\n");

-#endif

-  ErrorF("-allowMouseOpenFail    start server even if the mouse can't be initialized\n");

-  ErrorF("-ignoreABI             make module ABI mismatches non-fatal\n");

-  ErrorF("-isolateDevice bus_id  restrict device resets to bus_id (PCI only)\n");

-  ErrorF("-version               show the server version\n");

-  ErrorF("-showDefaultModulePath show the server default module path\n");

-  ErrorF("-showDefaultLibPath    show the server default library path\n");

-  /* OS-specific usage */

-  xf86UseMsg();

-  ErrorF("\n");

-}

-

-

-/*

- * xf86LoadModules iterates over a list that is being passed in.

- */

-Bool

-xf86LoadModules(char **list, pointer *optlist)

-{

-    int errmaj, errmin;

-    pointer opt;

-    int i;

-    char *name;

-    Bool failed = FALSE;

-

-    if (!list)

-	return TRUE;

-

-    for (i = 0; list[i] != NULL; i++) {

-

-	/* Normalise the module name */

-	name = xf86NormalizeName(list[i]);

-

-	/* Skip empty names */

-	if (name == NULL || *name == '\0')

-	    continue;

-

-	/* Replace obsolete keyboard driver with kbd */

-	if (!xf86NameCmp(name, "keyboard")) {

-	    strcpy(name, "kbd");

-	}

-

-	if (optlist)

-	    opt = optlist[i];

-	else

-	    opt = NULL;

-

-        if (!LoadModule(name, NULL, NULL, NULL, opt, NULL, &errmaj, &errmin)) {

-	    LoaderErrorMsg(NULL, name, errmaj, errmin);

-	    failed = TRUE;

-	}

-	free(name);

-    }

-    return !failed;

-}

-

-/* Pixmap format stuff */

-

-PixmapFormatPtr

-xf86GetPixFormat(ScrnInfoPtr pScrn, int depth)

-{

-    int i;

-    static PixmapFormatRec format;	/* XXX not reentrant */

-

-    /*

-     * When the formats[] list initialisation isn't complete, check the

-     * depth 24 pixmap config/cmdline options and screen-specified formats.

-     */

-

-    if (!formatsDone) {

-	if (depth == 24) {

-	    Pix24Flags pix24 = Pix24DontCare;

-

-	    format.depth = 24;

-	    format.scanlinePad = BITMAP_SCANLINE_PAD;

-	    if (xf86Info.pixmap24 != Pix24DontCare)

-		pix24 = xf86Info.pixmap24;

-	    else if (pScrn->pixmap24 != Pix24DontCare)

-		pix24 = pScrn->pixmap24;

-	    if (pix24 == Pix24Use24)

-		format.bitsPerPixel = 24;

-	    else

-		format.bitsPerPixel = 32;

-	    return &format;

-	}

-    }

-

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

-	if (formats[i].depth == depth)

-	   break;

-    if (i != numFormats)

-	return &formats[i];

-    else if (!formatsDone) {

-	/* Check for screen-specified formats */

-	for (i = 0; i < pScrn->numFormats; i++)

-	    if (pScrn->formats[i].depth == depth)

-		break;

-	if (i != pScrn->numFormats)

-	    return &pScrn->formats[i];

-    }

-    return NULL;

-}

-

-int

-xf86GetBppFromDepth(ScrnInfoPtr pScrn, int depth)

-{

-    PixmapFormatPtr format;

-

-

-    format = xf86GetPixFormat(pScrn, depth);

-    if (format)

-	return format->bitsPerPixel;

-    else

-	return 0;

-}

+/*
+ * Loosely based on code bearing the following copyright:
+ *
+ *   Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
+ */
+/*
+ * Copyright (c) 1992-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).
+ */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include <stdlib.h>
+#include <errno.h>
+
+#undef HAS_UTSNAME
+#if !defined(WIN32)
+#define HAS_UTSNAME 1
+#include <sys/utsname.h>
+#endif
+
+#include <X11/X.h>
+#include <X11/Xmd.h>
+#include <X11/Xproto.h>
+#include <X11/Xatom.h>
+#include "input.h"
+#include "servermd.h"
+#include "windowstr.h"
+#include "scrnintstr.h"
+#include "site.h"
+#include "mi.h"
+
+#include "compiler.h"
+
+#include "loaderProcs.h"
+#ifdef XFreeXDGA
+#include "dgaproc.h"
+#endif
+
+#define XF86_OS_PRIVS
+#include "xf86.h"
+#include "xf86Priv.h"
+#include "xf86Config.h"
+#include "xf86_OSlib.h"
+#include "xf86cmap.h"
+#include "xorgVersion.h"
+#include "xf86Build.h"
+#include "mipointer.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+#include "xf86DDC.h"
+#include "xf86Xinput.h"
+#include "xf86InPriv.h"
+#include "picturestr.h"
+
+#include "xf86Bus.h"
+#include "xf86VGAarbiter.h"
+#include "globals.h"
+
+#ifdef DPMSExtension
+#include <X11/extensions/dpmsconst.h>
+#include "dpmsproc.h"
+#endif
+#include <hotplug.h>
+
+
+#ifdef XF86PM
+void (*xf86OSPMClose)(void) = NULL;
+#endif
+static Bool xorgHWOpenConsole = FALSE;
+
+/* Common pixmap formats */
+
+static PixmapFormatRec formats[MAXFORMATS] = {
+	{ 1,	1,	BITMAP_SCANLINE_PAD },
+	{ 4,	8,	BITMAP_SCANLINE_PAD },
+	{ 8,	8,	BITMAP_SCANLINE_PAD },
+	{ 15,	16,	BITMAP_SCANLINE_PAD },
+	{ 16,	16,	BITMAP_SCANLINE_PAD },
+	{ 24,	32,	BITMAP_SCANLINE_PAD },
+	{ 32,	32,	BITMAP_SCANLINE_PAD },
+};
+static int numFormats = 7;
+static Bool formatsDone = FALSE;
+
+#ifndef OSNAME
+#define OSNAME " unknown"
+#endif
+#ifndef OSVENDOR
+#define OSVENDOR ""
+#endif
+#ifndef PRE_RELEASE
+#define PRE_RELEASE XORG_VERSION_SNAP
+#endif
+
+static void
+xf86PrintBanner(void)
+{
+#if PRE_RELEASE
+  xf86ErrorFVerb(0, "\n"
+    "This is a pre-release version of the X server from " XVENDORNAME ".\n"
+    "It is not supported in any way.\n"
+    "Bugs may be filed in the bugzilla at http://bugs.freedesktop.org/.\n"
+    "Select the \"xorg\" product for bugs you find in this release.\n"
+    "Before reporting bugs in pre-release versions please check the\n"
+    "latest version in the X.Org Foundation git repository.\n"
+    "See http://wiki.x.org/wiki/GitPage for git access instructions.\n");
+#endif
+  xf86ErrorFVerb(0, "\nX.Org X Server %d.%d.%d",
+	 XORG_VERSION_MAJOR,
+	 XORG_VERSION_MINOR,
+	 XORG_VERSION_PATCH);
+#if XORG_VERSION_SNAP > 0
+  xf86ErrorFVerb(0, ".%d", XORG_VERSION_SNAP);
+#endif
+
+#if XORG_VERSION_SNAP >= 900
+  /* When the minor number is 99, that signifies that the we are making
+   * a release candidate for a major version.  (X.0.0)
+   * When the patch number is 99, that signifies that the we are making
+   * a release candidate for a minor version.  (X.Y.0)
+   * When the patch number is < 99, then we are making a release
+   * candidate for the next point release.  (X.Y.Z)
+   */
+#if XORG_VERSION_MINOR >= 99
+  xf86ErrorFVerb(0, " (%d.0.0 RC %d)", XORG_VERSION_MAJOR+1,
+                 XORG_VERSION_SNAP - 900);
+#elif XORG_VERSION_PATCH == 99
+  xf86ErrorFVerb(0, " (%d.%d.0 RC %d)", XORG_VERSION_MAJOR,
+                 XORG_VERSION_MINOR + 1, XORG_VERSION_SNAP - 900);
+#else
+  xf86ErrorFVerb(0, " (%d.%d.%d RC %d)", XORG_VERSION_MAJOR,
+                 XORG_VERSION_MINOR, XORG_VERSION_PATCH + 1,
+                 XORG_VERSION_SNAP - 900);
+#endif
+#endif
+
+#ifdef XORG_CUSTOM_VERSION
+  xf86ErrorFVerb(0, " (%s)", XORG_CUSTOM_VERSION);
+#endif
+#ifndef XORG_DATE
+# define XORG_DATE "Unknown"
+#endif
+  xf86ErrorFVerb(0, "\nRelease Date: %s\n", XORG_DATE);
+  xf86ErrorFVerb(0, "X Protocol Version %d, Revision %d\n",
+         X_PROTOCOL, X_PROTOCOL_REVISION);
+  xf86ErrorFVerb(0, "Build Operating System: %s %s\n", OSNAME, OSVENDOR);
+#ifdef HAS_UTSNAME
+  {
+    struct utsname name;
+
+    /* Linux & BSD state that 0 is success, SysV (including Solaris, HP-UX,
+       and Irix) and Single Unix Spec 3 just say that non-negative is success.
+       All agree that failure is represented by a negative number.
+     */
+    if (uname(&name) >= 0) {
+      xf86ErrorFVerb(0, "Current Operating System: %s %s %s %s %s\n",
+	name.sysname, name.nodename, name.release, name.version, name.machine);
+#ifdef linux
+      do {
+	  char buf[80];
+	  int fd = open("/proc/cmdline", O_RDONLY);
+	  if (fd != -1) {
+	    xf86ErrorFVerb(0, "Kernel command line: ");
+	    memset(buf, 0, 80);
+	    while (read(fd, buf, 80) > 0) {
+		xf86ErrorFVerb(0, "%.80s", buf);
+		memset(buf, 0, 80);
+	    }
+	    close(fd);
+	  } 
+      } while (0);
+#endif
+    }
+  }
+#endif
+#if defined(BUILD_DATE) && (BUILD_DATE > 19000000)
+  {
+    struct tm t;
+    char buf[100];
+
+    memset(&t, 0, sizeof(t));
+    memset(buf, 0, sizeof(buf));
+    t.tm_mday = BUILD_DATE % 100;
+    t.tm_mon = (BUILD_DATE / 100) % 100 - 1;
+    t.tm_year = BUILD_DATE / 10000 - 1900;
+#if defined(BUILD_TIME)
+    t.tm_sec = BUILD_TIME % 100;
+    t.tm_min = (BUILD_TIME / 100) % 100;
+    t.tm_hour = (BUILD_TIME / 10000) % 100;
+    if (strftime(buf, sizeof(buf), "%d %B %Y  %I:%M:%S%p", &t))
+       xf86ErrorFVerb(0, "Build Date: %s\n", buf);
+#else
+    if (strftime(buf, sizeof(buf), "%d %B %Y", &t))
+       xf86ErrorFVerb(0, "Build Date: %s\n", buf);
+#endif
+  }
+#endif
+#if defined(BUILDERSTRING)
+  xf86ErrorFVerb(0, "%s \n", BUILDERSTRING);
+#endif
+  xf86ErrorFVerb(0, "Current version of pixman: %s\n",
+                 pixman_version_string());
+  xf86ErrorFVerb(0, "\tBefore reporting problems, check "
+                 ""__VENDORDWEBSUPPORT__"\n"
+                 "\tto make sure that you have the latest version.\n");
+}
+
+static void
+xf86PrintMarkers(void)
+{
+  LogPrintMarkers();
+}
+
+static Bool
+xf86CreateRootWindow(WindowPtr pWin)
+{
+  int ret = TRUE;
+  int err = Success;
+  ScreenPtr pScreen = pWin->drawable.pScreen;
+  RootWinPropPtr pProp;
+  CreateWindowProcPtr CreateWindow = (CreateWindowProcPtr)
+      dixLookupPrivate(&pScreen->devPrivates, xf86CreateRootWindowKey);
+
+  DebugF("xf86CreateRootWindow(%p)\n", pWin);
+
+  if ( pScreen->CreateWindow != xf86CreateRootWindow ) {
+    /* Can't find hook we are hung on */
+	xf86DrvMsg(pScreen->myNum, X_WARNING /* X_ERROR */,
+		  "xf86CreateRootWindow %p called when not in pScreen->CreateWindow %p n",
+		   (void *)xf86CreateRootWindow,
+		   (void *)pScreen->CreateWindow );
+  }
+
+  /* Unhook this function ... */
+  pScreen->CreateWindow = CreateWindow;
+  dixSetPrivate(&pScreen->devPrivates, xf86CreateRootWindowKey, NULL);
+
+  /* ... and call the previous CreateWindow fuction, if any */
+  if (NULL!=pScreen->CreateWindow) {
+    ret = (*pScreen->CreateWindow)(pWin);
+  }
+
+  /* Now do our stuff */
+  if (xf86RegisteredPropertiesTable != NULL) {
+    if (pWin->parent == NULL && xf86RegisteredPropertiesTable != NULL) {
+      for (pProp = xf86RegisteredPropertiesTable[pScreen->myNum];
+	   pProp != NULL && err==Success;
+	   pProp = pProp->next )
+	{
+	  Atom prop;
+
+	  prop = MakeAtom(pProp->name, strlen(pProp->name), TRUE);
+	  err = dixChangeWindowProperty(serverClient, pWin,
+					prop, pProp->type,
+					pProp->format, PropModeReplace,
+					pProp->size, pProp->data,
+					FALSE);
+	}
+
+      /* Look at err */
+      ret &= (err==Success);
+
+    } else {
+      xf86Msg(X_ERROR, "xf86CreateRootWindow unexpectedly called with "
+	      "non-root window %p (parent %p)\n",
+	      (void *)pWin, (void *)pWin->parent);
+      ret = FALSE;
+    }
+  }
+
+  DebugF("xf86CreateRootWindow() returns %d\n", ret);
+  return ret;
+}
+
+
+static void
+InstallSignalHandlers(void)
+{
+    /*
+     * Install signal handler for unexpected signals
+     */
+    xf86Info.caughtSignal=FALSE;
+    if (!xf86Info.notrapSignals) {
+	OsRegisterSigWrapper(xf86SigWrapper);
+    } else {
+	signal(SIGSEGV, SIG_DFL);
+	signal(SIGILL, SIG_DFL);
+#ifdef SIGEMT
+	signal(SIGEMT, SIG_DFL);
+#endif
+	signal(SIGFPE, SIG_DFL);
+	signal(SIGBUS, SIG_DFL);
+	signal(SIGSYS, SIG_DFL);
+	signal(SIGXCPU, SIG_DFL);
+	signal(SIGXFSZ, SIG_DFL);
+    }
+}
+
+/*
+ * InitOutput --
+ *	Initialize screenInfo for all actually accessible framebuffers.
+ *      That includes vt-manager setup, querying all possible devices and
+ *      collecting the pixmap formats.
+ */
+void
+InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
+{
+  int                    i, j, k, scr_index, was_blocked = 0;
+  char                   **modulelist;
+  pointer                *optionlist;
+  Pix24Flags		 screenpix24, pix24;
+  MessageType		 pix24From = X_DEFAULT;
+  Bool			 pix24Fail = FALSE;
+  Bool			 autoconfig = FALSE;
+  GDevPtr		 configured_device;
+
+  xf86Initialising = TRUE;
+
+  if (serverGeneration == 1) {
+    if ((xf86ServerName = strrchr(argv[0], '/')) != 0)
+      xf86ServerName++;
+    else
+      xf86ServerName = argv[0];
+
+	xf86PrintBanner();
+	xf86PrintMarkers();
+	if (xf86LogFile)  {
+	    time_t t;
+	    const char *ct;
+	    t = time(NULL);
+	    ct = ctime(&t);
+	    xf86MsgVerb(xf86LogFileFrom, 0, "Log file: \"%s\", Time: %s",
+			xf86LogFile, ct);
+	}
+
+    /* Read and parse the config file */
+    if (!xf86DoConfigure && !xf86DoShowOptions) {
+      switch (xf86HandleConfigFile(FALSE)) {
+      case CONFIG_OK:
+	break;
+      case CONFIG_PARSE_ERROR:
+	xf86Msg(X_ERROR, "Error parsing the config file\n");
+	return;
+      case CONFIG_NOFILE:
+	autoconfig = TRUE;
+	break;
+      }
+    }
+
+    InstallSignalHandlers();
+
+    /* Initialise the loader */
+    LoaderInit();
+
+    /* Tell the loader the default module search path */
+    LoaderSetPath(xf86ModulePath);
+
+    if (xf86Info.ignoreABI) {
+        LoaderSetOptions(LDR_OPT_ABI_MISMATCH_NONFATAL);
+    }
+
+    if (xf86DoShowOptions)
+        DoShowOptions();
+
+    /* Do a general bus probe.  This will be a PCI probe for x86 platforms */
+    xf86BusProbe();
+
+    if (xf86DoConfigure)
+	DoConfigure();
+
+    if (autoconfig) {
+	if (!xf86AutoConfig()) {
+	    xf86Msg(X_ERROR, "Auto configuration failed\n");
+	    return;
+	}
+    }
+
+#ifdef XF86PM
+    xf86OSPMClose = xf86OSPMOpen();
+#endif
+
+    /* Load all modules specified explicitly in the config file */
+    if ((modulelist = xf86ModulelistFromConfig(&optionlist))) {
+      xf86LoadModules(modulelist, optionlist);
+      free(modulelist);
+      free(optionlist);
+    }
+
+    /* Load all driver modules specified in the config file */
+    /* If there aren't any specified in the config file, autoconfig them */
+    /* FIXME: Does not handle multiple active screen sections, but I'm not
+     * sure if we really want to handle that case*/
+    configured_device = xf86ConfigLayout.screens->screen->device;
+    if ((!configured_device) || (!configured_device->driver)) {
+        if (!autoConfigDevice(configured_device)) {
+            xf86Msg(X_ERROR, "Automatic driver configuration failed\n");
+            return ;
+        }
+    }
+    if ((modulelist = xf86DriverlistFromConfig())) {
+      xf86LoadModules(modulelist, NULL);
+      free(modulelist);
+    }
+
+    /* Load all input driver modules specified in the config file. */
+    if ((modulelist = xf86InputDriverlistFromConfig())) {
+      xf86LoadModules(modulelist, NULL);
+      free(modulelist);
+    }
+
+    /*
+     * It is expected that xf86AddDriver()/xf86AddInputDriver will be
+     * called for each driver as it is loaded.  Those functions save the
+     * module pointers for drivers.
+     * XXX Nothing keeps track of them for other modules.
+     */
+    /* XXX What do we do if not all of these could be loaded? */
+
+    /*
+     * At this point, xf86DriverList[] is all filled in with entries for
+     * each of the drivers to try and xf86NumDrivers has the number of
+     * drivers.  If there are none, return now.
+     */
+
+    if (xf86NumDrivers == 0) {
+      xf86Msg(X_ERROR, "No drivers available.\n");
+      return;
+    }
+
+    /*
+     * Call each of the Identify functions and call the driverFunc to check
+     * if HW access is required.  The Identify functions print out some
+     * identifying information, and anything else that might be
+     * needed at this early stage.
+     */
+
+    for (i = 0; i < xf86NumDrivers; i++) {
+	if (xf86DriverList[i]->Identify != NULL)
+	    xf86DriverList[i]->Identify(0);
+
+	if (!xorgHWAccess || !xorgHWOpenConsole) {
+	    xorgHWFlags flags;
+	    if(!xf86DriverList[i]->driverFunc
+		|| !xf86DriverList[i]->driverFunc(NULL,
+						  GET_REQUIRED_HW_INTERFACES,
+						  &flags))
+		flags = HW_IO;
+
+	    if(NEED_IO_ENABLED(flags))
+		xorgHWAccess = TRUE;
+	    if(!(flags & HW_SKIP_CONSOLE))
+		xorgHWOpenConsole = TRUE;
+	}
+    }
+
+    if (xorgHWOpenConsole)
+	xf86OpenConsole();
+    else
+	xf86Info.dontVTSwitch = TRUE;
+
+    if (xf86BusConfig() == FALSE)
+        return;
+
+    xf86PostProbe();
+
+    /*
+     * Sort the drivers to match the requested ording.  Using a slow
+     * bubble sort.
+     */
+    for (j = 0; j < xf86NumScreens - 1; j++) {
+	for (i = 0; i < xf86NumScreens - j - 1; i++) {
+	    if (xf86Screens[i + 1]->confScreen->screennum <
+		xf86Screens[i]->confScreen->screennum) {
+		ScrnInfoPtr tmpScrn = xf86Screens[i + 1];
+		xf86Screens[i + 1] = xf86Screens[i];
+		xf86Screens[i] = tmpScrn;
+	    }
+	}
+    }
+    /* Fix up the indexes */
+    for (i = 0; i < xf86NumScreens; i++) {
+	xf86Screens[i]->scrnIndex = i;
+    }
+
+    /*
+     * Call the driver's PreInit()'s to complete initialisation for the first
+     * generation.
+     */
+
+    for (i = 0; i < xf86NumScreens; i++) {
+	xf86VGAarbiterScrnInit(xf86Screens[i]);
+	xf86VGAarbiterLock(xf86Screens[i]);
+	if (xf86Screens[i]->PreInit &&
+	    xf86Screens[i]->PreInit(xf86Screens[i], 0))
+	    xf86Screens[i]->configured = TRUE;
+	xf86VGAarbiterUnlock(xf86Screens[i]);
+    }
+    for (i = 0; i < xf86NumScreens; i++)
+	if (!xf86Screens[i]->configured)
+	    xf86DeleteScreen(i--, 0);
+
+    /*
+     * If no screens left, return now.
+     */
+
+    if (xf86NumScreens == 0) {
+      xf86Msg(X_ERROR,
+	      "Screen(s) found, but none have a usable configuration.\n");
+      return;
+    }
+
+    for (i = 0; i < xf86NumScreens; i++) {
+      if (xf86Screens[i]->name == NULL) {
+	XNFasprintf(&xf86Screens[i]->name, "screen%d", i);
+	xf86MsgVerb(X_WARNING, 0,
+		    "Screen driver %d has no name set, using `%s'.\n",
+		    i, xf86Screens[i]->name);
+      }
+    }
+
+    /* Remove (unload) drivers that are not required */
+    for (i = 0; i < xf86NumDrivers; i++)
+	if (xf86DriverList[i] && xf86DriverList[i]->refCount <= 0)
+	    xf86DeleteDriver(i);
+
+    /*
+     * At this stage we know how many screens there are.
+     */
+
+    for (i = 0; i < xf86NumScreens; i++)
+      xf86InitViewport(xf86Screens[i]);
+
+    /*
+     * Collect all pixmap formats and check for conflicts at the display
+     * level.  Should we die here?  Or just delete the offending screens?
+     */
+    screenpix24 = Pix24DontCare;
+    for (i = 0; i < xf86NumScreens; i++) {
+	if (xf86Screens[i]->imageByteOrder !=
+	    xf86Screens[0]->imageByteOrder)
+	    FatalError("Inconsistent display bitmapBitOrder.  Exiting\n");
+	if (xf86Screens[i]->bitmapScanlinePad !=
+	    xf86Screens[0]->bitmapScanlinePad)
+	    FatalError("Inconsistent display bitmapScanlinePad.  Exiting\n");
+	if (xf86Screens[i]->bitmapScanlineUnit !=
+	    xf86Screens[0]->bitmapScanlineUnit)
+	    FatalError("Inconsistent display bitmapScanlineUnit.  Exiting\n");
+	if (xf86Screens[i]->bitmapBitOrder !=
+	    xf86Screens[0]->bitmapBitOrder)
+	    FatalError("Inconsistent display bitmapBitOrder.  Exiting\n");
+
+	/* Determine the depth 24 pixmap format the screens would like */
+	if (xf86Screens[i]->pixmap24 != Pix24DontCare) {
+	    if (screenpix24 == Pix24DontCare)
+		screenpix24 = xf86Screens[i]->pixmap24;
+	    else if (screenpix24 != xf86Screens[i]->pixmap24)
+		FatalError("Inconsistent depth 24 pixmap format.  Exiting\n");
+	}
+    }
+    /* check if screenpix24 is consistent with the config/cmdline */
+    if (xf86Info.pixmap24 != Pix24DontCare) {
+	pix24 = xf86Info.pixmap24;
+	pix24From = xf86Info.pix24From;
+	if (screenpix24 != Pix24DontCare && screenpix24 != xf86Info.pixmap24)
+	    pix24Fail = TRUE;
+    } else if (screenpix24 != Pix24DontCare) {
+	pix24 = screenpix24;
+	pix24From = X_PROBED;
+    } else
+	pix24 = Pix24Use32;
+
+    if (pix24Fail)
+	FatalError("Screen(s) can't use the required depth 24 pixmap format"
+		   " (%d).  Exiting\n", PIX24TOBPP(pix24));
+
+    /* Initialise the depth 24 format */
+    for (j = 0; j < numFormats && formats[j].depth != 24; j++)
+	;
+    formats[j].bitsPerPixel = PIX24TOBPP(pix24);
+
+    /* Collect additional formats */
+    for (i = 0; i < xf86NumScreens; i++) {
+	for (j = 0; j < xf86Screens[i]->numFormats; j++) {
+	    for (k = 0; ; k++) {
+		if (k >= numFormats) {
+		    if (k >= MAXFORMATS)
+			FatalError("Too many pixmap formats!  Exiting\n");
+		    formats[k] = xf86Screens[i]->formats[j];
+		    numFormats++;
+		    break;
+		}
+		if (formats[k].depth == xf86Screens[i]->formats[j].depth) {
+		    if ((formats[k].bitsPerPixel ==
+			 xf86Screens[i]->formats[j].bitsPerPixel) &&
+		        (formats[k].scanlinePad ==
+			 xf86Screens[i]->formats[j].scanlinePad))
+			break;
+		    FatalError("Inconsistent pixmap format for depth %d."
+			       "  Exiting\n", formats[k].depth);
+		}
+	    }
+	}
+    }
+    formatsDone = TRUE;
+
+    if (xf86Info.vtno >= 0 ) {
+#define VT_ATOM_NAME         "XFree86_VT"
+      Atom VTAtom=-1;
+      CARD32  *VT = NULL;
+      int  ret;
+
+      /* This memory needs to stay available until the screen has been
+	 initialized, and we can create the property for real.
+      */
+      if ( (VT = malloc(sizeof(CARD32)))==NULL ) {
+	FatalError("Unable to make VT property - out of memory. Exiting...\n");
+      }
+      *VT = xf86Info.vtno;
+
+      VTAtom = MakeAtom(VT_ATOM_NAME, sizeof(VT_ATOM_NAME) - 1, TRUE);
+
+      for (i = 0, ret = Success; i < xf86NumScreens && ret == Success; i++) {
+	ret = xf86RegisterRootWindowProperty(xf86Screens[i]->scrnIndex,
+					     VTAtom, XA_INTEGER, 32,
+					     1, VT );
+	if (ret != Success)
+	  xf86DrvMsg(xf86Screens[i]->scrnIndex, X_WARNING,
+		     "Failed to register VT property\n");
+      }
+    }
+
+    /* If a screen uses depth 24, show what the pixmap format is */
+    for (i = 0; i < xf86NumScreens; i++) {
+	if (xf86Screens[i]->depth == 24) {
+	    xf86Msg(pix24From, "Depth 24 pixmap format is %d bpp\n",
+		    PIX24TOBPP(pix24));
+	    break;
+	}
+    }
+  } else {
+    /*
+     * serverGeneration != 1; some OSs have to do things here, too.
+     */
+    if (xorgHWOpenConsole)
+	xf86OpenConsole();
+
+#ifdef XF86PM
+    /*
+      should we reopen it here? We need to deal with an already opened
+      device. We could leave this to the OS layer. For now we simply
+      close it here
+    */
+    if (xf86OSPMClose)
+        xf86OSPMClose();
+    if ((xf86OSPMClose = xf86OSPMOpen()) != NULL)
+	xf86MsgVerb(X_INFO, 3, "APM registered successfully\n");
+#endif
+
+    /* Make sure full I/O access is enabled */
+    if (xorgHWAccess)
+	xf86EnableIO();
+  }
+
+  /*
+   * Use the previously collected parts to setup pScreenInfo
+   */
+
+  pScreenInfo->imageByteOrder = xf86Screens[0]->imageByteOrder;
+  pScreenInfo->bitmapScanlinePad = xf86Screens[0]->bitmapScanlinePad;
+  pScreenInfo->bitmapScanlineUnit = xf86Screens[0]->bitmapScanlineUnit;
+  pScreenInfo->bitmapBitOrder = xf86Screens[0]->bitmapBitOrder;
+  pScreenInfo->numPixmapFormats = numFormats;
+  for (i = 0; i < numFormats; i++)
+    pScreenInfo->formats[i] = formats[i];
+
+  /* Make sure the server's VT is active */
+
+  if (serverGeneration != 1) {
+    xf86Resetting = TRUE;
+    /* All screens are in the same state, so just check the first */
+    if (!xf86Screens[0]->vtSema) {
+#ifdef HAS_USL_VTS
+      ioctl(xf86Info.consoleFd, VT_RELDISP, VT_ACKACQ);
+#endif
+      xf86AccessEnter();
+      was_blocked = xf86BlockSIGIO();
+    }
+  }
+
+  for (i = 0; i < xf86NumScreens; i++)
+      if (!xf86ColormapAllocatePrivates(xf86Screens[i]))
+	  FatalError("Cannot register DDX private keys");
+
+  if (!dixRegisterPrivateKey(&xf86ScreenKeyRec, PRIVATE_SCREEN, 0) ||
+      !dixRegisterPrivateKey(&xf86CreateRootWindowKeyRec, PRIVATE_SCREEN, 0))
+      FatalError("Cannot register DDX private keys");
+
+  for (i = 0; i < xf86NumScreens; i++) {
+	xf86VGAarbiterLock(xf86Screens[i]);
+	/*
+	 * Almost everything uses these defaults, and many of those that
+	 * don't, will wrap them.
+	 */
+	xf86Screens[i]->EnableDisableFBAccess = xf86EnableDisableFBAccess;
+#ifdef XFreeXDGA
+	xf86Screens[i]->SetDGAMode = xf86SetDGAMode;
+#endif
+	xf86Screens[i]->DPMSSet = NULL;
+	xf86Screens[i]->LoadPalette = NULL;
+	xf86Screens[i]->SetOverscan = NULL;
+	xf86Screens[i]->DriverFunc = NULL;
+	xf86Screens[i]->pScreen = NULL;
+	scr_index = AddScreen(xf86Screens[i]->ScreenInit, argc, argv);
+	xf86VGAarbiterUnlock(xf86Screens[i]);
+      if (scr_index == i) {
+	/*
+	 * Hook in our ScrnInfoRec, and initialise some other pScreen
+	 * fields.
+	 */
+	dixSetPrivate(&screenInfo.screens[scr_index]->devPrivates,
+		      xf86ScreenKey, xf86Screens[i]);
+	xf86Screens[i]->pScreen = screenInfo.screens[scr_index];
+	/* The driver should set this, but make sure it is set anyway */
+	xf86Screens[i]->vtSema = TRUE;
+      } else {
+	/* This shouldn't normally happen */
+	FatalError("AddScreen/ScreenInit failed for driver %d\n", i);
+      }
+
+      DebugF("InitOutput - xf86Screens[%d]->pScreen = %p\n",
+	     i, xf86Screens[i]->pScreen );
+      DebugF("xf86Screens[%d]->pScreen->CreateWindow = %p\n",
+	     i, xf86Screens[i]->pScreen->CreateWindow );
+
+      dixSetPrivate(&screenInfo.screens[scr_index]->devPrivates,
+		    xf86CreateRootWindowKey,
+		    xf86Screens[i]->pScreen->CreateWindow);
+      xf86Screens[i]->pScreen->CreateWindow = xf86CreateRootWindow;
+
+    if (PictureGetSubpixelOrder (xf86Screens[i]->pScreen) == SubPixelUnknown)
+    {
+	xf86MonPtr DDC = (xf86MonPtr)(xf86Screens[i]->monitor->DDC);
+	PictureSetSubpixelOrder (xf86Screens[i]->pScreen,
+				 DDC ?
+				 (DDC->features.input_type ?
+				  SubPixelHorizontalRGB : SubPixelNone) :
+				 SubPixelUnknown);
+    }
+#ifdef RANDR
+    if (!xf86Info.disableRandR)
+	xf86RandRInit (screenInfo.screens[scr_index]);
+    xf86Msg(xf86Info.randRFrom, "RandR %s\n",
+	    xf86Info.disableRandR ? "disabled" : "enabled");
+#endif
+  }
+
+  xf86VGAarbiterWrapFunctions();
+  xf86UnblockSIGIO(was_blocked);
+
+  xf86InitOrigins();
+
+  xf86Resetting = FALSE;
+  xf86Initialising = FALSE;
+
+  RegisterBlockAndWakeupHandlers((BlockHandlerProcPtr)NoopDDA, xf86Wakeup,
+				 NULL);
+}
+
+/*
+ * InitInput --
+ *      Initialize all supported input devices.
+ */
+
+void
+InitInput(int argc, char **argv)
+{
+    InputInfoPtr* pDev;
+    DeviceIntPtr dev;
+
+    xf86Info.vtRequestsPending = FALSE;
+
+    mieqInit();
+
+    GetEventList(&xf86Events);
+
+    /* Call the PreInit function for each input device instance. */
+    for (pDev = xf86ConfigLayout.inputs; pDev && *pDev; pDev++) {
+        /* Replace obsolete keyboard driver with kbd */
+        if (!xf86NameCmp((*pDev)->driver, "keyboard")) {
+            strcpy((*pDev)->driver, "kbd");
+        }
+
+        /* If one fails, the others will too */
+        if (xf86NewInputDevice(*pDev, &dev, TRUE) == BadAlloc)
+            break;
+    }
+
+    config_init();
+}
+
+void
+CloseInput (void)
+{
+    config_fini();
+}
+
+/*
+ * OsVendorInit --
+ *      OS/Vendor-specific initialisations.  Called from OsInit(), which
+ *      is called by dix before establishing the well known sockets.
+ */
+
+void
+OsVendorInit(void)
+{
+  static Bool beenHere = FALSE;
+
+  signal(SIGCHLD, SIG_DFL);	/* Need to wait for child processes */
+
+  if (!beenHere) {
+    umask(022);
+    xf86LogInit();
+  }
+
+        /* Set stderr to non-blocking. */
+#ifndef O_NONBLOCK
+#if defined(FNDELAY)
+#define O_NONBLOCK FNDELAY
+#elif defined(O_NDELAY)
+#define O_NONBLOCK O_NDELAY
+#endif
+
+#ifdef O_NONBLOCK
+  if (!beenHere) {
+    if (geteuid() == 0 && getuid() != geteuid())
+    {
+      int status;
+
+      status = fcntl(fileno(stderr), F_GETFL, 0);
+      if (status != -1) {
+	fcntl(fileno(stderr), F_SETFL, status | O_NONBLOCK);
+      }
+    }
+  }
+#endif
+#endif
+
+  beenHere = TRUE;
+}
+
+/*
+ * ddxGiveUp --
+ *      Device dependent cleanup. Called by by dix before normal server death.
+ *      For SYSV386 we must switch the terminal back to normal mode. No error-
+ *      checking here, since there should be restored as much as possible.
+ */
+
+void
+ddxGiveUp(void)
+{
+    int i;
+
+    xf86VGAarbiterFini();
+
+#ifdef XF86PM
+    if (xf86OSPMClose)
+	xf86OSPMClose();
+    xf86OSPMClose = NULL;
+#endif
+
+    for (i = 0; i < xf86NumScreens; i++) {
+	/*
+	 * zero all access functions to
+	 * trap calls when switched away.
+	 */
+	xf86Screens[i]->vtSema = FALSE;
+    }
+
+#ifdef XFreeXDGA
+    DGAShutdown();
+#endif
+
+    if (xorgHWOpenConsole)
+	xf86CloseConsole();
+
+    xf86CloseLog();
+
+    /* If an unexpected signal was caught, dump a core for debugging */
+    if (xf86Info.caughtSignal)
+	OsAbort();
+}
+
+
+
+/*
+ * AbortDDX --
+ *      DDX - specific abort routine.  Called by AbortServer(). The attempt is
+ *      made to restore all original setting of the displays. Also all devices
+ *      are closed.
+ */
+
+void
+AbortDDX(void)
+{
+  int i;
+
+  xf86BlockSIGIO();
+
+  /*
+   * try to restore the original video state
+   */
+#ifdef DPMSExtension /* Turn screens back on */
+  if (DPMSPowerLevel != DPMSModeOn)
+      DPMSSet(serverClient, DPMSModeOn);
+#endif
+  if (xf86Screens) {
+      for (i = 0; i < xf86NumScreens; i++)
+	  if (xf86Screens[i]->vtSema) {
+	      /*
+	       * if we are aborting before ScreenInit() has finished
+	       * we might not have been wrapped yet. Therefore enable
+	       * screen explicitely.
+	       */
+	      xf86VGAarbiterLock(xf86Screens[i]);
+	      (xf86Screens[i]->LeaveVT)(i, 0);
+	      xf86VGAarbiterUnlock(xf86Screens[i]);
+	  }
+  }
+
+  xf86AccessLeave();
+
+  /*
+   * This is needed for an abnormal server exit, since the normal exit stuff
+   * MUST also be performed (i.e. the vt must be left in a defined state)
+   */
+  ddxGiveUp();
+}
+
+void
+OsVendorFatalError(void)
+{
+#ifdef VENDORSUPPORT
+    ErrorF("\nPlease refer to your Operating System Vendor support pages\n"
+	   "at %s for support on this crash.\n",VENDORSUPPORT);
+#else
+    ErrorF("\nPlease consult the "XVENDORNAME" support \n"
+	   "\t at "__VENDORDWEBSUPPORT__"\n for help. \n");
+#endif
+    if (xf86LogFile && xf86LogFileWasOpened)
+	ErrorF("Please also check the log file at \"%s\" for additional "
+              "information.\n", xf86LogFile);
+    ErrorF("\n");
+}
+
+int
+xf86SetVerbosity(int verb)
+{
+    int save = xf86Verbose;
+
+    xf86Verbose = verb;
+    LogSetParameter(XLOG_VERBOSITY, verb);
+    return save;
+}
+
+int
+xf86SetLogVerbosity(int verb)
+{
+    int save = xf86LogVerbose;
+
+    xf86LogVerbose = verb;
+    LogSetParameter(XLOG_FILE_VERBOSITY, verb);
+    return save;
+}
+
+static void
+xf86PrintDefaultModulePath(void)
+{
+  ErrorF("%s\n", DEFAULT_MODULE_PATH);
+}
+
+static void
+xf86PrintDefaultLibraryPath(void)
+{
+  ErrorF("%s\n", DEFAULT_LIBRARY_PATH);
+}
+
+/*
+ * ddxProcessArgument --
+ *	Process device-dependent command line args. Returns 0 if argument is
+ *      not device dependent, otherwise Count of number of elements of argv
+ *      that are part of a device dependent commandline option.
+ *
+ */
+
+/* ARGSUSED */
+int
+ddxProcessArgument(int argc, char **argv, int i)
+{
+#define CHECK_FOR_REQUIRED_ARGUMENT() \
+    if (((i + 1) >= argc) || (!argv[i + 1])) { 				\
+      ErrorF("Required argument to %s not specified\n", argv[i]); 	\
+      UseMsg(); 							\
+      FatalError("Required argument to %s not specified\n", argv[i]);	\
+    }
+
+  /* First the options that are only allowed for root */
+  if (!strcmp(argv[i], "-modulepath") || !strcmp(argv[i], "-logfile")) {
+    if ( (geteuid() == 0) && (getuid() != 0) ) {
+      FatalError("The '%s' option can only be used by root.\n", argv[i]);
+    }
+    else if (!strcmp(argv[i], "-modulepath"))
+    {
+      char *mp;
+      CHECK_FOR_REQUIRED_ARGUMENT();
+      mp = strdup(argv[i + 1]);
+      if (!mp)
+	FatalError("Can't allocate memory for ModulePath\n");
+      xf86ModulePath = mp;
+      xf86ModPathFrom = X_CMDLINE;
+      return 2;
+    }
+    else if (!strcmp(argv[i], "-logfile"))
+    {
+      char *lf;
+      CHECK_FOR_REQUIRED_ARGUMENT();
+      lf = strdup(argv[i + 1]);
+      if (!lf)
+	FatalError("Can't allocate memory for LogFile\n");
+      xf86LogFile = lf;
+      xf86LogFileFrom = X_CMDLINE;
+      return 2;
+    }
+  }
+  if (!strcmp(argv[i], "-config") || !strcmp(argv[i], "-xf86config"))
+  {
+    CHECK_FOR_REQUIRED_ARGUMENT();
+    if (getuid() != 0 && !xf86PathIsSafe(argv[i + 1])) {
+      FatalError("\nInvalid argument for %s\n"
+	  "\tFor non-root users, the file specified with %s must be\n"
+	  "\ta relative path and must not contain any \"..\" elements.\n"
+	  "\tUsing default "__XCONFIGFILE__" search path.\n\n",
+	  argv[i], argv[i]);
+    }
+    xf86ConfigFile = argv[i + 1];
+    return 2;
+  }
+  if (!strcmp(argv[i], "-configdir"))
+  {
+    CHECK_FOR_REQUIRED_ARGUMENT();
+    if (getuid() != 0 && !xf86PathIsSafe(argv[i + 1])) {
+      FatalError("\nInvalid argument for %s\n"
+	  "\tFor non-root users, the file specified with %s must be\n"
+	  "\ta relative path and must not contain any \"..\" elements.\n"
+	  "\tUsing default "__XCONFIGDIR__" search path.\n\n",
+	  argv[i], argv[i]);
+    }
+    xf86ConfigDir = argv[i + 1];
+    return 2;
+  }
+  if (!strcmp(argv[i],"-flipPixels"))
+  {
+    xf86FlipPixels = TRUE;
+    return 1;
+  }
+#ifdef XF86VIDMODE
+  if (!strcmp(argv[i],"-disableVidMode"))
+  {
+    xf86VidModeDisabled = TRUE;
+    return 1;
+  }
+  if (!strcmp(argv[i],"-allowNonLocalXvidtune"))
+  {
+    xf86VidModeAllowNonLocal = TRUE;
+    return 1;
+  }
+#endif
+  if (!strcmp(argv[i],"-allowMouseOpenFail"))
+  {
+    xf86AllowMouseOpenFail = TRUE;
+    return 1;
+  }
+  if (!strcmp(argv[i],"-ignoreABI"))
+  {
+    LoaderSetOptions(LDR_OPT_ABI_MISMATCH_NONFATAL);
+    return 1;
+  }
+  if (!strcmp(argv[i],"-verbose"))
+  {
+    if (++i < argc && argv[i])
+    {
+      char *end;
+      long val;
+      val = strtol(argv[i], &end, 0);
+      if (*end == '\0')
+      {
+	xf86SetVerbosity(val);
+	return 2;
+      }
+    }
+    xf86SetVerbosity(++xf86Verbose);
+    return 1;
+  }
+  if (!strcmp(argv[i],"-logverbose"))
+  {
+    if (++i < argc && argv[i])
+    {
+      char *end;
+      long val;
+      val = strtol(argv[i], &end, 0);
+      if (*end == '\0')
+      {
+	xf86SetLogVerbosity(val);
+	return 2;
+      }
+    }
+    xf86SetLogVerbosity(++xf86LogVerbose);
+    return 1;
+  }
+  if (!strcmp(argv[i],"-quiet"))
+  {
+    xf86SetVerbosity(-1);
+    return 1;
+  }
+  if (!strcmp(argv[i],"-showconfig") || !strcmp(argv[i],"-version"))
+  {
+    xf86PrintBanner();
+    exit(0);
+  }
+  if (!strcmp(argv[i],"-showDefaultModulePath"))
+  {
+    xf86PrintDefaultModulePath();
+    exit(0);
+  }
+  if (!strcmp(argv[i],"-showDefaultLibPath"))
+  {
+    xf86PrintDefaultLibraryPath();
+    exit(0);
+  }
+  /* Notice the -fp flag, but allow it to pass to the dix layer */
+  if (!strcmp(argv[i], "-fp"))
+  {
+    xf86fpFlag = TRUE;
+    return 0;
+  }
+  /* Notice the -bs flag, but allow it to pass to the dix layer */
+  if (!strcmp(argv[i], "-bs"))
+  {
+    xf86bsDisableFlag = TRUE;
+    return 0;
+  }
+  /* Notice the +bs flag, but allow it to pass to the dix layer */
+  if (!strcmp(argv[i], "+bs"))
+  {
+    xf86bsEnableFlag = TRUE;
+    return 0;
+  }
+  /* Notice the -s flag, but allow it to pass to the dix layer */
+  if (!strcmp(argv[i], "-s"))
+  {
+    xf86sFlag = TRUE;
+    return 0;
+  }
+  if (!strcmp(argv[i], "-pixmap24"))
+  {
+    xf86Pix24 = Pix24Use24;
+    return 1;
+  }
+  if (!strcmp(argv[i], "-pixmap32"))
+  {
+    xf86Pix24 = Pix24Use32;
+    return 1;
+  }
+  if (!strcmp(argv[i], "-fbbpp"))
+  {
+    int bpp;
+    CHECK_FOR_REQUIRED_ARGUMENT();
+    if (sscanf(argv[++i], "%d", &bpp) == 1)
+    {
+      xf86FbBpp = bpp;
+      return 2;
+    }
+    else
+    {
+      ErrorF("Invalid fbbpp\n");
+      return 0;
+    }
+  }
+  if (!strcmp(argv[i], "-depth"))
+  {
+    int depth;
+    CHECK_FOR_REQUIRED_ARGUMENT();
+    if (sscanf(argv[++i], "%d", &depth) == 1)
+    {
+      xf86Depth = depth;
+      return 2;
+    }
+    else
+    {
+      ErrorF("Invalid depth\n");
+      return 0;
+    }
+  }
+  if (!strcmp(argv[i], "-weight"))
+  {
+    int red, green, blue;
+    CHECK_FOR_REQUIRED_ARGUMENT();
+    if (sscanf(argv[++i], "%1d%1d%1d", &red, &green, &blue) == 3)
+    {
+      xf86Weight.red = red;
+      xf86Weight.green = green;
+      xf86Weight.blue = blue;
+      return 2;
+    }
+    else
+    {
+      ErrorF("Invalid weighting\n");
+      return 0;
+    }
+  }
+  if (!strcmp(argv[i], "-gamma")  || !strcmp(argv[i], "-rgamma") ||
+      !strcmp(argv[i], "-ggamma") || !strcmp(argv[i], "-bgamma"))
+  {
+    double gamma;
+    CHECK_FOR_REQUIRED_ARGUMENT();
+    if (sscanf(argv[++i], "%lf", &gamma) == 1) {
+       if (gamma < GAMMA_MIN || gamma > GAMMA_MAX) {
+	  ErrorF("gamma out of range, only  %.2f <= gamma_value <= %.1f"
+		 " is valid\n", GAMMA_MIN, GAMMA_MAX);
+	  return 0;
+       }
+       if (!strcmp(argv[i-1], "-gamma"))
+	  xf86Gamma.red = xf86Gamma.green = xf86Gamma.blue = gamma;
+       else if (!strcmp(argv[i-1], "-rgamma")) xf86Gamma.red = gamma;
+       else if (!strcmp(argv[i-1], "-ggamma")) xf86Gamma.green = gamma;
+       else if (!strcmp(argv[i-1], "-bgamma")) xf86Gamma.blue = gamma;
+       return 2;
+    }
+  }
+  if (!strcmp(argv[i], "-layout"))
+  {
+    CHECK_FOR_REQUIRED_ARGUMENT();
+    xf86LayoutName = argv[++i];
+    return 2;
+  }
+  if (!strcmp(argv[i], "-screen"))
+  {
+    CHECK_FOR_REQUIRED_ARGUMENT();
+    xf86ScreenName = argv[++i];
+    return 2;
+  }
+  if (!strcmp(argv[i], "-pointer"))
+  {
+    CHECK_FOR_REQUIRED_ARGUMENT();
+    xf86PointerName = argv[++i];
+    return 2;
+  }
+  if (!strcmp(argv[i], "-keyboard"))
+  {
+    CHECK_FOR_REQUIRED_ARGUMENT();
+    xf86KeyboardName = argv[++i];
+    return 2;
+  }
+  if (!strcmp(argv[i], "-nosilk"))
+  {
+    xf86silkenMouseDisableFlag = TRUE;
+    return 1;
+  }
+#ifdef HAVE_ACPI
+  if (!strcmp(argv[i], "-noacpi"))
+  {
+    xf86acpiDisableFlag = TRUE;
+    return 1;
+  }
+#endif
+  if (!strcmp(argv[i], "-configure"))
+  {
+    if (getuid() != 0 && geteuid() == 0) {
+	ErrorF("The '-configure' option can only be used by root.\n");
+	exit(1);
+    }
+    xf86DoConfigure = TRUE;
+    xf86AllowMouseOpenFail = TRUE;
+    return 1;
+  }
+  if (!strcmp(argv[i], "-showopts"))
+  {
+    if (getuid() != 0 && geteuid() == 0) {
+    ErrorF("The '-showopts' option can only be used by root.\n");
+    exit(1);
+    }
+    xf86DoShowOptions = TRUE;
+    return 1;
+  }
+  if (!strcmp(argv[i], "-isolateDevice"))
+  {
+    CHECK_FOR_REQUIRED_ARGUMENT();
+    if (strncmp(argv[++i], "PCI:", 4)) {
+       FatalError("Bus types other than PCI not yet isolable\n");
+    }
+    xf86PciIsolateDevice(argv[i]);
+    return 2;
+  }
+  /* Notice cmdline xkbdir, but pass to dix as well */
+  if (!strcmp(argv[i], "-xkbdir"))
+  {
+    xf86xkbdirFlag = TRUE;
+    return 0;
+  }
+
+  /* OS-specific processing */
+  return xf86ProcessArgument(argc, argv, i);
+}
+
+/*
+ * ddxUseMsg --
+ *	Print out correct use of device dependent commandline options.
+ *      Maybe the user now knows what really to do ...
+ */
+
+void
+ddxUseMsg(void)
+{
+  ErrorF("\n");
+  ErrorF("\n");
+  ErrorF("Device Dependent Usage\n");
+  if (getuid() == 0 || geteuid() != 0)
+  {
+    ErrorF("-modulepath paths      specify the module search path\n");
+    ErrorF("-logfile file          specify a log file name\n");
+    ErrorF("-configure             probe for devices and write an "__XCONFIGFILE__"\n");
+    ErrorF("-showopts              print available options for all installed drivers\n");
+  }
+  ErrorF("-config file           specify a configuration file, relative to the\n");
+  ErrorF("                       "__XCONFIGFILE__" search path, only root can use absolute\n");
+  ErrorF("-configdir dir         specify a configuration directory, relative to the\n");
+  ErrorF("                       "__XCONFIGDIR__" search path, only root can use absolute\n");
+  ErrorF("-verbose [n]           verbose startup messages\n");
+  ErrorF("-logverbose [n]        verbose log messages\n");
+  ErrorF("-quiet                 minimal startup messages\n");
+  ErrorF("-pixmap24              use 24bpp pixmaps for depth 24\n");
+  ErrorF("-pixmap32              use 32bpp pixmaps for depth 24\n");
+  ErrorF("-fbbpp n               set bpp for the framebuffer. Default: 8\n");
+  ErrorF("-depth n               set colour depth. Default: 8\n");
+  ErrorF("-gamma f               set gamma value (0.1 < f < 10.0) Default: 1.0\n");
+  ErrorF("-rgamma f              set gamma value for red phase\n");
+  ErrorF("-ggamma f              set gamma value for green phase\n");
+  ErrorF("-bgamma f              set gamma value for blue phase\n");
+  ErrorF("-weight nnn            set RGB weighting at 16 bpp.  Default: 565\n");
+  ErrorF("-layout name           specify the ServerLayout section name\n");
+  ErrorF("-screen name           specify the Screen section name\n");
+  ErrorF("-keyboard name         specify the core keyboard InputDevice name\n");
+  ErrorF("-pointer name          specify the core pointer InputDevice name\n");
+  ErrorF("-nosilk                disable Silken Mouse\n");
+  ErrorF("-flipPixels            swap default black/white Pixel values\n");
+#ifdef XF86VIDMODE
+  ErrorF("-disableVidMode        disable mode adjustments with xvidtune\n");
+  ErrorF("-allowNonLocalXvidtune allow xvidtune to be run as a non-local client\n");
+#endif
+  ErrorF("-allowMouseOpenFail    start server even if the mouse can't be initialized\n");
+  ErrorF("-ignoreABI             make module ABI mismatches non-fatal\n");
+  ErrorF("-isolateDevice bus_id  restrict device resets to bus_id (PCI only)\n");
+  ErrorF("-version               show the server version\n");
+  ErrorF("-showDefaultModulePath show the server default module path\n");
+  ErrorF("-showDefaultLibPath    show the server default library path\n");
+  /* OS-specific usage */
+  xf86UseMsg();
+  ErrorF("\n");
+}
+
+
+/*
+ * xf86LoadModules iterates over a list that is being passed in.
+ */
+Bool
+xf86LoadModules(char **list, pointer *optlist)
+{
+    int errmaj, errmin;
+    pointer opt;
+    int i;
+    char *name;
+    Bool failed = FALSE;
+
+    if (!list)
+	return TRUE;
+
+    for (i = 0; list[i] != NULL; i++) {
+
+	/* Normalise the module name */
+	name = xf86NormalizeName(list[i]);
+
+	/* Skip empty names */
+	if (name == NULL || *name == '\0')
+	    continue;
+
+	/* Replace obsolete keyboard driver with kbd */
+	if (!xf86NameCmp(name, "keyboard")) {
+	    strcpy(name, "kbd");
+	}
+
+	if (optlist)
+	    opt = optlist[i];
+	else
+	    opt = NULL;
+
+        if (!LoadModule(name, NULL, NULL, NULL, opt, NULL, &errmaj, &errmin)) {
+	    LoaderErrorMsg(NULL, name, errmaj, errmin);
+	    failed = TRUE;
+	}
+	free(name);
+    }
+    return !failed;
+}
+
+/* Pixmap format stuff */
+
+PixmapFormatPtr
+xf86GetPixFormat(ScrnInfoPtr pScrn, int depth)
+{
+    int i;
+    static PixmapFormatRec format;	/* XXX not reentrant */
+
+    /*
+     * When the formats[] list initialisation isn't complete, check the
+     * depth 24 pixmap config/cmdline options and screen-specified formats.
+     */
+
+    if (!formatsDone) {
+	if (depth == 24) {
+	    Pix24Flags pix24 = Pix24DontCare;
+
+	    format.depth = 24;
+	    format.scanlinePad = BITMAP_SCANLINE_PAD;
+	    if (xf86Info.pixmap24 != Pix24DontCare)
+		pix24 = xf86Info.pixmap24;
+	    else if (pScrn->pixmap24 != Pix24DontCare)
+		pix24 = pScrn->pixmap24;
+	    if (pix24 == Pix24Use24)
+		format.bitsPerPixel = 24;
+	    else
+		format.bitsPerPixel = 32;
+	    return &format;
+	}
+    }
+
+    for (i = 0; i < numFormats; i++)
+	if (formats[i].depth == depth)
+	   break;
+    if (i != numFormats)
+	return &formats[i];
+    else if (!formatsDone) {
+	/* Check for screen-specified formats */
+	for (i = 0; i < pScrn->numFormats; i++)
+	    if (pScrn->formats[i].depth == depth)
+		break;
+	if (i != pScrn->numFormats)
+	    return &pScrn->formats[i];
+    }
+    return NULL;
+}
+
+int
+xf86GetBppFromDepth(ScrnInfoPtr pScrn, int depth)
+{
+    PixmapFormatPtr format;
+
+
+    format = xf86GetPixFormat(pScrn, depth);
+    if (format)
+	return format->bitsPerPixel;
+    else
+	return 0;
+}
diff --git a/xorg-server/hw/xfree86/common/xf86PM.c b/xorg-server/hw/xfree86/common/xf86PM.c
index 7af89b5b4..16b6bdc4a 100644
--- a/xorg-server/hw/xfree86/common/xf86PM.c
+++ b/xorg-server/hw/xfree86/common/xf86PM.c
@@ -33,6 +33,7 @@
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86Xinput.h"
+#include "xf86_OSproc.h"
 
 int (*xf86PMGetEventFromOs)(int fd,pmEvent *events,int num) = NULL;
 pmWait (*xf86PMConfirmEventToOs)(int fd,pmEvent event) = NULL;
@@ -61,14 +62,14 @@ eventName(pmEvent event, char **str)
     }
 }
 
+static int sigio_blocked_for_suspend;
+
 static void
 suspend (pmEvent event, Bool undo)
 {
     int i;
     InputInfoPtr pInfo;
 
-   xf86inSuspend = TRUE;
-    
     for (i = 0; i < xf86NumScreens; i++) {
 	if (xf86Screens[i]->EnableDisableFBAccess)
 	    (*xf86Screens[i]->EnableDisableFBAccess) (i, FALSE);
@@ -78,7 +79,7 @@ suspend (pmEvent event, Bool undo)
 	DisableDevice(pInfo->dev, TRUE);
 	pInfo = pInfo->next;
     }
-    xf86EnterServerState(SETUP);
+    sigio_blocked_for_suspend = xf86BlockSIGIO();
     for (i = 0; i < xf86NumScreens; i++) {
 	if (xf86Screens[i]->PMEvent)
 	    xf86Screens[i]->PMEvent(i,event,undo);
@@ -98,7 +99,6 @@ resume(pmEvent event, Bool undo)
     InputInfoPtr pInfo;
 
     xf86AccessEnter();
-    xf86EnterServerState(SETUP);
     for (i = 0; i < xf86NumScreens; i++) {
 	if (xf86Screens[i]->PMEvent)
 	    xf86Screens[i]->PMEvent(i,event,undo);
@@ -107,7 +107,7 @@ resume(pmEvent event, Bool undo)
 	    xf86Screens[i]->EnterVT(i, 0);
 	}
     }
-    xf86EnterServerState(OPERATING);
+    xf86UnblockSIGIO(sigio_blocked_for_suspend);
     for (i = 0; i < xf86NumScreens; i++) {
 	if (xf86Screens[i]->EnableDisableFBAccess)
 	    (*xf86Screens[i]->EnableDisableFBAccess) (i, TRUE);
@@ -118,18 +118,12 @@ resume(pmEvent event, Bool undo)
 	EnableDevice(pInfo->dev, TRUE);
 	pInfo = pInfo->next;
     }
-    xf86inSuspend = FALSE;
 }
 
 static void
 DoApmEvent(pmEvent event, Bool undo)
 {
-    /* 
-     * we leave that as a global function for now. I don't know if 
-     * this might cause problems in the future. It is a global server 
-     * variable therefore it needs to be in a server info structure
-     */
-    int i, setup = 0;
+    int i, was_blocked;
     
     switch(event) {
 #if 0
@@ -159,14 +153,13 @@ DoApmEvent(pmEvent event, Bool undo)
 	}
 	break;
     default:
+	was_blocked = xf86BlockSIGIO();
 	for (i = 0; i < xf86NumScreens; i++) {
 	    if (xf86Screens[i]->PMEvent) {
-		if (!setup) xf86EnterServerState(SETUP);
-		setup = 1;
 		xf86Screens[i]->PMEvent(i,event,undo);
 	    }
 	}
-	if (setup) xf86EnterServerState(OPERATING);
+	xf86UnblockSIGIO(was_blocked);
 	break;
     }
 }
diff --git a/xorg-server/hw/xfree86/common/xf86Priv.h b/xorg-server/hw/xfree86/common/xf86Priv.h
index 01e178372..7137a5363 100644
--- a/xorg-server/hw/xfree86/common/xf86Priv.h
+++ b/xorg-server/hw/xfree86/common/xf86Priv.h
@@ -1,158 +1,157 @@
-/*

- * Copyright (c) 1997-2002 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 declarations for private XFree86 functions and variables,

- * and definitions of private macros.

- *

- * "private" means not available to video drivers.

- */

-

-#ifndef _XF86PRIV_H

-#define _XF86PRIV_H

-

-#include "xf86Privstr.h"

-#include "propertyst.h"

-#include "input.h"

-

-/*

- * Parameters set ONLY from the command line options

- * The global state of these things is held in xf86InfoRec (when appropriate).

- */

-extern _X_EXPORT const char *xf86ConfigFile;

-extern _X_EXPORT const char *xf86ConfigDir;

-extern _X_EXPORT  Bool xf86AllowMouseOpenFail;

-#ifdef XF86VIDMODE

-extern _X_EXPORT  Bool xf86VidModeDisabled;

-extern _X_EXPORT  Bool xf86VidModeAllowNonLocal;

-#endif 

-extern _X_EXPORT  Bool xf86fpFlag;

-extern _X_EXPORT  Bool xf86sFlag;

-extern _X_EXPORT  Bool xf86bsEnableFlag;

-extern _X_EXPORT  Bool xf86bsDisableFlag;

-extern _X_EXPORT  Bool xf86silkenMouseDisableFlag;

-extern _X_EXPORT  Bool xf86xkbdirFlag;

-#ifdef HAVE_ACPI

-extern _X_EXPORT  Bool xf86acpiDisableFlag;

-#endif

-extern _X_EXPORT  char *xf86LayoutName;

-extern _X_EXPORT  char *xf86ScreenName;

-extern _X_EXPORT  char *xf86PointerName;

-extern _X_EXPORT  char *xf86KeyboardName;

-extern _X_EXPORT  int xf86FbBpp;

-extern _X_EXPORT  int xf86Depth;

-extern _X_EXPORT  Pix24Flags xf86Pix24;

-extern _X_EXPORT  rgb xf86Weight;

-extern _X_EXPORT  Bool xf86FlipPixels;

-extern _X_EXPORT  Gamma xf86Gamma;

-extern _X_EXPORT  char *xf86ServerName;

-

-/* Other parameters */

-

-extern _X_EXPORT  xf86InfoRec xf86Info;

-extern _X_EXPORT  const char *xf86ModulePath;

-extern _X_EXPORT  MessageType xf86ModPathFrom;

-extern _X_EXPORT  const char *xf86LogFile;

-extern _X_EXPORT  MessageType xf86LogFileFrom;

-extern _X_EXPORT  Bool xf86LogFileWasOpened;

-extern _X_EXPORT  serverLayoutRec xf86ConfigLayout;

-

-extern _X_EXPORT  DriverPtr *xf86DriverList;

-extern _X_EXPORT  int xf86NumDrivers;

-extern _X_EXPORT  Bool xf86Resetting;

-extern _X_EXPORT  Bool xf86Initialising;

-extern _X_EXPORT  int xf86NumScreens;

-extern _X_EXPORT  const char *xf86VisualNames[];

-extern _X_EXPORT  int xf86Verbose;                 /* verbosity level */

-extern _X_EXPORT  int xf86LogVerbose;		/* log file verbosity level */

-extern _X_EXPORT  Bool xorgHWAccess;

-

-extern _X_EXPORT  RootWinPropPtr *xf86RegisteredPropertiesTable;

-

-#ifndef DEFAULT_VERBOSE

-#define DEFAULT_VERBOSE		0

-#endif

-#ifndef DEFAULT_LOG_VERBOSE

-#define DEFAULT_LOG_VERBOSE	3

-#endif

-#ifndef DEFAULT_DPI

-#define DEFAULT_DPI		96

-#endif

-

-/* Function Prototypes */

-#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 xf86PostProbe(void);

-extern _X_EXPORT void xf86ClearEntityListForScreen(int scrnIndex);

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

-extern _X_EXPORT void xf86PostScreenInit(void);

-

-/* xf86Config.c */

-

-extern _X_EXPORT Bool xf86PathIsSafe(const char *path);

-

-/* xf86DefaultModes */

-

-extern _X_EXPORT const DisplayModeRec xf86DefaultModes[];

-extern _X_EXPORT const int xf86NumDefaultModes;

-

-/* xf86Configure.c */

-extern _X_EXPORT void DoConfigure(void);

-

-/* xf86ShowOpts.c */

-extern _X_EXPORT void DoShowOptions(void);

-

-/* xf86Events.c */

-

-extern _X_EXPORT void xf86Wakeup(pointer blockData, int err, pointer pReadmask);

-extern _X_HIDDEN int xf86SigWrapper(int signo);

-extern _X_EXPORT void xf86HandlePMEvents(int fd, pointer data);

-extern _X_EXPORT int (*xf86PMGetEventFromOs)(int fd,pmEvent *events,int num);

-extern _X_EXPORT pmWait (*xf86PMConfirmEventToOs)(int fd,pmEvent event);

-

-/* xf86Helper.c */

-extern _X_EXPORT void xf86LogInit(void);

-extern _X_EXPORT void xf86CloseLog(void);

-

-/* xf86Init.c */

-extern _X_EXPORT Bool xf86LoadModules(char **list, pointer *optlist);

-extern _X_EXPORT int xf86SetVerbosity(int verb);

-extern _X_EXPORT int xf86SetLogVerbosity(int verb);

-extern _X_EXPORT Bool xf86CallDriverProbe( struct _DriverRec * drv, Bool detect_only );

-

-/* xf86Xinput.c */

-extern _X_EXPORT EventList *xf86Events;

-

-#endif /* _NO_XF86_PROTOTYPES */

-

-

-#endif /* _XF86PRIV_H */

+/*
+ * Copyright (c) 1997-2002 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 declarations for private XFree86 functions and variables,
+ * and definitions of private macros.
+ *
+ * "private" means not available to video drivers.
+ */
+
+#ifndef _XF86PRIV_H
+#define _XF86PRIV_H
+
+#include "xf86Privstr.h"
+#include "propertyst.h"
+#include "input.h"
+
+/*
+ * Parameters set ONLY from the command line options
+ * The global state of these things is held in xf86InfoRec (when appropriate).
+ */
+extern _X_EXPORT const char *xf86ConfigFile;
+extern _X_EXPORT const char *xf86ConfigDir;
+extern _X_EXPORT  Bool xf86AllowMouseOpenFail;
+#ifdef XF86VIDMODE
+extern _X_EXPORT  Bool xf86VidModeDisabled;
+extern _X_EXPORT  Bool xf86VidModeAllowNonLocal;
+#endif 
+extern _X_EXPORT  Bool xf86fpFlag;
+extern _X_EXPORT  Bool xf86sFlag;
+extern _X_EXPORT  Bool xf86bsEnableFlag;
+extern _X_EXPORT  Bool xf86bsDisableFlag;
+extern _X_EXPORT  Bool xf86silkenMouseDisableFlag;
+extern _X_EXPORT  Bool xf86xkbdirFlag;
+#ifdef HAVE_ACPI
+extern _X_EXPORT  Bool xf86acpiDisableFlag;
+#endif
+extern _X_EXPORT  char *xf86LayoutName;
+extern _X_EXPORT  char *xf86ScreenName;
+extern _X_EXPORT  char *xf86PointerName;
+extern _X_EXPORT  char *xf86KeyboardName;
+extern _X_EXPORT  int xf86FbBpp;
+extern _X_EXPORT  int xf86Depth;
+extern _X_EXPORT  Pix24Flags xf86Pix24;
+extern _X_EXPORT  rgb xf86Weight;
+extern _X_EXPORT  Bool xf86FlipPixels;
+extern _X_EXPORT  Gamma xf86Gamma;
+extern _X_EXPORT  char *xf86ServerName;
+
+/* Other parameters */
+
+extern _X_EXPORT  xf86InfoRec xf86Info;
+extern _X_EXPORT  const char *xf86ModulePath;
+extern _X_EXPORT  MessageType xf86ModPathFrom;
+extern _X_EXPORT  const char *xf86LogFile;
+extern _X_EXPORT  MessageType xf86LogFileFrom;
+extern _X_EXPORT  Bool xf86LogFileWasOpened;
+extern _X_EXPORT  serverLayoutRec xf86ConfigLayout;
+
+extern _X_EXPORT  DriverPtr *xf86DriverList;
+extern _X_EXPORT  int xf86NumDrivers;
+extern _X_EXPORT  Bool xf86Resetting;
+extern _X_EXPORT  Bool xf86Initialising;
+extern _X_EXPORT  int xf86NumScreens;
+extern _X_EXPORT  const char *xf86VisualNames[];
+extern _X_EXPORT  int xf86Verbose;                 /* verbosity level */
+extern _X_EXPORT  int xf86LogVerbose;		/* log file verbosity level */
+extern _X_EXPORT  Bool xorgHWAccess;
+
+extern _X_EXPORT  RootWinPropPtr *xf86RegisteredPropertiesTable;
+
+#ifndef DEFAULT_VERBOSE
+#define DEFAULT_VERBOSE		0
+#endif
+#ifndef DEFAULT_LOG_VERBOSE
+#define DEFAULT_LOG_VERBOSE	3
+#endif
+#ifndef DEFAULT_DPI
+#define DEFAULT_DPI		96
+#endif
+
+/* Function Prototypes */
+#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 xf86PostProbe(void);
+extern _X_EXPORT void xf86ClearEntityListForScreen(int scrnIndex);
+extern _X_EXPORT void xf86AddDevToEntity(int entityIndex, GDevPtr dev);
+
+/* xf86Config.c */
+
+extern _X_EXPORT Bool xf86PathIsSafe(const char *path);
+
+/* xf86DefaultModes */
+
+extern _X_EXPORT const DisplayModeRec xf86DefaultModes[];
+extern _X_EXPORT const int xf86NumDefaultModes;
+
+/* xf86Configure.c */
+extern _X_EXPORT void DoConfigure(void);
+
+/* xf86ShowOpts.c */
+extern _X_EXPORT void DoShowOptions(void);
+
+/* xf86Events.c */
+
+extern _X_EXPORT void xf86Wakeup(pointer blockData, int err, pointer pReadmask);
+extern _X_HIDDEN int xf86SigWrapper(int signo);
+extern _X_EXPORT void xf86HandlePMEvents(int fd, pointer data);
+extern _X_EXPORT int (*xf86PMGetEventFromOs)(int fd,pmEvent *events,int num);
+extern _X_EXPORT pmWait (*xf86PMConfirmEventToOs)(int fd,pmEvent event);
+
+/* xf86Helper.c */
+extern _X_EXPORT void xf86LogInit(void);
+extern _X_EXPORT void xf86CloseLog(void);
+
+/* xf86Init.c */
+extern _X_EXPORT Bool xf86LoadModules(char **list, pointer *optlist);
+extern _X_EXPORT int xf86SetVerbosity(int verb);
+extern _X_EXPORT int xf86SetLogVerbosity(int verb);
+extern _X_EXPORT Bool xf86CallDriverProbe( struct _DriverRec * drv, Bool detect_only );
+
+/* xf86Xinput.c */
+extern _X_EXPORT EventList *xf86Events;
+
+#endif /* _NO_XF86_PROTOTYPES */
+
+
+#endif /* _XF86PRIV_H */
diff --git a/xorg-server/hw/xfree86/common/xf86str.h b/xorg-server/hw/xfree86/common/xf86str.h
index 74ad759c5..0493dc53c 100644
--- a/xorg-server/hw/xfree86/common/xf86str.h
+++ b/xorg-server/hw/xfree86/common/xf86str.h
@@ -1,913 +1,906 @@
-

-/*

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

-    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 _InputInfoRec InputInfoRec;

-

-typedef struct _serverlayoutrec {

-    char *		id;

-    screenLayoutPtr	screens;

-    GDevPtr		inactives;

-    InputInfoRec**      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		10

-

-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);

-typedef void xf86ModeSetProc              (ScrnInfoPtr);

-

-

-/*

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

-

-    /* 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;

-    xf86ModeSetProc			*ModeSet;

-

-    /*

-     * 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 {
+    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 _InputInfoRec InputInfoRec;
+
+typedef struct _serverlayoutrec {
+    char *		id;
+    screenLayoutPtr	screens;
+    GDevPtr		inactives;
+    InputInfoRec**      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		10
+
+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;
+
+/* 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);
+typedef void xf86ModeSetProc              (ScrnInfoPtr);
+
+
+/*
+ * 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;
+
+    /* 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;
+    xf86ModeSetProc			*ModeSet;
+
+    /*
+     * 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 */