svn merge ^/branches/released

7 files changed, 1115 insertions, 1038 deletions

diff --git a/xorg-server/hw/xfree86/os-support/bsd/bsd_VTsw.c b/xorg-server/hw/xfree86/os-support/bsd/bsd_VTsw.c
index 476a0e957..90c9c30b1 100644
--- a/xorg-server/hw/xfree86/os-support/bsd/bsd_VTsw.c
+++ b/xorg-server/hw/xfree86/os-support/bsd/bsd_VTsw.c
@@ -1,94 +1,103 @@
-/*
- * Derived from VTsw_usl.c which is
- * Copyright 1993 by David Wexelblat <dwex@goblin.org>
- * by S_ren Schmidt (sos@login.dkuug.dk)
- *
- * 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"
-
-/*
- * Handle the VT-switching interface for OSs that use USL-style ioctl()s
- * (the bsd, sysv, sco, and linux subdirs).
- */
-
-/*
- * This function is the signal handler for the VT-switching signal.  It
- * is only referenced inside the OS-support layer.
- */
-void
-xf86VTRequest(int sig)
-{
-#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)
-	if (xf86Info.consType == SYSCONS || xf86Info.consType == PCVT) {
-		xf86Info.vtRequestsPending = TRUE;
-	}	
-#endif
-	return;
-}
-
-Bool
-xf86VTSwitchPending()
-{
-#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)
-	if (xf86Info.consType == SYSCONS || xf86Info.consType == PCVT) {
-		return(xf86Info.vtRequestsPending ? TRUE : FALSE);
-	}
-#endif
-	return FALSE;
-}
-
-Bool
-xf86VTSwitchAway()
-{
-#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)
-	if (xf86Info.consType == SYSCONS || xf86Info.consType == PCVT) {
-		xf86Info.vtRequestsPending = FALSE;
-		if (ioctl(xf86Info.consoleFd, VT_RELDISP, 1) < 0)
-			return(FALSE);
-		else
-			return(TRUE);
-	}
-#endif
-	return FALSE;
-}
-
-Bool
-xf86VTSwitchTo()
-{
-#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)
-	if (xf86Info.consType == SYSCONS || xf86Info.consType == PCVT) {
-		xf86Info.vtRequestsPending = FALSE;
-		if (ioctl(xf86Info.consoleFd, VT_RELDISP, VT_ACKACQ) < 0)
-			return(FALSE);
-		else
-			return(TRUE);
-	}
-#endif
-	return(TRUE);
-}
+/*

+ * Derived from VTsw_usl.c which is

+ * Copyright 1993 by David Wexelblat <dwex@goblin.org>

+ * by S_ren Schmidt (sos@login.dkuug.dk)

+ *

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

+

+/*

+ * Handle the VT-switching interface for OSs that use USL-style ioctl()s

+ * (the bsd, sysv, sco, and linux subdirs).

+ */

+

+/*

+ * This function is the signal handler for the VT-switching signal.  It

+ * is only referenced inside the OS-support layer.

+ */

+void

+xf86VTRequest(int sig)

+{

+#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)

+	if (xf86Info.consType == SYSCONS || xf86Info.consType == PCVT) {

+		xf86Info.vtRequestsPending = TRUE;

+	}	

+#endif

+	return;

+}

+

+Bool

+xf86VTSwitchPending()

+{

+#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)

+	if (xf86Info.consType == SYSCONS || xf86Info.consType == PCVT) {

+		return(xf86Info.vtRequestsPending ? TRUE : FALSE);

+	}

+#endif

+	return FALSE;

+}

+

+Bool

+xf86VTSwitchAway()

+{

+#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)

+	if (xf86Info.consType == SYSCONS || xf86Info.consType == PCVT) {

+		xf86Info.vtRequestsPending = FALSE;

+		if (ioctl(xf86Info.consoleFd, VT_RELDISP, 1) < 0)

+			return(FALSE);

+		else

+			return(TRUE);

+	}

+#endif

+	return FALSE;

+}

+

+Bool

+xf86VTSwitchTo()

+{

+#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)

+	if (xf86Info.consType == SYSCONS || xf86Info.consType == PCVT) {

+		xf86Info.vtRequestsPending = FALSE;

+		if (ioctl(xf86Info.consoleFd, VT_RELDISP, VT_ACKACQ) < 0)

+			return(FALSE);

+		else

+			return(TRUE);

+	}

+#endif

+	return(TRUE);

+}

+

+Bool

+xf86VTActivate(int vtno)

+{

+	if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, vtno) < 0) {

+		return(FALSE);

+	}

+	return(TRUE);

+}

diff --git a/xorg-server/hw/xfree86/os-support/sco/VTsw_sco.c b/xorg-server/hw/xfree86/os-support/sco/VTsw_sco.c
index d126e7869..9300b13b9 100644
--- a/xorg-server/hw/xfree86/os-support/sco/VTsw_sco.c
+++ b/xorg-server/hw/xfree86/os-support/sco/VTsw_sco.c
@@ -1,117 +1,127 @@
-/*
- * 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;
-  }
-}
+/*

+ * 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/shared/VTsw_noop.c b/xorg-server/hw/xfree86/os-support/shared/VTsw_noop.c
index 78cbe0e34..f3ddb29c9 100644
--- a/xorg-server/hw/xfree86/os-support/shared/VTsw_noop.c
+++ b/xorg-server/hw/xfree86/os-support/shared/VTsw_noop.c
@@ -1,54 +1,60 @@
-/*
- * Copyright 1993 by David Wexelblat <dwex@XFree86.org>
- *
- * 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"
-
-/*
- * No-op functions for OSs without VTs
- */
-
-Bool
-xf86VTSwitchPending(void)
-{
-	return(FALSE);
-}
-
-Bool
-xf86VTSwitchAway(void)
-{
-	return(FALSE);
-}
-
-Bool
-xf86VTSwitchTo(void)
-{
-	return(TRUE);
-}
+/*

+ * Copyright 1993 by David Wexelblat <dwex@XFree86.org>

+ *

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

+

+/*

+ * No-op functions for OSs without VTs

+ */

+

+Bool

+xf86VTSwitchPending(void)

+{

+	return(FALSE);

+}

+

+Bool

+xf86VTSwitchAway(void)

+{

+	return(FALSE);

+}

+

+Bool

+xf86VTSwitchTo(void)

+{

+	return(TRUE);

+}

+

+Bool

+xf86VTActivate(int vtno)

+{

+	return(TRUE);

+}

diff --git a/xorg-server/hw/xfree86/os-support/shared/VTsw_usl.c b/xorg-server/hw/xfree86/os-support/shared/VTsw_usl.c
index 9308640e2..34bca7ae2 100644
--- a/xorg-server/hw/xfree86/os-support/shared/VTsw_usl.c
+++ b/xorg-server/hw/xfree86/os-support/shared/VTsw_usl.c
@@ -1,90 +1,101 @@
-/*
- * Copyright 1993 by David Wexelblat <dwex@XFree86.org>
- *
- * 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"
-
-#ifdef OSHEADER
-# include OSHEADER
-#endif
-
-/*
- * Handle the VT-switching interface for OSs that use USL-style ioctl()s
- * (the sysv, sco, and linux subdirs).
- */
-
-/*
- * This function is the signal handler for the VT-switching signal.  It
- * is only referenced inside the OS-support layer.
- */
-void
-xf86VTRequest(int sig)
-{
-	signal(sig, (void(*)(int))xf86VTRequest);
-	xf86Info.vtRequestsPending = TRUE;
-	return;
-}
-
-Bool
-xf86VTSwitchPending(void)
-{
-    return(xf86Info.vtRequestsPending ? TRUE : FALSE);
-}
-
-Bool
-xf86VTSwitchAway(void)
-{
-	xf86Info.vtRequestsPending = FALSE;
-	if (ioctl(xf86Info.consoleFd, VT_RELDISP, 1) < 0)
-	{
-		return(FALSE);
-	}
-	else
-	{
-#ifdef OSSWITCHAWAY
-	        OSSWITCHAWAY;
-#endif
-		return(TRUE);
-	}
-}
-
-Bool
-xf86VTSwitchTo(void)
-{
-	xf86Info.vtRequestsPending = FALSE;
-	if (ioctl(xf86Info.consoleFd, VT_RELDISP, VT_ACKACQ) < 0)
-	{
-		return(FALSE);
-	}
-	else
-	{
-		return(TRUE);
-	}
-}
+/*

+ * Copyright 1993 by David Wexelblat <dwex@XFree86.org>

+ *

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

+

+#ifdef OSHEADER

+# include OSHEADER

+#endif

+

+/*

+ * Handle the VT-switching interface for OSs that use USL-style ioctl()s

+ * (the sysv, sco, and linux subdirs).

+ */

+

+/*

+ * This function is the signal handler for the VT-switching signal.  It

+ * is only referenced inside the OS-support layer.

+ */

+void

+xf86VTRequest(int sig)

+{

+	signal(sig, (void(*)(int))xf86VTRequest);

+	xf86Info.vtRequestsPending = TRUE;

+	return;

+}

+

+Bool

+xf86VTSwitchPending(void)

+{

+    return(xf86Info.vtRequestsPending ? TRUE : FALSE);

+}

+

+Bool

+xf86VTSwitchAway(void)

+{

+	xf86Info.vtRequestsPending = FALSE;

+	if (ioctl(xf86Info.consoleFd, VT_RELDISP, 1) < 0)

+	{

+		return(FALSE);

+	}

+	else

+	{

+#ifdef OSSWITCHAWAY

+	        OSSWITCHAWAY;

+#endif

+		return(TRUE);

+	}

+}

+

+Bool

+xf86VTSwitchTo(void)

+{

+	xf86Info.vtRequestsPending = FALSE;

+	if (ioctl(xf86Info.consoleFd, VT_RELDISP, VT_ACKACQ) < 0)

+	{

+		return(FALSE);

+	}

+	else

+	{

+		return(TRUE);

+	}

+}

+

+Bool

+xf86VTActivate(int vtno)

+{

+#ifdef VT_ACTIVATE

+	if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, vtno) < 0) {

+		return(FALSE);

+	}

+#endif

+	return(TRUE);

+}

diff --git a/xorg-server/hw/xfree86/os-support/solaris/sun_VTsw.c b/xorg-server/hw/xfree86/os-support/solaris/sun_VTsw.c
index ded2f271e..ee5c7c064 100644
--- a/xorg-server/hw/xfree86/os-support/solaris/sun_VTsw.c
+++ b/xorg-server/hw/xfree86/os-support/solaris/sun_VTsw.c
@@ -1,104 +1,137 @@
-/*
- * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
- *
- * 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 (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 NONINFRINGEMENT.  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.
- */
-
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#include <X11/X.h>
-
-#include "xf86.h"
-#include "xf86Priv.h"
-#include "xf86_OSlib.h"
-
-#include <door.h>
-#include <sys/vtdaemon.h>
-
-/*
- * Handle the VT-switching interface for Solaris/OpenSolaris
- */
-
-void
-xf86VTRequest(int sig)
-{
-	if (xf86Info.vtPendingNum != -1)
-	{
-		ioctl(xf86Info.consoleFd, VT_RELDISP, 1);
-		xf86Info.vtPendingNum = -1;
-
-		return;
-	}
-
-	xf86Info.vtRequestsPending = TRUE;
-	return;
-}
-
-Bool
-xf86VTSwitchPending(void)
-{
-    return(xf86Info.vtRequestsPending ? TRUE : FALSE);
-}
-
-Bool
-xf86VTSwitchAway(void)
-{
-	int door_fd;
-	vt_cmd_arg_t vt_door_arg;
-	door_arg_t door_arg;
-
-	xf86Info.vtRequestsPending = FALSE;
-
-	vt_door_arg.vt_ev = VT_EV_HOTKEYS;
-	vt_door_arg.vt_num = xf86Info.vtPendingNum;
-	door_arg.data_ptr = (char *)&vt_door_arg;
-	door_arg.data_size = sizeof (vt_cmd_arg_t);
-	door_arg.rbuf = NULL;
-	door_arg.rsize = 0;
-	door_arg.desc_ptr = NULL;
-	door_arg.desc_num = 0;
-
-	if ((door_fd = open(VT_DAEMON_DOOR_FILE, O_RDONLY)) < 0)
-		return (FALSE);
-
-	if (door_call(door_fd, &door_arg) != 0) {
-		close(door_fd);
-		return (FALSE);
-	}
-
-	close(door_fd);
-	return (TRUE);
-}
-
-Bool
-xf86VTSwitchTo(void)
-{
-	xf86Info.vtRequestsPending = FALSE;
-	if (ioctl(xf86Info.consoleFd, VT_RELDISP, VT_ACKACQ) < 0)
-	{
-		return(FALSE);
-	}
-	else
-	{
-		return(TRUE);
-	}
-}
+/*

+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.

+ *

+ * 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 (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 NONINFRINGEMENT.  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.

+ */

+

+#ifdef HAVE_XORG_CONFIG_H

+#include <xorg-config.h>

+#endif

+

+#include <X11/X.h>

+

+#include "xf86.h"

+#include "xf86Priv.h"

+#include "xf86_OSlib.h"

+

+#include <door.h>

+#include <sys/vtdaemon.h>

+

+/*

+ * Handle the VT-switching interface for Solaris/OpenSolaris

+ */

+

+static int xf86VTPruneDoor = 0;

+

+void

+xf86VTRelease(int sig)

+{

+	if (xf86Info.vtPendingNum == -1)

+	{

+		xf86VTPruneDoor = 1;

+		xf86Info.vtRequestsPending = TRUE;

+		return;

+	}

+

+	ioctl(xf86Info.consoleFd, VT_RELDISP, 1);

+	xf86Info.vtPendingNum = -1;

+

+	return;

+}

+

+void

+xf86VTAcquire(int sig)

+{

+	xf86Info.vtRequestsPending = TRUE;

+	return;

+}

+

+Bool

+xf86VTSwitchPending(void)

+{

+    return(xf86Info.vtRequestsPending ? TRUE : FALSE);

+}

+

+Bool

+xf86VTSwitchAway(void)

+{

+	int door_fd;

+	vt_cmd_arg_t vt_door_arg;

+	door_arg_t door_arg;

+

+	xf86Info.vtRequestsPending = FALSE;

+

+	if (xf86VTPruneDoor) {

+		xf86VTPruneDoor = 0;

+		ioctl(xf86Info.consoleFd, VT_RELDISP, 1);

+		return (TRUE);

+	}

+

+	vt_door_arg.vt_ev = VT_EV_HOTKEYS;

+	vt_door_arg.vt_num = xf86Info.vtPendingNum;

+	door_arg.data_ptr = (char *)&vt_door_arg;

+	door_arg.data_size = sizeof (vt_cmd_arg_t);

+	door_arg.rbuf = NULL;

+	door_arg.rsize = 0;

+	door_arg.desc_ptr = NULL;

+	door_arg.desc_num = 0;

+

+	if ((door_fd = open(VT_DAEMON_DOOR_FILE, O_RDONLY)) < 0)

+		return (FALSE);

+

+	if (door_call(door_fd, &door_arg) != 0) {

+		close(door_fd);

+		return (FALSE);

+	}

+

+	close(door_fd);

+	return (TRUE);

+}

+

+Bool

+xf86VTSwitchTo(void)

+{

+	xf86Info.vtRequestsPending = FALSE;

+	if (ioctl(xf86Info.consoleFd, VT_RELDISP, VT_ACKACQ) < 0)

+	{

+		return(FALSE);

+	}

+	else

+	{

+		return(TRUE);

+	}

+}

+

+Bool

+xf86VTActivate(int vtno)

+{

+	struct vt_stat state;

+

+	if (ioctl(xf86Info.consoleFd, VT_GETSTATE, &state) < 0)

+		return(FALSE);

+

+	if ((state.v_state & (1 << vtno)) == 0)

+		return(FALSE);

+

+	xf86Info.vtRequestsPending = TRUE;

+	xf86Info.vtPendingNum = vtno;

+

+	return(TRUE);

+}

diff --git a/xorg-server/hw/xfree86/os-support/solaris/sun_init.c b/xorg-server/hw/xfree86/os-support/solaris/sun_init.c
index 2c569f02c..82df2e9dd 100644
--- a/xorg-server/hw/xfree86/os-support/solaris/sun_init.c
+++ b/xorg-server/hw/xfree86/os-support/solaris/sun_init.c
@@ -1,360 +1,367 @@
-/*
- * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
- * Copyright 1993 by David Wexelblat <dwex@goblin.org>
- * Copyright 1999 by David Holland <davidh@iquest.net>
- *
- * 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 names of the copyright holders not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission.  The copyright holders make no representations
- * about the suitability of this software for any purpose.  It is provided "as
- * is" without express or implied warranty.
- *
- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, AND IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS 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 "xf86.h"
-#include "xf86Priv.h"
-#include "xf86_OSlib.h"
-#ifdef HAVE_SYS_KD_H
-# include <sys/kd.h>
-#endif
-
-static Bool KeepTty = FALSE;
-static Bool Protect0 = FALSE;
-#ifdef HAS_USL_VTS
-static int VTnum = -1;
-static int xf86StartVT = -1;
-static int vtEnabled = 0;
-#endif
-
-/* Device to open as xf86Info.consoleFd */
-static char consoleDev[PATH_MAX] = "/dev/fb";
-
-/* Set by -dev argument on CLI
-   Used by hw/xfree86/common/xf86AutoConfig.c for VIS_GETIDENTIFIER */
-_X_HIDDEN char xf86SolarisFbDev[PATH_MAX] = "/dev/fb";
-
-void
-xf86OpenConsole(void)
-{
-    int i;
-#ifdef HAS_USL_VTS
-    int fd;
-    struct vt_mode VT;
-    struct vt_stat vtinfo;
-    int FreeVTslot;
-    MessageType from = X_PROBED;
-#endif
-
-    if (serverGeneration == 1)
-    {
-	/* Check if we're run with euid==0 */
-	if (geteuid() != 0)
-	    FatalError("xf86OpenConsole: Server must be suid root\n");
-
-	/* Protect page 0 to help find NULL dereferencing */
-	/* mprotect() doesn't seem to work */
-	if (Protect0)
-	{
-	    int fd = -1;
-
-	    if ((fd = open("/dev/zero", O_RDONLY, 0)) < 0)
-	    {
-		xf86Msg(X_WARNING,
-			"xf86OpenConsole: cannot open /dev/zero (%s)\n",
-			strerror(errno));
-	    }
-	    else
-	    {
-		if ((int)mmap(0, 0x1000, PROT_NONE,
-			      MAP_FIXED | MAP_SHARED, fd, 0) == -1)
-		    xf86Msg(X_WARNING,
-			"xf86OpenConsole: failed to protect page 0 (%s)\n",
-			strerror(errno));
-
-		close(fd);
-	    }
-	}
-
-#ifdef HAS_USL_VTS
-
-	/*
-	 * Setup the virtual terminal manager
-	 */
-	if ((fd = open("/dev/vt/0",O_RDWR,0)) == -1)
-	{
-	    xf86ErrorF("xf86OpenConsole: Cannot open /dev/vt/0 (%s)\n",
-		       strerror(errno));
-	    vtEnabled = 0;
-	}
-	else
-	{
-	    if (ioctl(fd, VT_ENABLED, &vtEnabled) < 0)
-	    {
-		xf86ErrorF("xf86OpenConsole: VT_ENABLED failed (%s)\n",
-			   strerror(errno));
-		vtEnabled = 0;
-	    }
-	}
-
-
-	if (vtEnabled == 0)
-	{
-	    /* VT not enabled - kernel too old or Sparc platforms
-	       without visual_io support */
-	    xf86Msg(from, "VT infrastructure is not available\n");
-
-	    xf86StartVT = 0;
-	    xf86Info.vtno = 0;
-	    strlcpy(consoleDev, xf86SolarisFbDev, sizeof(consoleDev));
-	}
-	else
-	{
-	    if (ioctl(fd, VT_GETSTATE, &vtinfo) < 0)
-		FatalError("xf86OpenConsole: Cannot determine current VT\n");
-
-	    xf86StartVT = vtinfo.v_active;
-
-	    if (VTnum != -1)
-	    {
-		xf86Info.vtno = VTnum;
-		from = X_CMDLINE;
-	    }
-	    else
-	    {
-		if ((ioctl(fd, VT_OPENQRY, &xf86Info.vtno) < 0) ||
-		    (xf86Info.vtno == -1)) {
-		    FatalError("xf86OpenConsole: Cannot find a free VT\n");
-		}
-	    }
-
-	    xf86Msg(from, "using VT number %d\n\n", xf86Info.vtno);
-	    snprintf(consoleDev, PATH_MAX, "/dev/vt/%d", xf86Info.vtno);
-	}
-
-	if (fd != -1) {
-	    close(fd);
-	}
-
-#endif /* HAS_USL_VTS */
-
-	if (!KeepTty)
-	    setpgrp();
-
-	if (((xf86Info.consoleFd = open(consoleDev, O_RDWR | O_NDELAY, 0)) < 0))
-	    FatalError("xf86OpenConsole: Cannot open %s (%s)\n",
-		       consoleDev, strerror(errno));
-
-#ifdef HAS_USL_VTS
-
-	/* Change ownership of the vt */
-	chown(consoleDev, getuid(), getgid());
-
-	if (vtEnabled)
-	{
-	    /*
-	     * Now get the VT
-	     */
-	    if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, xf86Info.vtno) != 0)
-		xf86Msg(X_WARNING, "xf86OpenConsole: VT_ACTIVATE failed\n");
-
-	    if (ioctl(xf86Info.consoleFd, VT_WAITACTIVE, xf86Info.vtno) != 0)
-		xf86Msg(X_WARNING, "xf86OpenConsole: VT_WAITACTIVE failed\n");
-
-	    if (ioctl(xf86Info.consoleFd, VT_GETMODE, &VT) < 0)
-		FatalError("xf86OpenConsole: VT_GETMODE failed\n");
-
-	    OsSignal(SIGUSR1, xf86VTRequest);
-
-	    VT.mode = VT_PROCESS;
-	    VT.relsig = SIGUSR1;
-	    VT.acqsig = SIGUSR1;
-
-	    if (ioctl(xf86Info.consoleFd, VT_SETMODE, &VT) < 0)
-		FatalError("xf86OpenConsole: VT_SETMODE VT_PROCESS failed\n");
-
-	    if (ioctl(xf86Info.consoleFd, VT_SETDISPINFO, atoi(display)) < 0)
-		xf86Msg(X_WARNING, "xf86OpenConsole: VT_SETDISPINFO failed\n");
-	}
-#endif
-
-#ifdef KDSETMODE
-	SYSCALL(i = ioctl(xf86Info.consoleFd, KDSETMODE, KD_GRAPHICS));
-	if (i < 0) {
-	    xf86Msg(X_WARNING,
-		    "xf86OpenConsole: KDSETMODE KD_GRAPHICS failed on %s (%s)\n",
-		    consoleDev, strerror(errno));
-	}
-#endif
-    }
-    else /* serverGeneration != 1 */
-    {
-#ifdef HAS_USL_VTS
-	if (vtEnabled) {
-	    /*
-	     * Now re-get the VT
-	     */
-	    if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, xf86Info.vtno) != 0)
-		xf86Msg(X_WARNING, "xf86OpenConsole: VT_ACTIVATE failed\n");
-
-	    if (ioctl(xf86Info.consoleFd, VT_WAITACTIVE, xf86Info.vtno) != 0)
-		xf86Msg(X_WARNING, "xf86OpenConsole: VT_WAITACTIVE failed\n");
-
-	    /*
-	     * If the server doesn't have the VT when the reset occurs,
-	     * this is to make sure we don't continue until the activate
-	     * signal is received.
-	     */
-	    if (!xf86Screens[0]->vtSema)
-		sleep(5);
-	}
-#endif /* HAS_USL_VTS */
-
-    }
-}
-
-void
-xf86CloseConsole(void)
-{
-#ifdef HAS_USL_VTS
-    struct vt_mode VT;
-#endif
-
-#if !defined(__i386__) && !defined(__i386) && !defined(__x86)
-
-    if (!xf86DoConfigure) {
-	int fd;
-
-	/*
-	 * Wipe out framebuffer just like the non-SI Xsun server does.  This
-	 * could be improved by saving framebuffer contents in
-	 * xf86OpenConsole() above and restoring them here.  Also, it's unclear
-	 * at this point whether this should be done for all framebuffers in
-	 * the system, rather than only the console.
-	 */
-	if ((fd = open(xf86SolarisFbDev, O_RDWR, 0)) < 0) {
-	    xf86Msg(X_WARNING,
-		    "xf86CloseConsole():  unable to open framebuffer (%s)\n",
-		    strerror(errno));
-	} else {
-	    struct fbgattr fbattr;
-
-	    if ((ioctl(fd, FBIOGATTR, &fbattr) < 0) &&
-		(ioctl(fd, FBIOGTYPE, &fbattr.fbtype) < 0)) {
-		xf86Msg(X_WARNING,
-			"xf86CloseConsole():  unable to retrieve framebuffer"
-			" attributes (%s)\n", strerror(errno));
-	    } else {
-		pointer fbdata;
-
-		fbdata = mmap(NULL, fbattr.fbtype.fb_size,
-			      PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
-		if (fbdata == MAP_FAILED) {
-		    xf86Msg(X_WARNING,
-			    "xf86CloseConsole():  unable to mmap framebuffer"
-			    " (%s)\n", strerror(errno));
-		} else {
-		    memset(fbdata, 0, fbattr.fbtype.fb_size);
-		    munmap(fbdata, fbattr.fbtype.fb_size);
-		}
-	    }
-
-	    close(fd);
-	}
-    }
-
-#endif
-
-#ifdef KDSETMODE
-    /* Reset the display back to text mode */
-    SYSCALL(ioctl(xf86Info.consoleFd, KDSETMODE, KD_TEXT));
-#endif
-
-#ifdef HAS_USL_VTS
-    if (vtEnabled == 1) {
-	if (ioctl(xf86Info.consoleFd, VT_GETMODE, &VT) != -1)
-	{
-	    VT.mode = VT_AUTO;		/* Set default vt handling */
-	    ioctl(xf86Info.consoleFd, VT_SETMODE, &VT);
-	}
-
-	/* Activate the VT that X was started on */
-	ioctl(xf86Info.consoleFd, VT_ACTIVATE, xf86StartVT);
-    }
-#endif /* HAS_USL_VTS */
-
-    close(xf86Info.consoleFd);
-}
-
-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;
-    }
-
-    /*
-     * Undocumented flag to protect page 0 from read/write to help catch NULL
-     * pointer dereferences.  This is purely a debugging flag.
-     */
-    if (!strcmp(argv[i], "-protect0"))
-    {
-	Protect0 = TRUE;
-	return 1;
-    }
-
-#ifdef HAS_USL_VTS
-
-    if ((argv[i][0] == 'v') && (argv[i][1] == 't'))
-    {
-	if (sscanf(argv[i], "vt%d", &VTnum) == 0)
-	{
-	    UseMsg();
-	    VTnum = -1;
-	    return 0;
-	}
-
-	return 1;
-    }
-
-#endif /* HAS_USL_VTS */
-
-    if ((i + 1) < argc) {
-	if (!strcmp(argv[i], "-dev")) {
-	    strlcpy(xf86SolarisFbDev, argv[i+1], sizeof(xf86SolarisFbDev));
-	    return 2;
-	}
-    }
-
-    return 0;
-}
-
-void xf86UseMsg()
-{
-#ifdef HAS_USL_VTS
-    ErrorF("vtX                    Use the specified VT number\n");
-#endif
-    ErrorF("-dev <fb>              Framebuffer device\n");
-    ErrorF("-keeptty               Don't detach controlling tty\n");
-    ErrorF("                       (for debugging only)\n");
-}
+/*

+ * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany

+ * Copyright 1993 by David Wexelblat <dwex@goblin.org>

+ * Copyright 1999 by David Holland <davidh@iquest.net>

+ *

+ * 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 names of the copyright holders not be used in advertising or

+ * publicity pertaining to distribution of the software without specific,

+ * written prior permission.  The copyright holders make no representations

+ * about the suitability of this software for any purpose.  It is provided "as

+ * is" without express or implied warranty.

+ *

+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

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

+ * EVENT SHALL THE COPYRIGHT HOLDERS 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 "xf86.h"

+#include "xf86Priv.h"

+#include "xf86_OSlib.h"

+#ifdef HAVE_SYS_KD_H

+# include <sys/kd.h>

+#endif

+

+static Bool KeepTty = FALSE;

+static Bool Protect0 = FALSE;

+#ifdef HAS_USL_VTS

+static int VTnum = -1;

+static int xf86StartVT = -1;

+static int vtEnabled = 0;

+extern void xf86VTAcquire(int);

+extern void xf86VTRelease(int);

+#endif

+

+/* Device to open as xf86Info.consoleFd */

+static char consoleDev[PATH_MAX] = "/dev/fb";

+

+/* Set by -dev argument on CLI

+   Used by hw/xfree86/common/xf86AutoConfig.c for VIS_GETIDENTIFIER */

+_X_HIDDEN char xf86SolarisFbDev[PATH_MAX] = "/dev/fb";

+

+void

+xf86OpenConsole(void)

+{

+    int i;

+#ifdef HAS_USL_VTS

+    int fd;

+    struct vt_mode VT;

+    struct vt_stat vtinfo;

+    int FreeVTslot;

+    MessageType from = X_PROBED;

+#endif

+

+    if (serverGeneration == 1)

+    {

+	/* Check if we're run with euid==0 */

+	if (geteuid() != 0)

+	    FatalError("xf86OpenConsole: Server must be suid root\n");

+

+	/* Protect page 0 to help find NULL dereferencing */

+	/* mprotect() doesn't seem to work */

+	if (Protect0)

+	{

+	    int fd = -1;

+

+	    if ((fd = open("/dev/zero", O_RDONLY, 0)) < 0)

+	    {

+		xf86Msg(X_WARNING,

+			"xf86OpenConsole: cannot open /dev/zero (%s)\n",

+			strerror(errno));

+	    }

+	    else

+	    {

+		if ((int)mmap(0, 0x1000, PROT_NONE,

+			      MAP_FIXED | MAP_SHARED, fd, 0) == -1)

+		    xf86Msg(X_WARNING,

+			"xf86OpenConsole: failed to protect page 0 (%s)\n",

+			strerror(errno));

+

+		close(fd);

+	    }

+	}

+

+#ifdef HAS_USL_VTS

+

+	/*

+	 * Setup the virtual terminal manager

+	 */

+	if ((fd = open("/dev/vt/0",O_RDWR,0)) == -1)

+	{

+	    xf86ErrorF("xf86OpenConsole: Cannot open /dev/vt/0 (%s)\n",

+		       strerror(errno));

+	    vtEnabled = 0;

+	}

+	else

+	{

+	    if (ioctl(fd, VT_ENABLED, &vtEnabled) < 0)

+	    {

+		xf86ErrorF("xf86OpenConsole: VT_ENABLED failed (%s)\n",

+			   strerror(errno));

+		vtEnabled = 0;

+	    }

+	}

+

+

+	if (vtEnabled == 0)

+	{

+	    /* VT not enabled - kernel too old or Sparc platforms

+	       without visual_io support */

+	    xf86Msg(from, "VT infrastructure is not available\n");

+

+	    xf86StartVT = 0;

+	    xf86Info.vtno = 0;

+	    strlcpy(consoleDev, xf86SolarisFbDev, sizeof(consoleDev));

+	}

+	else

+	{

+	    if (ioctl(fd, VT_GETSTATE, &vtinfo) < 0)

+		FatalError("xf86OpenConsole: Cannot determine current VT\n");

+

+	    xf86StartVT = vtinfo.v_active;

+

+	    if (VTnum != -1)

+	    {

+		xf86Info.vtno = VTnum;

+		from = X_CMDLINE;

+	    }

+	    else

+	    {

+		if ((ioctl(fd, VT_OPENQRY, &xf86Info.vtno) < 0) ||

+		    (xf86Info.vtno == -1))

+		{

+		    FatalError("xf86OpenConsole: Cannot find a free VT\n");

+		}

+	    }

+

+	    xf86Msg(from, "using VT number %d\n\n", xf86Info.vtno);

+	    snprintf(consoleDev, PATH_MAX, "/dev/vt/%d", xf86Info.vtno);

+	}

+

+	if (fd != -1)

+	{

+	    close(fd);

+	}

+

+#endif /* HAS_USL_VTS */

+

+	if (!KeepTty)

+	    setpgrp();

+

+	if (((xf86Info.consoleFd = open(consoleDev, O_RDWR | O_NDELAY, 0)) < 0))

+	    FatalError("xf86OpenConsole: Cannot open %s (%s)\n",

+		       consoleDev, strerror(errno));

+

+#ifdef HAS_USL_VTS

+

+	/* Change ownership of the vt */

+	chown(consoleDev, getuid(), getgid());

+

+	if (vtEnabled)

+	{

+	    /*

+	     * Now get the VT

+	     */

+	    if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, xf86Info.vtno) != 0)

+		xf86Msg(X_WARNING, "xf86OpenConsole: VT_ACTIVATE failed\n");

+

+	    if (ioctl(xf86Info.consoleFd, VT_WAITACTIVE, xf86Info.vtno) != 0)

+		xf86Msg(X_WARNING, "xf86OpenConsole: VT_WAITACTIVE failed\n");

+

+	    if (ioctl(xf86Info.consoleFd, VT_GETMODE, &VT) < 0)

+		FatalError("xf86OpenConsole: VT_GETMODE failed\n");

+

+	    OsSignal(SIGUSR1, xf86VTAcquire);

+	    OsSignal(SIGUSR2, xf86VTRelease);

+

+	    VT.mode = VT_PROCESS;

+	    VT.acqsig = SIGUSR1;

+	    VT.relsig = SIGUSR2;

+

+	    if (ioctl(xf86Info.consoleFd, VT_SETMODE, &VT) < 0)

+		FatalError("xf86OpenConsole: VT_SETMODE VT_PROCESS failed\n");

+

+	    if (ioctl(xf86Info.consoleFd, VT_SETDISPINFO, atoi(display)) < 0)

+		xf86Msg(X_WARNING, "xf86OpenConsole: VT_SETDISPINFO failed\n");

+	}

+#endif

+

+#ifdef KDSETMODE

+	SYSCALL(i = ioctl(xf86Info.consoleFd, KDSETMODE, KD_GRAPHICS));

+	if (i < 0) {

+	    xf86Msg(X_WARNING,

+		    "xf86OpenConsole: KDSETMODE KD_GRAPHICS failed on %s (%s)\n",

+		    consoleDev, strerror(errno));

+	}

+#endif

+    }

+    else /* serverGeneration != 1 */

+    {

+#ifdef HAS_USL_VTS

+	if (vtEnabled)

+	{

+	    /*

+	     * Now re-get the VT

+	     */

+	    if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, xf86Info.vtno) != 0)

+		xf86Msg(X_WARNING, "xf86OpenConsole: VT_ACTIVATE failed\n");

+

+	    if (ioctl(xf86Info.consoleFd, VT_WAITACTIVE, xf86Info.vtno) != 0)

+		xf86Msg(X_WARNING, "xf86OpenConsole: VT_WAITACTIVE failed\n");

+

+	    /*

+	     * If the server doesn't have the VT when the reset occurs,

+	     * this is to make sure we don't continue until the activate

+	     * signal is received.

+	     */

+	    if (!xf86Screens[0]->vtSema)

+		sleep(5);

+	}

+#endif /* HAS_USL_VTS */

+

+    }

+}

+

+void

+xf86CloseConsole(void)

+{

+#ifdef HAS_USL_VTS

+    struct vt_mode VT;

+#endif

+

+#if !defined(__i386__) && !defined(__i386) && !defined(__x86)

+

+    if (!xf86DoConfigure) {

+	int fd;

+

+	/*

+	 * Wipe out framebuffer just like the non-SI Xsun server does.  This

+	 * could be improved by saving framebuffer contents in

+	 * xf86OpenConsole() above and restoring them here.  Also, it's unclear

+	 * at this point whether this should be done for all framebuffers in

+	 * the system, rather than only the console.

+	 */

+	if ((fd = open(xf86SolarisFbDev, O_RDWR, 0)) < 0) {

+	    xf86Msg(X_WARNING,

+		    "xf86CloseConsole():  unable to open framebuffer (%s)\n",

+		    strerror(errno));

+	} else {

+	    struct fbgattr fbattr;

+

+	    if ((ioctl(fd, FBIOGATTR, &fbattr) < 0) &&

+		(ioctl(fd, FBIOGTYPE, &fbattr.fbtype) < 0)) {

+		xf86Msg(X_WARNING,

+			"xf86CloseConsole():  unable to retrieve framebuffer"

+			" attributes (%s)\n", strerror(errno));

+	    } else {

+		pointer fbdata;

+

+		fbdata = mmap(NULL, fbattr.fbtype.fb_size,

+			      PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);

+		if (fbdata == MAP_FAILED) {

+		    xf86Msg(X_WARNING,

+			    "xf86CloseConsole():  unable to mmap framebuffer"

+			    " (%s)\n", strerror(errno));

+		} else {

+		    memset(fbdata, 0, fbattr.fbtype.fb_size);

+		    munmap(fbdata, fbattr.fbtype.fb_size);

+		}

+	    }

+

+	    close(fd);

+	}

+    }

+

+#endif

+

+#ifdef KDSETMODE

+    /* Reset the display back to text mode */

+    SYSCALL(ioctl(xf86Info.consoleFd, KDSETMODE, KD_TEXT));

+#endif

+

+#ifdef HAS_USL_VTS

+    if (vtEnabled)

+    {

+	if (ioctl(xf86Info.consoleFd, VT_GETMODE, &VT) != -1)

+	{

+	    VT.mode = VT_AUTO;		/* Set default vt handling */

+	    ioctl(xf86Info.consoleFd, VT_SETMODE, &VT);

+	}

+

+	/* Activate the VT that X was started on */

+	ioctl(xf86Info.consoleFd, VT_ACTIVATE, xf86StartVT);

+    }

+#endif /* HAS_USL_VTS */

+

+    close(xf86Info.consoleFd);

+}

+

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

+    }

+

+    /*

+     * Undocumented flag to protect page 0 from read/write to help catch NULL

+     * pointer dereferences.  This is purely a debugging flag.

+     */

+    if (!strcmp(argv[i], "-protect0"))

+    {

+	Protect0 = TRUE;

+	return 1;

+    }

+

+#ifdef HAS_USL_VTS

+

+    if ((argv[i][0] == 'v') && (argv[i][1] == 't'))

+    {

+	if (sscanf(argv[i], "vt%d", &VTnum) == 0)

+	{

+	    UseMsg();

+	    VTnum = -1;

+	    return 0;

+	}

+

+	return 1;

+    }

+

+#endif /* HAS_USL_VTS */

+

+    if ((i + 1) < argc) {

+	if (!strcmp(argv[i], "-dev")) {

+	    strlcpy(xf86SolarisFbDev, argv[i+1], sizeof(xf86SolarisFbDev));

+	    return 2;

+	}

+    }

+

+    return 0;

+}

+

+void xf86UseMsg()

+{

+#ifdef HAS_USL_VTS

+    ErrorF("vtX                    Use the specified VT number\n");

+#endif

+    ErrorF("-dev <fb>              Framebuffer device\n");

+    ErrorF("-keeptty               Don't detach controlling tty\n");

+    ErrorF("                       (for debugging only)\n");

+}

diff --git a/xorg-server/hw/xfree86/os-support/xf86_OSproc.h b/xorg-server/hw/xfree86/os-support/xf86_OSproc.h
index c1a117334..3fc332e13 100644
--- a/xorg-server/hw/xfree86/os-support/xf86_OSproc.h
+++ b/xorg-server/hw/xfree86/os-support/xf86_OSproc.h
@@ -1,219 +1,220 @@
-/*
- * Copyright 1990, 1991 by Thomas Roell, Dinkelscherben, Germany
- * Copyright 1992 by David Dawes <dawes@XFree86.org>
- * Copyright 1992 by Jim Tsillas <jtsilla@damon.ccs.northeastern.edu>
- * Copyright 1992 by Rich Murphey <Rich@Rice.edu>
- * Copyright 1992 by Robert Baron <Robert.Baron@ernst.mach.cs.cmu.edu>
- * Copyright 1992 by Orest Zborowski <obz@eskimo.com>
- * Copyright 1993 by Vrije Universiteit, The Netherlands
- * Copyright 1993 by David Wexelblat <dwex@XFree86.org>
- * Copyright 1994, 1996 by Holger Veit <Holger.Veit@gmd.de>
- * Copyright 1994-2003 by The XFree86 Project, 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 names of the above listed copyright holders 
- * not be used in advertising or publicity pertaining to distribution of 
- * the software without specific, written prior permission.  The above listed
- * copyright holders make no representations about the suitability of this 
- * software for any purpose.  It is provided "as is" without express or 
- * implied warranty.
- *
- * THE ABOVE LISTED COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD 
- * TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
- * AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDERS 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.
- *
- */
-
-/*
- * The ARM32 code here carries the following copyright:
- *
- * Copyright 1997
- * Digital Equipment Corporation. All rights reserved.
- * This software is furnished under license and may be used and copied only in 
- * accordance with the following terms and conditions.  Subject to these
- * conditions, you may download, copy, install, use, modify and distribute
- * this software in source and/or binary form. No title or ownership is
- * transferred hereby.
- *
- * 1) Any source code used, modified or distributed must reproduce and retain
- *    this copyright notice and list of conditions as they appear in the
- *    source file.
- *
- * 2) No right is granted to use any trade name, trademark, or logo of Digital 
- *    Equipment Corporation. Neither the "Digital Equipment Corporation"
- *    name nor any trademark or logo of Digital Equipment Corporation may be
- *    used to endorse or promote products derived from this software without
- *    the prior written permission of Digital Equipment Corporation.
- *
- * 3) This software is provided "AS-IS" and any express or implied warranties,
- *    including but not limited to, any implied warranties of merchantability,
- *    fitness for a particular purpose, or non-infringement are disclaimed.
- *    In no event shall DIGITAL be liable for any damages whatsoever, and in
- *    particular, DIGITAL shall not be liable for special, indirect,
- *    consequential, or incidental damages or damages for lost profits, loss
- *    of revenue or loss of use, whether such damages arise in contract, 
- *    negligence, tort, under statute, in equity, at law or otherwise, even
- *    if advised of the possibility of such damage. 
- *
- */
-
-
-#ifndef _XF86_OSPROC_H
-#define _XF86_OSPROC_H
-
-/*
- * The actual prototypes have been pulled into this seperate file so
- * that they can can be used without pulling in all of the OS specific
- * stuff like sys/stat.h, etc. This casues problem for loadable modules.
- */ 
-
-/*
- * Flags for xf86MapVidMem().  Multiple flags can be or'd together.  The
- * flags may be used as hints.  For example it would be permissible to
- * enable write combining for memory marked only for framebuffer use.
- */
-
-#define VIDMEM_FRAMEBUFFER	0x01	/* memory for framebuffer use */
-#define VIDMEM_MMIO		0x02	/* memory for I/O use */
-#define VIDMEM_MMIO_32BIT	0x04	/* memory accesses >= 32bit */
-#define VIDMEM_READSIDEEFFECT	0x08	/* reads can have side-effects */
-#define VIDMEM_SPARSE		0x10	/* sparse mapping required
-					 * assumed when VIDMEM_MMIO is
-					 * set. May be used with
-					 * VIDMEM_FRAMEBUFFER) */
-#define VIDMEM_READONLY		0x20	/* read-only mapping
-					 * used when reading BIOS images
-					 * through xf86MapVidMem() */
-
-/*
- * OS-independent modem state flags for xf86SetSerialModemState() and
- * xf86GetSerialModemState().
- */
-#define XF86_M_LE		0x001	/* line enable */
-#define XF86_M_DTR		0x002	/* data terminal ready */
-#define XF86_M_RTS		0x004	/* request to send */
-#define XF86_M_ST		0x008	/* secondary transmit */
-#define XF86_M_SR		0x010	/* secondary receive */
-#define XF86_M_CTS		0x020	/* clear to send */
-#define XF86_M_CAR		0x040	/* carrier detect */
-#define XF86_M_RNG		0x080	/* ring */
-#define XF86_M_DSR		0x100	/* data set ready */
-
-#ifndef NO_OSLIB_PROTOTYPES
-/*
- * This is to prevent re-entrancy to FatalError() when aborting.
- * Anything that can be called as a result of AbortDDX() should use this
- * instead of FatalError().
- */
-
-#define xf86FatalError(a, b) \
-	if (dispatchException & DE_TERMINATE) { \
-		ErrorF(a, b); \
-		ErrorF("\n"); \
-		return; \
-	} else FatalError(a, b)
-
-/***************************************************************************/
-/* Prototypes                                                              */
-/***************************************************************************/
-
-#include <X11/Xfuncproto.h>
-#include "opaque.h"
-
-_XFUNCPROTOBEGIN
-
-/* public functions */
-extern _X_EXPORT Bool xf86LinearVidMem(void);
-extern _X_EXPORT Bool xf86CheckMTRR(int);
-extern _X_EXPORT pointer xf86MapVidMem(int, int, unsigned long, unsigned long);
-extern _X_EXPORT void xf86UnMapVidMem(int, pointer, unsigned long);
-extern _X_EXPORT void xf86MapReadSideEffects(int, int, pointer, unsigned long);
-extern _X_EXPORT int xf86ReadBIOS(unsigned long, unsigned long, unsigned char *, int);
-extern _X_EXPORT Bool xf86EnableIO(void);
-extern _X_EXPORT void xf86DisableIO(void);
-#ifdef __NetBSD__
-extern _X_EXPORT void xf86SetTVOut(int);
-extern _X_EXPORT void xf86SetRGBOut(void);
-#endif
-extern _X_EXPORT void xf86OSRingBell(int, int, int);
-extern _X_EXPORT void xf86SetReallySlowBcopy(void);
-extern _X_EXPORT void xf86SlowBcopy(unsigned char *, unsigned char *, int);
-extern _X_EXPORT int xf86OpenSerial(pointer options);
-extern _X_EXPORT int xf86SetSerial(int fd, pointer options);
-extern _X_EXPORT int xf86SetSerialSpeed(int fd, int speed);
-extern _X_EXPORT int xf86ReadSerial(int fd, void *buf, int count);
-extern _X_EXPORT int xf86WriteSerial(int fd, const void *buf, int count);
-extern _X_EXPORT int xf86CloseSerial(int fd);
-extern _X_EXPORT int xf86FlushInput(int fd);
-extern _X_EXPORT int xf86WaitForInput(int fd, int timeout);
-extern _X_EXPORT int xf86SerialSendBreak(int fd, int duration);
-extern _X_EXPORT int xf86SetSerialModemState(int fd, int state);
-extern _X_EXPORT int xf86GetSerialModemState(int fd);
-extern _X_EXPORT int xf86SerialModemSetBits(int fd, int bits);
-extern _X_EXPORT int xf86SerialModemClearBits(int fd, int bits);
-extern _X_EXPORT int xf86LoadKernelModule(const char *pathname);
-
-/* AGP GART interface */
-
-typedef struct _AgpInfo {
-	CARD32		bridgeId;
-	CARD32		agpMode;
-	unsigned long	base;
-	unsigned long	size;
-	unsigned long	totalPages;
-	unsigned long	systemPages;
-	unsigned long	usedPages;
-} AgpInfo, *AgpInfoPtr;
-
-extern _X_EXPORT Bool xf86AgpGARTSupported(void);
-extern _X_EXPORT AgpInfoPtr xf86GetAGPInfo(int screenNum);
-extern _X_EXPORT Bool xf86AcquireGART(int screenNum);
-extern _X_EXPORT Bool xf86ReleaseGART(int screenNum);
-extern _X_EXPORT int xf86AllocateGARTMemory(int screenNum, unsigned long size, int type,
-				  unsigned long *physical);
-extern _X_EXPORT Bool xf86DeallocateGARTMemory(int screenNum, int key);
-extern _X_EXPORT Bool xf86BindGARTMemory(int screenNum, int key, unsigned long offset);
-extern _X_EXPORT Bool xf86UnbindGARTMemory(int screenNum, int key);
-extern _X_EXPORT Bool xf86EnableAGP(int screenNum, CARD32 mode);
-extern _X_EXPORT Bool xf86GARTCloseScreen(int screenNum);
-
-/* These routines are in shared/sigio.c and are not loaded as part of the
-   module.  These routines are small, and the code if very POSIX-signal (or
-   OS-signal) specific, so it seemed better to provide more complex
-   wrappers than to wrap each individual function called. */
-extern _X_EXPORT int xf86InstallSIGIOHandler(int fd, void (*f)(int, void *), void *);
-extern _X_EXPORT int xf86RemoveSIGIOHandler(int fd);
-extern _X_EXPORT int xf86BlockSIGIO (void);
-extern _X_EXPORT void xf86UnblockSIGIO (int);
-extern _X_EXPORT void xf86AssertBlockedSIGIO (char *);
-extern _X_EXPORT Bool xf86SIGIOSupported (void);
-
-#ifdef XF86_OS_PRIVS
-typedef void (*PMClose)(void);
-extern _X_EXPORT void xf86OpenConsole(void);
-extern _X_EXPORT void xf86CloseConsole(void);
-extern _X_EXPORT Bool xf86VTSwitchPending(void);
-extern _X_EXPORT Bool xf86VTSwitchAway(void);
-extern _X_EXPORT Bool xf86VTSwitchTo(void);
-extern _X_EXPORT void xf86VTRequest(int sig);
-extern _X_EXPORT int xf86ProcessArgument(int, char **, int);
-extern _X_EXPORT void xf86UseMsg(void);
-extern _X_EXPORT PMClose xf86OSPMOpen(void);
-
-extern _X_EXPORT void xf86MakeNewMapping(int, int, unsigned long, unsigned long, pointer);
-extern _X_EXPORT void xf86InitVidMem(void);
-
-#endif /* XF86_OS_PRIVS */
-
-
-_XFUNCPROTOEND
-#endif /* NO_OSLIB_PROTOTYPES */
-
-#endif /* _XF86_OSPROC_H */
+/*

+ * Copyright 1990, 1991 by Thomas Roell, Dinkelscherben, Germany

+ * Copyright 1992 by David Dawes <dawes@XFree86.org>

+ * Copyright 1992 by Jim Tsillas <jtsilla@damon.ccs.northeastern.edu>

+ * Copyright 1992 by Rich Murphey <Rich@Rice.edu>

+ * Copyright 1992 by Robert Baron <Robert.Baron@ernst.mach.cs.cmu.edu>

+ * Copyright 1992 by Orest Zborowski <obz@eskimo.com>

+ * Copyright 1993 by Vrije Universiteit, The Netherlands

+ * Copyright 1993 by David Wexelblat <dwex@XFree86.org>

+ * Copyright 1994, 1996 by Holger Veit <Holger.Veit@gmd.de>

+ * Copyright 1994-2003 by The XFree86 Project, 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 names of the above listed copyright holders 

+ * not be used in advertising or publicity pertaining to distribution of 

+ * the software without specific, written prior permission.  The above listed

+ * copyright holders make no representations about the suitability of this 

+ * software for any purpose.  It is provided "as is" without express or 

+ * implied warranty.

+ *

+ * THE ABOVE LISTED COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD 

+ * TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 

+ * AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDERS 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.

+ *

+ */

+

+/*

+ * The ARM32 code here carries the following copyright:

+ *

+ * Copyright 1997

+ * Digital Equipment Corporation. All rights reserved.

+ * This software is furnished under license and may be used and copied only in 

+ * accordance with the following terms and conditions.  Subject to these

+ * conditions, you may download, copy, install, use, modify and distribute

+ * this software in source and/or binary form. No title or ownership is

+ * transferred hereby.

+ *

+ * 1) Any source code used, modified or distributed must reproduce and retain

+ *    this copyright notice and list of conditions as they appear in the

+ *    source file.

+ *

+ * 2) No right is granted to use any trade name, trademark, or logo of Digital 

+ *    Equipment Corporation. Neither the "Digital Equipment Corporation"

+ *    name nor any trademark or logo of Digital Equipment Corporation may be

+ *    used to endorse or promote products derived from this software without

+ *    the prior written permission of Digital Equipment Corporation.

+ *

+ * 3) This software is provided "AS-IS" and any express or implied warranties,

+ *    including but not limited to, any implied warranties of merchantability,

+ *    fitness for a particular purpose, or non-infringement are disclaimed.

+ *    In no event shall DIGITAL be liable for any damages whatsoever, and in

+ *    particular, DIGITAL shall not be liable for special, indirect,

+ *    consequential, or incidental damages or damages for lost profits, loss

+ *    of revenue or loss of use, whether such damages arise in contract, 

+ *    negligence, tort, under statute, in equity, at law or otherwise, even

+ *    if advised of the possibility of such damage. 

+ *

+ */

+

+

+#ifndef _XF86_OSPROC_H

+#define _XF86_OSPROC_H

+

+/*

+ * The actual prototypes have been pulled into this seperate file so

+ * that they can can be used without pulling in all of the OS specific

+ * stuff like sys/stat.h, etc. This casues problem for loadable modules.

+ */ 

+

+/*

+ * Flags for xf86MapVidMem().  Multiple flags can be or'd together.  The

+ * flags may be used as hints.  For example it would be permissible to

+ * enable write combining for memory marked only for framebuffer use.

+ */

+

+#define VIDMEM_FRAMEBUFFER	0x01	/* memory for framebuffer use */

+#define VIDMEM_MMIO		0x02	/* memory for I/O use */

+#define VIDMEM_MMIO_32BIT	0x04	/* memory accesses >= 32bit */

+#define VIDMEM_READSIDEEFFECT	0x08	/* reads can have side-effects */

+#define VIDMEM_SPARSE		0x10	/* sparse mapping required

+					 * assumed when VIDMEM_MMIO is

+					 * set. May be used with

+					 * VIDMEM_FRAMEBUFFER) */

+#define VIDMEM_READONLY		0x20	/* read-only mapping

+					 * used when reading BIOS images

+					 * through xf86MapVidMem() */

+

+/*

+ * OS-independent modem state flags for xf86SetSerialModemState() and

+ * xf86GetSerialModemState().

+ */

+#define XF86_M_LE		0x001	/* line enable */

+#define XF86_M_DTR		0x002	/* data terminal ready */

+#define XF86_M_RTS		0x004	/* request to send */

+#define XF86_M_ST		0x008	/* secondary transmit */

+#define XF86_M_SR		0x010	/* secondary receive */

+#define XF86_M_CTS		0x020	/* clear to send */

+#define XF86_M_CAR		0x040	/* carrier detect */

+#define XF86_M_RNG		0x080	/* ring */

+#define XF86_M_DSR		0x100	/* data set ready */

+

+#ifndef NO_OSLIB_PROTOTYPES

+/*

+ * This is to prevent re-entrancy to FatalError() when aborting.

+ * Anything that can be called as a result of AbortDDX() should use this

+ * instead of FatalError().

+ */

+

+#define xf86FatalError(a, b) \

+	if (dispatchException & DE_TERMINATE) { \

+		ErrorF(a, b); \

+		ErrorF("\n"); \

+		return; \

+	} else FatalError(a, b)

+

+/***************************************************************************/

+/* Prototypes                                                              */

+/***************************************************************************/

+

+#include <X11/Xfuncproto.h>

+#include "opaque.h"

+

+_XFUNCPROTOBEGIN

+

+/* public functions */

+extern _X_EXPORT Bool xf86LinearVidMem(void);

+extern _X_EXPORT Bool xf86CheckMTRR(int);

+extern _X_EXPORT pointer xf86MapVidMem(int, int, unsigned long, unsigned long);

+extern _X_EXPORT void xf86UnMapVidMem(int, pointer, unsigned long);

+extern _X_EXPORT void xf86MapReadSideEffects(int, int, pointer, unsigned long);

+extern _X_EXPORT int xf86ReadBIOS(unsigned long, unsigned long, unsigned char *, int);

+extern _X_EXPORT Bool xf86EnableIO(void);

+extern _X_EXPORT void xf86DisableIO(void);

+#ifdef __NetBSD__

+extern _X_EXPORT void xf86SetTVOut(int);

+extern _X_EXPORT void xf86SetRGBOut(void);

+#endif

+extern _X_EXPORT void xf86OSRingBell(int, int, int);

+extern _X_EXPORT void xf86SetReallySlowBcopy(void);

+extern _X_EXPORT void xf86SlowBcopy(unsigned char *, unsigned char *, int);

+extern _X_EXPORT int xf86OpenSerial(pointer options);

+extern _X_EXPORT int xf86SetSerial(int fd, pointer options);

+extern _X_EXPORT int xf86SetSerialSpeed(int fd, int speed);

+extern _X_EXPORT int xf86ReadSerial(int fd, void *buf, int count);

+extern _X_EXPORT int xf86WriteSerial(int fd, const void *buf, int count);

+extern _X_EXPORT int xf86CloseSerial(int fd);

+extern _X_EXPORT int xf86FlushInput(int fd);

+extern _X_EXPORT int xf86WaitForInput(int fd, int timeout);

+extern _X_EXPORT int xf86SerialSendBreak(int fd, int duration);

+extern _X_EXPORT int xf86SetSerialModemState(int fd, int state);

+extern _X_EXPORT int xf86GetSerialModemState(int fd);

+extern _X_EXPORT int xf86SerialModemSetBits(int fd, int bits);

+extern _X_EXPORT int xf86SerialModemClearBits(int fd, int bits);

+extern _X_EXPORT int xf86LoadKernelModule(const char *pathname);

+

+/* AGP GART interface */

+

+typedef struct _AgpInfo {

+	CARD32		bridgeId;

+	CARD32		agpMode;

+	unsigned long	base;

+	unsigned long	size;

+	unsigned long	totalPages;

+	unsigned long	systemPages;

+	unsigned long	usedPages;

+} AgpInfo, *AgpInfoPtr;

+

+extern _X_EXPORT Bool xf86AgpGARTSupported(void);

+extern _X_EXPORT AgpInfoPtr xf86GetAGPInfo(int screenNum);

+extern _X_EXPORT Bool xf86AcquireGART(int screenNum);

+extern _X_EXPORT Bool xf86ReleaseGART(int screenNum);

+extern _X_EXPORT int xf86AllocateGARTMemory(int screenNum, unsigned long size, int type,

+				  unsigned long *physical);

+extern _X_EXPORT Bool xf86DeallocateGARTMemory(int screenNum, int key);

+extern _X_EXPORT Bool xf86BindGARTMemory(int screenNum, int key, unsigned long offset);

+extern _X_EXPORT Bool xf86UnbindGARTMemory(int screenNum, int key);

+extern _X_EXPORT Bool xf86EnableAGP(int screenNum, CARD32 mode);

+extern _X_EXPORT Bool xf86GARTCloseScreen(int screenNum);

+

+/* These routines are in shared/sigio.c and are not loaded as part of the

+   module.  These routines are small, and the code if very POSIX-signal (or

+   OS-signal) specific, so it seemed better to provide more complex

+   wrappers than to wrap each individual function called. */

+extern _X_EXPORT int xf86InstallSIGIOHandler(int fd, void (*f)(int, void *), void *);

+extern _X_EXPORT int xf86RemoveSIGIOHandler(int fd);

+extern _X_EXPORT int xf86BlockSIGIO (void);

+extern _X_EXPORT void xf86UnblockSIGIO (int);

+extern _X_EXPORT void xf86AssertBlockedSIGIO (char *);

+extern _X_EXPORT Bool xf86SIGIOSupported (void);

+

+#ifdef XF86_OS_PRIVS

+typedef void (*PMClose)(void);

+extern _X_EXPORT void xf86OpenConsole(void);

+extern _X_EXPORT void xf86CloseConsole(void);

+extern _X_HIDDEN Bool xf86VTActivate(int vtno);

+extern _X_EXPORT Bool xf86VTSwitchPending(void);

+extern _X_EXPORT Bool xf86VTSwitchAway(void);

+extern _X_EXPORT Bool xf86VTSwitchTo(void);

+extern _X_EXPORT void xf86VTRequest(int sig);

+extern _X_EXPORT int xf86ProcessArgument(int, char **, int);

+extern _X_EXPORT void xf86UseMsg(void);

+extern _X_EXPORT PMClose xf86OSPMOpen(void);

+

+extern _X_EXPORT void xf86MakeNewMapping(int, int, unsigned long, unsigned long, pointer);

+extern _X_EXPORT void xf86InitVidMem(void);

+

+#endif /* XF86_OS_PRIVS */

+

+

+_XFUNCPROTOEND

+#endif /* NO_OSLIB_PROTOTYPES */

+

+#endif /* _XF86_OSPROC_H */