svn merge ^/branches/released .

27 files changed, 11160 insertions, 12254 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 617f6b788..9c9bac6ba 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__) || defined(_MSC_VER)

-    /* 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) && !defined(_MSC_VER)

-#      include <sys/inline.h>

-#     endif

-#    else

-#     include "scoasm.h"

-#    endif

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

-	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__) || defined(_MSC_VER)
+    /* 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) && !defined(_MSC_VER)
+#      include <sys/inline.h>
+#     endif
+#    if (!defined(__HIGHC__) && !defined(__SUNPRO_C) && !defined(_MSC_VER)) || \
+	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 */
diff --git a/xorg-server/hw/xfree86/ddc/ddc.c b/xorg-server/hw/xfree86/ddc/ddc.c
index e9b8a52eb..179f42ccd 100644
--- a/xorg-server/hw/xfree86/ddc/ddc.c
+++ b/xorg-server/hw/xfree86/ddc/ddc.c
@@ -1,506 +1,503 @@
-/* xf86DDC.c 

- * 

- * Copyright 1998,1999 by Egbert Eich <Egbert.Eich@Physik.TU-Darmstadt.DE>

- */

-

-/*

- * A note on terminology.  DDC1 is the original dumb serial protocol, and

- * can only do up to 128 bytes of EDID.  DDC2 is I2C-encapsulated and

- * introduces extension blocks.  EDID is the old display identification

- * block, DisplayID is the new one.

- */

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include "misc.h"

-#include "xf86.h"

-#include "xf86_OSproc.h"

-#include "xf86DDC.h"

-#include <string.h>

-

-#define RETRIES 4

-

-typedef enum {

-    DDCOPT_NODDC1,

-    DDCOPT_NODDC2,

-    DDCOPT_NODDC

-} DDCOpts;

-

-static const OptionInfoRec DDCOptions[] = {

-    { DDCOPT_NODDC1,	"NoDDC1",	OPTV_BOOLEAN,	{0},	FALSE },

-    { DDCOPT_NODDC2,	"NoDDC2",	OPTV_BOOLEAN,	{0},	FALSE },

-    { DDCOPT_NODDC,	"NoDDC",	OPTV_BOOLEAN,	{0},	FALSE },

-    { -1,		NULL,		OPTV_NONE,	{0},	FALSE },

-};

-

-/* DDC1 */

-

-static int

-find_start(unsigned int *ptr)

-{

-    unsigned int comp[9], test[9];

-    int i,j;

-  

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

-	comp[i] = *(ptr++);

-	test[i] = 1;

-    }

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

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

-	    test[j] = test[j] & !(comp[j] ^ *(ptr++));

-	}

-    }

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

-	if (test[i]) return i+1;

-    return -1;

-}

-

-static unsigned char *

-find_header(unsigned char *block)

-{

-    unsigned char *ptr, *head_ptr, *end;

-    unsigned char header[]={0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00};

- 

-    ptr = block;

-    end = block + EDID1_LEN;

-    while (ptr<end) {

-	int i;

-	head_ptr = ptr;

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

-	    if (header[i] != *(head_ptr++)) break;

-	    if (head_ptr == end) head_ptr = block;

-	}

-	if (i==8) break;

-	ptr++; 

-    }

-    if (ptr == end) return NULL;

-    return ptr;

-}

-

-static unsigned char *

-resort(unsigned char *s_block)

-{

-    unsigned char *d_new, *d_ptr, *d_end, *s_ptr, *s_end;

-    unsigned char tmp;

-

-    s_end = s_block + EDID1_LEN;

-    d_new = malloc(EDID1_LEN);

-    if (!d_new) return NULL;

-    d_end = d_new + EDID1_LEN;

-

-    s_ptr = find_header(s_block);

-    if (!s_ptr) return NULL;

-    for (d_ptr=d_new;d_ptr<d_end;d_ptr++){

-	tmp = *(s_ptr++);

-	*d_ptr = tmp; 

-	if (s_ptr == s_end) s_ptr = s_block;

-    }

-    free(s_block);

-    return d_new;

-}

-

-static int

-DDC_checksum(const unsigned char *block, int len)

-{

-    int i, result = 0;

-    int not_null = 0;

-    

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

-	not_null |= block[i];

-	result += block[i];

-    }

-    

-#ifdef DEBUG

-    if (result & 0xFF) ErrorF("DDC checksum not correct\n");

-    if (!not_null) ErrorF("DDC read all Null\n");

-#endif

-

-    /* catch the trivial case where all bytes are 0 */

-    if (!not_null) return 1;

-

-    return result&0xFF;

-}

-

-static unsigned char *

-GetEDID_DDC1(unsigned int *s_ptr)

-{

-    unsigned char *d_block, *d_pos;

-    unsigned int *s_pos, *s_end;

-    int s_start;

-    int i,j;

-    s_start = find_start(s_ptr);

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

-    s_end = s_ptr + NUM;

-    s_pos = s_ptr + s_start;

-    d_block=malloc(EDID1_LEN);

-    if (!d_block) return NULL;

-    d_pos = d_block;

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

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

-	    *d_pos <<= 1;

-	    if (*s_pos) {

-		*d_pos |= 0x01;

-	    }

-	    s_pos++; if (s_pos == s_end) s_pos=s_ptr;

-	};

-	s_pos++; if (s_pos == s_end) s_pos=s_ptr;

-	d_pos++;

-    }

-    free(s_ptr);

-    if (d_block && DDC_checksum(d_block,EDID1_LEN)) {

-	free(d_block);

-	return NULL;

-    }

-    return (resort(d_block));

-}

-

-/* fetch entire EDID record; DDC bit needs to be masked */

-static unsigned int * 

-FetchEDID_DDC1(register ScrnInfoPtr pScrn,

-	       register unsigned int (*read_DDC)(ScrnInfoPtr))

-{

-    int count = NUM;

-    unsigned int *ptr, *xp;

-

-    ptr=xp=malloc(sizeof(int)*NUM);

-

-    if (!ptr)  return NULL;

-    do {

-	/* wait for next retrace */

-	*xp = read_DDC(pScrn);

-	xp++;

-    } while(--count);

-    return ptr;

-}

-

-/* test if DDC1  return 0 if not */

-static Bool

-TestDDC1(ScrnInfoPtr pScrn, unsigned int (*read_DDC)(ScrnInfoPtr))

-{

-    int old, count;

-

-    old = read_DDC(pScrn);

-    count = HEADER * BITS_PER_BYTE;

-    do {

-	/* wait for next retrace */

-	if (old != read_DDC(pScrn)) break;

-    } while(count--);

-    return count;

-}

-

-/* 

- * read EDID record , pass it to callback function to interpret.

- * callback function will store it for further use by calling

- * function; it will also decide if we need to reread it 

- */

-static unsigned char *

-EDIDRead_DDC1(ScrnInfoPtr pScrn, DDC1SetSpeedProc DDCSpeed, 

-              unsigned int (*read_DDC)(ScrnInfoPtr))

-{

-    unsigned char *EDID_block = NULL;

-    int count = RETRIES;

-

-    if (!read_DDC) { 

-	xf86DrvMsg(pScrn->scrnIndex, X_PROBED, 

-		   "chipset doesn't support DDC1\n");

-	return NULL; 

-    };

-

-    if (TestDDC1(pScrn,read_DDC)==-1) { 

-	xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "No DDC signal\n"); 

-	return NULL; 

-    };

-

-    if (DDCSpeed) DDCSpeed(pScrn,DDC_FAST);

-    do {

-	EDID_block = GetEDID_DDC1(FetchEDID_DDC1(pScrn,read_DDC)); 

-	count --;

-    } while (!EDID_block && count);

-    if (DDCSpeed) DDCSpeed(pScrn,DDC_SLOW);

-

-    return EDID_block;

-}

-

-/**

- * Attempts to probe the monitor for EDID information, if NoDDC and NoDDC1 are

- * unset.  EDID information blocks are interpreted and the results returned in

- * an xf86MonPtr.

- *

- * This function does not affect the list of modes used by drivers -- it is up

- * to the driver to decide policy on what to do with EDID information.

- *

- * @return pointer to a new xf86MonPtr containing the EDID information.

- * @return NULL if no monitor attached or failure to interpret the EDID.

- */

-xf86MonPtr

-xf86DoEDID_DDC1(

-    int scrnIndex, DDC1SetSpeedProc DDC1SetSpeed, 

-    unsigned int (*DDC1Read)(ScrnInfoPtr)

-)

-{

-    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];

-    unsigned char *EDID_block = NULL;

-    xf86MonPtr tmp = NULL;

-    int sigio;

-    /* Default DDC and DDC1 to enabled. */

-    Bool noddc = FALSE, noddc1 = FALSE;

-    OptionInfoPtr options;

-

-    options = xnfalloc(sizeof(DDCOptions));

-    (void)memcpy(options, DDCOptions, sizeof(DDCOptions));

-    xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, options);

-

-    xf86GetOptValBool(options, DDCOPT_NODDC, &noddc);

-    xf86GetOptValBool(options, DDCOPT_NODDC1, &noddc1);

-    free(options);

-    

-    if (noddc || noddc1)

-	return NULL;

-    

-    sigio = xf86BlockSIGIO();

-    EDID_block = EDIDRead_DDC1(pScrn,DDC1SetSpeed,DDC1Read);

-    xf86UnblockSIGIO(sigio);

-

-    if (EDID_block){

-	tmp = xf86InterpretEDID(scrnIndex,EDID_block);

-    }

-#ifdef DEBUG

-	else ErrorF("No EDID block returned\n");

-    if (!tmp)

-	ErrorF("Cannot interpret EDID block\n");

-#endif

-	return tmp;

-}

-

-/* DDC2 */

-

-static I2CDevPtr

-DDC2MakeDevice(I2CBusPtr pBus, int address, char *name)

-{

-    I2CDevPtr dev = NULL;

-

-    if (!(dev = xf86I2CFindDev(pBus, address))) {

-	dev = xf86CreateI2CDevRec();

-	dev->DevName = name;

-	dev->SlaveAddr = address;

-	dev->ByteTimeout = 2200; /* VESA DDC spec 3 p. 43 (+10 %) */

-	dev->StartTimeout = 550;

-	dev->BitTimeout = 40;

-	dev->AcknTimeout = 40;

-

-	dev->pI2CBus = pBus;

-	if (!xf86I2CDevInit(dev)) {

-	    xf86DrvMsg(pBus->scrnIndex, X_PROBED, "No DDC2 device\n");

-	    return NULL;

-	}

-    }

-

-    return dev;

-}

-

-static I2CDevPtr

-DDC2Init(int scrnIndex, I2CBusPtr pBus)

-{

-    I2CDevPtr dev = NULL;

-

-    /*

-     * Slow down the bus so that older monitors don't 

-     * miss things.

-     */

-    pBus->RiseFallTime = 20;

- 

-    dev = DDC2MakeDevice(pBus, 0x00A0, "ddc2");

-    if (xf86I2CProbeAddress(pBus, 0x0060))

-	DDC2MakeDevice(pBus, 0x0060, "E-EDID segment register");

-

-    return dev;

-}

-

-/* Mmmm, smell the hacks */

-static void

-EEDIDStop(I2CDevPtr d)

-{

-}

-

-/* block is the EDID block number.  a segment is two blocks. */

-static Bool

-DDC2Read(I2CDevPtr dev, int block, unsigned char *R_Buffer)

-{

-    unsigned char W_Buffer[1];

-    int i, segment;

-    I2CDevPtr seg;

-    void (*stop)(I2CDevPtr);

-

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

-	/* Stop bits reset the segment pointer to 0, so be careful here. */

-	segment = block >> 1;

-	if (segment) {

-	    Bool b;

-	    

-	    if (!(seg = xf86I2CFindDev(dev->pI2CBus, 0x0060)))

-		return FALSE;

-

-	    W_Buffer[0] = segment;

-

-	    stop = dev->pI2CBus->I2CStop;

-	    dev->pI2CBus->I2CStop = EEDIDStop;

-

-	    b = xf86I2CWriteRead(seg, W_Buffer, 1, NULL, 0);

-

-	    dev->pI2CBus->I2CStop = stop;

-	    if (!b) {

-		dev->pI2CBus->I2CStop(dev);

-		continue;

-	    }

-	}

-

-	W_Buffer[0] = (block & 0x01) * EDID1_LEN;

-

-	if (xf86I2CWriteRead(dev, W_Buffer, 1, R_Buffer, EDID1_LEN)) {

-	    if (!DDC_checksum(R_Buffer, EDID1_LEN))

-		return TRUE;

-	}

-    }

- 

-    return FALSE;

-}

-

-/**

- * Attempts to probe the monitor for EDID information, if NoDDC and NoDDC2 are

- * unset.  EDID information blocks are interpreted and the results returned in

- * an xf86MonPtr.  Unlike xf86DoEDID_DDC[12](), this function will return

- * the complete EDID data, including all extension blocks, if the 'complete'

- * parameter is TRUE;

- *

- * This function does not affect the list of modes used by drivers -- it is up

- * to the driver to decide policy on what to do with EDID information.

- *

- * @return pointer to a new xf86MonPtr containing the EDID information.

- * @return NULL if no monitor attached or failure to interpret the EDID.

- */

-xf86MonPtr

-xf86DoEEDID(int scrnIndex, I2CBusPtr pBus, Bool complete)

-{

-    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];

-    unsigned char *EDID_block = NULL;

-    xf86MonPtr tmp = NULL;

-    I2CDevPtr dev = NULL;

-    /* Default DDC and DDC2 to enabled. */

-    Bool noddc = FALSE, noddc2 = FALSE;

-    OptionInfoPtr options;

-

-    options = malloc(sizeof(DDCOptions));

-    if (!options)

-	return NULL;

-    memcpy(options, DDCOptions, sizeof(DDCOptions));

-    xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, options);

-

-    xf86GetOptValBool(options, DDCOPT_NODDC, &noddc);

-    xf86GetOptValBool(options, DDCOPT_NODDC2, &noddc2);

-    free(options);

-

-    if (noddc || noddc2)

-	return NULL;

-

-    if (!(dev = DDC2Init(scrnIndex, pBus)))

-	return NULL;

-

-    EDID_block = calloc(1, EDID1_LEN);

-    if (!EDID_block)

-	return NULL;

-

-    if (DDC2Read(dev, 0, EDID_block)) {

-	int i, n = EDID_block[0x7e];

-

-	if (complete && n) {

-	    EDID_block = realloc(EDID_block, EDID1_LEN * (1+n));

-

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

-		DDC2Read(dev, i+1, EDID_block + (EDID1_LEN * (1+i)));

-	}

-

-	tmp = xf86InterpretEEDID(scrnIndex, EDID_block);

-    }

-

-    if (tmp && complete)

-	tmp->flags |= MONITOR_EDID_COMPLETE_RAWDATA;

-

-    return tmp;

-}

-

-/**

- * Attempts to probe the monitor for EDID information, if NoDDC and NoDDC2 are

- * unset.  EDID information blocks are interpreted and the results returned in

- * an xf86MonPtr.

- *

- * This function does not affect the list of modes used by drivers -- it is up

- * to the driver to decide policy on what to do with EDID information.

- *

- * @return pointer to a new xf86MonPtr containing the EDID information.

- * @return NULL if no monitor attached or failure to interpret the EDID.

- */

-xf86MonPtr

-xf86DoEDID_DDC2(int scrnIndex, I2CBusPtr pBus)

-{

-    return xf86DoEEDID(scrnIndex, pBus, FALSE);

-}

-

-/* XXX write me */

-static void *

-DDC2ReadDisplayID(void)

-{

-    return FALSE;

-}

-

-/**

- * Attempts to probe the monitor for DisplayID information, if NoDDC and

- * NoDDC2 are unset.  DisplayID blocks are interpreted and the results

- * returned in an xf86MonPtr.

- *

- * This function does not affect the list of modes used by drivers -- it is up

- * to the driver to decide policy on what to do with DisplayID information.

- *

- * @return pointer to a new xf86MonPtr containing the DisplayID information.

- * @return NULL if no monitor attached or failure to interpret the DisplayID.

- */

-xf86MonPtr

-xf86DoDisplayID(int scrnIndex, I2CBusPtr pBus)

-{

-    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];

-    unsigned char *did = NULL;

-    xf86MonPtr tmp = NULL;

-    I2CDevPtr dev = NULL;

-    /* Default DDC and DDC2 to enabled. */

-    Bool noddc = FALSE, noddc2 = FALSE;

-    OptionInfoPtr options;

-

-    options = malloc(sizeof(DDCOptions));

-    if (!options)

-	return NULL;

-    memcpy(options, DDCOptions, sizeof(DDCOptions));

-    xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, options);

-

-    xf86GetOptValBool(options, DDCOPT_NODDC, &noddc);

-    xf86GetOptValBool(options, DDCOPT_NODDC2, &noddc2);

-    free(options);

-

-    if (noddc || noddc2)

-	return NULL;

-

-    if (!(dev = DDC2Init(scrnIndex, pBus)))

-	return NULL;

-

-    if ((did = DDC2ReadDisplayID())) {

-	tmp = calloc(1, sizeof(*tmp));

-	if (!tmp)

-	    return NULL;

-

-	tmp->scrnIndex = scrnIndex;

-	tmp->flags |= MONITOR_DISPLAYID;

-	tmp->rawData = did;

-    }

-

-    return tmp;

-}

+/* xf86DDC.c 
+ * 
+ * Copyright 1998,1999 by Egbert Eich <Egbert.Eich@Physik.TU-Darmstadt.DE>
+ */
+
+/*
+ * A note on terminology.  DDC1 is the original dumb serial protocol, and
+ * can only do up to 128 bytes of EDID.  DDC2 is I2C-encapsulated and
+ * introduces extension blocks.  EDID is the old display identification
+ * block, DisplayID is the new one.
+ */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "misc.h"
+#include "xf86.h"
+#include "xf86_OSproc.h"
+#include "xf86DDC.h"
+#include <string.h>
+
+#define RETRIES 4
+
+typedef enum {
+    DDCOPT_NODDC1,
+    DDCOPT_NODDC2,
+    DDCOPT_NODDC
+} DDCOpts;
+
+static const OptionInfoRec DDCOptions[] = {
+    { DDCOPT_NODDC1,	"NoDDC1",	OPTV_BOOLEAN,	{0},	FALSE },
+    { DDCOPT_NODDC2,	"NoDDC2",	OPTV_BOOLEAN,	{0},	FALSE },
+    { DDCOPT_NODDC,	"NoDDC",	OPTV_BOOLEAN,	{0},	FALSE },
+    { -1,		NULL,		OPTV_NONE,	{0},	FALSE },
+};
+
+/* DDC1 */
+
+static int
+find_start(unsigned int *ptr)
+{
+    unsigned int comp[9], test[9];
+    int i,j;
+  
+    for (i=0;i<9;i++){
+	comp[i] = *(ptr++);
+	test[i] = 1;
+    }
+    for (i=0;i<127;i++){
+	for (j=0;j<9;j++){
+	    test[j] = test[j] & !(comp[j] ^ *(ptr++));
+	}
+    }
+    for (i=0;i<9;i++)
+	if (test[i]) return i+1;
+    return -1;
+}
+
+static unsigned char *
+find_header(unsigned char *block)
+{
+    unsigned char *ptr, *head_ptr, *end;
+    unsigned char header[]={0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00};
+ 
+    ptr = block;
+    end = block + EDID1_LEN;
+    while (ptr<end) {
+	int i;
+	head_ptr = ptr;
+	for (i=0;i<8;i++){
+	    if (header[i] != *(head_ptr++)) break;
+	    if (head_ptr == end) head_ptr = block;
+	}
+	if (i==8) break;
+	ptr++; 
+    }
+    if (ptr == end) return NULL;
+    return ptr;
+}
+
+static unsigned char *
+resort(unsigned char *s_block)
+{
+    unsigned char *d_new, *d_ptr, *d_end, *s_ptr, *s_end;
+    unsigned char tmp;
+
+    s_end = s_block + EDID1_LEN;
+    d_new = malloc(EDID1_LEN);
+    if (!d_new) return NULL;
+    d_end = d_new + EDID1_LEN;
+
+    s_ptr = find_header(s_block);
+    if (!s_ptr) return NULL;
+    for (d_ptr=d_new;d_ptr<d_end;d_ptr++){
+	tmp = *(s_ptr++);
+	*d_ptr = tmp; 
+	if (s_ptr == s_end) s_ptr = s_block;
+    }
+    free(s_block);
+    return d_new;
+}
+
+static int
+DDC_checksum(const unsigned char *block, int len)
+{
+    int i, result = 0;
+    int not_null = 0;
+    
+    for (i=0;i<len;i++) {
+	not_null |= block[i];
+	result += block[i];
+    }
+    
+#ifdef DEBUG
+    if (result & 0xFF) ErrorF("DDC checksum not correct\n");
+    if (!not_null) ErrorF("DDC read all Null\n");
+#endif
+
+    /* catch the trivial case where all bytes are 0 */
+    if (!not_null) return 1;
+
+    return result&0xFF;
+}
+
+static unsigned char *
+GetEDID_DDC1(unsigned int *s_ptr)
+{
+    unsigned char *d_block, *d_pos;
+    unsigned int *s_pos, *s_end;
+    int s_start;
+    int i,j;
+    s_start = find_start(s_ptr);
+    if (s_start==-1) return NULL;
+    s_end = s_ptr + NUM;
+    s_pos = s_ptr + s_start;
+    d_block=malloc(EDID1_LEN);
+    if (!d_block) return NULL;
+    d_pos = d_block;
+    for (i=0;i<EDID1_LEN;i++) {
+	for (j=0;j<8;j++) {
+	    *d_pos <<= 1;
+	    if (*s_pos) {
+		*d_pos |= 0x01;
+	    }
+	    s_pos++; if (s_pos == s_end) s_pos=s_ptr;
+	};
+	s_pos++; if (s_pos == s_end) s_pos=s_ptr;
+	d_pos++;
+    }
+    free(s_ptr);
+    if (d_block && DDC_checksum(d_block,EDID1_LEN)) {
+	free(d_block);
+	return NULL;
+    }
+    return (resort(d_block));
+}
+
+/* fetch entire EDID record; DDC bit needs to be masked */
+static unsigned int * 
+FetchEDID_DDC1(register ScrnInfoPtr pScrn,
+	       register unsigned int (*read_DDC)(ScrnInfoPtr))
+{
+    int count = NUM;
+    unsigned int *ptr, *xp;
+
+    ptr=xp=malloc(sizeof(int)*NUM);
+
+    if (!ptr)  return NULL;
+    do {
+	/* wait for next retrace */
+	*xp = read_DDC(pScrn);
+	xp++;
+    } while(--count);
+    return ptr;
+}
+
+/* test if DDC1  return 0 if not */
+static Bool
+TestDDC1(ScrnInfoPtr pScrn, unsigned int (*read_DDC)(ScrnInfoPtr))
+{
+    int old, count;
+
+    old = read_DDC(pScrn);
+    count = HEADER * BITS_PER_BYTE;
+    do {
+	/* wait for next retrace */
+	if (old != read_DDC(pScrn)) break;
+    } while(count--);
+    return count;
+}
+
+/* 
+ * read EDID record , pass it to callback function to interpret.
+ * callback function will store it for further use by calling
+ * function; it will also decide if we need to reread it 
+ */
+static unsigned char *
+EDIDRead_DDC1(ScrnInfoPtr pScrn, DDC1SetSpeedProc DDCSpeed, 
+              unsigned int (*read_DDC)(ScrnInfoPtr))
+{
+    unsigned char *EDID_block = NULL;
+    int count = RETRIES;
+
+    if (!read_DDC) { 
+	xf86DrvMsg(pScrn->scrnIndex, X_PROBED, 
+		   "chipset doesn't support DDC1\n");
+	return NULL; 
+    };
+
+    if (TestDDC1(pScrn,read_DDC)==-1) { 
+	xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "No DDC signal\n"); 
+	return NULL; 
+    };
+
+    if (DDCSpeed) DDCSpeed(pScrn,DDC_FAST);
+    do {
+	EDID_block = GetEDID_DDC1(FetchEDID_DDC1(pScrn,read_DDC)); 
+	count --;
+    } while (!EDID_block && count);
+    if (DDCSpeed) DDCSpeed(pScrn,DDC_SLOW);
+
+    return EDID_block;
+}
+
+/**
+ * Attempts to probe the monitor for EDID information, if NoDDC and NoDDC1 are
+ * unset.  EDID information blocks are interpreted and the results returned in
+ * an xf86MonPtr.
+ *
+ * This function does not affect the list of modes used by drivers -- it is up
+ * to the driver to decide policy on what to do with EDID information.
+ *
+ * @return pointer to a new xf86MonPtr containing the EDID information.
+ * @return NULL if no monitor attached or failure to interpret the EDID.
+ */
+xf86MonPtr
+xf86DoEDID_DDC1(int scrnIndex, DDC1SetSpeedProc DDC1SetSpeed, 
+		unsigned int (*DDC1Read)(ScrnInfoPtr))
+{
+    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+    unsigned char *EDID_block = NULL;
+    xf86MonPtr tmp = NULL;
+    /* Default DDC and DDC1 to enabled. */
+    Bool noddc = FALSE, noddc1 = FALSE;
+    OptionInfoPtr options;
+
+    options = xnfalloc(sizeof(DDCOptions));
+    (void)memcpy(options, DDCOptions, sizeof(DDCOptions));
+    xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, options);
+
+    xf86GetOptValBool(options, DDCOPT_NODDC, &noddc);
+    xf86GetOptValBool(options, DDCOPT_NODDC1, &noddc1);
+    free(options);
+    
+    if (noddc || noddc1)
+	return NULL;
+    
+    OsBlockSignals();
+    EDID_block = EDIDRead_DDC1(pScrn,DDC1SetSpeed,DDC1Read);
+    OsReleaseSignals();
+
+    if (EDID_block){
+	tmp = xf86InterpretEDID(scrnIndex,EDID_block);
+    }
+#ifdef DEBUG
+	else ErrorF("No EDID block returned\n");
+    if (!tmp)
+	ErrorF("Cannot interpret EDID block\n");
+#endif
+	return tmp;
+}
+
+/* DDC2 */
+
+static I2CDevPtr
+DDC2MakeDevice(I2CBusPtr pBus, int address, char *name)
+{
+    I2CDevPtr dev = NULL;
+
+    if (!(dev = xf86I2CFindDev(pBus, address))) {
+	dev = xf86CreateI2CDevRec();
+	dev->DevName = name;
+	dev->SlaveAddr = address;
+	dev->ByteTimeout = 2200; /* VESA DDC spec 3 p. 43 (+10 %) */
+	dev->StartTimeout = 550;
+	dev->BitTimeout = 40;
+	dev->AcknTimeout = 40;
+
+	dev->pI2CBus = pBus;
+	if (!xf86I2CDevInit(dev)) {
+	    xf86DrvMsg(pBus->scrnIndex, X_PROBED, "No DDC2 device\n");
+	    return NULL;
+	}
+    }
+
+    return dev;
+}
+
+static I2CDevPtr
+DDC2Init(int scrnIndex, I2CBusPtr pBus)
+{
+    I2CDevPtr dev = NULL;
+
+    /*
+     * Slow down the bus so that older monitors don't 
+     * miss things.
+     */
+    pBus->RiseFallTime = 20;
+ 
+    dev = DDC2MakeDevice(pBus, 0x00A0, "ddc2");
+    if (xf86I2CProbeAddress(pBus, 0x0060))
+	DDC2MakeDevice(pBus, 0x0060, "E-EDID segment register");
+
+    return dev;
+}
+
+/* Mmmm, smell the hacks */
+static void
+EEDIDStop(I2CDevPtr d)
+{
+}
+
+/* block is the EDID block number.  a segment is two blocks. */
+static Bool
+DDC2Read(I2CDevPtr dev, int block, unsigned char *R_Buffer)
+{
+    unsigned char W_Buffer[1];
+    int i, segment;
+    I2CDevPtr seg;
+    void (*stop)(I2CDevPtr);
+
+    for (i = 0; i < RETRIES; i++) {
+	/* Stop bits reset the segment pointer to 0, so be careful here. */
+	segment = block >> 1;
+	if (segment) {
+	    Bool b;
+	    
+	    if (!(seg = xf86I2CFindDev(dev->pI2CBus, 0x0060)))
+		return FALSE;
+
+	    W_Buffer[0] = segment;
+
+	    stop = dev->pI2CBus->I2CStop;
+	    dev->pI2CBus->I2CStop = EEDIDStop;
+
+	    b = xf86I2CWriteRead(seg, W_Buffer, 1, NULL, 0);
+
+	    dev->pI2CBus->I2CStop = stop;
+	    if (!b) {
+		dev->pI2CBus->I2CStop(dev);
+		continue;
+	    }
+	}
+
+	W_Buffer[0] = (block & 0x01) * EDID1_LEN;
+
+	if (xf86I2CWriteRead(dev, W_Buffer, 1, R_Buffer, EDID1_LEN)) {
+	    if (!DDC_checksum(R_Buffer, EDID1_LEN))
+		return TRUE;
+	}
+    }
+ 
+    return FALSE;
+}
+
+/**
+ * Attempts to probe the monitor for EDID information, if NoDDC and NoDDC2 are
+ * unset.  EDID information blocks are interpreted and the results returned in
+ * an xf86MonPtr.  Unlike xf86DoEDID_DDC[12](), this function will return
+ * the complete EDID data, including all extension blocks, if the 'complete'
+ * parameter is TRUE;
+ *
+ * This function does not affect the list of modes used by drivers -- it is up
+ * to the driver to decide policy on what to do with EDID information.
+ *
+ * @return pointer to a new xf86MonPtr containing the EDID information.
+ * @return NULL if no monitor attached or failure to interpret the EDID.
+ */
+xf86MonPtr
+xf86DoEEDID(int scrnIndex, I2CBusPtr pBus, Bool complete)
+{
+    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+    unsigned char *EDID_block = NULL;
+    xf86MonPtr tmp = NULL;
+    I2CDevPtr dev = NULL;
+    /* Default DDC and DDC2 to enabled. */
+    Bool noddc = FALSE, noddc2 = FALSE;
+    OptionInfoPtr options;
+
+    options = malloc(sizeof(DDCOptions));
+    if (!options)
+	return NULL;
+    memcpy(options, DDCOptions, sizeof(DDCOptions));
+    xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, options);
+
+    xf86GetOptValBool(options, DDCOPT_NODDC, &noddc);
+    xf86GetOptValBool(options, DDCOPT_NODDC2, &noddc2);
+    free(options);
+
+    if (noddc || noddc2)
+	return NULL;
+
+    if (!(dev = DDC2Init(scrnIndex, pBus)))
+	return NULL;
+
+    EDID_block = calloc(1, EDID1_LEN);
+    if (!EDID_block)
+	return NULL;
+
+    if (DDC2Read(dev, 0, EDID_block)) {
+	int i, n = EDID_block[0x7e];
+
+	if (complete && n) {
+	    EDID_block = realloc(EDID_block, EDID1_LEN * (1+n));
+
+	    for (i = 0; i < n; i++)
+		DDC2Read(dev, i+1, EDID_block + (EDID1_LEN * (1+i)));
+	}
+
+	tmp = xf86InterpretEEDID(scrnIndex, EDID_block);
+    }
+
+    if (tmp && complete)
+	tmp->flags |= MONITOR_EDID_COMPLETE_RAWDATA;
+
+    return tmp;
+}
+
+/**
+ * Attempts to probe the monitor for EDID information, if NoDDC and NoDDC2 are
+ * unset.  EDID information blocks are interpreted and the results returned in
+ * an xf86MonPtr.
+ *
+ * This function does not affect the list of modes used by drivers -- it is up
+ * to the driver to decide policy on what to do with EDID information.
+ *
+ * @return pointer to a new xf86MonPtr containing the EDID information.
+ * @return NULL if no monitor attached or failure to interpret the EDID.
+ */
+xf86MonPtr
+xf86DoEDID_DDC2(int scrnIndex, I2CBusPtr pBus)
+{
+    return xf86DoEEDID(scrnIndex, pBus, FALSE);
+}
+
+/* XXX write me */
+static void *
+DDC2ReadDisplayID(void)
+{
+    return FALSE;
+}
+
+/**
+ * Attempts to probe the monitor for DisplayID information, if NoDDC and
+ * NoDDC2 are unset.  DisplayID blocks are interpreted and the results
+ * returned in an xf86MonPtr.
+ *
+ * This function does not affect the list of modes used by drivers -- it is up
+ * to the driver to decide policy on what to do with DisplayID information.
+ *
+ * @return pointer to a new xf86MonPtr containing the DisplayID information.
+ * @return NULL if no monitor attached or failure to interpret the DisplayID.
+ */
+xf86MonPtr
+xf86DoDisplayID(int scrnIndex, I2CBusPtr pBus)
+{
+    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+    unsigned char *did = NULL;
+    xf86MonPtr tmp = NULL;
+    I2CDevPtr dev = NULL;
+    /* Default DDC and DDC2 to enabled. */
+    Bool noddc = FALSE, noddc2 = FALSE;
+    OptionInfoPtr options;
+
+    options = malloc(sizeof(DDCOptions));
+    if (!options)
+	return NULL;
+    memcpy(options, DDCOptions, sizeof(DDCOptions));
+    xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, options);
+
+    xf86GetOptValBool(options, DDCOPT_NODDC, &noddc);
+    xf86GetOptValBool(options, DDCOPT_NODDC2, &noddc2);
+    free(options);
+
+    if (noddc || noddc2)
+	return NULL;
+
+    if (!(dev = DDC2Init(scrnIndex, pBus)))
+	return NULL;
+
+    if ((did = DDC2ReadDisplayID())) {
+	tmp = calloc(1, sizeof(*tmp));
+	if (!tmp)
+	    return NULL;
+
+	tmp->scrnIndex = scrnIndex;
+	tmp->flags |= MONITOR_DISPLAYID;
+	tmp->rawData = did;
+    }
+
+    return tmp;
+}
diff --git a/xorg-server/hw/xfree86/int10/helper_exec.c b/xorg-server/hw/xfree86/int10/helper_exec.c
index a55390194..b9af473b1 100644
--- a/xorg-server/hw/xfree86/int10/helper_exec.c
+++ b/xorg-server/hw/xfree86/int10/helper_exec.c
@@ -1,732 +1,733 @@
-/*

- *                   XFree86 int10 module

- *   execute BIOS int 10h calls in x86 real mode environment

- *                 Copyright 1999 Egbert Eich

- *

- *   Part of this code was inspired  by the VBIOS POSTing code in DOSEMU

- *   developed by the "DOSEMU-Development-Team"

- */

-

-/*

- * To debug port accesses define PRINT_PORT to 1.

- * Note! You also have to comment out ioperm()

- * in xf86EnableIO(). Otherwise we won't trap

- * on PIO.

- */

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#define PRINT_PORT 0

-

-#include <unistd.h>

-

-#include <X11/Xos.h>

-#include "xf86.h"

-#include "xf86_OSproc.h"

-#include "compiler.h"

-#define _INT10_PRIVATE

-#include "int10Defines.h"

-#include "xf86int10.h"

-#include "Pci.h"

-#ifdef _X86EMU

-#include "x86emu/x86emui.h"

-#else

-#define DEBUG_IO_TRACE() 0

-#endif

-#include <pciaccess.h>

-

-static int pciCfg1in(CARD16 addr, CARD32 *val);

-static int pciCfg1out(CARD16 addr, CARD32 val);

-static int pciCfg1inw(CARD16 addr, CARD16 *val);

-static int pciCfg1outw(CARD16 addr, CARD16 val);

-static int pciCfg1inb(CARD16 addr, CARD8 *val);

-static int pciCfg1outb(CARD16 addr, CARD8 val);

-#if defined (_PC)

-static void SetResetBIOSVars(xf86Int10InfoPtr pInt, Bool set);

-#endif

-

-#define REG pInt

-

-int

-setup_int(xf86Int10InfoPtr pInt)

-{

-    if (pInt != Int10Current) {

-	if (!MapCurrentInt10(pInt))

-	    return -1;

-	Int10Current = pInt;

-    }

-    X86_EAX = (CARD32) pInt->ax;

-    X86_EBX = (CARD32) pInt->bx;

-    X86_ECX = (CARD32) pInt->cx;

-    X86_EDX = (CARD32) pInt->dx;

-    X86_ESI = (CARD32) pInt->si;

-    X86_EDI = (CARD32) pInt->di;

-    X86_EBP = (CARD32) pInt->bp;

-    X86_ESP = 0x1000; X86_SS = pInt->stackseg >> 4;

-    X86_EIP = 0x0600; X86_CS = 0x0;	/* address of 'hlt' */

-    X86_DS = 0x40;			/* standard pc ds */

-    X86_ES = pInt->es;

-    X86_FS = 0;

-    X86_GS = 0;

-    X86_EFLAGS = X86_IF_MASK | X86_IOPL_MASK;

-#if defined (_PC)

-    if (pInt->Flags & SET_BIOS_SCRATCH)

-	SetResetBIOSVars(pInt, TRUE);

-#endif

-    return xf86BlockSIGIO();

-}

-

-void

-finish_int(xf86Int10InfoPtr pInt, int sig)

-{

-    xf86UnblockSIGIO(sig);

-    pInt->ax = (CARD32) X86_EAX;

-    pInt->bx = (CARD32) X86_EBX;

-    pInt->cx = (CARD32) X86_ECX;

-    pInt->dx = (CARD32) X86_EDX;

-    pInt->si = (CARD32) X86_ESI;

-    pInt->di = (CARD32) X86_EDI;

-    pInt->es = (CARD16) X86_ES;

-    pInt->bp = (CARD32) X86_EBP;

-    pInt->flags = (CARD32) X86_FLAGS;

-#if defined (_PC)

-    if (pInt->Flags & RESTORE_BIOS_SCRATCH)

-	SetResetBIOSVars(pInt, FALSE);

-#endif

-}

-

-/* general software interrupt handler */

-CARD32

-getIntVect(xf86Int10InfoPtr pInt,int num)

-{

-    return MEM_RW(pInt, num << 2) + (MEM_RW(pInt, (num << 2) + 2) << 4);

-}

-

-void

-pushw(xf86Int10InfoPtr pInt, CARD16 val)

-{

-    X86_ESP -= 2;

-    MEM_WW(pInt, ((CARD32) X86_SS << 4) + X86_SP, val);

-}

-

-int

-run_bios_int(int num, xf86Int10InfoPtr pInt)

-{

-    CARD32 eflags;

-#ifndef _PC

-    /* check if bios vector is initialized */

-    if (MEM_RW(pInt, (num << 2) + 2) == (SYS_BIOS >> 4)) { /* SYS_BIOS_SEG ?*/

-

-	if (num == 21 && X86_AH == 0x4e) {

- 	    xf86DrvMsg(pInt->scrnIndex, X_NOTICE,

-		       "Failing Find-Matching-File on non-PC"

-			" (int 21, func 4e)\n");

- 	    X86_AX = 2;

- 	    SET_FLAG(F_CF);

- 	    return 1;

- 	} else {

-	    xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 2,

-			   "Ignoring int 0x%02x call\n", num);

-	    if (xf86GetVerbosity() > 3) {

-		dump_registers(pInt);

-		stack_trace(pInt);

-	    }

-	    return 1;

-	}

-    }

-#endif

-#ifdef PRINT_INT

-    ErrorF("calling card BIOS at: ");

-#endif

-    eflags = X86_EFLAGS;

-#if 0

-    eflags = eflags | IF_MASK;

-    X86_EFLAGS = X86_EFLAGS  & ~(VIF_MASK | TF_MASK | IF_MASK | NT_MASK);

-#endif

-    pushw(pInt, eflags);

-    pushw(pInt, X86_CS);

-    pushw(pInt, X86_IP);

-    X86_CS = MEM_RW(pInt, (num << 2) + 2);

-    X86_IP = MEM_RW(pInt,  num << 2);

-#ifdef PRINT_INT

-    ErrorF("0x%x:%lx\n", X86_CS, X86_EIP);

-#endif

-    return 1;

-}

-

-/* Debugging stuff */

-void

-dump_code(xf86Int10InfoPtr pInt)

-{

-    int i;

-    unsigned long lina = SEG_ADR((CARD32), X86_CS, IP);

-

-    xf86DrvMsgVerb(pInt->scrnIndex, X_INFO, 3, "code at 0x%8.8lx:\n", lina);

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

-	xf86ErrorFVerb(3, " %2.2x", MEM_RB(pInt, lina + i));

-    xf86ErrorFVerb(3, "\n");

-    for (; i<0x20; i++)

-	xf86ErrorFVerb(3, " %2.2x", MEM_RB(pInt, lina + i));

-    xf86ErrorFVerb(3, "\n");

-}

-

-void

-dump_registers(xf86Int10InfoPtr pInt)

-{

-    xf86DrvMsgVerb(pInt->scrnIndex, X_INFO, 3,

-	"EAX=0x%8.8lx, EBX=0x%8.8lx, ECX=0x%8.8lx, EDX=0x%8.8lx\n",

-	(unsigned long)X86_EAX, (unsigned long)X86_EBX,

-	(unsigned long)X86_ECX, (unsigned long)X86_EDX);

-    xf86DrvMsgVerb(pInt->scrnIndex, X_INFO, 3,

-	"ESP=0x%8.8lx, EBP=0x%8.8lx, ESI=0x%8.8lx, EDI=0x%8.8lx\n",

-	(unsigned long)X86_ESP, (unsigned long)X86_EBP,

-	(unsigned long)X86_ESI, (unsigned long)X86_EDI);

-    xf86DrvMsgVerb(pInt->scrnIndex, X_INFO, 3,

-	"CS=0x%4.4x, SS=0x%4.4x,"

-	" DS=0x%4.4x, ES=0x%4.4x, FS=0x%4.4x, GS=0x%4.4x\n",

-	X86_CS, X86_SS, X86_DS, X86_ES, X86_FS, X86_GS);

-    xf86DrvMsgVerb(pInt->scrnIndex, X_INFO, 3,

-	"EIP=0x%8.8lx, EFLAGS=0x%8.8lx\n",

-	(unsigned long)X86_EIP, (unsigned long)X86_EFLAGS);

-}

-

-void

-stack_trace(xf86Int10InfoPtr pInt)

-{

-    int i = 0;

-    unsigned long stack = SEG_ADR((CARD32), X86_SS, SP);

-    unsigned long tail  = (CARD32)((X86_SS << 4) + 0x1000);

-

-    if (stack >= tail) return;

-

-    xf86MsgVerb(X_INFO, 3, "stack at 0x%8.8lx:\n", stack);

-    for (; stack < tail; stack++) {

-	xf86ErrorFVerb(3, " %2.2x", MEM_RB(pInt, stack));

-	i = (i + 1) % 0x10;

-	if (!i)

-	    xf86ErrorFVerb(3, "\n");

-    }

-    if (i)

-	xf86ErrorFVerb(3, "\n");

-}

-

-int

-port_rep_inb(xf86Int10InfoPtr pInt,

-	     CARD16 port, CARD32 base, int d_f, CARD32 count)

-{

-    register int inc = d_f ? -1 : 1;

-    CARD32 dst = base;

-    if (PRINT_PORT && DEBUG_IO_TRACE())

-	ErrorF(" rep_insb(%#x) %ld bytes at %8.8lx %s\n",

-		port, count, base, d_f ? "up" : "down");

-    while (count--) {

-	MEM_WB(pInt, dst, x_inb(port));

-	dst += inc;

-    }

-    return dst - base;

-}

-

-int

-port_rep_inw(xf86Int10InfoPtr pInt,

-	     CARD16 port, CARD32 base, int d_f, CARD32 count)

-{

-    register int inc = d_f ? -2 : 2;

-    CARD32 dst = base;

-    if (PRINT_PORT && DEBUG_IO_TRACE())

-	ErrorF(" rep_insw(%#x) %ld bytes at %8.8lx %s\n",

-	     port, count, base, d_f ? "up" : "down");

-    while (count--) {

-	MEM_WW(pInt, dst, x_inw(port));

-	dst += inc;

-    }

-    return dst - base;

-}

-

-int

-port_rep_inl(xf86Int10InfoPtr pInt,

-	     CARD16 port, CARD32 base, int d_f, CARD32 count)

-{

-    register int inc = d_f ? -4 : 4;

-    CARD32 dst = base;

-    if (PRINT_PORT && DEBUG_IO_TRACE())

-	ErrorF(" rep_insl(%#x) %ld bytes at %8.8lx %s\n",

-	     port, count, base, d_f ? "up" : "down");

-    while (count--) {

-	MEM_WL(pInt, dst, x_inl(port));

-	dst += inc;

-    }

-    return dst - base;

-}

-

-int

-port_rep_outb(xf86Int10InfoPtr pInt,

-	      CARD16 port, CARD32 base, int d_f, CARD32 count)

-{

-    register int inc = d_f ? -1 : 1;

-    CARD32 dst = base;

-    if (PRINT_PORT && DEBUG_IO_TRACE())

-	ErrorF(" rep_outb(%#x) %ld bytes at %8.8lx %s\n",

-	     port, count, base, d_f ? "up" : "down");

-    while (count--) {

-	x_outb(port, MEM_RB(pInt, dst));

-	dst += inc;

-    }

-    return dst - base;

-}

-

-int

-port_rep_outw(xf86Int10InfoPtr pInt,

-	      CARD16 port, CARD32 base, int d_f, CARD32 count)

-{

-    register int inc = d_f ? -2 : 2;

-    CARD32 dst = base;

-    if (PRINT_PORT && DEBUG_IO_TRACE())

-	ErrorF(" rep_outw(%#x) %ld bytes at %8.8lx %s\n",

-	     port, count, base, d_f ? "up" : "down");

-    while (count--) {

-	x_outw(port, MEM_RW(pInt, dst));

-	dst += inc;

-    }

-    return dst - base;

-}

-

-int

-port_rep_outl(xf86Int10InfoPtr pInt,

-	      CARD16 port, CARD32 base, int d_f, CARD32 count)

-{

-    register int inc = d_f ? -4 : 4;

-    CARD32 dst = base;

-    if (PRINT_PORT && DEBUG_IO_TRACE())

-	ErrorF(" rep_outl(%#x) %ld bytes at %8.8lx %s\n",

-	     port, count, base, d_f ? "up" : "down");

-    while (count--) {

-	x_outl(port, MEM_RL(pInt, dst));

-	dst += inc;

-    }

-    return dst - base;

-}

-

-CARD8

-x_inb(CARD16 port)

-{

-    CARD8 val;

-

-    if (port == 0x40) {

-	Int10Current->inb40time++;

-	val = (CARD8)(Int10Current->inb40time >>

-		      ((Int10Current->inb40time & 1) << 3));

-	if (PRINT_PORT && DEBUG_IO_TRACE())

-	    ErrorF(" inb(%#x) = %2.2x\n", port, val);

-#ifdef __NOT_YET__

-    } else if (port < 0x0100) {		/* Don't interfere with mainboard */

-	val = 0;

-	xf86DrvMsgVerb(Int10Current->scrnIndex, X_NOT_IMPLEMENTED, 2,

-	    "inb 0x%4.4x\n", port);

-	if (xf86GetVerbosity() > 3) {

-	    dump_registers(Int10Current);

-	    stack_trace(Int10Current);

-	}

-#endif /* __NOT_YET__ */

-    } else if (!pciCfg1inb(port, &val)) {

-	val = inb(Int10Current->ioBase + port);

-	if (PRINT_PORT && DEBUG_IO_TRACE())

-	    ErrorF(" inb(%#x) = %2.2x\n", port, val);

-    }

-    return val;

-}

-

-CARD16

-x_inw(CARD16 port)

-{

-    CARD16 val;

-

-    if (port == 0x5c) {

-	struct timeval tv;

-

-	/*

-	 * Emulate a PC98's timer.  Typical resolution is 3.26 usec.

-	 * Approximate this by dividing by 3.

-	 */

-	X_GETTIMEOFDAY(&tv);

-	val = (CARD16)(tv.tv_usec / 3);

-    } else if (!pciCfg1inw(port, &val)) {

-	val = inw(Int10Current->ioBase + port);

-	if (PRINT_PORT && DEBUG_IO_TRACE())

-	    ErrorF(" inw(%#x) = %4.4x\n", port, val);

-    }

-    return val;

-}

-

-void

-x_outb(CARD16 port, CARD8 val)

-{

-    if ((port == 0x43) && (val == 0)) {

-	struct timeval tv;

-	/*

-	 * Emulate a PC's timer 0.  Such timers typically have a resolution of

-	 * some .838 usec per tick, but this can only provide 1 usec per tick.

-	 * (Not that this matters much, given inherent emulation delays.)  Use

-	 * the bottom bit as a byte select.  See inb(0x40) above.

-	 */

-	X_GETTIMEOFDAY(&tv);

-	Int10Current->inb40time = (CARD16)(tv.tv_usec | 1);

-	if (PRINT_PORT && DEBUG_IO_TRACE())

-	    ErrorF(" outb(%#x, %2.2x)\n", port, val);

-#ifdef __NOT_YET__

-    } else if (port < 0x0100) {		/* Don't interfere with mainboard */

-	xf86DrvMsgVerb(Int10Current->scrnIndex, X_NOT_IMPLEMENTED, 2,

-	    "outb 0x%4.4x,0x%2.2x\n", port, val);

-	if (xf86GetVerbosity() > 3) {

-	    dump_registers(Int10Current);

-	    stack_trace(Int10Current);

-	}

-#endif /* __NOT_YET__ */

-    } else if (!pciCfg1outb(port, val)) {

-	if (PRINT_PORT && DEBUG_IO_TRACE())

-	    ErrorF(" outb(%#x, %2.2x)\n", port, val);

-	outb(Int10Current->ioBase + port, val);

-    }

-}

-

-void

-x_outw(CARD16 port, CARD16 val)

-{

-

-    if (!pciCfg1outw(port, val)) {

-	if (PRINT_PORT && DEBUG_IO_TRACE())

-	    ErrorF(" outw(%#x, %4.4x)\n", port, val);

-	outw(Int10Current->ioBase + port, val);

-    }

-}

-

-CARD32

-x_inl(CARD16 port)

-{

-    CARD32 val;

-

-    if (!pciCfg1in(port, &val)) {

-	val = inl(Int10Current->ioBase + port);

-	if (PRINT_PORT && DEBUG_IO_TRACE())

-	    ErrorF(" inl(%#x) = %8.8lx\n", port, val);

-    }

-    return val;

-}

-

-void

-x_outl(CARD16 port, CARD32 val)

-{

-    if (!pciCfg1out(port, val)) {

-	if (PRINT_PORT && DEBUG_IO_TRACE())

-	    ErrorF(" outl(%#x, %8.8lx)\n", port, val);

-	outl(Int10Current->ioBase + port, val);

-    }

-}

-

-CARD8

-Mem_rb(CARD32 addr)

-{

-    return (*Int10Current->mem->rb)(Int10Current, addr);

-}

-

-CARD16

-Mem_rw(CARD32 addr)

-{

-    return (*Int10Current->mem->rw)(Int10Current, addr);

-}

-

-CARD32

-Mem_rl(CARD32 addr)

-{

-    return (*Int10Current->mem->rl)(Int10Current, addr);

-}

-

-void

-Mem_wb(CARD32 addr, CARD8 val)

-{

-    (*Int10Current->mem->wb)(Int10Current, addr, val);

-}

-

-void

-Mem_ww(CARD32 addr, CARD16 val)

-{

-    (*Int10Current->mem->ww)(Int10Current, addr, val);

-}

-

-void

-Mem_wl(CARD32 addr, CARD32 val)

-{

-    (*Int10Current->mem->wl)(Int10Current, addr, val);

-}

-

-static CARD32 PciCfg1Addr = 0;

-

-#define PCI_DOM_FROM_TAG(tag)  (((tag) >> 24) & (PCI_DOM_MASK))

-#define PCI_BUS_FROM_TAG(tag)  (((tag) >> 16) & (PCI_DOMBUS_MASK))

-#define PCI_DEV_FROM_TAG(tag)  (((tag) & 0x0000f800u) >> 11)

-#define PCI_FUNC_FROM_TAG(tag) (((tag) & 0x00000700u) >> 8)

-

-#define PCI_OFFSET(x) ((x) & 0x000000ff)

-#define PCI_TAG(x)    ((x) & 0x7fffff00)

-

-static struct pci_device*

-pci_device_for_cfg_address (CARD32 addr)

-{

-	struct pci_device *dev = NULL;

-	PCITAG tag = PCI_TAG(addr);

-	struct pci_slot_match slot_match = {

-		.domain = PCI_DOM_FROM_TAG(tag),

-		.bus = PCI_BUS_NO_DOMAIN(PCI_BUS_FROM_TAG(tag)),

-		.dev = PCI_DEV_FROM_TAG(tag),

-		.func = PCI_FUNC_FROM_TAG(tag),

-		.match_data = 0

-	};

-

-	struct pci_device_iterator *iter =

-	    pci_slot_match_iterator_create (&slot_match);

-

-	if (iter)

-		dev = pci_device_next(iter);

-

-	pci_iterator_destroy(iter);

-

-	return dev;

-}

-

-static int

-pciCfg1in(CARD16 addr, CARD32 *val)

-{

-    if (addr == 0xCF8) {

-	*val = PciCfg1Addr;

-	return 1;

-    }

-    if (addr == 0xCFC) {

-	pci_device_cfg_read_u32(pci_device_for_cfg_address(PciCfg1Addr),

-			val, PCI_OFFSET(PciCfg1Addr));

-	if (PRINT_PORT && DEBUG_IO_TRACE())

-	    ErrorF(" cfg_inl(%#lx) = %8.8lx\n", PciCfg1Addr, *val);

-	return 1;

-    }

-    return 0;

-}

-

-static int

-pciCfg1out(CARD16 addr, CARD32 val)

-{

-    if (addr == 0xCF8) {

-	PciCfg1Addr = val;

-	return 1;

-    }

-    if (addr == 0xCFC) {

-	if (PRINT_PORT && DEBUG_IO_TRACE())

-	    ErrorF(" cfg_outl(%#lx, %8.8lx)\n", PciCfg1Addr, val);

-	pci_device_cfg_write_u32(pci_device_for_cfg_address(PciCfg1Addr),

-			val, PCI_OFFSET(PciCfg1Addr));

-	return 1;

-    }

-    return 0;

-}

-

-static int

-pciCfg1inw(CARD16 addr, CARD16 *val)

-{

-    int shift;

-

-    if ((addr >= 0xCF8) && (addr <= 0xCFB)) {

-	shift = (addr - 0xCF8) * 8;

-	*val = (PciCfg1Addr >> shift) & 0xffff;

-	return 1;

-    }

-    if ((addr >= 0xCFC) && (addr <= 0xCFF)) {

-	const unsigned offset = addr - 0xCFC;

-

-	pci_device_cfg_read_u16(pci_device_for_cfg_address(PciCfg1Addr),

-			val, PCI_OFFSET(PciCfg1Addr) + offset);

-	if (PRINT_PORT && DEBUG_IO_TRACE())

-	    ErrorF(" cfg_inw(%#lx) = %4.4x\n", PciCfg1Addr + offset, *val);

-	return 1;

-    }

-    return 0;

-}

-

-static int

-pciCfg1outw(CARD16 addr, CARD16 val)

-{

-    int shift;

-

-    if ((addr >= 0xCF8) && (addr <= 0xCFB)) {

-	shift = (addr - 0xCF8) * 8;

-	PciCfg1Addr &= ~(0xffff << shift);

-	PciCfg1Addr |= ((CARD32) val) << shift;

-	return 1;

-    }

-    if ((addr >= 0xCFC) && (addr <= 0xCFF)) {

-	const unsigned offset = addr - 0xCFC;

-

-	if (PRINT_PORT && DEBUG_IO_TRACE())

-	    ErrorF(" cfg_outw(%#lx, %4.4x)\n", PciCfg1Addr + offset, val);

-	pci_device_cfg_write_u16(pci_device_for_cfg_address(PciCfg1Addr),

-			val, PCI_OFFSET(PciCfg1Addr) + offset);

-	return 1;

-    }

-    return 0;

-}

-

-static int

-pciCfg1inb(CARD16 addr, CARD8 *val)

-{

-    int shift;

-

-    if ((addr >= 0xCF8) && (addr <= 0xCFB)) {

-	shift = (addr - 0xCF8) * 8;

-	*val = (PciCfg1Addr >> shift) & 0xff;

-	return 1;

-    }

-    if ((addr >= 0xCFC) && (addr <= 0xCFF)) {

-	const unsigned offset = addr - 0xCFC;

-

-	pci_device_cfg_read_u8(pci_device_for_cfg_address(PciCfg1Addr),

-			val, PCI_OFFSET(PciCfg1Addr) + offset);

-	if (PRINT_PORT && DEBUG_IO_TRACE())

-	    ErrorF(" cfg_inb(%#lx) = %2.2x\n", PciCfg1Addr + offset, *val);

-	return 1;

-    }

-    return 0;

-}

-

-static int

-pciCfg1outb(CARD16 addr, CARD8 val)

-{

-    int shift;

-

-    if ((addr >= 0xCF8) && (addr <= 0xCFB)) {

-	shift = (addr - 0xCF8) * 8;

-	PciCfg1Addr &= ~(0xff << shift);

-	PciCfg1Addr |= ((CARD32) val) << shift;

-	return 1;

-    }

-    if ((addr >= 0xCFC) && (addr <= 0xCFF)) {

-	const unsigned offset = addr - 0xCFC;

-

-	if (PRINT_PORT && DEBUG_IO_TRACE())

-	    ErrorF(" cfg_outb(%#lx, %2.2x)\n", PciCfg1Addr + offset, val);

-	pci_device_cfg_write_u8(pci_device_for_cfg_address(PciCfg1Addr),

-			val, PCI_OFFSET(PciCfg1Addr) + offset);

-	return 1;

-    }

-    return 0;

-}

-

-CARD8

-bios_checksum(const CARD8 *start, int size)

-{

-    CARD8 sum = 0;

-

-    while (size-- > 0)

-	sum += *start++;

-    return sum;

-}

-

-/*

- * Lock/Unlock legacy VGA. Some Bioses try to be very clever and make

- * an attempt to detect a legacy ISA card. If they find one they might

- * act very strange: for example they might configure the card as a

- * monochrome card. This might cause some drivers to choke.

- * To avoid this we attempt legacy VGA by writing to all know VGA

- * disable registers before we call the BIOS initialization and

- * restore the original values afterwards. In beween we hold our

- * breath. To get to a (possibly exising) ISA card need to disable

- * our current PCI card.

- */

-/*

- * This is just for booting: we just want to catch pure

- * legacy vga therefore we don't worry about mmio etc.

- * This stuff should really go into vgaHW.c. However then

- * the driver would have to load the vga-module prior to

- * doing int10.

- */

-void

-LockLegacyVGA(xf86Int10InfoPtr pInt, legacyVGAPtr vga)

-{

-    vga->save_msr    = inb(pInt->ioBase + 0x03CC);

-    vga->save_vse    = inb(pInt->ioBase + 0x03C3);

-#ifndef __ia64__

-    vga->save_46e8   = inb(pInt->ioBase + 0x46E8);

-#endif

-    vga->save_pos102 = inb(pInt->ioBase + 0x0102);

-    outb(pInt->ioBase + 0x03C2, ~(CARD8)0x03 & vga->save_msr);

-    outb(pInt->ioBase + 0x03C3, ~(CARD8)0x01 & vga->save_vse);

-#ifndef __ia64__

-    outb(pInt->ioBase + 0x46E8, ~(CARD8)0x08 & vga->save_46e8);

-#endif

-    outb(pInt->ioBase + 0x0102, ~(CARD8)0x01 & vga->save_pos102);

-}

-

-void

-UnlockLegacyVGA(xf86Int10InfoPtr pInt, legacyVGAPtr vga)

-{

-    outb(pInt->ioBase + 0x0102, vga->save_pos102);

-#ifndef __ia64__

-    outb(pInt->ioBase + 0x46E8, vga->save_46e8);

-#endif

-    outb(pInt->ioBase + 0x03C3, vga->save_vse);

-    outb(pInt->ioBase + 0x03C2, vga->save_msr);

-}

-

-#if defined (_PC)

-static void

-SetResetBIOSVars(xf86Int10InfoPtr pInt, Bool set)

-{

-    int pagesize = getpagesize();

-    unsigned char* base = xf86MapVidMem(pInt->scrnIndex,

-					VIDMEM_MMIO, 0, pagesize);

-    int i;

-

-    if (set) {

-	for (i = BIOS_SCRATCH_OFF; i < BIOS_SCRATCH_END; i++)

-	    MEM_WW(pInt, i, *(base + i));

-    } else {

-	for (i = BIOS_SCRATCH_OFF; i < BIOS_SCRATCH_END; i++)

-	    *(base + i) = MEM_RW(pInt, i);

-    }

-    

-    xf86UnMapVidMem(pInt->scrnIndex,base,pagesize);

-}

-

-void

-xf86Int10SaveRestoreBIOSVars(xf86Int10InfoPtr pInt, Bool save)

-{

-    int pagesize = getpagesize();

-    unsigned char* base;

-    int i;

-

-    if (!xf86IsEntityPrimary(pInt->entityIndex)

-	|| (!save && !pInt->BIOSScratch))

-	return;

-    

-    base = xf86MapVidMem(pInt->scrnIndex, VIDMEM_MMIO, 0, pagesize);

-    base += BIOS_SCRATCH_OFF;

-    if (save) {

-	if ((pInt->BIOSScratch

-	     = xnfalloc(BIOS_SCRATCH_LEN)))

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

-		*(((char*)pInt->BIOSScratch + i)) = *(base + i);	

-    } else {

-	if (pInt->BIOSScratch) {

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

-		*(base + i) = *(pInt->BIOSScratch + i); 

-	    free(pInt->BIOSScratch);

-	    pInt->BIOSScratch = NULL;

-	}

-    }

-    

-    xf86UnMapVidMem(pInt->scrnIndex,base - BIOS_SCRATCH_OFF ,pagesize);

-}

-#endif

-

-xf86Int10InfoPtr

-xf86InitInt10(int entityIndex)

-{

-    return xf86ExtendedInitInt10(entityIndex, 0);

-}

+/*
+ *                   XFree86 int10 module
+ *   execute BIOS int 10h calls in x86 real mode environment
+ *                 Copyright 1999 Egbert Eich
+ *
+ *   Part of this code was inspired  by the VBIOS POSTing code in DOSEMU
+ *   developed by the "DOSEMU-Development-Team"
+ */
+
+/*
+ * To debug port accesses define PRINT_PORT to 1.
+ * Note! You also have to comment out ioperm()
+ * in xf86EnableIO(). Otherwise we won't trap
+ * on PIO.
+ */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#define PRINT_PORT 0
+
+#include <unistd.h>
+
+#include <X11/Xos.h>
+#include "xf86.h"
+#include "xf86_OSproc.h"
+#include "compiler.h"
+#define _INT10_PRIVATE
+#include "int10Defines.h"
+#include "xf86int10.h"
+#include "Pci.h"
+#ifdef _X86EMU
+#include "x86emu/x86emui.h"
+#else
+#define DEBUG_IO_TRACE() 0
+#endif
+#include <pciaccess.h>
+
+static int pciCfg1in(CARD16 addr, CARD32 *val);
+static int pciCfg1out(CARD16 addr, CARD32 val);
+static int pciCfg1inw(CARD16 addr, CARD16 *val);
+static int pciCfg1outw(CARD16 addr, CARD16 val);
+static int pciCfg1inb(CARD16 addr, CARD8 *val);
+static int pciCfg1outb(CARD16 addr, CARD8 val);
+#if defined (_PC)
+static void SetResetBIOSVars(xf86Int10InfoPtr pInt, Bool set);
+#endif
+
+#define REG pInt
+
+int
+setup_int(xf86Int10InfoPtr pInt)
+{
+    if (pInt != Int10Current) {
+	if (!MapCurrentInt10(pInt))
+	    return -1;
+	Int10Current = pInt;
+    }
+    X86_EAX = (CARD32) pInt->ax;
+    X86_EBX = (CARD32) pInt->bx;
+    X86_ECX = (CARD32) pInt->cx;
+    X86_EDX = (CARD32) pInt->dx;
+    X86_ESI = (CARD32) pInt->si;
+    X86_EDI = (CARD32) pInt->di;
+    X86_EBP = (CARD32) pInt->bp;
+    X86_ESP = 0x1000; X86_SS = pInt->stackseg >> 4;
+    X86_EIP = 0x0600; X86_CS = 0x0;	/* address of 'hlt' */
+    X86_DS = 0x40;			/* standard pc ds */
+    X86_ES = pInt->es;
+    X86_FS = 0;
+    X86_GS = 0;
+    X86_EFLAGS = X86_IF_MASK | X86_IOPL_MASK;
+#if defined (_PC)
+    if (pInt->Flags & SET_BIOS_SCRATCH)
+	SetResetBIOSVars(pInt, TRUE);
+#endif
+    OsBlockSignals();
+    return 0;
+}
+
+void
+finish_int(xf86Int10InfoPtr pInt, int sig)
+{
+    OsReleaseSignals();
+    pInt->ax = (CARD32) X86_EAX;
+    pInt->bx = (CARD32) X86_EBX;
+    pInt->cx = (CARD32) X86_ECX;
+    pInt->dx = (CARD32) X86_EDX;
+    pInt->si = (CARD32) X86_ESI;
+    pInt->di = (CARD32) X86_EDI;
+    pInt->es = (CARD16) X86_ES;
+    pInt->bp = (CARD32) X86_EBP;
+    pInt->flags = (CARD32) X86_FLAGS;
+#if defined (_PC)
+    if (pInt->Flags & RESTORE_BIOS_SCRATCH)
+	SetResetBIOSVars(pInt, FALSE);
+#endif
+}
+
+/* general software interrupt handler */
+CARD32
+getIntVect(xf86Int10InfoPtr pInt,int num)
+{
+    return MEM_RW(pInt, num << 2) + (MEM_RW(pInt, (num << 2) + 2) << 4);
+}
+
+void
+pushw(xf86Int10InfoPtr pInt, CARD16 val)
+{
+    X86_ESP -= 2;
+    MEM_WW(pInt, ((CARD32) X86_SS << 4) + X86_SP, val);
+}
+
+int
+run_bios_int(int num, xf86Int10InfoPtr pInt)
+{
+    CARD32 eflags;
+#ifndef _PC
+    /* check if bios vector is initialized */
+    if (MEM_RW(pInt, (num << 2) + 2) == (SYS_BIOS >> 4)) { /* SYS_BIOS_SEG ?*/
+
+	if (num == 21 && X86_AH == 0x4e) {
+ 	    xf86DrvMsg(pInt->scrnIndex, X_NOTICE,
+		       "Failing Find-Matching-File on non-PC"
+			" (int 21, func 4e)\n");
+ 	    X86_AX = 2;
+ 	    SET_FLAG(F_CF);
+ 	    return 1;
+ 	} else {
+	    xf86DrvMsgVerb(pInt->scrnIndex, X_NOT_IMPLEMENTED, 2,
+			   "Ignoring int 0x%02x call\n", num);
+	    if (xf86GetVerbosity() > 3) {
+		dump_registers(pInt);
+		stack_trace(pInt);
+	    }
+	    return 1;
+	}
+    }
+#endif
+#ifdef PRINT_INT
+    ErrorF("calling card BIOS at: ");
+#endif
+    eflags = X86_EFLAGS;
+#if 0
+    eflags = eflags | IF_MASK;
+    X86_EFLAGS = X86_EFLAGS  & ~(VIF_MASK | TF_MASK | IF_MASK | NT_MASK);
+#endif
+    pushw(pInt, eflags);
+    pushw(pInt, X86_CS);
+    pushw(pInt, X86_IP);
+    X86_CS = MEM_RW(pInt, (num << 2) + 2);
+    X86_IP = MEM_RW(pInt,  num << 2);
+#ifdef PRINT_INT
+    ErrorF("0x%x:%lx\n", X86_CS, X86_EIP);
+#endif
+    return 1;
+}
+
+/* Debugging stuff */
+void
+dump_code(xf86Int10InfoPtr pInt)
+{
+    int i;
+    unsigned long lina = SEG_ADR((CARD32), X86_CS, IP);
+
+    xf86DrvMsgVerb(pInt->scrnIndex, X_INFO, 3, "code at 0x%8.8lx:\n", lina);
+    for (i=0; i<0x10; i++)
+	xf86ErrorFVerb(3, " %2.2x", MEM_RB(pInt, lina + i));
+    xf86ErrorFVerb(3, "\n");
+    for (; i<0x20; i++)
+	xf86ErrorFVerb(3, " %2.2x", MEM_RB(pInt, lina + i));
+    xf86ErrorFVerb(3, "\n");
+}
+
+void
+dump_registers(xf86Int10InfoPtr pInt)
+{
+    xf86DrvMsgVerb(pInt->scrnIndex, X_INFO, 3,
+	"EAX=0x%8.8lx, EBX=0x%8.8lx, ECX=0x%8.8lx, EDX=0x%8.8lx\n",
+	(unsigned long)X86_EAX, (unsigned long)X86_EBX,
+	(unsigned long)X86_ECX, (unsigned long)X86_EDX);
+    xf86DrvMsgVerb(pInt->scrnIndex, X_INFO, 3,
+	"ESP=0x%8.8lx, EBP=0x%8.8lx, ESI=0x%8.8lx, EDI=0x%8.8lx\n",
+	(unsigned long)X86_ESP, (unsigned long)X86_EBP,
+	(unsigned long)X86_ESI, (unsigned long)X86_EDI);
+    xf86DrvMsgVerb(pInt->scrnIndex, X_INFO, 3,
+	"CS=0x%4.4x, SS=0x%4.4x,"
+	" DS=0x%4.4x, ES=0x%4.4x, FS=0x%4.4x, GS=0x%4.4x\n",
+	X86_CS, X86_SS, X86_DS, X86_ES, X86_FS, X86_GS);
+    xf86DrvMsgVerb(pInt->scrnIndex, X_INFO, 3,
+	"EIP=0x%8.8lx, EFLAGS=0x%8.8lx\n",
+	(unsigned long)X86_EIP, (unsigned long)X86_EFLAGS);
+}
+
+void
+stack_trace(xf86Int10InfoPtr pInt)
+{
+    int i = 0;
+    unsigned long stack = SEG_ADR((CARD32), X86_SS, SP);
+    unsigned long tail  = (CARD32)((X86_SS << 4) + 0x1000);
+
+    if (stack >= tail) return;
+
+    xf86MsgVerb(X_INFO, 3, "stack at 0x%8.8lx:\n", stack);
+    for (; stack < tail; stack++) {
+	xf86ErrorFVerb(3, " %2.2x", MEM_RB(pInt, stack));
+	i = (i + 1) % 0x10;
+	if (!i)
+	    xf86ErrorFVerb(3, "\n");
+    }
+    if (i)
+	xf86ErrorFVerb(3, "\n");
+}
+
+int
+port_rep_inb(xf86Int10InfoPtr pInt,
+	     CARD16 port, CARD32 base, int d_f, CARD32 count)
+{
+    register int inc = d_f ? -1 : 1;
+    CARD32 dst = base;
+    if (PRINT_PORT && DEBUG_IO_TRACE())
+	ErrorF(" rep_insb(%#x) %ld bytes at %8.8lx %s\n",
+		port, count, base, d_f ? "up" : "down");
+    while (count--) {
+	MEM_WB(pInt, dst, x_inb(port));
+	dst += inc;
+    }
+    return dst - base;
+}
+
+int
+port_rep_inw(xf86Int10InfoPtr pInt,
+	     CARD16 port, CARD32 base, int d_f, CARD32 count)
+{
+    register int inc = d_f ? -2 : 2;
+    CARD32 dst = base;
+    if (PRINT_PORT && DEBUG_IO_TRACE())
+	ErrorF(" rep_insw(%#x) %ld bytes at %8.8lx %s\n",
+	     port, count, base, d_f ? "up" : "down");
+    while (count--) {
+	MEM_WW(pInt, dst, x_inw(port));
+	dst += inc;
+    }
+    return dst - base;
+}
+
+int
+port_rep_inl(xf86Int10InfoPtr pInt,
+	     CARD16 port, CARD32 base, int d_f, CARD32 count)
+{
+    register int inc = d_f ? -4 : 4;
+    CARD32 dst = base;
+    if (PRINT_PORT && DEBUG_IO_TRACE())
+	ErrorF(" rep_insl(%#x) %ld bytes at %8.8lx %s\n",
+	     port, count, base, d_f ? "up" : "down");
+    while (count--) {
+	MEM_WL(pInt, dst, x_inl(port));
+	dst += inc;
+    }
+    return dst - base;
+}
+
+int
+port_rep_outb(xf86Int10InfoPtr pInt,
+	      CARD16 port, CARD32 base, int d_f, CARD32 count)
+{
+    register int inc = d_f ? -1 : 1;
+    CARD32 dst = base;
+    if (PRINT_PORT && DEBUG_IO_TRACE())
+	ErrorF(" rep_outb(%#x) %ld bytes at %8.8lx %s\n",
+	     port, count, base, d_f ? "up" : "down");
+    while (count--) {
+	x_outb(port, MEM_RB(pInt, dst));
+	dst += inc;
+    }
+    return dst - base;
+}
+
+int
+port_rep_outw(xf86Int10InfoPtr pInt,
+	      CARD16 port, CARD32 base, int d_f, CARD32 count)
+{
+    register int inc = d_f ? -2 : 2;
+    CARD32 dst = base;
+    if (PRINT_PORT && DEBUG_IO_TRACE())
+	ErrorF(" rep_outw(%#x) %ld bytes at %8.8lx %s\n",
+	     port, count, base, d_f ? "up" : "down");
+    while (count--) {
+	x_outw(port, MEM_RW(pInt, dst));
+	dst += inc;
+    }
+    return dst - base;
+}
+
+int
+port_rep_outl(xf86Int10InfoPtr pInt,
+	      CARD16 port, CARD32 base, int d_f, CARD32 count)
+{
+    register int inc = d_f ? -4 : 4;
+    CARD32 dst = base;
+    if (PRINT_PORT && DEBUG_IO_TRACE())
+	ErrorF(" rep_outl(%#x) %ld bytes at %8.8lx %s\n",
+	     port, count, base, d_f ? "up" : "down");
+    while (count--) {
+	x_outl(port, MEM_RL(pInt, dst));
+	dst += inc;
+    }
+    return dst - base;
+}
+
+CARD8
+x_inb(CARD16 port)
+{
+    CARD8 val;
+
+    if (port == 0x40) {
+	Int10Current->inb40time++;
+	val = (CARD8)(Int10Current->inb40time >>
+		      ((Int10Current->inb40time & 1) << 3));
+	if (PRINT_PORT && DEBUG_IO_TRACE())
+	    ErrorF(" inb(%#x) = %2.2x\n", port, val);
+#ifdef __NOT_YET__
+    } else if (port < 0x0100) {		/* Don't interfere with mainboard */
+	val = 0;
+	xf86DrvMsgVerb(Int10Current->scrnIndex, X_NOT_IMPLEMENTED, 2,
+	    "inb 0x%4.4x\n", port);
+	if (xf86GetVerbosity() > 3) {
+	    dump_registers(Int10Current);
+	    stack_trace(Int10Current);
+	}
+#endif /* __NOT_YET__ */
+    } else if (!pciCfg1inb(port, &val)) {
+	val = inb(Int10Current->ioBase + port);
+	if (PRINT_PORT && DEBUG_IO_TRACE())
+	    ErrorF(" inb(%#x) = %2.2x\n", port, val);
+    }
+    return val;
+}
+
+CARD16
+x_inw(CARD16 port)
+{
+    CARD16 val;
+
+    if (port == 0x5c) {
+	struct timeval tv;
+
+	/*
+	 * Emulate a PC98's timer.  Typical resolution is 3.26 usec.
+	 * Approximate this by dividing by 3.
+	 */
+	X_GETTIMEOFDAY(&tv);
+	val = (CARD16)(tv.tv_usec / 3);
+    } else if (!pciCfg1inw(port, &val)) {
+	val = inw(Int10Current->ioBase + port);
+	if (PRINT_PORT && DEBUG_IO_TRACE())
+	    ErrorF(" inw(%#x) = %4.4x\n", port, val);
+    }
+    return val;
+}
+
+void
+x_outb(CARD16 port, CARD8 val)
+{
+    if ((port == 0x43) && (val == 0)) {
+	struct timeval tv;
+	/*
+	 * Emulate a PC's timer 0.  Such timers typically have a resolution of
+	 * some .838 usec per tick, but this can only provide 1 usec per tick.
+	 * (Not that this matters much, given inherent emulation delays.)  Use
+	 * the bottom bit as a byte select.  See inb(0x40) above.
+	 */
+	X_GETTIMEOFDAY(&tv);
+	Int10Current->inb40time = (CARD16)(tv.tv_usec | 1);
+	if (PRINT_PORT && DEBUG_IO_TRACE())
+	    ErrorF(" outb(%#x, %2.2x)\n", port, val);
+#ifdef __NOT_YET__
+    } else if (port < 0x0100) {		/* Don't interfere with mainboard */
+	xf86DrvMsgVerb(Int10Current->scrnIndex, X_NOT_IMPLEMENTED, 2,
+	    "outb 0x%4.4x,0x%2.2x\n", port, val);
+	if (xf86GetVerbosity() > 3) {
+	    dump_registers(Int10Current);
+	    stack_trace(Int10Current);
+	}
+#endif /* __NOT_YET__ */
+    } else if (!pciCfg1outb(port, val)) {
+	if (PRINT_PORT && DEBUG_IO_TRACE())
+	    ErrorF(" outb(%#x, %2.2x)\n", port, val);
+	outb(Int10Current->ioBase + port, val);
+    }
+}
+
+void
+x_outw(CARD16 port, CARD16 val)
+{
+
+    if (!pciCfg1outw(port, val)) {
+	if (PRINT_PORT && DEBUG_IO_TRACE())
+	    ErrorF(" outw(%#x, %4.4x)\n", port, val);
+	outw(Int10Current->ioBase + port, val);
+    }
+}
+
+CARD32
+x_inl(CARD16 port)
+{
+    CARD32 val;
+
+    if (!pciCfg1in(port, &val)) {
+	val = inl(Int10Current->ioBase + port);
+	if (PRINT_PORT && DEBUG_IO_TRACE())
+	    ErrorF(" inl(%#x) = %8.8lx\n", port, val);
+    }
+    return val;
+}
+
+void
+x_outl(CARD16 port, CARD32 val)
+{
+    if (!pciCfg1out(port, val)) {
+	if (PRINT_PORT && DEBUG_IO_TRACE())
+	    ErrorF(" outl(%#x, %8.8lx)\n", port, val);
+	outl(Int10Current->ioBase + port, val);
+    }
+}
+
+CARD8
+Mem_rb(CARD32 addr)
+{
+    return (*Int10Current->mem->rb)(Int10Current, addr);
+}
+
+CARD16
+Mem_rw(CARD32 addr)
+{
+    return (*Int10Current->mem->rw)(Int10Current, addr);
+}
+
+CARD32
+Mem_rl(CARD32 addr)
+{
+    return (*Int10Current->mem->rl)(Int10Current, addr);
+}
+
+void
+Mem_wb(CARD32 addr, CARD8 val)
+{
+    (*Int10Current->mem->wb)(Int10Current, addr, val);
+}
+
+void
+Mem_ww(CARD32 addr, CARD16 val)
+{
+    (*Int10Current->mem->ww)(Int10Current, addr, val);
+}
+
+void
+Mem_wl(CARD32 addr, CARD32 val)
+{
+    (*Int10Current->mem->wl)(Int10Current, addr, val);
+}
+
+static CARD32 PciCfg1Addr = 0;
+
+#define PCI_DOM_FROM_TAG(tag)  (((tag) >> 24) & (PCI_DOM_MASK))
+#define PCI_BUS_FROM_TAG(tag)  (((tag) >> 16) & (PCI_DOMBUS_MASK))
+#define PCI_DEV_FROM_TAG(tag)  (((tag) & 0x0000f800u) >> 11)
+#define PCI_FUNC_FROM_TAG(tag) (((tag) & 0x00000700u) >> 8)
+
+#define PCI_OFFSET(x) ((x) & 0x000000ff)
+#define PCI_TAG(x)    ((x) & 0x7fffff00)
+
+static struct pci_device*
+pci_device_for_cfg_address (CARD32 addr)
+{
+	struct pci_device *dev = NULL;
+	PCITAG tag = PCI_TAG(addr);
+	struct pci_slot_match slot_match = {
+		.domain = PCI_DOM_FROM_TAG(tag),
+		.bus = PCI_BUS_NO_DOMAIN(PCI_BUS_FROM_TAG(tag)),
+		.dev = PCI_DEV_FROM_TAG(tag),
+		.func = PCI_FUNC_FROM_TAG(tag),
+		.match_data = 0
+	};
+
+	struct pci_device_iterator *iter =
+	    pci_slot_match_iterator_create (&slot_match);
+
+	if (iter)
+		dev = pci_device_next(iter);
+
+	pci_iterator_destroy(iter);
+
+	return dev;
+}
+
+static int
+pciCfg1in(CARD16 addr, CARD32 *val)
+{
+    if (addr == 0xCF8) {
+	*val = PciCfg1Addr;
+	return 1;
+    }
+    if (addr == 0xCFC) {
+	pci_device_cfg_read_u32(pci_device_for_cfg_address(PciCfg1Addr),
+			val, PCI_OFFSET(PciCfg1Addr));
+	if (PRINT_PORT && DEBUG_IO_TRACE())
+	    ErrorF(" cfg_inl(%#lx) = %8.8lx\n", PciCfg1Addr, *val);
+	return 1;
+    }
+    return 0;
+}
+
+static int
+pciCfg1out(CARD16 addr, CARD32 val)
+{
+    if (addr == 0xCF8) {
+	PciCfg1Addr = val;
+	return 1;
+    }
+    if (addr == 0xCFC) {
+	if (PRINT_PORT && DEBUG_IO_TRACE())
+	    ErrorF(" cfg_outl(%#lx, %8.8lx)\n", PciCfg1Addr, val);
+	pci_device_cfg_write_u32(pci_device_for_cfg_address(PciCfg1Addr),
+			val, PCI_OFFSET(PciCfg1Addr));
+	return 1;
+    }
+    return 0;
+}
+
+static int
+pciCfg1inw(CARD16 addr, CARD16 *val)
+{
+    int shift;
+
+    if ((addr >= 0xCF8) && (addr <= 0xCFB)) {
+	shift = (addr - 0xCF8) * 8;
+	*val = (PciCfg1Addr >> shift) & 0xffff;
+	return 1;
+    }
+    if ((addr >= 0xCFC) && (addr <= 0xCFF)) {
+	const unsigned offset = addr - 0xCFC;
+
+	pci_device_cfg_read_u16(pci_device_for_cfg_address(PciCfg1Addr),
+			val, PCI_OFFSET(PciCfg1Addr) + offset);
+	if (PRINT_PORT && DEBUG_IO_TRACE())
+	    ErrorF(" cfg_inw(%#lx) = %4.4x\n", PciCfg1Addr + offset, *val);
+	return 1;
+    }
+    return 0;
+}
+
+static int
+pciCfg1outw(CARD16 addr, CARD16 val)
+{
+    int shift;
+
+    if ((addr >= 0xCF8) && (addr <= 0xCFB)) {
+	shift = (addr - 0xCF8) * 8;
+	PciCfg1Addr &= ~(0xffff << shift);
+	PciCfg1Addr |= ((CARD32) val) << shift;
+	return 1;
+    }
+    if ((addr >= 0xCFC) && (addr <= 0xCFF)) {
+	const unsigned offset = addr - 0xCFC;
+
+	if (PRINT_PORT && DEBUG_IO_TRACE())
+	    ErrorF(" cfg_outw(%#lx, %4.4x)\n", PciCfg1Addr + offset, val);
+	pci_device_cfg_write_u16(pci_device_for_cfg_address(PciCfg1Addr),
+			val, PCI_OFFSET(PciCfg1Addr) + offset);
+	return 1;
+    }
+    return 0;
+}
+
+static int
+pciCfg1inb(CARD16 addr, CARD8 *val)
+{
+    int shift;
+
+    if ((addr >= 0xCF8) && (addr <= 0xCFB)) {
+	shift = (addr - 0xCF8) * 8;
+	*val = (PciCfg1Addr >> shift) & 0xff;
+	return 1;
+    }
+    if ((addr >= 0xCFC) && (addr <= 0xCFF)) {
+	const unsigned offset = addr - 0xCFC;
+
+	pci_device_cfg_read_u8(pci_device_for_cfg_address(PciCfg1Addr),
+			val, PCI_OFFSET(PciCfg1Addr) + offset);
+	if (PRINT_PORT && DEBUG_IO_TRACE())
+	    ErrorF(" cfg_inb(%#lx) = %2.2x\n", PciCfg1Addr + offset, *val);
+	return 1;
+    }
+    return 0;
+}
+
+static int
+pciCfg1outb(CARD16 addr, CARD8 val)
+{
+    int shift;
+
+    if ((addr >= 0xCF8) && (addr <= 0xCFB)) {
+	shift = (addr - 0xCF8) * 8;
+	PciCfg1Addr &= ~(0xff << shift);
+	PciCfg1Addr |= ((CARD32) val) << shift;
+	return 1;
+    }
+    if ((addr >= 0xCFC) && (addr <= 0xCFF)) {
+	const unsigned offset = addr - 0xCFC;
+
+	if (PRINT_PORT && DEBUG_IO_TRACE())
+	    ErrorF(" cfg_outb(%#lx, %2.2x)\n", PciCfg1Addr + offset, val);
+	pci_device_cfg_write_u8(pci_device_for_cfg_address(PciCfg1Addr),
+			val, PCI_OFFSET(PciCfg1Addr) + offset);
+	return 1;
+    }
+    return 0;
+}
+
+CARD8
+bios_checksum(const CARD8 *start, int size)
+{
+    CARD8 sum = 0;
+
+    while (size-- > 0)
+	sum += *start++;
+    return sum;
+}
+
+/*
+ * Lock/Unlock legacy VGA. Some Bioses try to be very clever and make
+ * an attempt to detect a legacy ISA card. If they find one they might
+ * act very strange: for example they might configure the card as a
+ * monochrome card. This might cause some drivers to choke.
+ * To avoid this we attempt legacy VGA by writing to all know VGA
+ * disable registers before we call the BIOS initialization and
+ * restore the original values afterwards. In beween we hold our
+ * breath. To get to a (possibly exising) ISA card need to disable
+ * our current PCI card.
+ */
+/*
+ * This is just for booting: we just want to catch pure
+ * legacy vga therefore we don't worry about mmio etc.
+ * This stuff should really go into vgaHW.c. However then
+ * the driver would have to load the vga-module prior to
+ * doing int10.
+ */
+void
+LockLegacyVGA(xf86Int10InfoPtr pInt, legacyVGAPtr vga)
+{
+    vga->save_msr    = inb(pInt->ioBase + 0x03CC);
+    vga->save_vse    = inb(pInt->ioBase + 0x03C3);
+#ifndef __ia64__
+    vga->save_46e8   = inb(pInt->ioBase + 0x46E8);
+#endif
+    vga->save_pos102 = inb(pInt->ioBase + 0x0102);
+    outb(pInt->ioBase + 0x03C2, ~(CARD8)0x03 & vga->save_msr);
+    outb(pInt->ioBase + 0x03C3, ~(CARD8)0x01 & vga->save_vse);
+#ifndef __ia64__
+    outb(pInt->ioBase + 0x46E8, ~(CARD8)0x08 & vga->save_46e8);
+#endif
+    outb(pInt->ioBase + 0x0102, ~(CARD8)0x01 & vga->save_pos102);
+}
+
+void
+UnlockLegacyVGA(xf86Int10InfoPtr pInt, legacyVGAPtr vga)
+{
+    outb(pInt->ioBase + 0x0102, vga->save_pos102);
+#ifndef __ia64__
+    outb(pInt->ioBase + 0x46E8, vga->save_46e8);
+#endif
+    outb(pInt->ioBase + 0x03C3, vga->save_vse);
+    outb(pInt->ioBase + 0x03C2, vga->save_msr);
+}
+
+#if defined (_PC)
+static void
+SetResetBIOSVars(xf86Int10InfoPtr pInt, Bool set)
+{
+    int pagesize = getpagesize();
+    unsigned char* base = xf86MapVidMem(pInt->scrnIndex,
+					VIDMEM_MMIO, 0, pagesize);
+    int i;
+
+    if (set) {
+	for (i = BIOS_SCRATCH_OFF; i < BIOS_SCRATCH_END; i++)
+	    MEM_WW(pInt, i, *(base + i));
+    } else {
+	for (i = BIOS_SCRATCH_OFF; i < BIOS_SCRATCH_END; i++)
+	    *(base + i) = MEM_RW(pInt, i);
+    }
+    
+    xf86UnMapVidMem(pInt->scrnIndex,base,pagesize);
+}
+
+void
+xf86Int10SaveRestoreBIOSVars(xf86Int10InfoPtr pInt, Bool save)
+{
+    int pagesize = getpagesize();
+    unsigned char* base;
+    int i;
+
+    if (!xf86IsEntityPrimary(pInt->entityIndex)
+	|| (!save && !pInt->BIOSScratch))
+	return;
+    
+    base = xf86MapVidMem(pInt->scrnIndex, VIDMEM_MMIO, 0, pagesize);
+    base += BIOS_SCRATCH_OFF;
+    if (save) {
+	if ((pInt->BIOSScratch
+	     = xnfalloc(BIOS_SCRATCH_LEN)))
+	    for (i = 0; i < BIOS_SCRATCH_LEN; i++)
+		*(((char*)pInt->BIOSScratch + i)) = *(base + i);	
+    } else {
+	if (pInt->BIOSScratch) {
+	    for (i = 0; i < BIOS_SCRATCH_LEN; i++)
+		*(base + i) = *(pInt->BIOSScratch + i); 
+	    free(pInt->BIOSScratch);
+	    pInt->BIOSScratch = NULL;
+	}
+    }
+    
+    xf86UnMapVidMem(pInt->scrnIndex,base - BIOS_SCRATCH_OFF ,pagesize);
+}
+#endif
+
+xf86Int10InfoPtr
+xf86InitInt10(int entityIndex)
+{
+    return xf86ExtendedInitInt10(entityIndex, 0);
+}
diff --git a/xorg-server/hw/xfree86/loader/loader.c b/xorg-server/hw/xfree86/loader/loader.c
index dce3b22f6..159b61198 100644
--- a/xorg-server/hw/xfree86/loader/loader.c
+++ b/xorg-server/hw/xfree86/loader/loader.c
@@ -1,228 +1,208 @@
-/*

- * Copyright 1995-1998 by Metro Link, Inc.

- *

- * 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 Metro Link, Inc. not be used in

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

- * specific, written prior permission.  Metro Link, Inc. makes no

- * representations about the suitability of this software for any purpose.

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

- *

- * METRO LINK, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

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

- * EVENT SHALL METRO LINK, INC. 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) 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).

- */

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include <errno.h>

-#include <stdio.h>

-#include <stdlib.h>

-#include <sys/types.h>

-#include <unistd.h>

-#include <sys/stat.h>

-#include <fcntl.h>

-#include <string.h>

-#include <stdarg.h>

-

-#include "os.h"

-#include "loader.h"

-#include "loaderProcs.h"

-#include "xf86.h"

-#include "xf86Priv.h"

-#include "compiler.h"

-

-#ifdef HAVE_DLFCN_H

-

-#include <dlfcn.h>

-#include <X11/Xos.h>

-

-#if defined(DL_LAZY)

-#define DLOPEN_LAZY DL_LAZY

-#elif defined(RTLD_LAZY)

-#define DLOPEN_LAZY RTLD_LAZY

-#elif defined(__FreeBSD__)

-#define DLOPEN_LAZY 1

-#else

-#define DLOPEN_LAZY 0

-#endif

-

-#if defined(LD_GLOBAL)

-#define DLOPEN_GLOBAL LD_GLOBAL

-#elif defined(RTLD_GLOBAL)

-#define DLOPEN_GLOBAL RTLD_GLOBAL

-#else

-#define DLOPEN_GLOBAL 0

-#endif

-

-#else

-#error i have no dynamic linker and i must scream

-#endif

-

-extern void *xorg_symbols[];

-

-void

-LoaderInit(void)

-{

-    xf86MsgVerb(X_INFO, 2, "Loader magic: %p\n", (void *)xorg_symbols);

-    xf86MsgVerb(X_INFO, 2, "Module ABI versions:\n");

-    xf86ErrorFVerb(2, "\t%s: %d.%d\n", ABI_CLASS_ANSIC,

-		   GET_ABI_MAJOR(LoaderVersionInfo.ansicVersion),

-		   GET_ABI_MINOR(LoaderVersionInfo.ansicVersion));

-    xf86ErrorFVerb(2, "\t%s: %d.%d\n", ABI_CLASS_VIDEODRV,

-		   GET_ABI_MAJOR(LoaderVersionInfo.videodrvVersion),

-		   GET_ABI_MINOR(LoaderVersionInfo.videodrvVersion));

-    xf86ErrorFVerb(2, "\t%s : %d.%d\n", ABI_CLASS_XINPUT,

-		   GET_ABI_MAJOR(LoaderVersionInfo.xinputVersion),

-		   GET_ABI_MINOR(LoaderVersionInfo.xinputVersion));

-    xf86ErrorFVerb(2, "\t%s : %d.%d\n", ABI_CLASS_EXTENSION,

-		   GET_ABI_MAJOR(LoaderVersionInfo.extensionVersion),

-		   GET_ABI_MINOR(LoaderVersionInfo.extensionVersion));

-

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

-    /* For UnixWare we need to load the C Runtime libraries which are

-     * normally auto-linked by the compiler. Otherwise we are bound to

-     * see unresolved symbols when trying to use the type "long long".

-     * Obviously, this does not apply if the GNU C compiler is used.

-     */

-    {

-	int errmaj, errmin, wasLoaded; /* place holders */

-	char *xcrtpath = DEFAULT_MODULE_PATH "/libcrt.a";

-	char *uwcrtpath = "/usr/ccs/lib/libcrt.a";

-	char *path;

-	struct stat st;

-

-	if(stat(xcrtpath, &st) < 0)

-	    path = uwcrtpath; /* fallback: try to get libcrt.a from the uccs */

-	else

-	    path = xcrtpath; /* get the libcrt.a we compiled with */

-	LoaderOpen (path, &errmaj, &errmin, &wasLoaded, 0);

-    }

-#endif

-}

-

-/* Public Interface to the loader. */

-

-void *

-LoaderOpen(const char *module, int *errmaj, int *errmin)

-{

-    void *ret;

-

-#if defined(DEBUG)

-    ErrorF("LoaderOpen(%s)\n", module);

-#endif

-

-    xf86Msg(X_INFO, "Loading %s\n", module);

-

-    if (!(ret = dlopen(module, DLOPEN_LAZY | DLOPEN_GLOBAL))) {

-	xf86Msg(X_ERROR, "Failed to load %s: %s\n", module, dlerror());

-	if (errmaj)

-	    *errmaj = LDR_NOLOAD;

-	if (errmin)

-	    *errmin = LDR_NOLOAD;

-	return NULL;

-    }

-

-    return ret;

-}

-

-void *

-LoaderSymbol(const char *name)

-{

-    static void *global_scope = NULL;

-    void *p;

-

-    p = dlsym(RTLD_DEFAULT, name);

-    if (p != NULL)

-	return p;

-

-    if (!global_scope)

-	global_scope = dlopen(NULL, DLOPEN_LAZY | DLOPEN_GLOBAL);

-

-    if (global_scope)

-	return dlsym(global_scope, name);

-

-    return NULL;

-}

-

-void

-LoaderUnload(const char *name, void *handle)

-{

-    xf86Msg(X_INFO, "Unloading %s\n", name);

-    if (handle)

-	dlclose(handle);

-}

-

-unsigned long LoaderOptions = 0;

-

-void

-LoaderSetOptions(unsigned long opts)

-{

-    LoaderOptions |= opts;

-}

-

-Bool

-LoaderShouldIgnoreABI(void)

-{

-    return (LoaderOptions & LDR_OPT_ABI_MISMATCH_NONFATAL) != 0;

-}

-

-int

-LoaderGetABIVersion(const char *abiclass)

-{

-    struct {

-        const char *name;

-        int version;

-    } classes[] = {

-        { ABI_CLASS_ANSIC,     LoaderVersionInfo.ansicVersion },

-        { ABI_CLASS_VIDEODRV,  LoaderVersionInfo.videodrvVersion },

-        { ABI_CLASS_XINPUT,    LoaderVersionInfo.xinputVersion },

-        { ABI_CLASS_EXTENSION, LoaderVersionInfo.extensionVersion },

-        { ABI_CLASS_FONT,      LoaderVersionInfo.fontVersion },

-        { NULL,                0 }

-    };

-    int i;

-

-    for(i = 0; classes[i].name; i++) {

-        if(!strcmp(classes[i].name, abiclass)) {

-            return classes[i].version;

-        }

-    }

-

-    return 0;

-}

+/*
+ * Copyright 1995-1998 by Metro Link, Inc.
+ *
+ * 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 Metro Link, Inc. not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Metro Link, Inc. makes no
+ * representations about the suitability of this software for any purpose.
+ *  It is provided "as is" without express or implied warranty.
+ *
+ * METRO LINK, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL METRO LINK, INC. 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) 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).
+ */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <string.h>
+#include <stdarg.h>
+
+#include "os.h"
+#include "loader.h"
+#include "loaderProcs.h"
+#include "xf86.h"
+#include "xf86Priv.h"
+#include "compiler.h"
+
+#ifdef HAVE_DLFCN_H
+
+#include <dlfcn.h>
+#include <X11/Xos.h>
+
+#if defined(DL_LAZY)
+#define DLOPEN_LAZY DL_LAZY
+#elif defined(RTLD_LAZY)
+#define DLOPEN_LAZY RTLD_LAZY
+#elif defined(__FreeBSD__)
+#define DLOPEN_LAZY 1
+#else
+#define DLOPEN_LAZY 0
+#endif
+
+#if defined(LD_GLOBAL)
+#define DLOPEN_GLOBAL LD_GLOBAL
+#elif defined(RTLD_GLOBAL)
+#define DLOPEN_GLOBAL RTLD_GLOBAL
+#else
+#define DLOPEN_GLOBAL 0
+#endif
+
+#else
+#error i have no dynamic linker and i must scream
+#endif
+
+extern void *xorg_symbols[];
+
+void
+LoaderInit(void)
+{
+    xf86MsgVerb(X_INFO, 2, "Loader magic: %p\n", (void *)xorg_symbols);
+    xf86MsgVerb(X_INFO, 2, "Module ABI versions:\n");
+    xf86ErrorFVerb(2, "\t%s: %d.%d\n", ABI_CLASS_ANSIC,
+		   GET_ABI_MAJOR(LoaderVersionInfo.ansicVersion),
+		   GET_ABI_MINOR(LoaderVersionInfo.ansicVersion));
+    xf86ErrorFVerb(2, "\t%s: %d.%d\n", ABI_CLASS_VIDEODRV,
+		   GET_ABI_MAJOR(LoaderVersionInfo.videodrvVersion),
+		   GET_ABI_MINOR(LoaderVersionInfo.videodrvVersion));
+    xf86ErrorFVerb(2, "\t%s : %d.%d\n", ABI_CLASS_XINPUT,
+		   GET_ABI_MAJOR(LoaderVersionInfo.xinputVersion),
+		   GET_ABI_MINOR(LoaderVersionInfo.xinputVersion));
+    xf86ErrorFVerb(2, "\t%s : %d.%d\n", ABI_CLASS_EXTENSION,
+		   GET_ABI_MAJOR(LoaderVersionInfo.extensionVersion),
+		   GET_ABI_MINOR(LoaderVersionInfo.extensionVersion));
+
+}
+
+/* Public Interface to the loader. */
+
+void *
+LoaderOpen(const char *module, int *errmaj, int *errmin)
+{
+    void *ret;
+
+#if defined(DEBUG)
+    ErrorF("LoaderOpen(%s)\n", module);
+#endif
+
+    xf86Msg(X_INFO, "Loading %s\n", module);
+
+    if (!(ret = dlopen(module, DLOPEN_LAZY | DLOPEN_GLOBAL))) {
+	xf86Msg(X_ERROR, "Failed to load %s: %s\n", module, dlerror());
+	if (errmaj)
+	    *errmaj = LDR_NOLOAD;
+	if (errmin)
+	    *errmin = LDR_NOLOAD;
+	return NULL;
+    }
+
+    return ret;
+}
+
+void *
+LoaderSymbol(const char *name)
+{
+    static void *global_scope = NULL;
+    void *p;
+
+    p = dlsym(RTLD_DEFAULT, name);
+    if (p != NULL)
+	return p;
+
+    if (!global_scope)
+	global_scope = dlopen(NULL, DLOPEN_LAZY | DLOPEN_GLOBAL);
+
+    if (global_scope)
+	return dlsym(global_scope, name);
+
+    return NULL;
+}
+
+void
+LoaderUnload(const char *name, void *handle)
+{
+    xf86Msg(X_INFO, "Unloading %s\n", name);
+    if (handle)
+	dlclose(handle);
+}
+
+unsigned long LoaderOptions = 0;
+
+void
+LoaderSetOptions(unsigned long opts)
+{
+    LoaderOptions |= opts;
+}
+
+Bool
+LoaderShouldIgnoreABI(void)
+{
+    return (LoaderOptions & LDR_OPT_ABI_MISMATCH_NONFATAL) != 0;
+}
+
+int
+LoaderGetABIVersion(const char *abiclass)
+{
+    struct {
+        const char *name;
+        int version;
+    } classes[] = {
+        { ABI_CLASS_ANSIC,     LoaderVersionInfo.ansicVersion },
+        { ABI_CLASS_VIDEODRV,  LoaderVersionInfo.videodrvVersion },
+        { ABI_CLASS_XINPUT,    LoaderVersionInfo.xinputVersion },
+        { ABI_CLASS_EXTENSION, LoaderVersionInfo.extensionVersion },
+        { ABI_CLASS_FONT,      LoaderVersionInfo.fontVersion },
+        { NULL,                0 }
+    };
+    int i;
+
+    for(i = 0; classes[i].name; i++) {
+        if(!strcmp(classes[i].name, abiclass)) {
+            return classes[i].version;
+        }
+    }
+
+    return 0;
+}
diff --git a/xorg-server/hw/xfree86/loader/os.c b/xorg-server/hw/xfree86/loader/os.c
index 5acce0024..6b5ac7e86 100644
--- a/xorg-server/hw/xfree86/loader/os.c
+++ b/xorg-server/hw/xfree86/loader/os.c
@@ -50,8 +50,6 @@
 #define OSNAME "openbsd"
 #elif defined(__GNU__)
 #define OSNAME "hurd"
-#elif defined(__SCO__)
-#define OSNAME "sco"
 #elif defined(SVR4) && defined(sun)
 #define OSNAME "solaris"
 #elif defined(SVR5)
diff --git a/xorg-server/hw/xfree86/loader/sdksyms.sh b/xorg-server/hw/xfree86/loader/sdksyms.sh
index c25aaf010..f60b8ed74 100644
--- a/xorg-server/hw/xfree86/loader/sdksyms.sh
+++ b/xorg-server/hw/xfree86/loader/sdksyms.sh
@@ -1,420 +1,424 @@
-#!/bin/sh

-

-cat > sdksyms.c << EOF

-/* This file is automatically generated by sdksyms.sh. */

-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-

-/* These must be included first */

-#include "misc.h"

-#include "miscstruct.h"

-

-

-/* render/Makefile.am */

-#include "picture.h"

-#include "mipict.h"

-#include "glyphstr.h"

-#include "picturestr.h"

-

-

-/* fb/Makefile.am -- module */

-/*

-#include "fb.h"

-#include "fbrop.h"

-#include "fboverlay.h"

-#include "wfbrename.h"

-#include "fbpict.h"

- */

-

-

-/* miext/shadow/Makefile.am -- module */

-/*

-#include "shadow.h"

- */

-

-

-/* miext/damage/Makefile.am */

-#include "damage.h"

-#include "damagestr.h"

-

-/* miext/sync/Makefile.am */

-#include "misync.h"

-#include "misyncstr.h"

-

-/* Xext/Makefile.am -- half is module, half is builtin */

-/*

-#include "xvdix.h"

-#include "xvmcext.h"

- */

-#include "geext.h"

-#include "geint.h"

-#include "shmint.h"

-#include "syncsdk.h"

-#if XINERAMA

-# include "panoramiXsrv.h"

-# include "panoramiX.h"

-#endif

-

-

-/* hw/xfree86/int10/Makefile.am -- module */

-/*

-#include "xf86int10.h"

- */

-

-

-/* hw/xfree86/i2c/Makefile.am -- "mostly" modules */

-#include "xf86i2c.h"

-/*

-#include "bt829.h"

-#include "fi1236.h"

-#include "msp3430.h"

-#include "tda8425.h"

-#include "tda9850.h"

-#include "tda9885.h"

-#include "uda1380.h"

-#include "i2c_def.h"

- */

-

-

-/* hw/xfree86/modes/Makefile.am */

-#include "xf86Crtc.h"

-#include "xf86Modes.h"

-#include "xf86RandR12.h"

-/* #include "xf86Rename.h" */

-

-

-/* hw/xfree86/ddc/Makefile.am */

-#include "edid.h"

-#include "xf86DDC.h"

-

-

-/* hw/xfree86/dri2/Makefile.am -- module */

-/*

-#if DRI2

-# include "dri2.h"

-#endif

- */

-

-

-/* hw/xfree86/vgahw/Makefile.am -- module */

-/*

-#include "vgaHW.h"

- */

-

-

-/* hw/xfree86/fbdevhw/Makefile.am -- module */

-/*

-#include "fbdevhw.h"

- */

-

-

-/* hw/xfree86/common/Makefile.am */

-#include "compiler.h"

-#include "fourcc.h"

-#include "xf86.h"

-#include "xf86Module.h"

-#include "xf86Opt.h"

-#include "xf86PciInfo.h"

-#include "xf86Priv.h"

-#include "xf86Privstr.h"

-#include "xf86cmap.h"

-#include "xf86fbman.h"

-#include "xf86str.h"

-#include "xf86Xinput.h"

-#include "xf86VGAarbiter.h"

-#include "xisb.h"

-#if XV

-# include "xf86xv.h"

-# include "xf86xvmc.h"

-# include "xf86xvpriv.h"

-#endif

-/* XF86VidMode code is in libextmod module */

-/*

-#if XF86VIDMODE

-# include "vidmodeproc.h"

-#endif

- */

-#include "xorgVersion.h"

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

-# include "xf86sbusBus.h"

-#endif

-

-

-/* hw/xfree86/ramdac/Makefile.am */

-#include "BT.h"

-#include "IBM.h"

-#include "TI.h"

-#include "xf86Cursor.h"

-#include "xf86RamDac.h"

-

-

-/* hw/xfree86/shadowfb/Makefile.am -- module */

-/*

-#include "shadowfb.h"

- */

-

-

-/* hw/xfree86/os-support/solaris/Makefile.am */

-#if defined(sun386)

-# include "agpgart.h"

-#endif

-

-

-/* hw/xfree86/os-support/Makefile.am */

-#include "xf86_OSproc.h"

-#include "xf86_OSlib.h"

-

-

-/* hw/xfree86/os-support/bus/Makefile.am */

-#include "xf86Pci.h"

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

-# include "xf86Sbus.h"

-#endif

-

-

-/* hw/xfree86/xaa/Makefile.am -- module */

-/*

-#include "xaa.h"

-#include "xaalocal.h"

-#include "xaarop.h"

- */

-

-

-/* hw/xfree86/dixmods/extmod/Makefile.am -- module */

-/*

-#include "dgaproc.h"

- */

-

-

-/* hw/xfree86/parser/Makefile.am */

-#include "xf86Parser.h"

-#include "xf86Optrec.h"

-

-

-/* hw/xfree86/vbe/Makefile.am -- module */

-/*

-#include "vbe.h"

-#include "vbeModes.h"

- */

-

-

-/* hw/xfree86/dri/Makefile.am -- module */

-/*

-#if XF86DRI

-# include "dri.h"

-# include "sarea.h"

-# include "dristruct.h"

-#endif

- */

-

-

-/* mi/Makefile.am */

-#include "micmap.h"

-#include "miline.h"

-#include "mipointer.h"

-#include "mi.h"

-#include "mibstore.h"

-#include "migc.h"

-#include "mipointrst.h"

-#include "mizerarc.h"

-#include "micoord.h"

-#include "mifillarc.h"

-#include "mispans.h"

-#include "miwideline.h"

-#include "mistruct.h"

-#include "mifpoly.h"

-#include "mioverlay.h"

-

-

-/* randr/Makefile.am */

-#include "randrstr.h"

-#include "rrtransform.h"

-

-

-/* dbe/Makefile.am -- module */

-/*

-#include "dbestruct.h"

- */

-

-

-/* exa/Makefile.am -- module */

-/*

-#include "exa.h"

- */

-

-

-/* xfixes/Makefile.am */

-#include "xfixes.h"

-

-

-/* include/Makefile.am */

-#include "XIstubs.h"

-#include "Xprintf.h"

-#include "closestr.h"

-#include "closure.h"

-#include "colormap.h"

-#include "colormapst.h"

-#include "hotplug.h"

-#include "cursor.h"

-#include "cursorstr.h"

-#include "dix.h"

-#include "dixaccess.h"

-#include "dixevents.h"

-#include "dixfont.h"

-#include "dixfontstr.h"

-#include "dixgrabs.h"

-#include "dixstruct.h"

-#include "exevents.h"

-#include "extension.h"

-#include "extinit.h"

-#include "extnsionst.h"

-#include "gc.h"

-#include "gcstruct.h"

-#include "globals.h"

-#include "input.h"

-#include "inputstr.h"

-/* already included */

-/*

-#include "misc.h"

-#include "miscstruct.h"

- */

-#include "opaque.h"

-#include "os.h"

-#include "pixmap.h"

-#include "pixmapstr.h"

-#include "privates.h"

-#include "property.h"

-#include "propertyst.h"

-#include "ptrveloc.h"

-#include "region.h"

-#include "regionstr.h"

-#include "registry.h"

-#include "resource.h"

-#include "rgb.h"

-#include "screenint.h"

-#include "scrnintstr.h"

-#include "selection.h"

-#include "servermd.h"

-#include "site.h"

-#include "swaprep.h"

-#include "swapreq.h"

-#include "validate.h"

-#include "window.h"

-#include "windowstr.h"

-#include "xace.h"

-#include "xkbfile.h"

-#include "xkbsrv.h"

-#include "xkbstr.h"

-#include "xkbrules.h"

-#include "xserver-properties.h"

-

-EOF

-

-topdir=$1

-shift

-LC_ALL=C

-export LC_ALL

-${CPP:-cpp} "$@" -DXorgLoader sdksyms.c | ${AWK:-awk} -v topdir=$topdir '

-BEGIN {

-    sdk = 0;

-    print("/*");

-    print(" * These symbols are referenced to ensure they");

-    print(" * will be available in the X Server binary.");

-    print(" */");

-    printf("/* topdir=%s */\n", topdir);

-    print("_X_HIDDEN void *xorg_symbols[] = {");

-

-    printf("sdksyms.c:") > "sdksyms.dep";

-}

-/^# [0-9]+ "/ {

-    #   Process text after a include in a relative path or when the

-    # processed file has a basename matching $top_srcdir.

-    #   Note that indexing starts at 1; 0 means no match, and there

-    # is a starting ".

-    sdk = $3 !~ /^"\// || index($3, topdir) == 2;

-

-    if (sdk && $3 ~ /\.h"$/) {

-	# remove quotes

-	gsub(/"/, "", $3);

-	line = $2;

-	header = $3;

-	if (! headers[$3]) {

-	    printf(" \\\n  %s", $3) >> "sdksyms.dep";

-	    headers[$3] = 1;

-	}

-    }

-    next;

-}

-

-/^extern[ 	]/  {

-    if (sdk) {

-	n = 3;

-

-	# skip attribute, if any

-	while ($n ~ /^(__attribute__|__global)/ ||

-	    # skip modifiers, if any

-	    $n ~ /^\*?(unsigned|const|volatile|struct)$/ ||

-	    # skip pointer

-	    $n ~ /\*$/)

-	    n++;

-

-	# type specifier may not be set, as in

-	#   extern _X_EXPORT unsigned name(...)

-	if ($n !~ /[^a-zA-Z0-9_]/)

-	    n++;

-

-	# match

-	#    extern _X_EXPORT type (* name[])(...)

-	if ($n ~ /^[^a-zA-Z0-9_]+$/)

-	    n++;

-

-	# match

-	#	extern _X_EXPORT const name *const ...

-	if ($n ~ /^([^a-zA-Z0-9_]+)?const$/)

-	    n++;

-

-	# actual name may be in the next line, as in

-	#   extern _X_EXPORT type

-	# possibly ending with a *

-	#   name(...)

-	if ($n == "" || $n ~ /^\*+$/) {

-	    getline;

-	    n = 1;

-	}

-

-	# dont modify $0 or $n

-	symbol = $n;

-

-	# remove starting non word chars

-	sub(/^[^a-zA-Z0-9_]+/, "",symbol);

-

-	# remove from first non word to end of line

-	sub(/[^a-zA-Z0-9_].*/, "", symbol);

-

-	#print;

-	printf("    (void *) &%-50s /* %s:%s */\n", symbol ",", header, line);

-    }

-}

-

-{

-    line++;

-}

-

-END {

-    print("};");

-

-    print("") >> "sdksyms.dep";

-}' > _sdksyms.c

-

-STATUS=$?

-

-cat _sdksyms.c >> sdksyms.c

-rm _sdksyms.c

-

-[ $? != 0 ] && exit $?

-

-exit $STATUS

+#!/bin/sh
+
+cat > sdksyms.c << EOF
+/* This file is automatically generated by sdksyms.sh. */
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+
+/* These must be included first */
+#include "misc.h"
+#include "miscstruct.h"
+
+
+/* render/Makefile.am */
+#include "picture.h"
+#include "mipict.h"
+#include "glyphstr.h"
+#include "picturestr.h"
+
+
+/* fb/Makefile.am -- module */
+/*
+#include "fb.h"
+#include "fbrop.h"
+#include "fboverlay.h"
+#include "wfbrename.h"
+#include "fbpict.h"
+ */
+
+
+/* miext/shadow/Makefile.am -- module */
+/*
+#include "shadow.h"
+ */
+
+
+/* miext/damage/Makefile.am */
+#include "damage.h"
+#include "damagestr.h"
+
+/* miext/sync/Makefile.am */
+#include "misync.h"
+#include "misyncstr.h"
+
+/* Xext/Makefile.am -- half is module, half is builtin */
+/*
+#include "xvdix.h"
+#include "xvmcext.h"
+ */
+#include "geext.h"
+#include "geint.h"
+#include "shmint.h"
+#include "syncsdk.h"
+#if XINERAMA
+# include "panoramiXsrv.h"
+# include "panoramiX.h"
+#endif
+
+
+/* hw/xfree86/int10/Makefile.am -- module */
+/*
+#include "xf86int10.h"
+ */
+
+
+/* hw/xfree86/i2c/Makefile.am -- "mostly" modules */
+#include "xf86i2c.h"
+/*
+#include "bt829.h"
+#include "fi1236.h"
+#include "msp3430.h"
+#include "tda8425.h"
+#include "tda9850.h"
+#include "tda9885.h"
+#include "uda1380.h"
+#include "i2c_def.h"
+ */
+
+
+/* hw/xfree86/modes/Makefile.am */
+#include "xf86Crtc.h"
+#include "xf86Modes.h"
+#include "xf86RandR12.h"
+/* #include "xf86Rename.h" */
+
+
+/* hw/xfree86/ddc/Makefile.am */
+#include "edid.h"
+#include "xf86DDC.h"
+
+
+/* hw/xfree86/dri2/Makefile.am -- module */
+/*
+#if DRI2
+# include "dri2.h"
+#endif
+ */
+
+
+/* hw/xfree86/vgahw/Makefile.am -- module */
+/*
+#include "vgaHW.h"
+ */
+
+
+/* hw/xfree86/fbdevhw/Makefile.am -- module */
+/*
+#include "fbdevhw.h"
+ */
+
+
+/* hw/xfree86/common/Makefile.am */
+#include "compiler.h"
+#include "fourcc.h"
+#include "xf86.h"
+#include "xf86Module.h"
+#include "xf86Opt.h"
+#include "xf86PciInfo.h"
+#include "xf86Priv.h"
+#include "xf86Privstr.h"
+#include "xf86cmap.h"
+#include "xf86fbman.h"
+#include "xf86str.h"
+#include "xf86Xinput.h"
+#include "xf86VGAarbiter.h"
+#include "xisb.h"
+#if XV
+# include "xf86xv.h"
+# include "xf86xvmc.h"
+# include "xf86xvpriv.h"
+#endif
+/* XF86VidMode code is in libextmod module */
+/*
+#if XF86VIDMODE
+# include "vidmodeproc.h"
+#endif
+ */
+#include "xorgVersion.h"
+#if defined(__sparc__) || defined(__sparc)
+# include "xf86sbusBus.h"
+#endif
+
+
+/* hw/xfree86/ramdac/Makefile.am */
+#include "BT.h"
+#include "IBM.h"
+#include "TI.h"
+#include "xf86Cursor.h"
+#include "xf86RamDac.h"
+
+
+/* hw/xfree86/shadowfb/Makefile.am -- module */
+/*
+#include "shadowfb.h"
+ */
+
+
+/* hw/xfree86/os-support/solaris/Makefile.am */
+#if defined(sun386)
+# include "agpgart.h"
+#endif
+
+
+/* hw/xfree86/os-support/Makefile.am */
+#include "xf86_OSproc.h"
+#include "xf86_OSlib.h"
+
+
+/* hw/xfree86/os-support/bus/Makefile.am */
+#include "xf86Pci.h"
+#if defined(__sparc__) || defined(__sparc)
+# include "xf86Sbus.h"
+#endif
+
+
+/* hw/xfree86/xaa/Makefile.am -- module */
+/*
+#include "xaa.h"
+#include "xaalocal.h"
+#include "xaarop.h"
+ */
+
+
+/* hw/xfree86/dixmods/extmod/Makefile.am -- module */
+/*
+#include "dgaproc.h"
+ */
+
+
+/* hw/xfree86/parser/Makefile.am */
+#include "xf86Parser.h"
+#include "xf86Optrec.h"
+
+
+/* hw/xfree86/vbe/Makefile.am -- module */
+/*
+#include "vbe.h"
+#include "vbeModes.h"
+ */
+
+
+/* hw/xfree86/dri/Makefile.am -- module */
+/*
+#if XF86DRI
+# include "dri.h"
+# include "sarea.h"
+# include "dristruct.h"
+#endif
+ */
+
+
+/* mi/Makefile.am */
+#include "micmap.h"
+#include "miline.h"
+#include "mipointer.h"
+#include "mi.h"
+#include "mibstore.h"
+#include "migc.h"
+#include "mipointrst.h"
+#include "mizerarc.h"
+#include "micoord.h"
+#include "mifillarc.h"
+#include "mispans.h"
+#include "miwideline.h"
+#include "mistruct.h"
+#include "mifpoly.h"
+#include "mioverlay.h"
+
+
+/* randr/Makefile.am */
+#include "randrstr.h"
+#include "rrtransform.h"
+
+
+/* dbe/Makefile.am -- module */
+/*
+#include "dbestruct.h"
+ */
+
+
+/* exa/Makefile.am -- module */
+/*
+#include "exa.h"
+ */
+
+
+/* xfixes/Makefile.am */
+#include "xfixes.h"
+
+
+/* include/Makefile.am */
+#include "XIstubs.h"
+#include "Xprintf.h"
+#include "closestr.h"
+#include "closure.h"
+#include "colormap.h"
+#include "colormapst.h"
+#include "hotplug.h"
+#include "cursor.h"
+#include "cursorstr.h"
+#include "dix.h"
+#include "dixaccess.h"
+#include "dixevents.h"
+#include "dixfont.h"
+#include "dixfontstr.h"
+#include "dixgrabs.h"
+#include "dixstruct.h"
+#include "exevents.h"
+#include "extension.h"
+#include "extinit.h"
+#include "extnsionst.h"
+#include "gc.h"
+#include "gcstruct.h"
+#include "globals.h"
+#include "input.h"
+#include "inputstr.h"
+/* already included */
+/*
+#include "misc.h"
+#include "miscstruct.h"
+ */
+#include "opaque.h"
+#include "os.h"
+#include "pixmap.h"
+#include "pixmapstr.h"
+#include "privates.h"
+#include "property.h"
+#include "propertyst.h"
+#include "ptrveloc.h"
+#include "region.h"
+#include "regionstr.h"
+#include "registry.h"
+#include "resource.h"
+#include "rgb.h"
+#include "screenint.h"
+#include "scrnintstr.h"
+#include "selection.h"
+#include "servermd.h"
+#include "site.h"
+#include "swaprep.h"
+#include "swapreq.h"
+#include "validate.h"
+#include "window.h"
+#include "windowstr.h"
+#include "xace.h"
+#include "xkbfile.h"
+#include "xkbsrv.h"
+#include "xkbstr.h"
+#include "xkbrules.h"
+#include "xserver-properties.h"
+
+EOF
+
+topdir=$1
+shift
+LC_ALL=C
+export LC_ALL
+${CPP:-cpp} "$@" -DXorgLoader sdksyms.c | ${AWK:-awk} -v topdir=$topdir '
+BEGIN {
+    sdk = 0;
+    print("/*");
+    print(" * These symbols are referenced to ensure they");
+    print(" * will be available in the X Server binary.");
+    print(" */");
+    printf("/* topdir=%s */\n", topdir);
+    print("_X_HIDDEN void *xorg_symbols[] = {");
+
+    printf("sdksyms.c:") > "sdksyms.dep";
+}
+/^# [0-9]+ "/ {
+    #   Process text after a include in a relative path or when the
+    # processed file has a basename matching $top_srcdir.
+    #   Note that indexing starts at 1; 0 means no match, and there
+    # is a starting ".
+    sdk = $3 !~ /^"\// || index($3, topdir) == 2;
+
+    if (sdk && $3 ~ /\.h"$/) {
+	# remove quotes
+	gsub(/"/, "", $3);
+	line = $2;
+	header = $3;
+	if (! headers[$3]) {
+	    printf(" \\\n  %s", $3) >> "sdksyms.dep";
+	    headers[$3] = 1;
+	}
+    }
+    next;
+}
+
+/^extern[ 	]/  {
+    if (sdk) {
+	n = 3;
+
+	# skip attribute, if any
+	while ($n ~ /^(__attribute__|__global)/ ||
+	    # skip modifiers, if any
+	    $n ~ /^\*?(unsigned|const|volatile|struct)$/ ||
+	    # skip pointer
+	    $n ~ /^[a-zA-Z0-9_]*\*$/)
+	    n++;
+
+	# type specifier may not be set, as in
+	#   extern _X_EXPORT unsigned name(...)
+	if ($n !~ /[^a-zA-Z0-9_]/)
+	    n++;
+
+	# go back if we are at the parameter list already
+	if ($n ~ /^[(]([^*].*)?$/)
+	    n--;
+
+	# match
+	#    extern _X_EXPORT type (* name[])(...)
+	if ($n ~ /^[^a-zA-Z0-9_]+$/)
+	    n++;
+
+	# match
+	#	extern _X_EXPORT const name *const ...
+	if ($n ~ /^([^a-zA-Z0-9_]+)?const$/)
+	    n++;
+
+	# actual name may be in the next line, as in
+	#   extern _X_EXPORT type
+	# possibly ending with a *
+	#   name(...)
+	if ($n == "" || $n ~ /^\*+$/) {
+	    getline;
+	    n = 1;
+	}
+
+	# dont modify $0 or $n
+	symbol = $n;
+
+	# remove starting non word chars
+	sub(/^[^a-zA-Z0-9_]+/, "",symbol);
+
+	# remove from first non word to end of line
+	sub(/[^a-zA-Z0-9_].*/, "", symbol);
+
+	#print;
+	printf("    (void *) &%-50s /* %s:%s */\n", symbol ",", header, line);
+    }
+}
+
+{
+    line++;
+}
+
+END {
+    print("};");
+
+    print("") >> "sdksyms.dep";
+}' > _sdksyms.c
+
+STATUS=$?
+
+cat _sdksyms.c >> sdksyms.c
+rm _sdksyms.c
+
+[ $? != 0 ] && exit $?
+
+exit $STATUS
diff --git a/xorg-server/hw/xfree86/modes/xf86EdidModes.c b/xorg-server/hw/xfree86/modes/xf86EdidModes.c
index f8cd9a0ca..d9ece7a14 100644
--- a/xorg-server/hw/xfree86/modes/xf86EdidModes.c
+++ b/xorg-server/hw/xfree86/modes/xf86EdidModes.c
@@ -1,1211 +1,1216 @@
-/*

- * Copyright 2006 Luc Verhaegen.

- * Copyright 2008 Red Hat, 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, sub license,

- * 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 (including the

- * next paragraph) 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 NON-INFRINGEMENT. IN NO EVENT SHALL

- * THE AUTHORS OR COPYRIGHT HOLDERS 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.

- */

-

-/**

- * @file This file covers code to convert a xf86MonPtr containing EDID-probed

- * information into a list of modes, including applying monitor-specific

- * quirks to fix broken EDID data.

- */

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#else

-#ifdef HAVE_CONFIG_H

-#include <config.h>

-#endif

-#endif

-

-#define _PARSE_EDID_

-#include "xf86.h"

-#include "xf86DDC.h"

-#include <X11/Xatom.h>

-#include "property.h"

-#include "propertyst.h"

-#include "xf86Crtc.h"

-#include <string.h>

-#include <math.h>

-

-static void handle_detailed_rblank(struct detailed_monitor_section *det_mon,

-                                   void *data)

-{

-    if (det_mon->type == DS_RANGES)

-        if (det_mon->section.ranges.supported_blanking & CVT_REDUCED)

-            *(Bool*)data = TRUE;

-}

-

-static Bool

-xf86MonitorSupportsReducedBlanking(xf86MonPtr DDC)

-{

-    /* EDID 1.4 explicitly defines RB support */

-    if (DDC->ver.revision >= 4) {

-        Bool ret = FALSE;

-

-        xf86ForEachDetailedBlock(DDC, handle_detailed_rblank, &ret);

-        return ret;

-    }

-

-    /* For anything older, assume digital means RB support. Boo. */

-    if (DDC->features.input_type)

-        return TRUE;

-

-    return FALSE;

-}

-

-static Bool quirk_prefer_large_60 (int scrnIndex, xf86MonPtr DDC)

-{

-    /* Belinea 10 15 55 */

-    if (memcmp (DDC->vendor.name, "MAX", 4) == 0 &&

-	((DDC->vendor.prod_id == 1516) ||

-	(DDC->vendor.prod_id == 0x77e)))

-	return TRUE;

-    

-    /* Acer AL1706 */

-    if (memcmp (DDC->vendor.name, "ACR", 4) == 0 &&

-	DDC->vendor.prod_id == 44358)

-	return TRUE;

-

-    /* Bug #10814: Samsung SyncMaster 225BW */

-    if (memcmp (DDC->vendor.name, "SAM", 4) == 0 &&

-	DDC->vendor.prod_id == 596)

-	return TRUE;

-

-    /* Bug #10545: Samsung SyncMaster 226BW */

-    if (memcmp (DDC->vendor.name, "SAM", 4) == 0 &&

-	DDC->vendor.prod_id == 638)

-	return TRUE;

-

-    /* Acer F51 */

-    if (memcmp (DDC->vendor.name, "API", 4) == 0 &&

-	DDC->vendor.prod_id == 0x7602)

-	return TRUE;

-

-

-    return FALSE;

-}

-

-static Bool quirk_prefer_large_75 (int scrnIndex, xf86MonPtr DDC)

-{

-    /* Bug #11603: Funai Electronics PM36B */

-    if (memcmp (DDC->vendor.name, "FCM", 4) == 0 &&

-	DDC->vendor.prod_id == 13600)

-	return TRUE;

-

-    return FALSE;

-}

-

-static Bool quirk_detailed_h_in_cm (int scrnIndex, xf86MonPtr DDC)

-{

-    /* Bug #11603: Funai Electronics PM36B */

-    if (memcmp (DDC->vendor.name, "FCM", 4) == 0 &&

-	DDC->vendor.prod_id == 13600)

-	return TRUE;

-

-    return FALSE;

-}

-

-static Bool quirk_detailed_v_in_cm (int scrnIndex, xf86MonPtr DDC)

-{

-    /* Bug #11603: Funai Electronics PM36B */

-    if (memcmp (DDC->vendor.name, "FCM", 4) == 0 &&

-	DDC->vendor.prod_id == 13600)

-	return TRUE;

-

-    /* Bug #21000: LGPhilipsLCD LP154W01-TLAJ */

-    if (memcmp (DDC->vendor.name, "LPL", 4) == 0 &&

-	DDC->vendor.prod_id == 47360)

-	return TRUE;

-

-    /* Bug #10304: LGPhilipsLCD LP154W01-A5 */

-    if (memcmp(DDC->vendor.name, "LPL", 4) == 0 &&

-	DDC->vendor.prod_id == 0)

-	return TRUE;

-

-    /* Bug #24482: LGPhilipsLCD LP154W01-TLA1 */

-    if (memcmp(DDC->vendor.name, "LPL", 4) == 0 &&

-	DDC->vendor.prod_id == 0x2a00)

-	return TRUE;

-

-    /* Bug #21750: Samsung Syncmaster 2333HD */

-    if (memcmp (DDC->vendor.name, "SAM", 4) == 0 &&

-	DDC->vendor.prod_id == 1157)

-	return TRUE;

-

-    return FALSE;

-}

-

-static Bool quirk_detailed_use_maximum_size (int scrnIndex, xf86MonPtr DDC)

-{

-    /* Bug #21324: Iiyama Vision Master 450 */

-    if (memcmp (DDC->vendor.name, "IVM", 4) == 0 &&

-	DDC->vendor.prod_id == 6400)

-	return TRUE;

-

-    return FALSE;

-}

-

-static Bool quirk_135_clock_too_high (int scrnIndex, xf86MonPtr DDC)

-{

-    /* Envision Peripherals, Inc. EN-7100e.  See bug #9550. */

-    if (memcmp (DDC->vendor.name, "EPI", 4) == 0 &&

-	DDC->vendor.prod_id == 59264)

-	return TRUE;

-    

-    return FALSE;

-}

-

-static Bool quirk_first_detailed_preferred (int scrnIndex, xf86MonPtr DDC)

-{

-    /* Philips 107p5 CRT. Reported on xorg@ with pastebin. */

-    if (memcmp (DDC->vendor.name, "PHL", 4) == 0 &&

-	DDC->vendor.prod_id == 57364)

-	return TRUE;

-

-    /* Proview AY765C 17" LCD. See bug #15160*/

-    if (memcmp (DDC->vendor.name, "PTS", 4) == 0 &&

-	DDC->vendor.prod_id == 765)

-	return TRUE;

-

-    /* ACR of some sort RH #284231 */

-    if (memcmp (DDC->vendor.name, "ACR", 4) == 0 &&

-	DDC->vendor.prod_id == 2423)

-	return TRUE;

-

-    /* Peacock Ergovision 19.  See rh#492359 */

-    if (memcmp (DDC->vendor.name, "PEA", 4) == 0 &&

-	DDC->vendor.prod_id == 9003)

-	return TRUE;

-

-    return FALSE;

-}

-

-static Bool quirk_detailed_sync_pp(int scrnIndex, xf86MonPtr DDC)

-{

-    /* Bug #12439: Samsung SyncMaster 205BW */

-    if (memcmp (DDC->vendor.name, "SAM", 4) == 0 &&

-	DDC->vendor.prod_id == 541)

-	return TRUE;

-    return FALSE;

-}

-

-/* This should probably be made more generic */

-static Bool quirk_dvi_single_link(int scrnIndex, xf86MonPtr DDC)

-{

-    /* Red Hat bug #453106: Apple 23" Cinema Display */

-    if (memcmp (DDC->vendor.name, "APL", 4) == 0 &&

-	DDC->vendor.prod_id == 0x921c)

-	return TRUE;

-    return FALSE;

-}

-

-typedef struct {

-    Bool	(*detect) (int scrnIndex, xf86MonPtr DDC);

-    ddc_quirk_t	quirk;

-    char	*description;

-} ddc_quirk_map_t;

-

-static const ddc_quirk_map_t ddc_quirks[] = {

-    {

-	quirk_prefer_large_60,   DDC_QUIRK_PREFER_LARGE_60,

-	"Detailed timing is not preferred, use largest mode at 60Hz"

-    },

-    {

-	quirk_135_clock_too_high,   DDC_QUIRK_135_CLOCK_TOO_HIGH,

-	"Recommended 135MHz pixel clock is too high"

-    },

-    {

-	quirk_prefer_large_75,   DDC_QUIRK_PREFER_LARGE_75,

-	"Detailed timing is not preferred, use largest mode at 75Hz"

-    },

-    {

-	quirk_detailed_h_in_cm,   DDC_QUIRK_DETAILED_H_IN_CM,

-	"Detailed timings give horizontal size in cm."

-    },

-    {

-	quirk_detailed_v_in_cm,   DDC_QUIRK_DETAILED_V_IN_CM,

-	"Detailed timings give vertical size in cm."

-    },

-    {

-	quirk_detailed_use_maximum_size,   DDC_QUIRK_DETAILED_USE_MAXIMUM_SIZE,

-	"Use maximum size instead of detailed timing sizes."

-    },

-    {

-	quirk_first_detailed_preferred, DDC_QUIRK_FIRST_DETAILED_PREFERRED,

-	"First detailed timing was not marked as preferred."

-    },

-    {

-	quirk_detailed_sync_pp, DDC_QUIRK_DETAILED_SYNC_PP,

-	"Use +hsync +vsync for detailed timing."

-    },

-    {

-	quirk_dvi_single_link, DDC_QUIRK_DVI_SINGLE_LINK,

-	"Forcing maximum pixel clock to single DVI link."

-    },

-    { 

-	NULL,		DDC_QUIRK_NONE,

-	"No known quirks"

-    },

-};

-

-/*

- * These more or less come from the DMT spec.  The 720x400 modes are

- * inferred from historical 80x25 practice.  The 640x480@67 and 832x624@75

- * modes are old-school Mac modes.  The EDID spec says the 1152x864@75 mode

- * should be 1152x870, again for the Mac, but instead we use the x864 DMT

- * mode.

- *

- * The DMT modes have been fact-checked; the rest are mild guesses.

- */

-#define MODEPREFIX NULL, NULL, NULL, 0, M_T_DRIVER

-#define MODESUFFIX 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,FALSE,FALSE,0,NULL,0,0.0,0.0

-

-static const DisplayModeRec DDCEstablishedModes[17] = {

-    { MODEPREFIX,    40000,  800,  840,  968, 1056, 0,  600,  601,  605,  628, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 800x600@60Hz */

-    { MODEPREFIX,    36000,  800,  824,  896, 1024, 0,  600,  601,  603,  625, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 800x600@56Hz */

-    { MODEPREFIX,    31500,  640,  656,  720,  840, 0,  480,  481,  484,  500, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* 640x480@75Hz */

-    { MODEPREFIX,    31500,  640,  664,  704,  832, 0,  480,  489,  492,  520, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* 640x480@72Hz */

-    { MODEPREFIX,    30240,  640,  704,  768,  864, 0,  480,  483,  486,  525, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* 640x480@67Hz */

-    { MODEPREFIX,    25175,  640,  656,  752,  800, 0,  480,  490,  492,  525, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* 640x480@60Hz */

-    { MODEPREFIX,    35500,  720,  738,  846,  900, 0,  400,  421,  423,  449, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* 720x400@88Hz */

-    { MODEPREFIX,    28320,  720,  738,  846,  900, 0,  400,  412,  414,  449, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 720x400@70Hz */

-    { MODEPREFIX,   135000, 1280, 1296, 1440, 1688, 0, 1024, 1025, 1028, 1066, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 1280x1024@75Hz */

-    { MODEPREFIX,    78750, 1024, 1040, 1136, 1312, 0,  768,  769,  772,  800, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 1024x768@75Hz */

-    { MODEPREFIX,    75000, 1024, 1048, 1184, 1328, 0,  768,  771,  777,  806, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* 1024x768@70Hz */

-    { MODEPREFIX,    65000, 1024, 1048, 1184, 1344, 0,  768,  771,  777,  806, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* 1024x768@60Hz */

-    { MODEPREFIX,    44900, 1024, 1032, 1208, 1264, 0,  768,  768,  772,  817, 0, V_PHSYNC | V_PVSYNC | V_INTERLACE, MODESUFFIX }, /* 1024x768@43Hz */

-    { MODEPREFIX,    57284,  832,  864,  928, 1152, 0,  624,  625,  628,  667, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* 832x624@75Hz */

-    { MODEPREFIX,    49500,  800,  816,  896, 1056, 0,  600,  601,  604,  625, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 800x600@75Hz */

-    { MODEPREFIX,    50000,  800,  856,  976, 1040, 0,  600,  637,  643,  666, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 800x600@72Hz */

-    { MODEPREFIX,   108000, 1152, 1216, 1344, 1600, 0,  864,  865,  868,  900, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 1152x864@75Hz */

-};

-

-static DisplayModePtr

-DDCModesFromEstablished(int scrnIndex, struct established_timings *timing,

-			ddc_quirk_t quirks)

-{

-    DisplayModePtr Modes = NULL, Mode = NULL;

-    CARD32 bits = (timing->t1) | (timing->t2 << 8) |

-        ((timing->t_manu & 0x80) << 9);

-    int i;

-

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

-        if (bits & (0x01 << i)) {

-            Mode = xf86DuplicateMode(&DDCEstablishedModes[i]);

-            Modes = xf86ModesAdd(Modes, Mode);

-        }

-    }

-

-    return Modes;

-}

-

-/* Autogenerated from the DMT spec */

-const DisplayModeRec DMTModes[] = {

-    { MODEPREFIX,    31500,  640,  672,  736,  832, 0,  350,  382,  385,  445, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 640x350@85Hz */

-    { MODEPREFIX,    31500,  640,  672,  736,  832, 0,  400,  401,  404,  445, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 640x400@85Hz */

-    { MODEPREFIX,    35500,  720,  756,  828,  936, 0,  400,  401,  404,  446, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 720x400@85Hz */

-    { MODEPREFIX,    25175,  640,  656,  752,  800, 0,  480,  490,  492,  525, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* 640x480@60Hz */

-    { MODEPREFIX,    31500,  640,  664,  704,  832, 0,  480,  489,  492,  520, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* 640x480@72Hz */

-    { MODEPREFIX,    31500,  640,  656,  720,  840, 0,  480,  481,  484,  500, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* 640x480@75Hz */

-    { MODEPREFIX,    36000,  640,  696,  752,  832, 0,  480,  481,  484,  509, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* 640x480@85Hz */

-    { MODEPREFIX,    36000,  800,  824,  896, 1024, 0,  600,  601,  603,  625, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 800x600@56Hz */

-    { MODEPREFIX,    40000,  800,  840,  968, 1056, 0,  600,  601,  605,  628, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 800x600@60Hz */

-    { MODEPREFIX,    50000,  800,  856,  976, 1040, 0,  600,  637,  643,  666, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 800x600@72Hz */

-    { MODEPREFIX,    49500,  800,  816,  896, 1056, 0,  600,  601,  604,  625, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 800x600@75Hz */

-    { MODEPREFIX,    56250,  800,  832,  896, 1048, 0,  600,  601,  604,  631, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 800x600@85Hz */

-    { MODEPREFIX,    73250,  800,  848,  880,  960, 0,  600,  603,  607,  636, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 800x600@120Hz RB */

-    { MODEPREFIX,    33750,  848,  864,  976, 1088, 0,  480,  486,  494,  517, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 848x480@60Hz */

-    { MODEPREFIX,    44900, 1024, 1032, 1208, 1264, 0,  768,  768,  772,  817, 0, V_PHSYNC | V_PVSYNC | V_INTERLACE, MODESUFFIX }, /* 1024x768@43Hz (interlaced) */

-    { MODEPREFIX,    65000, 1024, 1048, 1184, 1344, 0,  768,  771,  777,  806, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* 1024x768@60Hz */

-    { MODEPREFIX,    75000, 1024, 1048, 1184, 1328, 0,  768,  771,  777,  806, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* 1024x768@70Hz */

-    { MODEPREFIX,    78750, 1024, 1040, 1136, 1312, 0,  768,  769,  772,  800, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 1024x768@75Hz */

-    { MODEPREFIX,    94500, 1024, 1072, 1168, 1376, 0,  768,  769,  772,  808, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 1024x768@85Hz */

-    { MODEPREFIX,   115500, 1024, 1072, 1104, 1184, 0,  768,  771,  775,  813, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 1024x768@120Hz RB */

-    { MODEPREFIX,   108000, 1152, 1216, 1344, 1600, 0,  864,  865,  868,  900, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 1152x864@75Hz */

-    { MODEPREFIX,    68250, 1280, 1328, 1360, 1440, 0,  768,  771,  778,  790, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 1280x768@60Hz RB */

-    { MODEPREFIX,    79500, 1280, 1344, 1472, 1664, 0,  768,  771,  778,  798, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1280x768@60Hz */

-    { MODEPREFIX,   102250, 1280, 1360, 1488, 1696, 0,  768,  771,  778,  805, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1280x768@75Hz */

-    { MODEPREFIX,   117500, 1280, 1360, 1496, 1712, 0,  768,  771,  778,  809, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1280x768@85Hz */

-    { MODEPREFIX,   140250, 1280, 1328, 1360, 1440, 0,  768,  771,  778,  813, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 1280x768@120Hz RB */

-    { MODEPREFIX,    71000, 1280, 1328, 1360, 1440, 0,  800,  803,  809,  823, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 1280x800@60Hz RB */

-    { MODEPREFIX,    83500, 1280, 1352, 1480, 1680, 0,  800,  803,  809,  831, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1280x800@60Hz */

-    { MODEPREFIX,   106500, 1280, 1360, 1488, 1696, 0,  800,  803,  809,  838, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1280x800@75Hz */

-    { MODEPREFIX,   122500, 1280, 1360, 1496, 1712, 0,  800,  803,  809,  843, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1280x800@85Hz */

-    { MODEPREFIX,   146250, 1280, 1328, 1360, 1440, 0,  800,  803,  809,  847, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 1280x800@120Hz RB */

-    { MODEPREFIX,   108000, 1280, 1376, 1488, 1800, 0,  960,  961,  964, 1000, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 1280x960@60Hz */

-    { MODEPREFIX,   148500, 1280, 1344, 1504, 1728, 0,  960,  961,  964, 1011, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 1280x960@85Hz */

-    { MODEPREFIX,   175500, 1280, 1328, 1360, 1440, 0,  960,  963,  967, 1017, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 1280x960@120Hz RB */

-    { MODEPREFIX,   108000, 1280, 1328, 1440, 1688, 0, 1024, 1025, 1028, 1066, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 1280x1024@60Hz */

-    { MODEPREFIX,   135000, 1280, 1296, 1440, 1688, 0, 1024, 1025, 1028, 1066, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 1280x1024@75Hz */

-    { MODEPREFIX,   157500, 1280, 1344, 1504, 1728, 0, 1024, 1025, 1028, 1072, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 1280x1024@85Hz */

-    { MODEPREFIX,   187250, 1280, 1328, 1360, 1440, 0, 1024, 1027, 1034, 1084, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 1280x1024@120Hz RB */

-    { MODEPREFIX,    85500, 1360, 1424, 1536, 1792, 0,  768,  771,  777,  795, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 1360x768@60Hz */

-    { MODEPREFIX,   148250, 1360, 1408, 1440, 1520, 0,  768,  771,  776,  813, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 1360x768@120Hz RB */

-    { MODEPREFIX,   101000, 1400, 1448, 1480, 1560, 0, 1050, 1053, 1057, 1080, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 1400x1050@60Hz RB */

-    { MODEPREFIX,   121750, 1400, 1488, 1632, 1864, 0, 1050, 1053, 1057, 1089, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1400x1050@60Hz */

-    { MODEPREFIX,   156000, 1400, 1504, 1648, 1896, 0, 1050, 1053, 1057, 1099, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1400x1050@75Hz */

-    { MODEPREFIX,   179500, 1400, 1504, 1656, 1912, 0, 1050, 1053, 1057, 1105, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1400x1050@85Hz */

-    { MODEPREFIX,   208000, 1400, 1448, 1480, 1560, 0, 1050, 1053, 1057, 1112, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 1400x1050@120Hz RB */

-    { MODEPREFIX,    88750, 1440, 1488, 1520, 1600, 0,  900,  903,  909,  926, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 1440x900@60Hz RB */

-    { MODEPREFIX,   106500, 1440, 1520, 1672, 1904, 0,  900,  903,  909,  934, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1440x900@60Hz */

-    { MODEPREFIX,   136750, 1440, 1536, 1688, 1936, 0,  900,  903,  909,  942, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1440x900@75Hz */

-    { MODEPREFIX,   157000, 1440, 1544, 1696, 1952, 0,  900,  903,  909,  948, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1440x900@85Hz */

-    { MODEPREFIX,   182750, 1440, 1488, 1520, 1600, 0,  900,  903,  909,  953, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 1440x900@120Hz RB */

-    { MODEPREFIX,   162000, 1600, 1664, 1856, 2160, 0, 1200, 1201, 1204, 1250, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 1600x1200@60Hz */

-    { MODEPREFIX,   175500, 1600, 1664, 1856, 2160, 0, 1200, 1201, 1204, 1250, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 1600x1200@65Hz */

-    { MODEPREFIX,   189000, 1600, 1664, 1856, 2160, 0, 1200, 1201, 1204, 1250, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 1600x1200@70Hz */

-    { MODEPREFIX,   202500, 1600, 1664, 1856, 2160, 0, 1200, 1201, 1204, 1250, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 1600x1200@75Hz */

-    { MODEPREFIX,   229500, 1600, 1664, 1856, 2160, 0, 1200, 1201, 1204, 1250, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 1600x1200@85Hz */

-    { MODEPREFIX,   268250, 1600, 1648, 1680, 1760, 0, 1200, 1203, 1207, 1271, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 1600x1200@120Hz RB */

-    { MODEPREFIX,   119000, 1680, 1728, 1760, 1840, 0, 1050, 1053, 1059, 1080, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 1680x1050@60Hz RB */

-    { MODEPREFIX,   146250, 1680, 1784, 1960, 2240, 0, 1050, 1053, 1059, 1089, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1680x1050@60Hz */

-    { MODEPREFIX,   187000, 1680, 1800, 1976, 2272, 0, 1050, 1053, 1059, 1099, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1680x1050@75Hz */

-    { MODEPREFIX,   214750, 1680, 1808, 1984, 2288, 0, 1050, 1053, 1059, 1105, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1680x1050@85Hz */

-    { MODEPREFIX,   245500, 1680, 1728, 1760, 1840, 0, 1050, 1053, 1059, 1112, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 1680x1050@120Hz RB */

-    { MODEPREFIX,   204750, 1792, 1920, 2120, 2448, 0, 1344, 1345, 1348, 1394, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1792x1344@60Hz */

-    { MODEPREFIX,   261000, 1792, 1888, 2104, 2456, 0, 1344, 1345, 1348, 1417, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1792x1344@75Hz */

-    { MODEPREFIX,   333250, 1792, 1840, 1872, 1952, 0, 1344, 1347, 1351, 1423, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 1792x1344@120Hz RB */

-    { MODEPREFIX,   218250, 1856, 1952, 2176, 2528, 0, 1392, 1393, 1396, 1439, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1856x1392@60Hz */

-    { MODEPREFIX,   288000, 1856, 1984, 2208, 2560, 0, 1392, 1393, 1396, 1500, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1856x1392@75Hz */

-    { MODEPREFIX,   356500, 1856, 1904, 1936, 2016, 0, 1392, 1395, 1399, 1474, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 1856x1392@120Hz RB */

-    { MODEPREFIX,   154000, 1920, 1968, 2000, 2080, 0, 1200, 1203, 1209, 1235, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 1920x1200@60Hz RB */

-    { MODEPREFIX,   193250, 1920, 2056, 2256, 2592, 0, 1200, 1203, 1209, 1245, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1920x1200@60Hz */

-    { MODEPREFIX,   245250, 1920, 2056, 2264, 2608, 0, 1200, 1203, 1209, 1255, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1920x1200@75Hz */

-    { MODEPREFIX,   281250, 1920, 2064, 2272, 2624, 0, 1200, 1203, 1209, 1262, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1920x1200@85Hz */

-    { MODEPREFIX,   317000, 1920, 1968, 2000, 2080, 0, 1200, 1203, 1209, 1271, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 1920x1200@120Hz RB */

-    { MODEPREFIX,   234000, 1920, 2048, 2256, 2600, 0, 1440, 1441, 1444, 1500, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1920x1440@60Hz */

-    { MODEPREFIX,   297000, 1920, 2064, 2288, 2640, 0, 1440, 1441, 1444, 1500, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1920x1440@75Hz */

-    { MODEPREFIX,   380500, 1920, 1968, 2000, 2080, 0, 1440, 1443, 1447, 1525, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 1920x1440@120Hz RB */

-    { MODEPREFIX,   268500, 2560, 2608, 2640, 2720, 0, 1600, 1603, 1609, 1646, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 2560x1600@60Hz RB */

-    { MODEPREFIX,   348500, 2560, 2752, 3032, 3504, 0, 1600, 1603, 1609, 1658, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 2560x1600@60Hz */

-    { MODEPREFIX,   443250, 2560, 2768, 3048, 3536, 0, 1600, 1603, 1609, 1672, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 2560x1600@75Hz */

-    { MODEPREFIX,   505250, 2560, 2768, 3048, 3536, 0, 1600, 1603, 1609, 1682, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 2560x1600@85Hz */

-    { MODEPREFIX,   552750, 2560, 2608, 2640, 2720, 0, 1600, 1603, 1609, 1694, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 2560x1600@120Hz RB */

-};

-

-#define LEVEL_DMT 0

-#define LEVEL_GTF 1

-#define LEVEL_CVT 2

-

-static int

-MonitorStandardTimingLevel(xf86MonPtr DDC)

-{

-    if (DDC->ver.revision >= 2) {

-	if (DDC->ver.revision >= 4 && CVT_SUPPORTED(DDC->features.msc)) {

-	    return LEVEL_CVT;

-	}

-	return LEVEL_GTF;

-    }

-    return LEVEL_DMT;

-}

-

-static int

-ModeRefresh(const DisplayModeRec *mode)

-{

-    return (int)(xf86ModeVRefresh(mode) + 0.5);

-}

-

-/*

- * If rb is not set, then we'll not consider reduced-blanking modes as

- * part of the DMT pool.  For the 'standard' EDID mode descriptor there's

- * no way to specify whether the mode should be RB or not.

- */

-DisplayModePtr

-FindDMTMode(int hsize, int vsize, int refresh, Bool rb)

-{

-    int i;

-    const DisplayModeRec *ret;

-

-    for (i = 0; i < sizeof(DMTModes) / sizeof(DisplayModeRec); i++) {

-	ret = &DMTModes[i];

-

-	if (!rb && xf86ModeIsReduced(ret))

-	    continue;

-

-	if (ret->HDisplay == hsize &&

-	    ret->VDisplay == vsize &&

-	    refresh == ModeRefresh(ret))

-	    return xf86DuplicateMode(ret);

-    }

-

-    return NULL;

-}

-

-/*

- * Appendix B of the EDID 1.4 spec defines the right thing to do here.

- * If the timing given here matches a mode defined in the VESA DMT standard,

- * we _must_ use that.  If the device supports CVT modes, then we should

- * generate a CVT timing.  If both of the above fail, use GTF.

- *

- * There are some wrinkles here.  EDID 1.1 and 1.0 sinks can't really

- * "support" GTF, since it wasn't a standard yet; so if they ask for a

- * timing in this section that isn't defined in DMT, returning a GTF mode

- * may not actually be valid.  EDID 1.3 sinks often report support for

- * some CVT modes, but they are not required to support CVT timings for

- * modes in the standard timing descriptor, so we should _not_ treat them

- * as CVT-compliant (unless specified in an extension block I suppose).

- *

- * EDID 1.4 requires that all sink devices support both GTF and CVT timings

- * for modes in this section, but does say that CVT is preferred.

- */

-static DisplayModePtr

-DDCModesFromStandardTiming(struct std_timings *timing, ddc_quirk_t quirks,

-			   int timing_level, Bool rb)

-{

-    DisplayModePtr Modes = NULL, Mode = NULL;

-    int i, hsize, vsize, refresh;

-

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

-	hsize = timing[i].hsize;

-	vsize = timing[i].vsize;

-	refresh = timing[i].refresh;

-

-	/* HDTV hack, because you can't say 1366 */

-	if (refresh == 60 &&

-	    ((hsize == 1360 && vsize == 765) ||

-	     (hsize == 1368 && vsize == 769))) {

-	    Mode = xf86CVTMode(1366, 768, 60, FALSE, FALSE);

-	    Mode->HDisplay = 1366;

-	    Mode->HSyncStart--;

-	    Mode->HSyncEnd--;

-	} else if (hsize && vsize && refresh) {

-	    Mode = FindDMTMode(hsize, vsize, refresh, rb);

-

-	    if (!Mode) {

-		if (timing_level == LEVEL_CVT)

-		    /* pass rb here too? */

-		    Mode = xf86CVTMode(hsize, vsize, refresh, FALSE, FALSE);

-		else if (timing_level == LEVEL_GTF)

-		    Mode = xf86GTFMode(hsize, vsize, refresh, FALSE, FALSE);

-	    }

-

-	}

-

-	if (Mode) {

-	    Mode->type = M_T_DRIVER;

-	    Modes = xf86ModesAdd(Modes, Mode);

-	}

-	Mode = NULL;

-    }

-

-    return Modes;

-}

-

-static void

-DDCModeDoInterlaceQuirks(DisplayModePtr mode)

-{

-    /*

-     * EDID is delightfully ambiguous about how interlaced modes are to be

-     * encoded.  X's internal representation is of frame height, but some

-     * HDTV detailed timings are encoded as field height.

-     *

-     * The format list here is from CEA, in frame size.  Technically we

-     * should be checking refresh rate too.  Whatever.

-     */

-    static const struct {

-	int w, h;

-    } cea_interlaced[] = {

-	{ 1920, 1080 },

-	{  720,  480 },

-	{ 1440,  480 },

-	{ 2880,  480 },

-	{  720,  576 },

-	{ 1440,  576 },

-	{ 2880,  576 },

-    };

-    static const int n_modes = sizeof(cea_interlaced)/sizeof(cea_interlaced[0]);

-    int i;

-

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

-	if ((mode->HDisplay == cea_interlaced[i].w) &&

-	    (mode->VDisplay == cea_interlaced[i].h / 2)) {

-	    mode->VDisplay *= 2;

-	    mode->VSyncStart *= 2;

-	    mode->VSyncEnd *= 2;

-	    mode->VTotal *= 2;

-	    mode->VTotal |= 1;

-	}

-    }

-

-    mode->Flags |= V_INTERLACE;

-}

-

-/*

- *

- */

-static DisplayModePtr

-DDCModeFromDetailedTiming(int scrnIndex, struct detailed_timings *timing,

-			  Bool preferred, ddc_quirk_t quirks)

-{

-    DisplayModePtr Mode;

-

-    /*

-     * Refuse to create modes that are insufficiently large.  64 is a random

-     * number, maybe the spec says something about what the minimum is.  In

-     * particular I see this frequently with _old_ EDID, 1.0 or so, so maybe

-     * our parser is just being too aggresive there.

-     */

-    if (timing->h_active < 64 || timing->v_active < 64) {

-	xf86DrvMsg(scrnIndex, X_INFO,

-		   "%s: Ignoring tiny %dx%d mode\n", __func__,

-		   timing->h_active, timing->v_active);

-	return NULL;

-    }

-

-    /* We don't do stereo */

-    if (timing->stereo) {

-        xf86DrvMsg(scrnIndex, X_INFO,

-		   "%s: Ignoring: We don't handle stereo.\n", __func__);

-        return NULL;

-    }

-

-    /* We only do seperate sync currently */

-    if (timing->sync != 0x03) {

-         xf86DrvMsg(scrnIndex, X_INFO,

-		    "%s: %dx%d Warning: We only handle separate"

-                    " sync.\n", __func__, timing->h_active, timing->v_active);

-    }

-

-    Mode = xnfcalloc(1, sizeof(DisplayModeRec));

-

-    Mode->type = M_T_DRIVER;

-    if (preferred)

-	Mode->type |= M_T_PREFERRED;

-

-    if( ( quirks & DDC_QUIRK_135_CLOCK_TOO_HIGH ) &&

-	timing->clock == 135000000 )

-        Mode->Clock = 108880;

-    else

-        Mode->Clock = timing->clock / 1000.0;

-

-    Mode->HDisplay = timing->h_active;

-    Mode->HSyncStart = timing->h_active + timing->h_sync_off;

-    Mode->HSyncEnd = Mode->HSyncStart + timing->h_sync_width;

-    Mode->HTotal = timing->h_active + timing->h_blanking;

-

-    Mode->VDisplay = timing->v_active;

-    Mode->VSyncStart = timing->v_active + timing->v_sync_off;

-    Mode->VSyncEnd = Mode->VSyncStart + timing->v_sync_width;

-    Mode->VTotal = timing->v_active + timing->v_blanking;

-

-    /* perform basic check on the detail timing */

-    if (Mode->HSyncEnd > Mode->HTotal || Mode->VSyncEnd > Mode->VTotal) {

-	free(Mode);

-	return NULL;

-    }

-

-    /* We ignore h/v_size and h/v_border for now. */

-

-    if (timing->interlaced)

-	DDCModeDoInterlaceQuirks(Mode);

-

-    if (quirks & DDC_QUIRK_DETAILED_SYNC_PP)

-	Mode->Flags |= V_PVSYNC | V_PHSYNC;

-    else {

-	if (timing->misc & 0x02)

-	    Mode->Flags |= V_PVSYNC;

-	else

-	    Mode->Flags |= V_NVSYNC;

-

-	if (timing->misc & 0x01)

-	    Mode->Flags |= V_PHSYNC;

-	else

-	    Mode->Flags |= V_NHSYNC;

-    }

-

-    xf86SetModeDefaultName(Mode);

-

-    return Mode;

-}

-

-static DisplayModePtr

-DDCModesFromCVT(int scrnIndex, struct cvt_timings *t)

-{

-    DisplayModePtr modes = NULL;

-    int i;

-

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

-	if (t[i].height) {

-	    if (t[i].rates & 0x10)

-		modes = xf86ModesAdd(modes,

-			xf86CVTMode(t[i].width, t[i].height, 50, 0, 0));

-	    if (t[i].rates & 0x08)

-		modes = xf86ModesAdd(modes,

-			xf86CVTMode(t[i].width, t[i].height, 60, 0, 0));

-	    if (t[i].rates & 0x04)

-		modes = xf86ModesAdd(modes,

-			xf86CVTMode(t[i].width, t[i].height, 75, 0, 0));

-	    if (t[i].rates & 0x02)

-		modes = xf86ModesAdd(modes,

-			xf86CVTMode(t[i].width, t[i].height, 85, 0, 0));

-	    if (t[i].rates & 0x01)

-		modes = xf86ModesAdd(modes,

-			xf86CVTMode(t[i].width, t[i].height, 60, 1, 0));

-	} else break;

-    }

-

-    return modes;

-}

-

-static const struct {

-    short w;

-    short h;

-    short r;

-    short rb;

-} EstIIIModes[] = {

-    /* byte 6 */

-    { 640, 350, 85, 0 },

-    { 640, 400, 85, 0 },

-    { 720, 400, 85, 0 },

-    { 640, 480, 85, 0 },

-    { 848, 480, 60, 0 },

-    { 800, 600, 85, 0 },

-    { 1024, 768, 85, 0 },

-    { 1152, 864, 75, 0 },

-    /* byte 7 */

-    { 1280, 768, 60, 1 },

-    { 1280, 768, 60, 0 },

-    { 1280, 768, 75, 0 },

-    { 1280, 768, 85, 0 },

-    { 1280, 960, 60, 0 },

-    { 1280, 960, 85, 0 },

-    { 1280, 1024, 60, 0 },

-    { 1280, 1024, 85, 0 },

-    /* byte 8 */

-    { 1360, 768, 60, 0 },

-    { 1440, 900, 60, 1 },

-    { 1440, 900, 60, 0 },

-    { 1440, 900, 75, 0 },

-    { 1440, 900, 85, 0 },

-    { 1400, 1050, 60, 1 },

-    { 1400, 1050, 60, 0 },

-    { 1400, 1050, 75, 0 },

-    /* byte 9 */

-    { 1400, 1050, 85, 0 },

-    { 1680, 1050, 60, 1 },

-    { 1680, 1050, 60, 0 },

-    { 1680, 1050, 75, 0 },

-    { 1680, 1050, 85, 0 },

-    { 1600, 1200, 60, 0 },

-    { 1600, 1200, 65, 0 },

-    { 1600, 1200, 70, 0 },

-    /* byte 10 */

-    { 1600, 1200, 75, 0 },

-    { 1600, 1200, 85, 0 },

-    { 1792, 1344, 60, 0 },

-    { 1792, 1344, 85, 0 },

-    { 1856, 1392, 60, 0 },

-    { 1856, 1392, 75, 0 },

-    { 1920, 1200, 60, 1 },

-    { 1920, 1200, 60, 0 },

-    /* byte 11 */

-    { 1920, 1200, 75, 0 },

-    { 1920, 1200, 85, 0 },

-    { 1920, 1440, 60, 0 },

-    { 1920, 1440, 75, 0 },

-};

-

-static DisplayModePtr

-DDCModesFromEstIII(unsigned char *est)

-{

-    DisplayModePtr modes = NULL;

-    int i, j, m;

-

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

-	for (j = 7; j > 0; j--) {

-	    if (est[i] & (1 << j)) {

-		m = (i * 8) + (7 - j);

-		modes = xf86ModesAdd(modes,

-				     FindDMTMode(EstIIIModes[m].w,

-						 EstIIIModes[m].h,

-						 EstIIIModes[m].r,

-						 EstIIIModes[m].rb));

-	    }

-	}

-    }

-

-    return modes;

-}

-

-/*

- * This is only valid when the sink claims to be continuous-frequency

- * but does not supply a detailed range descriptor.  Such sinks are

- * arguably broken.  Currently the mode validation code isn't aware of

- * this; the non-RANDR code even punts the decision of optional sync

- * range checking to the driver.  Loss.

- */

-static void

-DDCGuessRangesFromModes(int scrnIndex, MonPtr Monitor, DisplayModePtr Modes)

-{

-    DisplayModePtr Mode = Modes;

-

-    if (!Monitor || !Modes)

-        return;

-

-    /* set up the ranges for scanning through the modes */

-    Monitor->nHsync = 1;

-    Monitor->hsync[0].lo = 1024.0;

-    Monitor->hsync[0].hi = 0.0;

-

-    Monitor->nVrefresh = 1;

-    Monitor->vrefresh[0].lo = 1024.0;

-    Monitor->vrefresh[0].hi = 0.0;

-

-    while (Mode) {

-        if (!Mode->HSync)

-            Mode->HSync = ((float) Mode->Clock ) / ((float) Mode->HTotal);

-

-        if (!Mode->VRefresh)

-            Mode->VRefresh = (1000.0 * ((float) Mode->Clock)) / 

-                ((float) (Mode->HTotal * Mode->VTotal));

-

-        if (Mode->HSync < Monitor->hsync[0].lo)

-            Monitor->hsync[0].lo = Mode->HSync;

-

-        if (Mode->HSync > Monitor->hsync[0].hi)

-            Monitor->hsync[0].hi = Mode->HSync;

-

-        if (Mode->VRefresh < Monitor->vrefresh[0].lo)

-            Monitor->vrefresh[0].lo = Mode->VRefresh;

-

-        if (Mode->VRefresh > Monitor->vrefresh[0].hi)

-            Monitor->vrefresh[0].hi = Mode->VRefresh;

-

-        Mode = Mode->next;

-    }

-}

-

-ddc_quirk_t

-xf86DDCDetectQuirks(int scrnIndex, xf86MonPtr DDC, Bool verbose)

-{

-    ddc_quirk_t	quirks;

-    int i;

-

-    quirks = DDC_QUIRK_NONE;

-    for (i = 0; ddc_quirks[i].detect; i++) {

-	if (ddc_quirks[i].detect (scrnIndex, DDC)) {

-	    if (verbose) {

-		xf86DrvMsg (scrnIndex, X_INFO, "    EDID quirk: %s\n",

-			    ddc_quirks[i].description);

-	    }

-	    quirks |= ddc_quirks[i].quirk;

-	}

-    }

-

-    return quirks;

-}

-

-void xf86DetTimingApplyQuirks(struct detailed_monitor_section *det_mon,

-                              ddc_quirk_t quirks,

-                              int hsize, int vsize)

-{

-    if (det_mon->type != DT)

-        return;

-

-    if (quirks & DDC_QUIRK_DETAILED_H_IN_CM)

-        det_mon->section.d_timings.h_size *= 10;

-

-    if (quirks & DDC_QUIRK_DETAILED_V_IN_CM)

-        det_mon->section.d_timings.v_size *= 10;

-

-    if (quirks & DDC_QUIRK_DETAILED_USE_MAXIMUM_SIZE) {

-        det_mon->section.d_timings.h_size = 10 * hsize;

-        det_mon->section.d_timings.v_size = 10 * vsize;

-    }

-}

-

-/**

- * Applies monitor-specific quirks to the decoded EDID information.

- *

- * Note that some quirks applying to the mode list are still implemented in

- * xf86DDCGetModes.

- */

-void

-xf86DDCApplyQuirks(int scrnIndex, xf86MonPtr DDC)

-{

-    ddc_quirk_t quirks = xf86DDCDetectQuirks (scrnIndex, DDC, FALSE);

-    int i;

-

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

-        xf86DetTimingApplyQuirks(DDC->det_mon + i, quirks,

-                                 DDC->features.hsize,

-                                 DDC->features.vsize);

-    }

-}

-

-/**

- * Walks the modes list, finding the mode with the largest area which is

- * closest to the target refresh rate, and marks it as the only preferred mode.

-*/

-static void

-xf86DDCSetPreferredRefresh(int scrnIndex, DisplayModePtr modes,

-			   float target_refresh)

-{

-	DisplayModePtr	mode, best = modes;

-

-	for (mode = modes; mode; mode = mode->next)

-	{

-	    mode->type &= ~M_T_PREFERRED;

-

-	    if (mode == best) continue;

-

-	    if (mode->HDisplay * mode->VDisplay >

-		best->HDisplay * best->VDisplay)

-	    {

-		best = mode;

-		continue;

-	    }

-	    if (mode->HDisplay * mode->VDisplay ==

-		best->HDisplay * best->VDisplay)

-	    {

-		double	mode_refresh = xf86ModeVRefresh (mode);

-		double	best_refresh = xf86ModeVRefresh (best);

-		double	mode_dist = fabs(mode_refresh - target_refresh);

-		double	best_dist = fabs(best_refresh - target_refresh);

-

-		if (mode_dist < best_dist)

-		{

-		    best = mode;

-		    continue;

-		}

-	    }

-	}

-	if (best)

-	    best->type |= M_T_PREFERRED;

-}

-

-#define CEA_VIDEO_MODES_NUM  64

-static const DisplayModeRec CEAVideoModes[CEA_VIDEO_MODES_NUM] = {

-    { MODEPREFIX,    25175,  640,  656,  752,  800, 0,  480,  490,  492,  525, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 1:640x480@60Hz */

-    { MODEPREFIX,    27000,  720,  736,  798,  858, 0,  480,  489,  495,  525, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 2:720x480@60Hz */

-    { MODEPREFIX,    27000,  720,  736,  798,  858, 0,  480,  489,  495,  525, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 3:720x480@60Hz */

-    { MODEPREFIX,    74250, 1280, 1390, 1430, 1650, 0,  720,  725,  730,  750, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* VIC 4: 1280x720@60Hz */

-    { MODEPREFIX,    74250, 1920, 2008, 2052, 2200, 0, 1080, 1084, 1094, 1125, 0, V_PHSYNC | V_PVSYNC | V_INTERLACE, MODESUFFIX }, /* VIC 5:1920x1080i@60Hz */

-    { MODEPREFIX,    27000, 1440, 1478, 1602, 1716, 0,  480,  488,  494,  525, 0, V_NHSYNC | V_NVSYNC | V_INTERLACE, MODESUFFIX }, /* VIC 6:1440x480i@60Hz */

-    { MODEPREFIX,    27000, 1440, 1478, 1602, 1716, 0,  480,  488,  494,  525, 0, V_NHSYNC | V_NVSYNC | V_INTERLACE, MODESUFFIX }, /* VIC 7:1440x480i@60Hz */

-    { MODEPREFIX,    27000, 1440, 1478, 1602, 1716, 0,  240,  244,  247,  262, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 8:1440x240@60Hz */

-    { MODEPREFIX,    27000, 1440, 1478, 1602, 1716, 0,  240,  244,  247,  262, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 9:1440x240@60Hz */

-    { MODEPREFIX,    54000, 2880, 2956, 3204, 3432, 0,  480,  488,  494,  525, 0, V_NHSYNC | V_NVSYNC | V_INTERLACE, MODESUFFIX }, /* VIC 10:2880x480i@60Hz */

-    { MODEPREFIX,    54000, 2880, 2956, 3204, 3432, 0,  480,  488,  494,  525, 0, V_NHSYNC | V_NVSYNC | V_INTERLACE, MODESUFFIX }, /* VIC 11:2880x480i@60Hz */

-    { MODEPREFIX,    54000, 2880, 2956, 3204, 3432, 0,  240,  244,  247,  262, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 12:2880x240@60Hz */

-    { MODEPREFIX,    54000, 2880, 2956, 3204, 3432, 0,  240,  244,  247,  262, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 13:2880x240@60Hz */

-    { MODEPREFIX,    54000, 1440, 1472, 1596, 1716, 0,  480,  489,  495,  525, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 14:1440x480@60Hz */

-    { MODEPREFIX,    54000, 1440, 1472, 1596, 1716, 0,  480,  489,  495,  525, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 15:1440x480@60Hz */

-    { MODEPREFIX,   148500, 1920, 2008, 2052, 2200, 0, 1080, 1084, 1089, 1125, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* VIC 16:1920x1080@60Hz */

-    { MODEPREFIX,    27000,  720,  732,  796,  864, 0,  576,  581,  586,  625, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 17:720x576@50Hz */

-    { MODEPREFIX,    27000,  720,  732,  796,  864, 0,  576,  581,  586,  625, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 18:720x576@50Hz */

-    { MODEPREFIX,    74250, 1280, 1720, 1760, 1980, 0,  720,  725,  730,  750, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* VIC 19: 1280x720@50Hz */

-    { MODEPREFIX,    74250, 1920, 2448, 2492, 2640, 0, 1080, 1084, 1094, 1125, 0, V_PHSYNC | V_PVSYNC | V_INTERLACE, MODESUFFIX }, /* VIC 20:1920x1080i@50Hz */

-    { MODEPREFIX,    27000, 1440, 1464, 1590, 1728, 0,  576,  580,  586,  625, 0, V_NHSYNC | V_NVSYNC | V_INTERLACE, MODESUFFIX }, /* VIC 21:1440x576i@50Hz */

-    { MODEPREFIX,    27000, 1440, 1464, 1590, 1728, 0,  576,  580,  586,  625, 0, V_NHSYNC | V_NVSYNC | V_INTERLACE, MODESUFFIX }, /* VIC 22:1440x576i@50Hz */

-    { MODEPREFIX,    27000, 1440, 1464, 1590, 1728, 0,  288,  290,  293,  312, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 23:1440x288@50Hz */

-    { MODEPREFIX,    27000, 1440, 1464, 1590, 1728, 0,  288,  290,  293,  312, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 24:1440x288@50Hz */

-    { MODEPREFIX,    54000, 2880, 2928, 3180, 3456, 0,  576,  580,  586,  625, 0, V_NHSYNC | V_NVSYNC | V_INTERLACE, MODESUFFIX }, /* VIC 25:2880x576i@50Hz */

-    { MODEPREFIX,    54000, 2880, 2928, 3180, 3456, 0,  576,  580,  586,  625, 0, V_NHSYNC | V_NVSYNC | V_INTERLACE, MODESUFFIX }, /* VIC 26:2880x576i@50Hz */

-    { MODEPREFIX,    54000, 2880, 2928, 3180, 3456, 0,  288,  290,  293,  312, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 27:2880x288@50Hz */

-    { MODEPREFIX,    54000, 2880, 2928, 3180, 3456, 0,  288,  290,  293,  312, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 28:2880x288@50Hz */

-    { MODEPREFIX,    54000, 1440, 1464, 1592, 1728, 0,  576,  581,  586,  625, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 29:1440x576@50Hz */

-    { MODEPREFIX,    54000, 1440, 1464, 1592, 1728, 0,  576,  581,  586,  625, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 30:1440x576@50Hz */

-    { MODEPREFIX,   148500, 1920, 2448, 2492, 2640, 0, 1080, 1084, 1089, 1125, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* VIC 31:1920x1080@50Hz */

-    { MODEPREFIX,    74250, 1920, 2558, 2602, 2750, 0, 1080, 1084, 1089, 1125, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* VIC 32:1920x1080@24Hz */

-    { MODEPREFIX,    74250, 1920, 2448, 2492, 2640, 0, 1080, 1084, 1089, 1125, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* VIC 33:1920x1080@25Hz */

-    { MODEPREFIX,    74250, 1920, 2008, 2052, 2200, 0, 1080, 1084, 1089, 1125, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* VIC 34:1920x1080@30Hz */

-    { MODEPREFIX,   108000, 2880, 2944, 3192, 3432, 0,  480,  489,  495,  525, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 35:2880x480@60Hz */

-    { MODEPREFIX,   108000, 2880, 2944, 3192, 3432, 0,  480,  489,  495,  525, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 36:2880x480@60Hz */

-    { MODEPREFIX,   108000, 2880, 2928, 3184, 3456, 0,  576,  581,  586,  625, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 37:2880x576@50Hz */

-    { MODEPREFIX,   108000, 2880, 2928, 3184, 3456, 0,  576,  581,  586,  625, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 38:2880x576@50Hz */

-    { MODEPREFIX,    72000, 1920, 1952, 2120, 2304, 0, 1080, 1126, 1136, 1250, 0, V_PHSYNC | V_NVSYNC | V_INTERLACE, MODESUFFIX }, /* VIC 39:1920x1080i@50Hz */

-    { MODEPREFIX,   148500, 1920, 2448, 2492, 2640, 0, 1080, 1084, 1094, 1125, 0, V_PHSYNC | V_PVSYNC | V_INTERLACE, MODESUFFIX }, /* VIC 40:1920x1080i@100Hz */

-    { MODEPREFIX,   148500, 1280, 1720, 1760, 1980, 0,  720,  725,  730,  750, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* VIC 41:1280x720@100Hz */

-    { MODEPREFIX,    54000,  720,  732,  796,  864, 0,  576,  581,  586,  625, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 42:720x576@100Hz */

-    { MODEPREFIX,    54000,  720,  732,  796,  864, 0,  576,  581,  586,  625, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 43:720x576@100Hz */

-    { MODEPREFIX,    54000, 1440, 1464, 1590, 1728, 0,  576,  580,  586,  625, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 44:1440x576i@100Hz */

-    { MODEPREFIX,    54000, 1440, 1464, 1590, 1728, 0,  576,  580,  586,  625, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 45:1440x576i@100Hz */

-    { MODEPREFIX,   148500, 1920, 2008, 2052, 2200, 0, 1080, 1084, 1094, 1125, 0, V_PHSYNC | V_PVSYNC | V_INTERLACE, MODESUFFIX }, /* VIC 46:1920x1080i@120Hz */

-    { MODEPREFIX,   148500, 1280, 1390, 1430, 1650, 0,  720,  725,  730,  750, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* VIC 47:1280x720@120Hz */

-    { MODEPREFIX,    54000,  720,  736,  798,  858, 0,  480,  489,  495,  525, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 48:720x480@120Hz */

-    { MODEPREFIX,    54000,  720,  736,  798,  858, 0,  480,  489,  495,  525, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 49:720x480@120Hz */

-    { MODEPREFIX,    54000, 1440, 1478, 1602, 1716, 0,  480,  488,  494,  525, 0, V_NHSYNC | V_NVSYNC | V_INTERLACE, MODESUFFIX },/* VIC 50:1440x480i@120Hz */

-    { MODEPREFIX,    54000, 1440, 1478, 1602, 1716, 0,  480,  488,  494,  525, 0, V_NHSYNC | V_NVSYNC | V_INTERLACE, MODESUFFIX },/* VIC 51:1440x480i@120Hz */

-    { MODEPREFIX,   108000,  720,  732,  796,  864, 0,  576,  581,  586,  625, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 52:720x576@200Hz */

-    { MODEPREFIX,   108000,  720,  732,  796,  864, 0,  576,  581,  586,  625, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 53:720x576@200Hz */

-    { MODEPREFIX,   108000, 1440, 1464, 1590, 1728, 0,  576,  580,  586,  625, 0, V_NHSYNC | V_NVSYNC | V_INTERLACE, MODESUFFIX },/* VIC 54:1440x576i@200Hz */

-    { MODEPREFIX,   108000, 1440, 1464, 1590, 1728, 0,  576,  580,  586,  625, 0, V_NHSYNC | V_NVSYNC | V_INTERLACE, MODESUFFIX },/* VIC 55:1440x576i@200Hz */

-    { MODEPREFIX,   108000,  720,  736,  798,  858, 0,  480,  489,  495,  525, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 56:720x480@240Hz */

-    { MODEPREFIX,   108000,  720,  736,  798,  858, 0,  480,  489,  495,  525, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 57:720x480@240Hz */

-    { MODEPREFIX,   108000, 1440, 1478, 1602, 1716, 0,  480,  488,  494,  525, 0, V_NHSYNC | V_NVSYNC | V_INTERLACE, MODESUFFIX },/* VIC 58:1440x480i@240 */

-    { MODEPREFIX,   108000, 1440, 1478, 1602, 1716, 0,  480,  488,  494,  525, 0, V_NHSYNC | V_NVSYNC | V_INTERLACE, MODESUFFIX },/* VIC 59:1440x480i@240 */

-    { MODEPREFIX,    59400, 1280, 3040, 3080, 3300, 0,  720,  725,  730,  750, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* VIC 60: 1280x720@24Hz */

-    { MODEPREFIX,    74250, 3700, 3740, 1430, 3960, 0,  720,  725,  730,  750, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* VIC 61: 1280x720@25Hz */

-    { MODEPREFIX,    74250, 1280, 3040, 3080, 3300, 0,  720,  725,  730,  750, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* VIC 62: 1280x720@30Hz */

-    { MODEPREFIX,   297000, 1920, 2008, 2052, 2200, 0, 1080, 1084, 1089, 1125, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* VIC 63: 1920x1080@120Hz */

-    { MODEPREFIX,   297000, 1920, 2448, 2492, 2640, 0, 1080, 1084, 1094, 1125, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* VIC 64:1920x1080@100Hz */

-};

-

-/* chose mode line by cea short video descriptor*/

-static void handle_cea_svd(struct cea_video_block *video, void *data)

-{

-    DisplayModePtr Mode;

-    DisplayModePtr *Modes = (DisplayModePtr *) data;

-    int vid;

-

-    vid = video ->video_code & 0x7f;

-    if (vid < CEA_VIDEO_MODES_NUM) {

-	Mode = xf86DuplicateMode(CEAVideoModes + vid);

-	*Modes = xf86ModesAdd(*Modes, Mode);

-    }

-}

-

-static DisplayModePtr

-DDCModesFromCEAExtension(int scrnIndex, xf86MonPtr MonPtr)

-{

-    DisplayModePtr Modes = NULL;

-

-    xf86ForEachVideoBlock(MonPtr,

-                          handle_cea_svd,

-                          &Modes);

-

-    return Modes;

-}

-

-struct det_modes_parameter {

-    xf86MonPtr DDC;

-    ddc_quirk_t quirks;

-    DisplayModePtr  Modes;

-    Bool rb;

-    Bool preferred;

-    int timing_level;

-};

-

-static void handle_detailed_modes(struct detailed_monitor_section *det_mon,

-	                          void *data)

-{

-    DisplayModePtr  Mode;

-    struct det_modes_parameter *p = (struct det_modes_parameter *)data;

-

-    xf86DetTimingApplyQuirks(det_mon,p->quirks,

-                             p->DDC->features.hsize,

-                             p->DDC->features.vsize);

-

-    switch (det_mon->type) {

-    case DT:

-        Mode = DDCModeFromDetailedTiming(p->DDC->scrnIndex,

-                                         &det_mon->section.d_timings,

-                                         p->preferred,

-                                         p->quirks);

-        p->preferred = FALSE;

-        p->Modes = xf86ModesAdd(p->Modes, Mode);

-        break;

-    case DS_STD_TIMINGS:

-        Mode = DDCModesFromStandardTiming(det_mon->section.std_t,

-                                          p->quirks, p->timing_level,p->rb);

-        p->Modes = xf86ModesAdd(p->Modes, Mode);

-        break;

-    case DS_CVT:

-        Mode = DDCModesFromCVT(p->DDC->scrnIndex, det_mon->section.cvt);

-        p->Modes = xf86ModesAdd(p->Modes, Mode);

-        break;

-    case DS_EST_III:

-	Mode = DDCModesFromEstIII(det_mon->section.est_iii);

-	p->Modes = xf86ModesAdd(p->Modes, Mode);

-	break;

-    default:

-        break;

-    }

-}

-

-DisplayModePtr

-xf86DDCGetModes(int scrnIndex, xf86MonPtr DDC)

-{

-    DisplayModePtr  Modes = NULL, Mode;

-    ddc_quirk_t	    quirks;

-    Bool	    preferred, rb;

-    int		    timing_level;

-    struct det_modes_parameter p;

-

-    xf86DrvMsg (scrnIndex, X_INFO, "EDID vendor \"%s\", prod id %d\n",

-		DDC->vendor.name, DDC->vendor.prod_id);

-

-    quirks = xf86DDCDetectQuirks(scrnIndex, DDC, TRUE);

-

-    preferred = PREFERRED_TIMING_MODE(DDC->features.msc);

-    if (DDC->ver.revision >= 4)

-	preferred = TRUE;

-    if (quirks & DDC_QUIRK_FIRST_DETAILED_PREFERRED)

-	preferred = TRUE;

-    if (quirks & (DDC_QUIRK_PREFER_LARGE_60 | DDC_QUIRK_PREFER_LARGE_75))

-	preferred = FALSE;

-

-    rb = xf86MonitorSupportsReducedBlanking(DDC);

-

-    timing_level = MonitorStandardTimingLevel(DDC);

-

-    p.quirks = quirks;

-    p.DDC = DDC;

-    p.Modes = Modes;

-    p.rb = rb;

-    p.preferred = preferred;

-    p.timing_level = timing_level;

-    xf86ForEachDetailedBlock(DDC, handle_detailed_modes, &p);

-    Modes = p.Modes;

-

-    /* Add established timings */

-    Mode = DDCModesFromEstablished(scrnIndex, &DDC->timings1, quirks);

-    Modes = xf86ModesAdd(Modes, Mode);

-

-    /* Add standard timings */

-    Mode = DDCModesFromStandardTiming(DDC->timings2, quirks, timing_level, rb);

-    Modes = xf86ModesAdd(Modes, Mode);

-

-    /* Add cea-extension mode timings */

-    Mode = DDCModesFromCEAExtension(scrnIndex,DDC);

-    Modes = xf86ModesAdd(Modes, Mode);

-

-    if (quirks & DDC_QUIRK_PREFER_LARGE_60)

-	xf86DDCSetPreferredRefresh(scrnIndex, Modes, 60);

-

-    if (quirks & DDC_QUIRK_PREFER_LARGE_75)

-	xf86DDCSetPreferredRefresh(scrnIndex, Modes, 75);

-

-    Modes = xf86PruneDuplicateModes(Modes);

-

-    return Modes;

-}

-

-struct det_mon_parameter {

-    MonPtr Monitor;

-    ddc_quirk_t quirks;

-    Bool have_hsync;

-    Bool have_vrefresh;

-    Bool have_maxpixclock;

-};

-

-static void handle_detailed_monset(struct detailed_monitor_section *det_mon,

-                                   void *data)

-{

-    int clock;

-    struct det_mon_parameter *p = (struct det_mon_parameter *)data;

-    int scrnIndex = ((xf86MonPtr)(p->Monitor->DDC))->scrnIndex;

-

-    switch (det_mon->type) {

-    case DS_RANGES:

-        if (!p->have_hsync) {

-            if (!p->Monitor->nHsync)

-                xf86DrvMsg(scrnIndex, X_INFO,

-                    "Using EDID range info for horizontal sync\n");

-                p->Monitor->hsync[p->Monitor->nHsync].lo =

-                    det_mon->section.ranges.min_h;

-                p->Monitor->hsync[p->Monitor->nHsync].hi =

-                    det_mon->section.ranges.max_h;

-                p->Monitor->nHsync++;

-        } else {

-            xf86DrvMsg(scrnIndex, X_INFO,

-                "Using hsync ranges from config file\n");

-        }

-

-        if (!p->have_vrefresh) {

-            if (!p->Monitor->nVrefresh)

-                xf86DrvMsg(scrnIndex, X_INFO,

-                    "Using EDID range info for vertical refresh\n");

-            p->Monitor->vrefresh[p->Monitor->nVrefresh].lo =

-                det_mon->section.ranges.min_v;

-            p->Monitor->vrefresh[p->Monitor->nVrefresh].hi =

-                det_mon->section.ranges.max_v;

-            p->Monitor->nVrefresh++;

-        } else {

-            xf86DrvMsg(scrnIndex, X_INFO,

-                "Using vrefresh ranges from config file\n");

-        }

-

-        clock = det_mon->section.ranges.max_clock * 1000;

-        if (p->quirks & DDC_QUIRK_DVI_SINGLE_LINK)

-            clock = min(clock, 165000);

-        if (!p->have_maxpixclock && clock > p->Monitor->maxPixClock)

-            p->Monitor->maxPixClock = clock;

-

-        break;

-    default:

-        break;

-    }

-}

-

-/*

- * Fill out MonPtr with xf86MonPtr information.

- */

-void

-xf86EdidMonitorSet(int scrnIndex, MonPtr Monitor, xf86MonPtr DDC)

-{

-    DisplayModePtr Modes = NULL, Mode;

-    struct det_mon_parameter p;

-

-    if (!Monitor || !DDC)

-        return;

-

-    Monitor->DDC = DDC;

-

-    if (Monitor->widthmm <= 0 || Monitor->heightmm <= 0) {

-	Monitor->widthmm = 10 * DDC->features.hsize;

-	Monitor->heightmm = 10 * DDC->features.vsize;

-    }

-

-    Monitor->reducedblanking = xf86MonitorSupportsReducedBlanking(DDC);

-

-    Modes = xf86DDCGetModes(scrnIndex, DDC);

-

-    /* Go through the detailed monitor sections */

-    p.Monitor = Monitor;

-    p.quirks = xf86DDCDetectQuirks(scrnIndex, Monitor->DDC, FALSE);

-    p.have_hsync = (Monitor->nHsync != 0);

-    p.have_vrefresh = (Monitor->nVrefresh != 0);

-    p.have_maxpixclock = (Monitor->maxPixClock != 0);

-    xf86ForEachDetailedBlock(DDC, handle_detailed_monset, &p);

-

-    if (Modes) {

-        /* Print Modes */

-        xf86DrvMsg(scrnIndex, X_INFO, "Printing DDC gathered Modelines:\n");

-

-        Mode = Modes;

-        while (Mode) {

-            xf86PrintModeline(scrnIndex, Mode);

-            Mode = Mode->next;

-        }

-

-        /* Do we still need ranges to be filled in? */

-        if (!Monitor->nHsync || !Monitor->nVrefresh)

-            DDCGuessRangesFromModes(scrnIndex, Monitor, Modes);

-

-        /* look for last Mode */

-        Mode = Modes;

-

-        while (Mode->next)

-            Mode = Mode->next;

-

-        /* add to MonPtr */

-        if (Monitor->Modes) {

-            Monitor->Last->next = Modes;

-            Modes->prev = Monitor->Last;

-            Monitor->Last = Mode;

-        } else {

-            Monitor->Modes = Modes;

-            Monitor->Last = Mode;

-        }

-    }

-}

+/*
+ * Copyright 2006 Luc Verhaegen.
+ * Copyright 2008 Red Hat, 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, sub license,
+ * 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 (including the
+ * next paragraph) 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 NON-INFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS 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.
+ */
+
+/**
+ * @file This file covers code to convert a xf86MonPtr containing EDID-probed
+ * information into a list of modes, including applying monitor-specific
+ * quirks to fix broken EDID data.
+ */
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#else
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#endif
+
+#define _PARSE_EDID_
+#include "xf86.h"
+#include "xf86DDC.h"
+#include <X11/Xatom.h>
+#include "property.h"
+#include "propertyst.h"
+#include "xf86Crtc.h"
+#include <string.h>
+#include <math.h>
+
+static void handle_detailed_rblank(struct detailed_monitor_section *det_mon,
+                                   void *data)
+{
+    if (det_mon->type == DS_RANGES)
+        if (det_mon->section.ranges.supported_blanking & CVT_REDUCED)
+            *(Bool*)data = TRUE;
+}
+
+static Bool
+xf86MonitorSupportsReducedBlanking(xf86MonPtr DDC)
+{
+    /* EDID 1.4 explicitly defines RB support */
+    if (DDC->ver.revision >= 4) {
+        Bool ret = FALSE;
+
+        xf86ForEachDetailedBlock(DDC, handle_detailed_rblank, &ret);
+        return ret;
+    }
+
+    /* For anything older, assume digital means RB support. Boo. */
+    if (DDC->features.input_type)
+        return TRUE;
+
+    return FALSE;
+}
+
+static Bool quirk_prefer_large_60 (int scrnIndex, xf86MonPtr DDC)
+{
+    /* Belinea 10 15 55 */
+    if (memcmp (DDC->vendor.name, "MAX", 4) == 0 &&
+	((DDC->vendor.prod_id == 1516) ||
+	(DDC->vendor.prod_id == 0x77e)))
+	return TRUE;
+    
+    /* Acer AL1706 */
+    if (memcmp (DDC->vendor.name, "ACR", 4) == 0 &&
+	DDC->vendor.prod_id == 44358)
+	return TRUE;
+
+    /* Bug #10814: Samsung SyncMaster 225BW */
+    if (memcmp (DDC->vendor.name, "SAM", 4) == 0 &&
+	DDC->vendor.prod_id == 596)
+	return TRUE;
+
+    /* Bug #10545: Samsung SyncMaster 226BW */
+    if (memcmp (DDC->vendor.name, "SAM", 4) == 0 &&
+	DDC->vendor.prod_id == 638)
+	return TRUE;
+
+    /* Acer F51 */
+    if (memcmp (DDC->vendor.name, "API", 4) == 0 &&
+	DDC->vendor.prod_id == 0x7602)
+	return TRUE;
+
+
+    return FALSE;
+}
+
+static Bool quirk_prefer_large_75 (int scrnIndex, xf86MonPtr DDC)
+{
+    /* Bug #11603: Funai Electronics PM36B */
+    if (memcmp (DDC->vendor.name, "FCM", 4) == 0 &&
+	DDC->vendor.prod_id == 13600)
+	return TRUE;
+
+    return FALSE;
+}
+
+static Bool quirk_detailed_h_in_cm (int scrnIndex, xf86MonPtr DDC)
+{
+    /* Bug #11603: Funai Electronics PM36B */
+    if (memcmp (DDC->vendor.name, "FCM", 4) == 0 &&
+	DDC->vendor.prod_id == 13600)
+	return TRUE;
+
+    return FALSE;
+}
+
+static Bool quirk_detailed_v_in_cm (int scrnIndex, xf86MonPtr DDC)
+{
+    /* Bug #11603: Funai Electronics PM36B */
+    if (memcmp (DDC->vendor.name, "FCM", 4) == 0 &&
+	DDC->vendor.prod_id == 13600)
+	return TRUE;
+
+    /* Bug #21000: LGPhilipsLCD LP154W01-TLAJ */
+    if (memcmp (DDC->vendor.name, "LPL", 4) == 0 &&
+	DDC->vendor.prod_id == 47360)
+	return TRUE;
+
+    /* Bug #10304: LGPhilipsLCD LP154W01-A5 */
+    if (memcmp(DDC->vendor.name, "LPL", 4) == 0 &&
+	DDC->vendor.prod_id == 0)
+	return TRUE;
+
+    /* Bug #24482: LGPhilipsLCD LP154W01-TLA1 */
+    if (memcmp(DDC->vendor.name, "LPL", 4) == 0 &&
+	DDC->vendor.prod_id == 0x2a00)
+	return TRUE;
+
+    /* Bug #28414: HP Compaq NC8430 LP154W01-TLA8 */
+    if (memcmp (DDC->vendor.name, "LPL", 4) == 0 &&
+	DDC->vendor.prod_id == 5750)
+	return TRUE;
+
+    /* Bug #21750: Samsung Syncmaster 2333HD */
+    if (memcmp (DDC->vendor.name, "SAM", 4) == 0 &&
+	DDC->vendor.prod_id == 1157)
+	return TRUE;
+
+    return FALSE;
+}
+
+static Bool quirk_detailed_use_maximum_size (int scrnIndex, xf86MonPtr DDC)
+{
+    /* Bug #21324: Iiyama Vision Master 450 */
+    if (memcmp (DDC->vendor.name, "IVM", 4) == 0 &&
+	DDC->vendor.prod_id == 6400)
+	return TRUE;
+
+    return FALSE;
+}
+
+static Bool quirk_135_clock_too_high (int scrnIndex, xf86MonPtr DDC)
+{
+    /* Envision Peripherals, Inc. EN-7100e.  See bug #9550. */
+    if (memcmp (DDC->vendor.name, "EPI", 4) == 0 &&
+	DDC->vendor.prod_id == 59264)
+	return TRUE;
+    
+    return FALSE;
+}
+
+static Bool quirk_first_detailed_preferred (int scrnIndex, xf86MonPtr DDC)
+{
+    /* Philips 107p5 CRT. Reported on xorg@ with pastebin. */
+    if (memcmp (DDC->vendor.name, "PHL", 4) == 0 &&
+	DDC->vendor.prod_id == 57364)
+	return TRUE;
+
+    /* Proview AY765C 17" LCD. See bug #15160*/
+    if (memcmp (DDC->vendor.name, "PTS", 4) == 0 &&
+	DDC->vendor.prod_id == 765)
+	return TRUE;
+
+    /* ACR of some sort RH #284231 */
+    if (memcmp (DDC->vendor.name, "ACR", 4) == 0 &&
+	DDC->vendor.prod_id == 2423)
+	return TRUE;
+
+    /* Peacock Ergovision 19.  See rh#492359 */
+    if (memcmp (DDC->vendor.name, "PEA", 4) == 0 &&
+	DDC->vendor.prod_id == 9003)
+	return TRUE;
+
+    return FALSE;
+}
+
+static Bool quirk_detailed_sync_pp(int scrnIndex, xf86MonPtr DDC)
+{
+    /* Bug #12439: Samsung SyncMaster 205BW */
+    if (memcmp (DDC->vendor.name, "SAM", 4) == 0 &&
+	DDC->vendor.prod_id == 541)
+	return TRUE;
+    return FALSE;
+}
+
+/* This should probably be made more generic */
+static Bool quirk_dvi_single_link(int scrnIndex, xf86MonPtr DDC)
+{
+    /* Red Hat bug #453106: Apple 23" Cinema Display */
+    if (memcmp (DDC->vendor.name, "APL", 4) == 0 &&
+	DDC->vendor.prod_id == 0x921c)
+	return TRUE;
+    return FALSE;
+}
+
+typedef struct {
+    Bool	(*detect) (int scrnIndex, xf86MonPtr DDC);
+    ddc_quirk_t	quirk;
+    char	*description;
+} ddc_quirk_map_t;
+
+static const ddc_quirk_map_t ddc_quirks[] = {
+    {
+	quirk_prefer_large_60,   DDC_QUIRK_PREFER_LARGE_60,
+	"Detailed timing is not preferred, use largest mode at 60Hz"
+    },
+    {
+	quirk_135_clock_too_high,   DDC_QUIRK_135_CLOCK_TOO_HIGH,
+	"Recommended 135MHz pixel clock is too high"
+    },
+    {
+	quirk_prefer_large_75,   DDC_QUIRK_PREFER_LARGE_75,
+	"Detailed timing is not preferred, use largest mode at 75Hz"
+    },
+    {
+	quirk_detailed_h_in_cm,   DDC_QUIRK_DETAILED_H_IN_CM,
+	"Detailed timings give horizontal size in cm."
+    },
+    {
+	quirk_detailed_v_in_cm,   DDC_QUIRK_DETAILED_V_IN_CM,
+	"Detailed timings give vertical size in cm."
+    },
+    {
+	quirk_detailed_use_maximum_size,   DDC_QUIRK_DETAILED_USE_MAXIMUM_SIZE,
+	"Use maximum size instead of detailed timing sizes."
+    },
+    {
+	quirk_first_detailed_preferred, DDC_QUIRK_FIRST_DETAILED_PREFERRED,
+	"First detailed timing was not marked as preferred."
+    },
+    {
+	quirk_detailed_sync_pp, DDC_QUIRK_DETAILED_SYNC_PP,
+	"Use +hsync +vsync for detailed timing."
+    },
+    {
+	quirk_dvi_single_link, DDC_QUIRK_DVI_SINGLE_LINK,
+	"Forcing maximum pixel clock to single DVI link."
+    },
+    { 
+	NULL,		DDC_QUIRK_NONE,
+	"No known quirks"
+    },
+};
+
+/*
+ * These more or less come from the DMT spec.  The 720x400 modes are
+ * inferred from historical 80x25 practice.  The 640x480@67 and 832x624@75
+ * modes are old-school Mac modes.  The EDID spec says the 1152x864@75 mode
+ * should be 1152x870, again for the Mac, but instead we use the x864 DMT
+ * mode.
+ *
+ * The DMT modes have been fact-checked; the rest are mild guesses.
+ */
+#define MODEPREFIX NULL, NULL, NULL, 0, M_T_DRIVER
+#define MODESUFFIX 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,FALSE,FALSE,0,NULL,0,0.0,0.0
+
+static const DisplayModeRec DDCEstablishedModes[17] = {
+    { MODEPREFIX,    40000,  800,  840,  968, 1056, 0,  600,  601,  605,  628, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 800x600@60Hz */
+    { MODEPREFIX,    36000,  800,  824,  896, 1024, 0,  600,  601,  603,  625, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 800x600@56Hz */
+    { MODEPREFIX,    31500,  640,  656,  720,  840, 0,  480,  481,  484,  500, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* 640x480@75Hz */
+    { MODEPREFIX,    31500,  640,  664,  704,  832, 0,  480,  489,  492,  520, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* 640x480@72Hz */
+    { MODEPREFIX,    30240,  640,  704,  768,  864, 0,  480,  483,  486,  525, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* 640x480@67Hz */
+    { MODEPREFIX,    25175,  640,  656,  752,  800, 0,  480,  490,  492,  525, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* 640x480@60Hz */
+    { MODEPREFIX,    35500,  720,  738,  846,  900, 0,  400,  421,  423,  449, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* 720x400@88Hz */
+    { MODEPREFIX,    28320,  720,  738,  846,  900, 0,  400,  412,  414,  449, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 720x400@70Hz */
+    { MODEPREFIX,   135000, 1280, 1296, 1440, 1688, 0, 1024, 1025, 1028, 1066, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 1280x1024@75Hz */
+    { MODEPREFIX,    78750, 1024, 1040, 1136, 1312, 0,  768,  769,  772,  800, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 1024x768@75Hz */
+    { MODEPREFIX,    75000, 1024, 1048, 1184, 1328, 0,  768,  771,  777,  806, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* 1024x768@70Hz */
+    { MODEPREFIX,    65000, 1024, 1048, 1184, 1344, 0,  768,  771,  777,  806, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* 1024x768@60Hz */
+    { MODEPREFIX,    44900, 1024, 1032, 1208, 1264, 0,  768,  768,  772,  817, 0, V_PHSYNC | V_PVSYNC | V_INTERLACE, MODESUFFIX }, /* 1024x768@43Hz */
+    { MODEPREFIX,    57284,  832,  864,  928, 1152, 0,  624,  625,  628,  667, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* 832x624@75Hz */
+    { MODEPREFIX,    49500,  800,  816,  896, 1056, 0,  600,  601,  604,  625, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 800x600@75Hz */
+    { MODEPREFIX,    50000,  800,  856,  976, 1040, 0,  600,  637,  643,  666, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 800x600@72Hz */
+    { MODEPREFIX,   108000, 1152, 1216, 1344, 1600, 0,  864,  865,  868,  900, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 1152x864@75Hz */
+};
+
+static DisplayModePtr
+DDCModesFromEstablished(int scrnIndex, struct established_timings *timing,
+			ddc_quirk_t quirks)
+{
+    DisplayModePtr Modes = NULL, Mode = NULL;
+    CARD32 bits = (timing->t1) | (timing->t2 << 8) |
+        ((timing->t_manu & 0x80) << 9);
+    int i;
+
+    for (i = 0; i < 17; i++) {
+        if (bits & (0x01 << i)) {
+            Mode = xf86DuplicateMode(&DDCEstablishedModes[i]);
+            Modes = xf86ModesAdd(Modes, Mode);
+        }
+    }
+
+    return Modes;
+}
+
+/* Autogenerated from the DMT spec */
+const DisplayModeRec DMTModes[] = {
+    { MODEPREFIX,    31500,  640,  672,  736,  832, 0,  350,  382,  385,  445, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 640x350@85Hz */
+    { MODEPREFIX,    31500,  640,  672,  736,  832, 0,  400,  401,  404,  445, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 640x400@85Hz */
+    { MODEPREFIX,    35500,  720,  756,  828,  936, 0,  400,  401,  404,  446, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 720x400@85Hz */
+    { MODEPREFIX,    25175,  640,  656,  752,  800, 0,  480,  490,  492,  525, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* 640x480@60Hz */
+    { MODEPREFIX,    31500,  640,  664,  704,  832, 0,  480,  489,  492,  520, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* 640x480@72Hz */
+    { MODEPREFIX,    31500,  640,  656,  720,  840, 0,  480,  481,  484,  500, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* 640x480@75Hz */
+    { MODEPREFIX,    36000,  640,  696,  752,  832, 0,  480,  481,  484,  509, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* 640x480@85Hz */
+    { MODEPREFIX,    36000,  800,  824,  896, 1024, 0,  600,  601,  603,  625, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 800x600@56Hz */
+    { MODEPREFIX,    40000,  800,  840,  968, 1056, 0,  600,  601,  605,  628, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 800x600@60Hz */
+    { MODEPREFIX,    50000,  800,  856,  976, 1040, 0,  600,  637,  643,  666, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 800x600@72Hz */
+    { MODEPREFIX,    49500,  800,  816,  896, 1056, 0,  600,  601,  604,  625, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 800x600@75Hz */
+    { MODEPREFIX,    56250,  800,  832,  896, 1048, 0,  600,  601,  604,  631, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 800x600@85Hz */
+    { MODEPREFIX,    73250,  800,  848,  880,  960, 0,  600,  603,  607,  636, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 800x600@120Hz RB */
+    { MODEPREFIX,    33750,  848,  864,  976, 1088, 0,  480,  486,  494,  517, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 848x480@60Hz */
+    { MODEPREFIX,    44900, 1024, 1032, 1208, 1264, 0,  768,  768,  772,  817, 0, V_PHSYNC | V_PVSYNC | V_INTERLACE, MODESUFFIX }, /* 1024x768@43Hz (interlaced) */
+    { MODEPREFIX,    65000, 1024, 1048, 1184, 1344, 0,  768,  771,  777,  806, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* 1024x768@60Hz */
+    { MODEPREFIX,    75000, 1024, 1048, 1184, 1328, 0,  768,  771,  777,  806, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* 1024x768@70Hz */
+    { MODEPREFIX,    78750, 1024, 1040, 1136, 1312, 0,  768,  769,  772,  800, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 1024x768@75Hz */
+    { MODEPREFIX,    94500, 1024, 1072, 1168, 1376, 0,  768,  769,  772,  808, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 1024x768@85Hz */
+    { MODEPREFIX,   115500, 1024, 1072, 1104, 1184, 0,  768,  771,  775,  813, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 1024x768@120Hz RB */
+    { MODEPREFIX,   108000, 1152, 1216, 1344, 1600, 0,  864,  865,  868,  900, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 1152x864@75Hz */
+    { MODEPREFIX,    68250, 1280, 1328, 1360, 1440, 0,  768,  771,  778,  790, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 1280x768@60Hz RB */
+    { MODEPREFIX,    79500, 1280, 1344, 1472, 1664, 0,  768,  771,  778,  798, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1280x768@60Hz */
+    { MODEPREFIX,   102250, 1280, 1360, 1488, 1696, 0,  768,  771,  778,  805, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1280x768@75Hz */
+    { MODEPREFIX,   117500, 1280, 1360, 1496, 1712, 0,  768,  771,  778,  809, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1280x768@85Hz */
+    { MODEPREFIX,   140250, 1280, 1328, 1360, 1440, 0,  768,  771,  778,  813, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 1280x768@120Hz RB */
+    { MODEPREFIX,    71000, 1280, 1328, 1360, 1440, 0,  800,  803,  809,  823, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 1280x800@60Hz RB */
+    { MODEPREFIX,    83500, 1280, 1352, 1480, 1680, 0,  800,  803,  809,  831, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1280x800@60Hz */
+    { MODEPREFIX,   106500, 1280, 1360, 1488, 1696, 0,  800,  803,  809,  838, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1280x800@75Hz */
+    { MODEPREFIX,   122500, 1280, 1360, 1496, 1712, 0,  800,  803,  809,  843, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1280x800@85Hz */
+    { MODEPREFIX,   146250, 1280, 1328, 1360, 1440, 0,  800,  803,  809,  847, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 1280x800@120Hz RB */
+    { MODEPREFIX,   108000, 1280, 1376, 1488, 1800, 0,  960,  961,  964, 1000, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 1280x960@60Hz */
+    { MODEPREFIX,   148500, 1280, 1344, 1504, 1728, 0,  960,  961,  964, 1011, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 1280x960@85Hz */
+    { MODEPREFIX,   175500, 1280, 1328, 1360, 1440, 0,  960,  963,  967, 1017, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 1280x960@120Hz RB */
+    { MODEPREFIX,   108000, 1280, 1328, 1440, 1688, 0, 1024, 1025, 1028, 1066, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 1280x1024@60Hz */
+    { MODEPREFIX,   135000, 1280, 1296, 1440, 1688, 0, 1024, 1025, 1028, 1066, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 1280x1024@75Hz */
+    { MODEPREFIX,   157500, 1280, 1344, 1504, 1728, 0, 1024, 1025, 1028, 1072, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 1280x1024@85Hz */
+    { MODEPREFIX,   187250, 1280, 1328, 1360, 1440, 0, 1024, 1027, 1034, 1084, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 1280x1024@120Hz RB */
+    { MODEPREFIX,    85500, 1360, 1424, 1536, 1792, 0,  768,  771,  777,  795, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 1360x768@60Hz */
+    { MODEPREFIX,   148250, 1360, 1408, 1440, 1520, 0,  768,  771,  776,  813, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 1360x768@120Hz RB */
+    { MODEPREFIX,   101000, 1400, 1448, 1480, 1560, 0, 1050, 1053, 1057, 1080, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 1400x1050@60Hz RB */
+    { MODEPREFIX,   121750, 1400, 1488, 1632, 1864, 0, 1050, 1053, 1057, 1089, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1400x1050@60Hz */
+    { MODEPREFIX,   156000, 1400, 1504, 1648, 1896, 0, 1050, 1053, 1057, 1099, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1400x1050@75Hz */
+    { MODEPREFIX,   179500, 1400, 1504, 1656, 1912, 0, 1050, 1053, 1057, 1105, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1400x1050@85Hz */
+    { MODEPREFIX,   208000, 1400, 1448, 1480, 1560, 0, 1050, 1053, 1057, 1112, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 1400x1050@120Hz RB */
+    { MODEPREFIX,    88750, 1440, 1488, 1520, 1600, 0,  900,  903,  909,  926, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 1440x900@60Hz RB */
+    { MODEPREFIX,   106500, 1440, 1520, 1672, 1904, 0,  900,  903,  909,  934, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1440x900@60Hz */
+    { MODEPREFIX,   136750, 1440, 1536, 1688, 1936, 0,  900,  903,  909,  942, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1440x900@75Hz */
+    { MODEPREFIX,   157000, 1440, 1544, 1696, 1952, 0,  900,  903,  909,  948, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1440x900@85Hz */
+    { MODEPREFIX,   182750, 1440, 1488, 1520, 1600, 0,  900,  903,  909,  953, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 1440x900@120Hz RB */
+    { MODEPREFIX,   162000, 1600, 1664, 1856, 2160, 0, 1200, 1201, 1204, 1250, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 1600x1200@60Hz */
+    { MODEPREFIX,   175500, 1600, 1664, 1856, 2160, 0, 1200, 1201, 1204, 1250, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 1600x1200@65Hz */
+    { MODEPREFIX,   189000, 1600, 1664, 1856, 2160, 0, 1200, 1201, 1204, 1250, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 1600x1200@70Hz */
+    { MODEPREFIX,   202500, 1600, 1664, 1856, 2160, 0, 1200, 1201, 1204, 1250, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 1600x1200@75Hz */
+    { MODEPREFIX,   229500, 1600, 1664, 1856, 2160, 0, 1200, 1201, 1204, 1250, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* 1600x1200@85Hz */
+    { MODEPREFIX,   268250, 1600, 1648, 1680, 1760, 0, 1200, 1203, 1207, 1271, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 1600x1200@120Hz RB */
+    { MODEPREFIX,   119000, 1680, 1728, 1760, 1840, 0, 1050, 1053, 1059, 1080, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 1680x1050@60Hz RB */
+    { MODEPREFIX,   146250, 1680, 1784, 1960, 2240, 0, 1050, 1053, 1059, 1089, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1680x1050@60Hz */
+    { MODEPREFIX,   187000, 1680, 1800, 1976, 2272, 0, 1050, 1053, 1059, 1099, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1680x1050@75Hz */
+    { MODEPREFIX,   214750, 1680, 1808, 1984, 2288, 0, 1050, 1053, 1059, 1105, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1680x1050@85Hz */
+    { MODEPREFIX,   245500, 1680, 1728, 1760, 1840, 0, 1050, 1053, 1059, 1112, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 1680x1050@120Hz RB */
+    { MODEPREFIX,   204750, 1792, 1920, 2120, 2448, 0, 1344, 1345, 1348, 1394, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1792x1344@60Hz */
+    { MODEPREFIX,   261000, 1792, 1888, 2104, 2456, 0, 1344, 1345, 1348, 1417, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1792x1344@75Hz */
+    { MODEPREFIX,   333250, 1792, 1840, 1872, 1952, 0, 1344, 1347, 1351, 1423, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 1792x1344@120Hz RB */
+    { MODEPREFIX,   218250, 1856, 1952, 2176, 2528, 0, 1392, 1393, 1396, 1439, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1856x1392@60Hz */
+    { MODEPREFIX,   288000, 1856, 1984, 2208, 2560, 0, 1392, 1393, 1396, 1500, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1856x1392@75Hz */
+    { MODEPREFIX,   356500, 1856, 1904, 1936, 2016, 0, 1392, 1395, 1399, 1474, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 1856x1392@120Hz RB */
+    { MODEPREFIX,   154000, 1920, 1968, 2000, 2080, 0, 1200, 1203, 1209, 1235, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 1920x1200@60Hz RB */
+    { MODEPREFIX,   193250, 1920, 2056, 2256, 2592, 0, 1200, 1203, 1209, 1245, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1920x1200@60Hz */
+    { MODEPREFIX,   245250, 1920, 2056, 2264, 2608, 0, 1200, 1203, 1209, 1255, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1920x1200@75Hz */
+    { MODEPREFIX,   281250, 1920, 2064, 2272, 2624, 0, 1200, 1203, 1209, 1262, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1920x1200@85Hz */
+    { MODEPREFIX,   317000, 1920, 1968, 2000, 2080, 0, 1200, 1203, 1209, 1271, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 1920x1200@120Hz RB */
+    { MODEPREFIX,   234000, 1920, 2048, 2256, 2600, 0, 1440, 1441, 1444, 1500, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1920x1440@60Hz */
+    { MODEPREFIX,   297000, 1920, 2064, 2288, 2640, 0, 1440, 1441, 1444, 1500, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 1920x1440@75Hz */
+    { MODEPREFIX,   380500, 1920, 1968, 2000, 2080, 0, 1440, 1443, 1447, 1525, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 1920x1440@120Hz RB */
+    { MODEPREFIX,   268500, 2560, 2608, 2640, 2720, 0, 1600, 1603, 1609, 1646, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 2560x1600@60Hz RB */
+    { MODEPREFIX,   348500, 2560, 2752, 3032, 3504, 0, 1600, 1603, 1609, 1658, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 2560x1600@60Hz */
+    { MODEPREFIX,   443250, 2560, 2768, 3048, 3536, 0, 1600, 1603, 1609, 1672, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 2560x1600@75Hz */
+    { MODEPREFIX,   505250, 2560, 2768, 3048, 3536, 0, 1600, 1603, 1609, 1682, 0, V_NHSYNC | V_PVSYNC, MODESUFFIX }, /* 2560x1600@85Hz */
+    { MODEPREFIX,   552750, 2560, 2608, 2640, 2720, 0, 1600, 1603, 1609, 1694, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX }, /* 2560x1600@120Hz RB */
+};
+
+#define LEVEL_DMT 0
+#define LEVEL_GTF 1
+#define LEVEL_CVT 2
+
+static int
+MonitorStandardTimingLevel(xf86MonPtr DDC)
+{
+    if (DDC->ver.revision >= 2) {
+	if (DDC->ver.revision >= 4 && CVT_SUPPORTED(DDC->features.msc)) {
+	    return LEVEL_CVT;
+	}
+	return LEVEL_GTF;
+    }
+    return LEVEL_DMT;
+}
+
+static int
+ModeRefresh(const DisplayModeRec *mode)
+{
+    return (int)(xf86ModeVRefresh(mode) + 0.5);
+}
+
+/*
+ * If rb is not set, then we'll not consider reduced-blanking modes as
+ * part of the DMT pool.  For the 'standard' EDID mode descriptor there's
+ * no way to specify whether the mode should be RB or not.
+ */
+DisplayModePtr
+FindDMTMode(int hsize, int vsize, int refresh, Bool rb)
+{
+    int i;
+    const DisplayModeRec *ret;
+
+    for (i = 0; i < sizeof(DMTModes) / sizeof(DisplayModeRec); i++) {
+	ret = &DMTModes[i];
+
+	if (!rb && xf86ModeIsReduced(ret))
+	    continue;
+
+	if (ret->HDisplay == hsize &&
+	    ret->VDisplay == vsize &&
+	    refresh == ModeRefresh(ret))
+	    return xf86DuplicateMode(ret);
+    }
+
+    return NULL;
+}
+
+/*
+ * Appendix B of the EDID 1.4 spec defines the right thing to do here.
+ * If the timing given here matches a mode defined in the VESA DMT standard,
+ * we _must_ use that.  If the device supports CVT modes, then we should
+ * generate a CVT timing.  If both of the above fail, use GTF.
+ *
+ * There are some wrinkles here.  EDID 1.1 and 1.0 sinks can't really
+ * "support" GTF, since it wasn't a standard yet; so if they ask for a
+ * timing in this section that isn't defined in DMT, returning a GTF mode
+ * may not actually be valid.  EDID 1.3 sinks often report support for
+ * some CVT modes, but they are not required to support CVT timings for
+ * modes in the standard timing descriptor, so we should _not_ treat them
+ * as CVT-compliant (unless specified in an extension block I suppose).
+ *
+ * EDID 1.4 requires that all sink devices support both GTF and CVT timings
+ * for modes in this section, but does say that CVT is preferred.
+ */
+static DisplayModePtr
+DDCModesFromStandardTiming(struct std_timings *timing, ddc_quirk_t quirks,
+			   int timing_level, Bool rb)
+{
+    DisplayModePtr Modes = NULL, Mode = NULL;
+    int i, hsize, vsize, refresh;
+
+    for (i = 0; i < STD_TIMINGS; i++) {
+	hsize = timing[i].hsize;
+	vsize = timing[i].vsize;
+	refresh = timing[i].refresh;
+
+	/* HDTV hack, because you can't say 1366 */
+	if (refresh == 60 &&
+	    ((hsize == 1360 && vsize == 765) ||
+	     (hsize == 1368 && vsize == 769))) {
+	    Mode = xf86CVTMode(1366, 768, 60, FALSE, FALSE);
+	    Mode->HDisplay = 1366;
+	    Mode->HSyncStart--;
+	    Mode->HSyncEnd--;
+	} else if (hsize && vsize && refresh) {
+	    Mode = FindDMTMode(hsize, vsize, refresh, rb);
+
+	    if (!Mode) {
+		if (timing_level == LEVEL_CVT)
+		    /* pass rb here too? */
+		    Mode = xf86CVTMode(hsize, vsize, refresh, FALSE, FALSE);
+		else if (timing_level == LEVEL_GTF)
+		    Mode = xf86GTFMode(hsize, vsize, refresh, FALSE, FALSE);
+	    }
+
+	}
+
+	if (Mode) {
+	    Mode->type = M_T_DRIVER;
+	    Modes = xf86ModesAdd(Modes, Mode);
+	}
+	Mode = NULL;
+    }
+
+    return Modes;
+}
+
+static void
+DDCModeDoInterlaceQuirks(DisplayModePtr mode)
+{
+    /*
+     * EDID is delightfully ambiguous about how interlaced modes are to be
+     * encoded.  X's internal representation is of frame height, but some
+     * HDTV detailed timings are encoded as field height.
+     *
+     * The format list here is from CEA, in frame size.  Technically we
+     * should be checking refresh rate too.  Whatever.
+     */
+    static const struct {
+	int w, h;
+    } cea_interlaced[] = {
+	{ 1920, 1080 },
+	{  720,  480 },
+	{ 1440,  480 },
+	{ 2880,  480 },
+	{  720,  576 },
+	{ 1440,  576 },
+	{ 2880,  576 },
+    };
+    static const int n_modes = sizeof(cea_interlaced)/sizeof(cea_interlaced[0]);
+    int i;
+
+    for (i = 0; i < n_modes; i++) {
+	if ((mode->HDisplay == cea_interlaced[i].w) &&
+	    (mode->VDisplay == cea_interlaced[i].h / 2)) {
+	    mode->VDisplay *= 2;
+	    mode->VSyncStart *= 2;
+	    mode->VSyncEnd *= 2;
+	    mode->VTotal *= 2;
+	    mode->VTotal |= 1;
+	}
+    }
+
+    mode->Flags |= V_INTERLACE;
+}
+
+/*
+ *
+ */
+static DisplayModePtr
+DDCModeFromDetailedTiming(int scrnIndex, struct detailed_timings *timing,
+			  Bool preferred, ddc_quirk_t quirks)
+{
+    DisplayModePtr Mode;
+
+    /*
+     * Refuse to create modes that are insufficiently large.  64 is a random
+     * number, maybe the spec says something about what the minimum is.  In
+     * particular I see this frequently with _old_ EDID, 1.0 or so, so maybe
+     * our parser is just being too aggresive there.
+     */
+    if (timing->h_active < 64 || timing->v_active < 64) {
+	xf86DrvMsg(scrnIndex, X_INFO,
+		   "%s: Ignoring tiny %dx%d mode\n", __func__,
+		   timing->h_active, timing->v_active);
+	return NULL;
+    }
+
+    /* We don't do stereo */
+    if (timing->stereo) {
+        xf86DrvMsg(scrnIndex, X_INFO,
+		   "%s: Ignoring: We don't handle stereo.\n", __func__);
+        return NULL;
+    }
+
+    /* We only do seperate sync currently */
+    if (timing->sync != 0x03) {
+         xf86DrvMsg(scrnIndex, X_INFO,
+		    "%s: %dx%d Warning: We only handle separate"
+                    " sync.\n", __func__, timing->h_active, timing->v_active);
+    }
+
+    Mode = xnfcalloc(1, sizeof(DisplayModeRec));
+
+    Mode->type = M_T_DRIVER;
+    if (preferred)
+	Mode->type |= M_T_PREFERRED;
+
+    if( ( quirks & DDC_QUIRK_135_CLOCK_TOO_HIGH ) &&
+	timing->clock == 135000000 )
+        Mode->Clock = 108880;
+    else
+        Mode->Clock = timing->clock / 1000.0;
+
+    Mode->HDisplay = timing->h_active;
+    Mode->HSyncStart = timing->h_active + timing->h_sync_off;
+    Mode->HSyncEnd = Mode->HSyncStart + timing->h_sync_width;
+    Mode->HTotal = timing->h_active + timing->h_blanking;
+
+    Mode->VDisplay = timing->v_active;
+    Mode->VSyncStart = timing->v_active + timing->v_sync_off;
+    Mode->VSyncEnd = Mode->VSyncStart + timing->v_sync_width;
+    Mode->VTotal = timing->v_active + timing->v_blanking;
+
+    /* perform basic check on the detail timing */
+    if (Mode->HSyncEnd > Mode->HTotal || Mode->VSyncEnd > Mode->VTotal) {
+	free(Mode);
+	return NULL;
+    }
+
+    /* We ignore h/v_size and h/v_border for now. */
+
+    if (timing->interlaced)
+	DDCModeDoInterlaceQuirks(Mode);
+
+    if (quirks & DDC_QUIRK_DETAILED_SYNC_PP)
+	Mode->Flags |= V_PVSYNC | V_PHSYNC;
+    else {
+	if (timing->misc & 0x02)
+	    Mode->Flags |= V_PVSYNC;
+	else
+	    Mode->Flags |= V_NVSYNC;
+
+	if (timing->misc & 0x01)
+	    Mode->Flags |= V_PHSYNC;
+	else
+	    Mode->Flags |= V_NHSYNC;
+    }
+
+    xf86SetModeDefaultName(Mode);
+
+    return Mode;
+}
+
+static DisplayModePtr
+DDCModesFromCVT(int scrnIndex, struct cvt_timings *t)
+{
+    DisplayModePtr modes = NULL;
+    int i;
+
+    for (i = 0; i < 4; i++) {
+	if (t[i].height) {
+	    if (t[i].rates & 0x10)
+		modes = xf86ModesAdd(modes,
+			xf86CVTMode(t[i].width, t[i].height, 50, 0, 0));
+	    if (t[i].rates & 0x08)
+		modes = xf86ModesAdd(modes,
+			xf86CVTMode(t[i].width, t[i].height, 60, 0, 0));
+	    if (t[i].rates & 0x04)
+		modes = xf86ModesAdd(modes,
+			xf86CVTMode(t[i].width, t[i].height, 75, 0, 0));
+	    if (t[i].rates & 0x02)
+		modes = xf86ModesAdd(modes,
+			xf86CVTMode(t[i].width, t[i].height, 85, 0, 0));
+	    if (t[i].rates & 0x01)
+		modes = xf86ModesAdd(modes,
+			xf86CVTMode(t[i].width, t[i].height, 60, 1, 0));
+	} else break;
+    }
+
+    return modes;
+}
+
+static const struct {
+    short w;
+    short h;
+    short r;
+    short rb;
+} EstIIIModes[] = {
+    /* byte 6 */
+    { 640, 350, 85, 0 },
+    { 640, 400, 85, 0 },
+    { 720, 400, 85, 0 },
+    { 640, 480, 85, 0 },
+    { 848, 480, 60, 0 },
+    { 800, 600, 85, 0 },
+    { 1024, 768, 85, 0 },
+    { 1152, 864, 75, 0 },
+    /* byte 7 */
+    { 1280, 768, 60, 1 },
+    { 1280, 768, 60, 0 },
+    { 1280, 768, 75, 0 },
+    { 1280, 768, 85, 0 },
+    { 1280, 960, 60, 0 },
+    { 1280, 960, 85, 0 },
+    { 1280, 1024, 60, 0 },
+    { 1280, 1024, 85, 0 },
+    /* byte 8 */
+    { 1360, 768, 60, 0 },
+    { 1440, 900, 60, 1 },
+    { 1440, 900, 60, 0 },
+    { 1440, 900, 75, 0 },
+    { 1440, 900, 85, 0 },
+    { 1400, 1050, 60, 1 },
+    { 1400, 1050, 60, 0 },
+    { 1400, 1050, 75, 0 },
+    /* byte 9 */
+    { 1400, 1050, 85, 0 },
+    { 1680, 1050, 60, 1 },
+    { 1680, 1050, 60, 0 },
+    { 1680, 1050, 75, 0 },
+    { 1680, 1050, 85, 0 },
+    { 1600, 1200, 60, 0 },
+    { 1600, 1200, 65, 0 },
+    { 1600, 1200, 70, 0 },
+    /* byte 10 */
+    { 1600, 1200, 75, 0 },
+    { 1600, 1200, 85, 0 },
+    { 1792, 1344, 60, 0 },
+    { 1792, 1344, 85, 0 },
+    { 1856, 1392, 60, 0 },
+    { 1856, 1392, 75, 0 },
+    { 1920, 1200, 60, 1 },
+    { 1920, 1200, 60, 0 },
+    /* byte 11 */
+    { 1920, 1200, 75, 0 },
+    { 1920, 1200, 85, 0 },
+    { 1920, 1440, 60, 0 },
+    { 1920, 1440, 75, 0 },
+};
+
+static DisplayModePtr
+DDCModesFromEstIII(unsigned char *est)
+{
+    DisplayModePtr modes = NULL;
+    int i, j, m;
+
+    for (i = 0; i < 6; i++) {
+	for (j = 7; j > 0; j--) {
+	    if (est[i] & (1 << j)) {
+		m = (i * 8) + (7 - j);
+		modes = xf86ModesAdd(modes,
+				     FindDMTMode(EstIIIModes[m].w,
+						 EstIIIModes[m].h,
+						 EstIIIModes[m].r,
+						 EstIIIModes[m].rb));
+	    }
+	}
+    }
+
+    return modes;
+}
+
+/*
+ * This is only valid when the sink claims to be continuous-frequency
+ * but does not supply a detailed range descriptor.  Such sinks are
+ * arguably broken.  Currently the mode validation code isn't aware of
+ * this; the non-RANDR code even punts the decision of optional sync
+ * range checking to the driver.  Loss.
+ */
+static void
+DDCGuessRangesFromModes(int scrnIndex, MonPtr Monitor, DisplayModePtr Modes)
+{
+    DisplayModePtr Mode = Modes;
+
+    if (!Monitor || !Modes)
+        return;
+
+    /* set up the ranges for scanning through the modes */
+    Monitor->nHsync = 1;
+    Monitor->hsync[0].lo = 1024.0;
+    Monitor->hsync[0].hi = 0.0;
+
+    Monitor->nVrefresh = 1;
+    Monitor->vrefresh[0].lo = 1024.0;
+    Monitor->vrefresh[0].hi = 0.0;
+
+    while (Mode) {
+        if (!Mode->HSync)
+            Mode->HSync = ((float) Mode->Clock ) / ((float) Mode->HTotal);
+
+        if (!Mode->VRefresh)
+            Mode->VRefresh = (1000.0 * ((float) Mode->Clock)) / 
+                ((float) (Mode->HTotal * Mode->VTotal));
+
+        if (Mode->HSync < Monitor->hsync[0].lo)
+            Monitor->hsync[0].lo = Mode->HSync;
+
+        if (Mode->HSync > Monitor->hsync[0].hi)
+            Monitor->hsync[0].hi = Mode->HSync;
+
+        if (Mode->VRefresh < Monitor->vrefresh[0].lo)
+            Monitor->vrefresh[0].lo = Mode->VRefresh;
+
+        if (Mode->VRefresh > Monitor->vrefresh[0].hi)
+            Monitor->vrefresh[0].hi = Mode->VRefresh;
+
+        Mode = Mode->next;
+    }
+}
+
+ddc_quirk_t
+xf86DDCDetectQuirks(int scrnIndex, xf86MonPtr DDC, Bool verbose)
+{
+    ddc_quirk_t	quirks;
+    int i;
+
+    quirks = DDC_QUIRK_NONE;
+    for (i = 0; ddc_quirks[i].detect; i++) {
+	if (ddc_quirks[i].detect (scrnIndex, DDC)) {
+	    if (verbose) {
+		xf86DrvMsg (scrnIndex, X_INFO, "    EDID quirk: %s\n",
+			    ddc_quirks[i].description);
+	    }
+	    quirks |= ddc_quirks[i].quirk;
+	}
+    }
+
+    return quirks;
+}
+
+void xf86DetTimingApplyQuirks(struct detailed_monitor_section *det_mon,
+                              ddc_quirk_t quirks,
+                              int hsize, int vsize)
+{
+    if (det_mon->type != DT)
+        return;
+
+    if (quirks & DDC_QUIRK_DETAILED_H_IN_CM)
+        det_mon->section.d_timings.h_size *= 10;
+
+    if (quirks & DDC_QUIRK_DETAILED_V_IN_CM)
+        det_mon->section.d_timings.v_size *= 10;
+
+    if (quirks & DDC_QUIRK_DETAILED_USE_MAXIMUM_SIZE) {
+        det_mon->section.d_timings.h_size = 10 * hsize;
+        det_mon->section.d_timings.v_size = 10 * vsize;
+    }
+}
+
+/**
+ * Applies monitor-specific quirks to the decoded EDID information.
+ *
+ * Note that some quirks applying to the mode list are still implemented in
+ * xf86DDCGetModes.
+ */
+void
+xf86DDCApplyQuirks(int scrnIndex, xf86MonPtr DDC)
+{
+    ddc_quirk_t quirks = xf86DDCDetectQuirks (scrnIndex, DDC, FALSE);
+    int i;
+
+    for (i = 0; i < DET_TIMINGS; i++) {
+        xf86DetTimingApplyQuirks(DDC->det_mon + i, quirks,
+                                 DDC->features.hsize,
+                                 DDC->features.vsize);
+    }
+}
+
+/**
+ * Walks the modes list, finding the mode with the largest area which is
+ * closest to the target refresh rate, and marks it as the only preferred mode.
+*/
+static void
+xf86DDCSetPreferredRefresh(int scrnIndex, DisplayModePtr modes,
+			   float target_refresh)
+{
+	DisplayModePtr	mode, best = modes;
+
+	for (mode = modes; mode; mode = mode->next)
+	{
+	    mode->type &= ~M_T_PREFERRED;
+
+	    if (mode == best) continue;
+
+	    if (mode->HDisplay * mode->VDisplay >
+		best->HDisplay * best->VDisplay)
+	    {
+		best = mode;
+		continue;
+	    }
+	    if (mode->HDisplay * mode->VDisplay ==
+		best->HDisplay * best->VDisplay)
+	    {
+		double	mode_refresh = xf86ModeVRefresh (mode);
+		double	best_refresh = xf86ModeVRefresh (best);
+		double	mode_dist = fabs(mode_refresh - target_refresh);
+		double	best_dist = fabs(best_refresh - target_refresh);
+
+		if (mode_dist < best_dist)
+		{
+		    best = mode;
+		    continue;
+		}
+	    }
+	}
+	if (best)
+	    best->type |= M_T_PREFERRED;
+}
+
+#define CEA_VIDEO_MODES_NUM  64
+static const DisplayModeRec CEAVideoModes[CEA_VIDEO_MODES_NUM] = {
+    { MODEPREFIX,    25175,  640,  656,  752,  800, 0,  480,  490,  492,  525, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 1:640x480@60Hz */
+    { MODEPREFIX,    27000,  720,  736,  798,  858, 0,  480,  489,  495,  525, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 2:720x480@60Hz */
+    { MODEPREFIX,    27000,  720,  736,  798,  858, 0,  480,  489,  495,  525, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 3:720x480@60Hz */
+    { MODEPREFIX,    74250, 1280, 1390, 1430, 1650, 0,  720,  725,  730,  750, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* VIC 4: 1280x720@60Hz */
+    { MODEPREFIX,    74250, 1920, 2008, 2052, 2200, 0, 1080, 1084, 1094, 1125, 0, V_PHSYNC | V_PVSYNC | V_INTERLACE, MODESUFFIX }, /* VIC 5:1920x1080i@60Hz */
+    { MODEPREFIX,    27000, 1440, 1478, 1602, 1716, 0,  480,  488,  494,  525, 0, V_NHSYNC | V_NVSYNC | V_INTERLACE, MODESUFFIX }, /* VIC 6:1440x480i@60Hz */
+    { MODEPREFIX,    27000, 1440, 1478, 1602, 1716, 0,  480,  488,  494,  525, 0, V_NHSYNC | V_NVSYNC | V_INTERLACE, MODESUFFIX }, /* VIC 7:1440x480i@60Hz */
+    { MODEPREFIX,    27000, 1440, 1478, 1602, 1716, 0,  240,  244,  247,  262, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 8:1440x240@60Hz */
+    { MODEPREFIX,    27000, 1440, 1478, 1602, 1716, 0,  240,  244,  247,  262, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 9:1440x240@60Hz */
+    { MODEPREFIX,    54000, 2880, 2956, 3204, 3432, 0,  480,  488,  494,  525, 0, V_NHSYNC | V_NVSYNC | V_INTERLACE, MODESUFFIX }, /* VIC 10:2880x480i@60Hz */
+    { MODEPREFIX,    54000, 2880, 2956, 3204, 3432, 0,  480,  488,  494,  525, 0, V_NHSYNC | V_NVSYNC | V_INTERLACE, MODESUFFIX }, /* VIC 11:2880x480i@60Hz */
+    { MODEPREFIX,    54000, 2880, 2956, 3204, 3432, 0,  240,  244,  247,  262, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 12:2880x240@60Hz */
+    { MODEPREFIX,    54000, 2880, 2956, 3204, 3432, 0,  240,  244,  247,  262, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 13:2880x240@60Hz */
+    { MODEPREFIX,    54000, 1440, 1472, 1596, 1716, 0,  480,  489,  495,  525, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 14:1440x480@60Hz */
+    { MODEPREFIX,    54000, 1440, 1472, 1596, 1716, 0,  480,  489,  495,  525, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 15:1440x480@60Hz */
+    { MODEPREFIX,   148500, 1920, 2008, 2052, 2200, 0, 1080, 1084, 1089, 1125, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* VIC 16:1920x1080@60Hz */
+    { MODEPREFIX,    27000,  720,  732,  796,  864, 0,  576,  581,  586,  625, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 17:720x576@50Hz */
+    { MODEPREFIX,    27000,  720,  732,  796,  864, 0,  576,  581,  586,  625, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 18:720x576@50Hz */
+    { MODEPREFIX,    74250, 1280, 1720, 1760, 1980, 0,  720,  725,  730,  750, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* VIC 19: 1280x720@50Hz */
+    { MODEPREFIX,    74250, 1920, 2448, 2492, 2640, 0, 1080, 1084, 1094, 1125, 0, V_PHSYNC | V_PVSYNC | V_INTERLACE, MODESUFFIX }, /* VIC 20:1920x1080i@50Hz */
+    { MODEPREFIX,    27000, 1440, 1464, 1590, 1728, 0,  576,  580,  586,  625, 0, V_NHSYNC | V_NVSYNC | V_INTERLACE, MODESUFFIX }, /* VIC 21:1440x576i@50Hz */
+    { MODEPREFIX,    27000, 1440, 1464, 1590, 1728, 0,  576,  580,  586,  625, 0, V_NHSYNC | V_NVSYNC | V_INTERLACE, MODESUFFIX }, /* VIC 22:1440x576i@50Hz */
+    { MODEPREFIX,    27000, 1440, 1464, 1590, 1728, 0,  288,  290,  293,  312, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 23:1440x288@50Hz */
+    { MODEPREFIX,    27000, 1440, 1464, 1590, 1728, 0,  288,  290,  293,  312, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 24:1440x288@50Hz */
+    { MODEPREFIX,    54000, 2880, 2928, 3180, 3456, 0,  576,  580,  586,  625, 0, V_NHSYNC | V_NVSYNC | V_INTERLACE, MODESUFFIX }, /* VIC 25:2880x576i@50Hz */
+    { MODEPREFIX,    54000, 2880, 2928, 3180, 3456, 0,  576,  580,  586,  625, 0, V_NHSYNC | V_NVSYNC | V_INTERLACE, MODESUFFIX }, /* VIC 26:2880x576i@50Hz */
+    { MODEPREFIX,    54000, 2880, 2928, 3180, 3456, 0,  288,  290,  293,  312, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 27:2880x288@50Hz */
+    { MODEPREFIX,    54000, 2880, 2928, 3180, 3456, 0,  288,  290,  293,  312, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 28:2880x288@50Hz */
+    { MODEPREFIX,    54000, 1440, 1464, 1592, 1728, 0,  576,  581,  586,  625, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 29:1440x576@50Hz */
+    { MODEPREFIX,    54000, 1440, 1464, 1592, 1728, 0,  576,  581,  586,  625, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 30:1440x576@50Hz */
+    { MODEPREFIX,   148500, 1920, 2448, 2492, 2640, 0, 1080, 1084, 1089, 1125, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* VIC 31:1920x1080@50Hz */
+    { MODEPREFIX,    74250, 1920, 2558, 2602, 2750, 0, 1080, 1084, 1089, 1125, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* VIC 32:1920x1080@24Hz */
+    { MODEPREFIX,    74250, 1920, 2448, 2492, 2640, 0, 1080, 1084, 1089, 1125, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* VIC 33:1920x1080@25Hz */
+    { MODEPREFIX,    74250, 1920, 2008, 2052, 2200, 0, 1080, 1084, 1089, 1125, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* VIC 34:1920x1080@30Hz */
+    { MODEPREFIX,   108000, 2880, 2944, 3192, 3432, 0,  480,  489,  495,  525, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 35:2880x480@60Hz */
+    { MODEPREFIX,   108000, 2880, 2944, 3192, 3432, 0,  480,  489,  495,  525, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 36:2880x480@60Hz */
+    { MODEPREFIX,   108000, 2880, 2928, 3184, 3456, 0,  576,  581,  586,  625, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 37:2880x576@50Hz */
+    { MODEPREFIX,   108000, 2880, 2928, 3184, 3456, 0,  576,  581,  586,  625, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 38:2880x576@50Hz */
+    { MODEPREFIX,    72000, 1920, 1952, 2120, 2304, 0, 1080, 1126, 1136, 1250, 0, V_PHSYNC | V_NVSYNC | V_INTERLACE, MODESUFFIX }, /* VIC 39:1920x1080i@50Hz */
+    { MODEPREFIX,   148500, 1920, 2448, 2492, 2640, 0, 1080, 1084, 1094, 1125, 0, V_PHSYNC | V_PVSYNC | V_INTERLACE, MODESUFFIX }, /* VIC 40:1920x1080i@100Hz */
+    { MODEPREFIX,   148500, 1280, 1720, 1760, 1980, 0,  720,  725,  730,  750, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* VIC 41:1280x720@100Hz */
+    { MODEPREFIX,    54000,  720,  732,  796,  864, 0,  576,  581,  586,  625, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 42:720x576@100Hz */
+    { MODEPREFIX,    54000,  720,  732,  796,  864, 0,  576,  581,  586,  625, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 43:720x576@100Hz */
+    { MODEPREFIX,    54000, 1440, 1464, 1590, 1728, 0,  576,  580,  586,  625, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 44:1440x576i@100Hz */
+    { MODEPREFIX,    54000, 1440, 1464, 1590, 1728, 0,  576,  580,  586,  625, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 45:1440x576i@100Hz */
+    { MODEPREFIX,   148500, 1920, 2008, 2052, 2200, 0, 1080, 1084, 1094, 1125, 0, V_PHSYNC | V_PVSYNC | V_INTERLACE, MODESUFFIX }, /* VIC 46:1920x1080i@120Hz */
+    { MODEPREFIX,   148500, 1280, 1390, 1430, 1650, 0,  720,  725,  730,  750, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* VIC 47:1280x720@120Hz */
+    { MODEPREFIX,    54000,  720,  736,  798,  858, 0,  480,  489,  495,  525, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 48:720x480@120Hz */
+    { MODEPREFIX,    54000,  720,  736,  798,  858, 0,  480,  489,  495,  525, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 49:720x480@120Hz */
+    { MODEPREFIX,    54000, 1440, 1478, 1602, 1716, 0,  480,  488,  494,  525, 0, V_NHSYNC | V_NVSYNC | V_INTERLACE, MODESUFFIX },/* VIC 50:1440x480i@120Hz */
+    { MODEPREFIX,    54000, 1440, 1478, 1602, 1716, 0,  480,  488,  494,  525, 0, V_NHSYNC | V_NVSYNC | V_INTERLACE, MODESUFFIX },/* VIC 51:1440x480i@120Hz */
+    { MODEPREFIX,   108000,  720,  732,  796,  864, 0,  576,  581,  586,  625, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 52:720x576@200Hz */
+    { MODEPREFIX,   108000,  720,  732,  796,  864, 0,  576,  581,  586,  625, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 53:720x576@200Hz */
+    { MODEPREFIX,   108000, 1440, 1464, 1590, 1728, 0,  576,  580,  586,  625, 0, V_NHSYNC | V_NVSYNC | V_INTERLACE, MODESUFFIX },/* VIC 54:1440x576i@200Hz */
+    { MODEPREFIX,   108000, 1440, 1464, 1590, 1728, 0,  576,  580,  586,  625, 0, V_NHSYNC | V_NVSYNC | V_INTERLACE, MODESUFFIX },/* VIC 55:1440x576i@200Hz */
+    { MODEPREFIX,   108000,  720,  736,  798,  858, 0,  480,  489,  495,  525, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 56:720x480@240Hz */
+    { MODEPREFIX,   108000,  720,  736,  798,  858, 0,  480,  489,  495,  525, 0, V_NHSYNC | V_NVSYNC, MODESUFFIX }, /* VIC 57:720x480@240Hz */
+    { MODEPREFIX,   108000, 1440, 1478, 1602, 1716, 0,  480,  488,  494,  525, 0, V_NHSYNC | V_NVSYNC | V_INTERLACE, MODESUFFIX },/* VIC 58:1440x480i@240 */
+    { MODEPREFIX,   108000, 1440, 1478, 1602, 1716, 0,  480,  488,  494,  525, 0, V_NHSYNC | V_NVSYNC | V_INTERLACE, MODESUFFIX },/* VIC 59:1440x480i@240 */
+    { MODEPREFIX,    59400, 1280, 3040, 3080, 3300, 0,  720,  725,  730,  750, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* VIC 60: 1280x720@24Hz */
+    { MODEPREFIX,    74250, 3700, 3740, 1430, 3960, 0,  720,  725,  730,  750, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* VIC 61: 1280x720@25Hz */
+    { MODEPREFIX,    74250, 1280, 3040, 3080, 3300, 0,  720,  725,  730,  750, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* VIC 62: 1280x720@30Hz */
+    { MODEPREFIX,   297000, 1920, 2008, 2052, 2200, 0, 1080, 1084, 1089, 1125, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* VIC 63: 1920x1080@120Hz */
+    { MODEPREFIX,   297000, 1920, 2448, 2492, 2640, 0, 1080, 1084, 1094, 1125, 0, V_PHSYNC | V_PVSYNC, MODESUFFIX }, /* VIC 64:1920x1080@100Hz */
+};
+
+/* chose mode line by cea short video descriptor*/
+static void handle_cea_svd(struct cea_video_block *video, void *data)
+{
+    DisplayModePtr Mode;
+    DisplayModePtr *Modes = (DisplayModePtr *) data;
+    int vid;
+
+    vid = video ->video_code & 0x7f;
+    if (vid < CEA_VIDEO_MODES_NUM) {
+	Mode = xf86DuplicateMode(CEAVideoModes + vid);
+	*Modes = xf86ModesAdd(*Modes, Mode);
+    }
+}
+
+static DisplayModePtr
+DDCModesFromCEAExtension(int scrnIndex, xf86MonPtr MonPtr)
+{
+    DisplayModePtr Modes = NULL;
+
+    xf86ForEachVideoBlock(MonPtr,
+                          handle_cea_svd,
+                          &Modes);
+
+    return Modes;
+}
+
+struct det_modes_parameter {
+    xf86MonPtr DDC;
+    ddc_quirk_t quirks;
+    DisplayModePtr  Modes;
+    Bool rb;
+    Bool preferred;
+    int timing_level;
+};
+
+static void handle_detailed_modes(struct detailed_monitor_section *det_mon,
+	                          void *data)
+{
+    DisplayModePtr  Mode;
+    struct det_modes_parameter *p = (struct det_modes_parameter *)data;
+
+    xf86DetTimingApplyQuirks(det_mon,p->quirks,
+                             p->DDC->features.hsize,
+                             p->DDC->features.vsize);
+
+    switch (det_mon->type) {
+    case DT:
+        Mode = DDCModeFromDetailedTiming(p->DDC->scrnIndex,
+                                         &det_mon->section.d_timings,
+                                         p->preferred,
+                                         p->quirks);
+        p->preferred = FALSE;
+        p->Modes = xf86ModesAdd(p->Modes, Mode);
+        break;
+    case DS_STD_TIMINGS:
+        Mode = DDCModesFromStandardTiming(det_mon->section.std_t,
+                                          p->quirks, p->timing_level,p->rb);
+        p->Modes = xf86ModesAdd(p->Modes, Mode);
+        break;
+    case DS_CVT:
+        Mode = DDCModesFromCVT(p->DDC->scrnIndex, det_mon->section.cvt);
+        p->Modes = xf86ModesAdd(p->Modes, Mode);
+        break;
+    case DS_EST_III:
+	Mode = DDCModesFromEstIII(det_mon->section.est_iii);
+	p->Modes = xf86ModesAdd(p->Modes, Mode);
+	break;
+    default:
+        break;
+    }
+}
+
+DisplayModePtr
+xf86DDCGetModes(int scrnIndex, xf86MonPtr DDC)
+{
+    DisplayModePtr  Modes = NULL, Mode;
+    ddc_quirk_t	    quirks;
+    Bool	    preferred, rb;
+    int		    timing_level;
+    struct det_modes_parameter p;
+
+    xf86DrvMsg (scrnIndex, X_INFO, "EDID vendor \"%s\", prod id %d\n",
+		DDC->vendor.name, DDC->vendor.prod_id);
+
+    quirks = xf86DDCDetectQuirks(scrnIndex, DDC, TRUE);
+
+    preferred = PREFERRED_TIMING_MODE(DDC->features.msc);
+    if (DDC->ver.revision >= 4)
+	preferred = TRUE;
+    if (quirks & DDC_QUIRK_FIRST_DETAILED_PREFERRED)
+	preferred = TRUE;
+    if (quirks & (DDC_QUIRK_PREFER_LARGE_60 | DDC_QUIRK_PREFER_LARGE_75))
+	preferred = FALSE;
+
+    rb = xf86MonitorSupportsReducedBlanking(DDC);
+
+    timing_level = MonitorStandardTimingLevel(DDC);
+
+    p.quirks = quirks;
+    p.DDC = DDC;
+    p.Modes = Modes;
+    p.rb = rb;
+    p.preferred = preferred;
+    p.timing_level = timing_level;
+    xf86ForEachDetailedBlock(DDC, handle_detailed_modes, &p);
+    Modes = p.Modes;
+
+    /* Add established timings */
+    Mode = DDCModesFromEstablished(scrnIndex, &DDC->timings1, quirks);
+    Modes = xf86ModesAdd(Modes, Mode);
+
+    /* Add standard timings */
+    Mode = DDCModesFromStandardTiming(DDC->timings2, quirks, timing_level, rb);
+    Modes = xf86ModesAdd(Modes, Mode);
+
+    /* Add cea-extension mode timings */
+    Mode = DDCModesFromCEAExtension(scrnIndex,DDC);
+    Modes = xf86ModesAdd(Modes, Mode);
+
+    if (quirks & DDC_QUIRK_PREFER_LARGE_60)
+	xf86DDCSetPreferredRefresh(scrnIndex, Modes, 60);
+
+    if (quirks & DDC_QUIRK_PREFER_LARGE_75)
+	xf86DDCSetPreferredRefresh(scrnIndex, Modes, 75);
+
+    Modes = xf86PruneDuplicateModes(Modes);
+
+    return Modes;
+}
+
+struct det_mon_parameter {
+    MonPtr Monitor;
+    ddc_quirk_t quirks;
+    Bool have_hsync;
+    Bool have_vrefresh;
+    Bool have_maxpixclock;
+};
+
+static void handle_detailed_monset(struct detailed_monitor_section *det_mon,
+                                   void *data)
+{
+    int clock;
+    struct det_mon_parameter *p = (struct det_mon_parameter *)data;
+    int scrnIndex = ((xf86MonPtr)(p->Monitor->DDC))->scrnIndex;
+
+    switch (det_mon->type) {
+    case DS_RANGES:
+        if (!p->have_hsync) {
+            if (!p->Monitor->nHsync)
+                xf86DrvMsg(scrnIndex, X_INFO,
+                    "Using EDID range info for horizontal sync\n");
+                p->Monitor->hsync[p->Monitor->nHsync].lo =
+                    det_mon->section.ranges.min_h;
+                p->Monitor->hsync[p->Monitor->nHsync].hi =
+                    det_mon->section.ranges.max_h;
+                p->Monitor->nHsync++;
+        } else {
+            xf86DrvMsg(scrnIndex, X_INFO,
+                "Using hsync ranges from config file\n");
+        }
+
+        if (!p->have_vrefresh) {
+            if (!p->Monitor->nVrefresh)
+                xf86DrvMsg(scrnIndex, X_INFO,
+                    "Using EDID range info for vertical refresh\n");
+            p->Monitor->vrefresh[p->Monitor->nVrefresh].lo =
+                det_mon->section.ranges.min_v;
+            p->Monitor->vrefresh[p->Monitor->nVrefresh].hi =
+                det_mon->section.ranges.max_v;
+            p->Monitor->nVrefresh++;
+        } else {
+            xf86DrvMsg(scrnIndex, X_INFO,
+                "Using vrefresh ranges from config file\n");
+        }
+
+        clock = det_mon->section.ranges.max_clock * 1000;
+        if (p->quirks & DDC_QUIRK_DVI_SINGLE_LINK)
+            clock = min(clock, 165000);
+        if (!p->have_maxpixclock && clock > p->Monitor->maxPixClock)
+            p->Monitor->maxPixClock = clock;
+
+        break;
+    default:
+        break;
+    }
+}
+
+/*
+ * Fill out MonPtr with xf86MonPtr information.
+ */
+void
+xf86EdidMonitorSet(int scrnIndex, MonPtr Monitor, xf86MonPtr DDC)
+{
+    DisplayModePtr Modes = NULL, Mode;
+    struct det_mon_parameter p;
+
+    if (!Monitor || !DDC)
+        return;
+
+    Monitor->DDC = DDC;
+
+    if (Monitor->widthmm <= 0 || Monitor->heightmm <= 0) {
+	Monitor->widthmm = 10 * DDC->features.hsize;
+	Monitor->heightmm = 10 * DDC->features.vsize;
+    }
+
+    Monitor->reducedblanking = xf86MonitorSupportsReducedBlanking(DDC);
+
+    Modes = xf86DDCGetModes(scrnIndex, DDC);
+
+    /* Go through the detailed monitor sections */
+    p.Monitor = Monitor;
+    p.quirks = xf86DDCDetectQuirks(scrnIndex, Monitor->DDC, FALSE);
+    p.have_hsync = (Monitor->nHsync != 0);
+    p.have_vrefresh = (Monitor->nVrefresh != 0);
+    p.have_maxpixclock = (Monitor->maxPixClock != 0);
+    xf86ForEachDetailedBlock(DDC, handle_detailed_monset, &p);
+
+    if (Modes) {
+        /* Print Modes */
+        xf86DrvMsg(scrnIndex, X_INFO, "Printing DDC gathered Modelines:\n");
+
+        Mode = Modes;
+        while (Mode) {
+            xf86PrintModeline(scrnIndex, Mode);
+            Mode = Mode->next;
+        }
+
+        /* Do we still need ranges to be filled in? */
+        if (!Monitor->nHsync || !Monitor->nVrefresh)
+            DDCGuessRangesFromModes(scrnIndex, Monitor, Modes);
+
+        /* look for last Mode */
+        Mode = Modes;
+
+        while (Mode->next)
+            Mode = Mode->next;
+
+        /* add to MonPtr */
+        if (Monitor->Modes) {
+            Monitor->Last->next = Modes;
+            Modes->prev = Monitor->Last;
+            Monitor->Last = Mode;
+        } else {
+            Monitor->Modes = Modes;
+            Monitor->Last = Mode;
+        }
+    }
+}
diff --git a/xorg-server/hw/xfree86/os-support/Makefile.am b/xorg-server/hw/xfree86/os-support/Makefile.am
index c0504d5eb..3af4328ff 100644
--- a/xorg-server/hw/xfree86/os-support/Makefile.am
+++ b/xorg-server/hw/xfree86/os-support/Makefile.am
@@ -1,26 +1,26 @@
-SUBDIRS = bus @XORG_OS_SUBDIR@ misc $(DRI_SUBDIRS)

-DIST_SUBDIRS = bsd bus misc linux solaris sco hurd

-

-sdk_HEADERS = xf86_OSproc.h xf86_OSlib.h

-

-EXTRA_DIST = int10Defines.h xf86OSpriv.h

-

-# to get the grouping semantics right, you have to glom these three together

-# as one library, otherwise libtool will actively defeat your attempts to

-# list them multiple times on the link line.

-noinst_LTLIBRARIES = libxorgos.la

-libxorgos_la_SOURCES = xorgos.c

-libxorgos_la_LIBADD = @XORG_OS_SUBDIR@/lib@XORG_OS_SUBDIR@.la \

-                      bus/libbus.la \

-                      misc/libmisc.la

-

-AM_CFLAGS = $(DIX_CFLAGS) 

-

-xorgos.c:

-	touch $@

-

-DISTCLEANFILES = xorgos.c

-

-# FIXME: These don't seem to be used anywhere

-EXTRA_DIST += \

-	shared/bios_devmem.c

+SUBDIRS = bus @XORG_OS_SUBDIR@ misc $(DRI_SUBDIRS)
+DIST_SUBDIRS = bsd bus misc linux solaris hurd
+
+sdk_HEADERS = xf86_OSproc.h xf86_OSlib.h
+
+EXTRA_DIST = int10Defines.h xf86OSpriv.h
+
+# to get the grouping semantics right, you have to glom these three together
+# as one library, otherwise libtool will actively defeat your attempts to
+# list them multiple times on the link line.
+noinst_LTLIBRARIES = libxorgos.la
+libxorgos_la_SOURCES = xorgos.c
+libxorgos_la_LIBADD = @XORG_OS_SUBDIR@/lib@XORG_OS_SUBDIR@.la \
+                      bus/libbus.la \
+                      misc/libmisc.la
+
+AM_CFLAGS = $(DIX_CFLAGS) 
+
+xorgos.c:
+	touch $@
+
+DISTCLEANFILES = xorgos.c
+
+# FIXME: These don't seem to be used anywhere
+EXTRA_DIST += \
+	shared/bios_devmem.c
diff --git a/xorg-server/hw/xfree86/os-support/sco/Makefile.am b/xorg-server/hw/xfree86/os-support/sco/Makefile.am
deleted file mode 100644
index b5d40f7a5..000000000
--- a/xorg-server/hw/xfree86/os-support/sco/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-EXTRA_DIST = \
-	VTsw_sco.c \
-	sco_init.c \
-	sco_iop.c \
-	sco_video.c
diff --git a/xorg-server/hw/xfree86/os-support/sco/VTsw_sco.c b/xorg-server/hw/xfree86/os-support/sco/VTsw_sco.c
deleted file mode 100644
index c9ef7d5cd..000000000
--- a/xorg-server/hw/xfree86/os-support/sco/VTsw_sco.c
+++ /dev/null
@@ -1,127 +0,0 @@
-/*

- * Copyright 1993 by David Wexelblat <dwex@goblin.org>

- * Copyright 1993 by David McCullough <davidm@stallion.oz.au>

- *

- * 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 David Wexelblat not be used in

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

- * specific, written prior permission.  David Wexelblat makes no representations

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

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

- *

- * DAVID WEXELBLAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

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

- * EVENT SHALL DAVID WEXELBLAT 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.

- *

- */

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include <X11/X.h>

-

-#include "xf86.h"

-#include "xf86Priv.h"

-#include "xf86_OSlib.h"

-

-/* For the event driver prototypes */

-#include <sys/event.h>

-#include <mouse.h>

-

-/*

- * Handle the VT-switching interface for SCO

- */

-

-/*

- * This function is the signal handler for the VT-switching signal.  It

- * is only referenced inside the OS-support layer. NOTE: we do NOT need

- * to re-arm the signal here, since we used sigaction() to set the signal

- * disposition in sco_init.c. If we had used signal(), we would need to

- * re-arm the signal here. All we need to do now is record the fact that

- * we got the signal. XFree86 handles the rest.

- */

-void

-xf86VTRequest(int sig)

-{

-  xf86Info.vtRequestsPending = TRUE;

-  return;

-}

-

-Bool

-xf86VTSwitchPending(void)

-{

-  return xf86Info.vtRequestsPending ? TRUE : FALSE;

-}

-

-/*

- * When we switch away, we need to flush and suspend the event driver

- * before the VT_RELDISP. We also need to get the current LED status

- * and preserve it, so that we can restore it when we come back.

- */

-static int sco_ledstatus = -1;

-static unsigned int sco_ledstate = 0;

-

-Bool

-xf86VTSwitchAway(void)

-{

-  ev_flush();

-  ev_suspend();

-

-  sco_ledstatus = ioctl(xf86Info.consoleFd, KDGETLED, &sco_ledstate);

-

-  xf86Info.vtRequestsPending = FALSE;

-  if (ioctl(xf86Info.consoleFd, VT_RELDISP, VT_TRUE) < 0) {

-    return FALSE;

-  } else {

-    return TRUE;

-  }

-}

-

-/*

- * When we come back to the X server, we need to resume the event driver,

- * and we need to restore the LED settings to what they were when we

- * switched away.

- */

-Bool

-xf86VTSwitchTo(void)

-{

-  ev_resume();

-

-  xf86Info.vtRequestsPending = FALSE;

-  if (ioctl(xf86Info.consoleFd, VT_RELDISP, VT_ACKACQ) < 0) {

-    return FALSE;

-  } else {

-    if (sco_ledstatus >= 0) {

-      ioctl (xf86Info.consoleFd, KDSETLED, sco_ledstate);

-    }

-    sco_ledstatus = -1;

-

-    /*

-     * Convince the console driver this screen is in graphics mode,

-     * otherwise it assumes it can do more to the screen than it should.

-     */

-    if (ioctl(xf86Info.consoleFd, KDSETMODE, KD_GRAPHICS) < 0) {

-        ErrorF("Failed to set graphics mode (%s)\n", strerror(errno));

-    }

-

-    return TRUE;

-  }

-}

-

-Bool

-xf86VTActivate(int vtno)

-{

-	if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, vtno - 1) < 0) {

-		return FALSE;

-	}

-

-	return TRUE;

-}

diff --git a/xorg-server/hw/xfree86/os-support/sco/sco_init.c b/xorg-server/hw/xfree86/os-support/sco/sco_init.c
deleted file mode 100644
index fd4c898dd..000000000
--- a/xorg-server/hw/xfree86/os-support/sco/sco_init.c
+++ /dev/null
@@ -1,294 +0,0 @@
-/*

- * Copyright 2001-2005 by J. Kean Johnston <jkj@sco.com>

- *

- * 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 J. Kean Johnston not be used in

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

- * specific, written prior permission.  J. Kean Johnston makes no

- * representations about the suitability of this software for any purpose.

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

- *

- * J. KEAN JOHNSTON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

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

- * EVENT SHALL J. KEAN JOHNSTON 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.

- */

-

-/* Re-written May 2001 to represent the current state of reality */

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include <X11/X.h>

-#include <X11/Xmd.h>

-

-#include "compiler.h"

-

-#include "xf86.h"

-#include "xf86Priv.h"

-#include "xf86_OSlib.h"

-

-static Bool KeepTty = FALSE;

-static int VTnum = -1;

-static char vtdevice[48];

-static int sco_console_mode = -1;

-

-extern Bool mpxLock;

-

-void

-xf86OpenConsole(void)

-{

-  int i, ioctl_ret;

-  struct vt_mode VT;

-  struct vid_info vidinf;

-  struct sigaction sigvtsw;

-  char *ttn;

-

-  if (serverGeneration == 1) {

-    /* check if we're run with euid==0 */

-    if (geteuid() != 0) {

-      FatalError("xf86OpenConsole: Server must be setuid root\n");

-    }

-

-    /* If we are run in the background we will get SIGTTOU. Ignore it. */

-    OsSignal (SIGTTOU, SIG_IGN);

-

-    /*

-     * Set up the virtual terminal (multiscreen in SCO parlance).

-     * For the actual console itself, screens are numbered from

-     * 1 to (usually) 16. However, it is possible to have a nested

-     * server, and it is also possible to be on a multi-console

-     * system such as MaxSpeed or SunRiver. Therefore, we should

-     * not make any assumptions about the TTY name we are on, and

-     * instead we rely on ttyname() to give us the real TTY name.

-     * Previously, we tried to determine the TTY name manually.

-     * This is wrong. The only time we need to futz with the TTY name

-     * is if we were given the name of a TTY to run on explicity on

-     * the command line.

-     */

-

-    if (VTnum == -1) {

-      /*

-       * No device was specified. We need to query the kernel to see which

-       * console device we are on (and in fact if we are on a console at all).

-       */

-      ttn = ttyname (1);

-

-      if (ttn == (char *)0) {

-	FatalError ("xf86OpenConsole: Could not determine TTY name: %s\n",

-	  strerror(errno));

-      }

-      strlcpy (vtdevice, ttn, sizeof(vtdevice));

-    } else if (VTnum >= 0) {

-      snprintf (vtdevice, sizeof(vtdevice), "/dev/tty%02d", VTnum);

-    }

-

-    /*

-     * Now we can dispose of stdin/stdout

-     */

-    fclose (stdin);

-    fclose (stdout);

-

-    if ((xf86Info.consoleFd = open(vtdevice, O_RDWR | O_NDELAY, 0)) < 0) {

-      FatalError("xf86OpenConsole: Cannot open %s: %s\n", vtdevice,

-	strerror(errno));

-    }

-

-    /*

-     * We make 100% sure we use the correct VT number. This can get ugly

-     * where there are multi-consoles in use, so we make sure we query

-     * the kernel for the correct VT number. It knows best, we don't.

-     */

-    vidinf.size = sizeof(vidinf);

-    if (ioctl (xf86Info.consoleFd, CONS_GETINFO, &vidinf) < 0) {

-      FatalError ("xf86OpenConsole: %s not a console device "

-	"or error querying device: %s\n", vtdevice, strerror (errno));

-    }

-    xf86Info.vtno = vidinf.m_num;

-    VTnum = vidinf.m_num + 1; /* 0-based */

-

-    ErrorF("(using VT%02d device %s)\n\n", VTnum, vtdevice);

-

-    /* We activate the console just in case its not the one we are on */

-    if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, xf86Info.vtno) != 0) {

-        ErrorF("xf86OpenConsole: VT_ACTIVATE failed (%s)\n", strerror(errno));

-    }

-

-    /* Disassociate from controling TTY */

-    if (!KeepTty) {

-      setpgrp();

-    }

-

-    /*

-     * Now we get the current mode that the console device is in. We will

-     * use this later when we close the console device to restore it to

-     * that same mode.

-     */

-    if ((sco_console_mode = ioctl(xf86Info.consoleFd, CONS_GET, 0L)) < 0) {

-      FatalError("xf86OpenConsole: CONS_GET failed on console (%s)\n",

-          strerror(errno));

-    }

-

-    if (ioctl(xf86Info.consoleFd, VT_GETMODE, &VT) < 0) {

-      FatalError("xf86OpenConsole: VT_GETMODE failed (%s)\n", strerror(errno));

-    }

-

-    sigvtsw.sa_handler = xf86VTRequest;

-    sigfillset(&sigvtsw.sa_mask);

-    sigvtsw.sa_flags = 0;

-

-    /* NOTE: Using sigaction means we dont have to re-arm the signal */

-    sigaction(SIGUSR1, &sigvtsw, NULL);

-

-    VT.mode = VT_PROCESS;

-    VT.relsig = SIGUSR1;

-    VT.acqsig = SIGUSR1;

-    VT.frsig = SIGINT;          /* Not implemented */

-    VT.waitv = 0;

-

-    /*

-     * The SCO X server tries the following call 5 times. Lets do the same

-     * thing. It shouldn't really be required but sometimes things take a

-     * while to settle down when switching screens. *helpless shrug* I know

-     * its sucks but ...

-     */

-

-    ioctl_ret = 0;

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

-      ioctl_ret = ioctl(xf86Info.consoleFd, VT_SETMODE, &VT);

-      if (ioctl_ret >= 0)

-        break;

-      usleep(999999); /* Dont use nap() - it forces linking with -lx */

-    }

-

-    if (ioctl_ret < 0) {

-      FatalError("xf86OpenConsole: VT_SETMODE failed (%s)\n", strerror(errno));

-    }

-

-    /*

-     * Convince the console driver we are in graphics mode.

-     */

-    if (ioctl(xf86Info.consoleFd, KDSETMODE, KD_GRAPHICS) < 0) {

-        ErrorF("Failed to set graphics mode (%s)\n", strerror(errno));

-    }

-  } else { /* serverGeneration != 1 */

-    if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, xf86Info.vtno) != 0) {

-      ErrorF("xf86OpenConsole: VT_ACTIVATE failed (%s)\n", strerror(errno));

-    }

-  }

-}

-

-/*

- * Restore the console to its previous state. This may cause flicker if

- * the screen was previous in a graphics mode, because we first set it

- * to text mode. This has the advantage of getting the console driver

- * to do a soft reset on the card, which really does help settle the

- * video card down again after coming out of Xfree86.

- */

-void

-xf86CloseConsole(void)

-{

-  struct vt_mode VT;

-  struct sigaction sigvtsw;

-

-  /* Set text mode (possibly briefly) */

-  ioctl(xf86Info.consoleFd, KDSETMODE, KD_TEXT0);

-

-  /* Restore the original mode */

-  if (sco_console_mode != -1) {

-      ioctl(xf86Info.consoleFd, MODESWITCH | sco_console_mode, 0L);

-  }

-

-  ioctl(xf86Info.consoleFd, VT_RELDISP, 1);     /* Release the display */

-

-  sigvtsw.sa_handler = SIG_DFL;

-  sigfillset(&sigvtsw.sa_mask);

-  sigvtsw.sa_flags = 0;

-

-  sigaction(SIGUSR1, &sigvtsw, NULL);

-

-  VT.mode = VT_AUTO;

-  VT.waitv = 0;

-  VT.relsig = SIGUSR1;

-  VT.acqsig = SIGUSR1;

-  VT.frsig  = SIGINT;

-  ioctl(xf86Info.consoleFd, VT_SETMODE, &VT); /* Revert to auto handling */

-

-  close(xf86Info.consoleFd); /* We're done with the device */

-}

-

-int

-xf86ProcessArgument(int argc, char *argv[], int i)

-{

-  /*

-   * Keep server from detaching from controlling tty.  This is useful

-   * when debugging (so the server can receive keyboard signals).

-   */

-  if (!strcmp(argv[i], "-keeptty")) {

-    KeepTty = TRUE;

-    return 1;

-  }

-

-  /*

-   * By default, the X server wants to bind itself to CPU 0. This makes

-   * sure that the server has full access to the I/O ports at IOPL 3.

-   * Some SMP systems have trouble with I/O on CPU's other than 0. If,

-   * however, you have a system that is well behaved, you can specify

-   * this argument and let the scheduler decide which CPU the server

-   * should run on.

-   */

-  if (!strcmp(argv[i], "-nompxlock")) {

-    mpxLock = FALSE;

-    return 1;

-  }

-

-  /*

-   * Specify the VT number to run on (NOT the device).

-   */

-  if ((argv[i][0] == 'v') && (argv[i][1] == 't')) {

-    if (sscanf(argv[i], "vt%2d", &VTnum) == 0) {

-      UseMsg();

-      VTnum = -1;

-      return 0;

-    }

-    if (VTnum <= 0) {

-      UseMsg();

-      VTnum = -1;

-      return 0;

-    }

-    return 1;

-  }

-

-  /*

-   * Use a device the user specifies.

-   */

-  if (!strcmp(argv[i], "-crt")) {

-    if (++i > argc) {

-      UseMsg();

-      VTnum = -1;

-      return 0;

-    } else {

-      VTnum = -2;

-      strlcpy (vtdevice, argv[i], sizeof(vtdevice));

-      return 2;

-    }

-  }

-  return 0;

-}

-

-void

-xf86UseMsg(void)

-{

-	ErrorF("vtXX                   use the specified VT number\n");

-	ErrorF("-crt DEVICE            use the specified VT device\n");

-        ErrorF("-nompxlock             dont bind X server to CPU 0\n");

-	ErrorF("-keeptty               ");

-	ErrorF("don't detach controlling tty (for debugging only)\n");

-}

diff --git a/xorg-server/hw/xfree86/os-support/sco/sco_iop.c b/xorg-server/hw/xfree86/os-support/sco/sco_iop.c
deleted file mode 100644
index 3da4fcf3a..000000000
--- a/xorg-server/hw/xfree86/os-support/sco/sco_iop.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright 2001 by J. Kean Johnston <jkj@caldera.com>
- *
- * 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 J. Kean Johnston not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission.  J. Kean Johnston makes no
- * representations about the suitability of this software for any purpose.
- * It is provided "as is" without express or implied warranty.
- *
- * J. KEAN JOHNSTON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL J. KEAN JOHNSTON 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.
- */
-
-
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#include <X11/X.h>
-
-#include "compiler.h"
-
-#define _NEED_SYSI86
-#include "xf86.h"
-#include "xf86Priv.h"
-#include "xf86OSpriv.h"
-#include "xf86_OSlib.h"
-
-
-/***************************************************************************/
-/* I/O Permissions section                                                 */
-/***************************************************************************/
-
-/*
- * There is a right way and a wrong way of doing this. Unfortunately, we
- * are forced to do it the wrong way. The right way is to be told the range
- * or ranges of I/O ports the driver(s) need access to, in order to use the
- * CONS_IOPERM ioctl() to grant access only to those ports we care about.
- * This way we can guarantee some small level of stability because a driver
- * does not have access to all ports (which would mean it could play with
- * the PIT and thus affect scheduling times, or a whole slew of other
- * nasty things). However, because XFree86 currently only enables or disables
- * ALL port access, we need to run at IOPL 3, which basically means the
- * X Server runs at the same level as the kernel. You can image why this is
- * unsafe. Oh, and this is not a problem unique to OSR5, other OSes are
- * affected by this as well.
- *
- * So, for the time being, we change our IOPL until such time as the XFree86
- * architecture is changed to allow for tighter control of I/O ports. If and
- * when it is, then the CONS_ADDIOP/DELIOP ioctl() should be used to enable 
- * or disable access to the desired ports.
- */
-
-extern long sysi86 (int cmd, ...);
-
-static Bool IOEnabled = FALSE;
-
-Bool
-xf86EnableIO(void)
-{
-	if (IOEnabled)
-		return TRUE;
-
-	if (sysi86(SI86V86, V86SC_IOPL, PS_IOPL) < 0) {
-		xf86Msg(X_WARNING,"Failed to set IOPL for extended I/O\n");
-		return FALSE;
-	}
-	
-	IOEnabled = TRUE;
-	return TRUE;
-}
-
-void
-xf86DisableIO(void)
-{
-	if (!IOEnabled)
-		return;
-
-	sysi86(SI86V86, V86SC_IOPL, 0);
-	IOEnabled = FALSE;
-}
diff --git a/xorg-server/hw/xfree86/os-support/sco/sco_video.c b/xorg-server/hw/xfree86/os-support/sco/sco_video.c
deleted file mode 100644
index f63b71df8..000000000
--- a/xorg-server/hw/xfree86/os-support/sco/sco_video.c
+++ /dev/null
@@ -1,290 +0,0 @@
-/*
- * Copyright 2001 by J. Kean Johnston <jkj@sco.com>
- *
- * 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 J. Kean Johnston not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission.  J. Kean Johnston makes no
- * representations about the suitability of this software for any purpose.
- * It is provided "as is" without express or implied warranty.
- *
- * J. KEAN JOHNSTON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL J. KEAN JOHNSTON 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.
- */
-
-/* Re-written May 2001 to represent the current state of reality */
-
-/*
- * This file contains the completely re-written SCO OpenServer video
- * routines for XFree86 4.x. Much of this is based on the SCO X server
- * code (which is an X11R5 server) and will probably only work on
- * OpenServer versions 5.0.5, 5.0.6 and later. Please send me (jkj@sco.com)
- * email if you have any questions.
- *
- * Ideally, you should use OSR5.0.6A or later, with the updated console
- * driver for 5.0.6A (its the default driver in 5.0.7 and later).
- * However, if you are running on an older system, this code will detect
- * that and adjust accordingly.
- */
-
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#include <X11/X.h>
-#include "input.h"
-#include "scrnintstr.h"
-
-#define _NEED_SYSI86
-#include "xf86.h"
-#include "xf86Priv.h"
-#include "xf86OSpriv.h"
-#include "xf86_OSlib.h"
-
-#include <sys/ci/ciioctl.h>
-#define MPXNAME "/dev/atp1"
-#define BASECPU 1
-
-Bool mpxLock = TRUE;
-
-#define USE_VASMETHOD	1
-
-/***************************************************************************/
-/* Video Memory Mapping section                                            */
-/***************************************************************************/
-
-static int sco_mcdone = 0, sco_ismc = 0;
-
-/***************************************************************************/
-/*
- * To map the video memory, we first need to see if we are on a multi-console
- * system. If we are, we need to try to use an existing video class in the
- * kernel. We do this by retrieving the list of currently defined classes
- * (via the new CONS_GETCLASS ioctl()) to see if we have a class that will
- * match the range of memory we desire. If we can't find one, we have an
- * error and we abort.
- *
- * If we are not using a multi-console, we can simply use mmap() to map in
- * the frame buffer, using the classs-access method as a fall-back only if
- * the mmap() fails (it shouldn't). We always set the appropriate pointers
- * in the config structure to point ot the right function to map and unmap
- * the video memory. An alternative to using mmap() is to use the new
- * CONS_ADDVAS call, which will use vasmalloc() and vasbind() in the kernel
- * to map the physical address to a virtual one, which it then returns.
- * I am not 100% sure if this is faster or not, but it may prove easier to
- * debug things. Just to be on the safe side, I have included both methods
- * here, and the mmap() method can be used by setting USE_VASMETHOD to 0
- * above.
- */
-
-#if !defined(CONS_ADDVAS)
-# undef USE_VASMETHOD
-# define USE_VASMETHOD 0
-#endif
-
-static int
-scoIsMultiConsole (void)
-{
-	int x;
-
-	if (sco_mcdone)
-		return sco_ismc;
-	x = access ("/usr/lib/vidconf/.multiconsole", F_OK);
-	if (x == 0)
-		sco_ismc = 1;
-	sco_mcdone = 1;
-	return sco_ismc;
-}
-
-/*
- * This maps memory using mmap()
- */
-static pointer
-mapVidMemMMAP(int ScreenNum, unsigned long Base, unsigned long Size, int flags)
-{
-  int fd;
-  unsigned long realBase, alignOff;
-  pointer base;
-
-  fd = open (DEV_MEM, (flags & VIDMEM_READONLY) ? O_RDONLY : O_RDWR);
-  if (fd < 0) {
-    FatalError("xf86MapVidMem: failed to open %s (%s)\n", DEV_MEM,
-       	strerror(errno));
-    return 0; /* NOTREACHED */
-  }
-
-  realBase = Base & ~(getpagesize() - 1);
-  alignOff = Base - realBase;
-
-  DebugF("base: %lx, realBase: %lx, alignOff: %lx\n", Base,realBase,alignOff);
-
-  base = mmap((caddr_t)0, Size + alignOff,
-	      (flags & VIDMEM_READONLY) ? PROT_READ : (PROT_READ | PROT_WRITE),
-  	      MAP_SHARED, fd, (off_t)realBase);
-  close(fd);
-  if (base == MAP_FAILED) {
-    FatalError("xf86MapVidMem: Could not mmap framebuffer (0x%08x,0x%x) (%s)\n",
-       	Base, Size, strerror(errno));
-    return 0; /* NOTREACHED */
-  }
-
-    DebugF("base: %lx aligned base: %lx\n",base, base + alignOff);
-    return (pointer)((char *)base + alignOff);
-}
-
-#if (USE_VASMETHOD)
-/*
- * This maps memory using the virtual address space (VAS) console calls.
- */
-static pointer
-mapVidMemVAS(int ScreenNum, unsigned long Base, unsigned long Size, int flags)
-{
-  struct vidvasmem vas;
-  pointer base;
-
-  vas.base = (long)Base;
-  vas.size = (long)Size;
-
-  base = (pointer)ioctl (xf86Info.consoleFd, CONS_ADDVAS, &vas);
-  if (base == (pointer)-1) {
-    return mapVidMemMMAP(ScreenNum, Base, Size, flags);
-  }
-  return base;
-}
-#endif /* USE_VASMETHOD */
-
-struct vidclass vidclasslist[] = {
-	{ "VBE", "", 0xf0000000, 0x2000000, 0 },
-	{ "P9000", "", 0xc0000000, 0x400000, 0 },
-	{ "TULIP", "", 0x80000000, 0x400000, 0 },
-	{ "VIPER", "", 0xa0000000, 0x400000, 0 },
-	{ "S3T", "", 0xa0000000, 0x200000, 0 },
-	{ "S3DT", "", 0x4000000, 0x400000, 0 },
-	{ "MGA", "", 0x2200000, 0x4000, 0 },
-	{ "CLVGA", "", 0xa0000, 0x20000, 0 },
-	{ "OLIVE", "", 0xd8000000, 0x400000, 0 },
-	{ "S3C", "", 0xa0000, 0x10000, 0 },
-	{ "MGAVLB", "", 0xac000, 0x34000, 0 },
-	{ "ATI8514", "", 0xFF000, 0x1000, 0 },
-	{ "GXREGS", "", 0xb0000, 0x10000, 0 },
-	{ "GX", "", 0xa0000, 0x10000, 0 },
-	{ "CT64300", "", 0xa0000000, 0x400000, 0 },
-	{ "SVGA", "", 0xa0000, 0x20000, 0 },
-	{ "S3V", "", 0xa0000000, 0x400000, 0 },
-	{ "8514A", "", 0xFF000, 0x1000, 0 },
-	{ "VGA", "", 0xa0000, 0x10000, 0 },
-	{ 0 }
-};
-
-static pointer
-mapVidMemVC(int ScreenNum, unsigned long Base, unsigned long Size, int flags)
-{
-  struct vidclass *vcp;
-  char *class = NULL;
-  pointer base;
-
-  for (vcp = vidclasslist; vcp->name; vcp++) {
-    if ((vcp->base == Base) && (vcp->size == Size)) {
-      class = vcp->name;
-      break;
-    }
-  }
-
-  if (class == NULL) {
-    /*
-     * As a fall-back, we will try and use the mmap() approach. This may
-     * prove to be the wrong thing to do, but time and testing will tell.
-     */
-    ErrorF("xf86MapVidMem: No class map defined for (0x%08x,0x%08x)\n", Base, Size);
-#if USE_VASMETHOD
-    return mapVidMemVAS(ScreenNum, Base, Size, flags);
-#else /* !USE_VASMETHOD */
-    return mapVidMemMMAP(ScreenNum, Base, Size, flags);
-#endif
-  }
-
-  /*
-   * We found a suitable class. Try and use it.
-   */
-  base = (pointer)ioctl(xf86Info.consoleFd, MAP_CLASS, class);
-  if ((int)base == -1) {
-    FatalError("xf86MapVidMem: Failed to map video memory class `%s'\n", class);
-    return 0; /* NOTREACHED */
-  }
-
-  return base;
-}
-
-/*
- * Unmapping the video memory is easy. We always call munmap(), as it is
- * safe to do so even if we haven't actually mapped in any pages via mmap().
- * In the case where we used the video class, we don't need to do anything
- * as the kernel will clean up the TSS when we exit, and will undo the
- * vasbind() that was done when the class was originally mapped. If we used
- * vasmap, we simply undo the map. Again, it is benign to call vasunmap
- * even if we got the frame buffer via some other mechanism (like mmap).
- */
-
-static void
-unmapVidMem(int ScreenNum, pointer Base, unsigned long Size)
-{
-#if USE_VASMETHOD
-  struct vidvasmem vas;
-  int x;
-
-  vas.base = (long)Base;
-  vas.size = (long)Size;
-
-  x = ioctl (xf86Info.consoleFd, CONS_DELVAS, &vas);
-  if (x == 0)
-    return;
-#endif /* USE_VASMETHOD */
-
-  munmap(Base, Size);
-}
-
-/*
- * Set things up to point to our local functions. When the kernel gets
- * MTRR support, we will need to add the required functions for that
- * here too. MTRR support will most likely appear in 5.0.8 or 5.1.0.
- *
- * We also want to lock the X server process to the base CPU in an MPX
- * system, since we will be going to IOPL 3. Most engine drivers can cope
- * with I/O access on any CPU but there are a few (AST Manhattan I believe)
- * that can't, so the server needs to be locked to CPU0.
- */
-void
-xf86OSInitVidMem(VidMemInfoPtr pVidMem)
-{
-  int mpx_fd;
-
-  if (scoIsMultiConsole ()) {
-    pVidMem->mapMem = mapVidMemVC;
-  } else {
-#if USE_VASMETHOD
-    pVidMem->mapMem = mapVidMemVAS;
-#else
-    pVidMem->mapMem = mapVidMemMMAP;
-#endif
-  }
-
-  pVidMem->unmapMem = unmapVidMem;
-  pVidMem->linearSupported = TRUE;
-  pVidMem->initialised = TRUE;
-
-  if (mpxLock && (mpx_fd = open (MPXNAME, O_RDONLY)) > 0) {
-    if (ioctl (mpx_fd, ACPU_XLOCK, BASECPU) < 0)
-      ErrorF ("xf86OSInitVidMem: Can not bind to CPU 0 (%s)\n",
-          strerror(errno));
-    close (mpx_fd);
-  }
-}
-
diff --git a/xorg-server/hw/xfree86/os-support/xf86_OSlib.h b/xorg-server/hw/xfree86/os-support/xf86_OSlib.h
index c53fc0dac..3b646da70 100644
--- a/xorg-server/hw/xfree86/os-support/xf86_OSlib.h
+++ b/xorg-server/hw/xfree86/os-support/xf86_OSlib.h
@@ -85,22 +85,11 @@
 /**************************************************************************/
 #if (defined(SYSV) || defined(SVR4)) && \
     (defined(sun) || defined(__i386__))
-# ifdef SCO325
-#  ifndef _SVID3
-#   define _SVID3
-#  endif
-#  ifndef _NO_STATIC
-#   define _NO_STATIC
-#  endif
-# endif
 # include <sys/ioctl.h>
 # include <signal.h>
 # include <termio.h>
 # include <sys/stat.h>
 # include <sys/types.h>
-# if defined(__SCO__) 
-# include <sys/param.h>
-# endif
 
 
 # include <errno.h>
@@ -140,15 +129,7 @@
 # if !defined(sun)
 #  include <sys/emap.h>
 # endif
-# if defined(SCO325)
-#  include <sys/vtkd.h>
-#  include <sys/console.h>
-#  include <sys/scankbd.h>
-#  include <sys/vid.h>
-#  define LED_CAP CLKED
-#  define LED_NUM NLKED
-#  define LED_SCR SLKED
-# elif defined(HAS_USL_VTS)
+# if   defined(HAS_USL_VTS)
 #  if !defined(sun)
 #   include <sys/at_ansi.h>
 #  endif
@@ -177,20 +158,12 @@
 #  define VT_ACKACQ 2
 # endif /* !VT_ACKACQ */
 
-# if defined(__SCO__)
-#  include <sys/sysmacros.h>
-#  define POSIX_TTY
-# endif /* __SCO__ */
 
-# if defined(SVR4) || defined(SCO325)
+# if defined(SVR4) 
 #  include <sys/mman.h>
 #  if !(defined(sun) && defined (SVR4))
 #    define DEV_MEM "/dev/pmem"
 #  endif
-#  ifdef SCO325
-#   undef DEV_MEM
-#   define DEV_MEM "/dev/mem"
-#  endif
 #  define CLEARDTR_SUPPORT
 #  define POSIX_TTY
 # endif /* SVR4 */
diff --git a/xorg-server/hw/xfree86/parser/Makefile.am b/xorg-server/hw/xfree86/parser/Makefile.am
index 6fe7b87c1..fb5d49e88 100644
--- a/xorg-server/hw/xfree86/parser/Makefile.am
+++ b/xorg-server/hw/xfree86/parser/Makefile.am
@@ -1,51 +1,51 @@
-if INSTALL_LIBXF86CONFIG

-noinst_LTLIBRARIES = libxf86config_internal.la

-lib_LIBRARIES = libxf86config.a

-LIBHEADERS = \

-	xf86Optrec.h \

-	xf86Parser.h

-else

-noinst_LTLIBRARIES = libxf86config_internal.la

-endif

-

-INTERNAL_SOURCES= \

-	Device.c \

-	Files.c \

-	Flags.c \

-	Input.c \

-	InputClass.c \

-	Layout.c \

-	Module.c \

-	Video.c \

-	Monitor.c \

-	Pointer.c \

-	Screen.c \

-	Vendor.c \

-	read.c \

-	scan.c \

-	write.c \

-	DRI.c \

-	Extensions.c

-

-libxf86config_internal_la_SOURCES = \

-	$(INTERNAL_SOURCES)

-

-libxf86config_a_SOURCES = \

-	$(TOP_SRCDIR)/os/xprintf.c \

-	$(INTERNAL_SOURCES)

-libxf86config_a_CFLAGS = $(AM_CFLAGS)

-

-AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) \

-	-DSYSCONFDIR=\"$(sysconfdir)\" \

-	-DDATADIR=\"$(datadir)\"

-

-EXTRA_DIST = \

-	Configint.h \

-	configProcs.h \

-	xf86Optrec.h \

-	xf86Parser.h \

-	xf86tokens.h

-

-sdk_HEADERS = \

-	xf86Parser.h \

-	xf86Optrec.h

+if INSTALL_LIBXF86CONFIG
+noinst_LTLIBRARIES = libxf86config_internal.la
+lib_LIBRARIES = libxf86config.a
+LIBHEADERS = \
+	xf86Optrec.h \
+	xf86Parser.h
+else
+noinst_LTLIBRARIES = libxf86config_internal.la
+endif
+
+INTERNAL_SOURCES= \
+	Device.c \
+	Files.c \
+	Flags.c \
+	Input.c \
+	InputClass.c \
+	Layout.c \
+	Module.c \
+	Video.c \
+	Monitor.c \
+	Pointer.c \
+	Screen.c \
+	Vendor.c \
+	read.c \
+	scan.c \
+	write.c \
+	DRI.c \
+	Extensions.c
+
+libxf86config_internal_la_SOURCES = \
+	$(INTERNAL_SOURCES)
+
+libxf86config_a_SOURCES = \
+	$(top_srcdir)/os/xprintf.c \
+	$(INTERNAL_SOURCES)
+libxf86config_a_CFLAGS = $(AM_CFLAGS)
+
+AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) \
+	-DSYSCONFDIR=\"$(sysconfdir)\" \
+	-DDATADIR=\"$(datadir)\"
+
+EXTRA_DIST = \
+	Configint.h \
+	configProcs.h \
+	xf86Optrec.h \
+	xf86Parser.h \
+	xf86tokens.h
+
+sdk_HEADERS = \
+	xf86Parser.h \
+	xf86Optrec.h