Change all misc.h and os.h references to <X11/foo.h>.

6 files changed, 27 insertions, 8 deletions

diff --git a/hw/xfree86/os-support/solaris/agpgart.h b/hw/xfree86/os-support/solaris/agpgart.h
index 8942bdcb3..09d63ec26 100644
--- a/hw/xfree86/os-support/solaris/agpgart.h
+++ b/hw/xfree86/os-support/solaris/agpgart.h
@@ -1,4 +1,4 @@
-/* $XdotOrg: $ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/sunos/agpgart.h,v 1.1 2005/06/09 03:11:58 alanc Exp $ */
 /*
  * AGPGART module version 0.99
  * Copyright (C) 1999 Jeff Hartmann
diff --git a/hw/xfree86/os-support/solaris/sun_agp.c b/hw/xfree86/os-support/solaris/sun_agp.c
index 9e5886c28..126415e6e 100644
--- a/hw/xfree86/os-support/solaris/sun_agp.c
+++ b/hw/xfree86/os-support/solaris/sun_agp.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: $ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_agp.c,v 1.1 2005/06/09 03:11:58 alanc Exp $ */
 /*
  * Abstraction of the AGP GART interface.
  *
diff --git a/hw/xfree86/os-support/solaris/sun_init.c b/hw/xfree86/os-support/solaris/sun_init.c
index 358a44f35..97c6dba39 100644
--- a/hw/xfree86/os-support/solaris/sun_init.c
+++ b/hw/xfree86/os-support/solaris/sun_init.c
@@ -22,7 +22,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
  */
-/* $XdotOrg: $ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_init.c,v 1.3 2005/05/21 07:46:37 alanc Exp $ */
 
 #include "xf86.h"
 #include "xf86Priv.h"
diff --git a/hw/xfree86/os-support/solaris/sun_kbd.c b/hw/xfree86/os-support/solaris/sun_kbd.c
index 7e4998817..56929d69b 100644
--- a/hw/xfree86/os-support/solaris/sun_kbd.c
+++ b/hw/xfree86/os-support/solaris/sun_kbd.c
@@ -23,12 +23,15 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_kbd.c,v 1.3 2004/06/13 04:50:21 alanc Exp $ */
 
+#include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86_OSlib.h"
 
 static int sun_otranslation = -1;
 static int sun_odirect = -1;
+int sun_ktype;
 
 int
 xf86GetKbdLeds()
@@ -53,7 +56,8 @@ xf86SetKbdRepeat(char rad)
 void
 xf86KbdInit()
 {
-	int	ktype, klayout;
+	int	klayout;
+	const char *ktype_name;
 
 	if (xf86Info.kbdFd < 0) {
 		xf86Info.kbdFd = open("/dev/kbd", O_RDWR|O_NONBLOCK);
@@ -62,11 +66,11 @@ xf86KbdInit()
 	}
 
 	/*
-	 * None of the followin should ever fail.  If it does, something is
+	 * None of the following should ever fail.  If it does, something is
 	 * broken (IMO) - DWH 8/21/99
 	 */
 
-	if (ioctl(xf86Info.kbdFd, KIOCTYPE, &ktype) < 0)
+	if (ioctl(xf86Info.kbdFd, KIOCTYPE, &sun_ktype) < 0)
 		FatalError("Unable to determine keyboard type: %d\n", errno);
 
 	if (ioctl(xf86Info.kbdFd, KIOCLAYOUT, &klayout) < 0)
@@ -77,6 +81,21 @@ xf86KbdInit()
 
 	if (ioctl(xf86Info.kbdFd, KIOCGDIRECT, &sun_odirect) < 0)
 		FatalError("Unable to determine keyboard direct setting\n");
+
+	switch (sun_ktype) {
+	case KB_SUN3:
+	    ktype_name = "Sun Type 3"; break;
+	case KB_SUN4:
+	    ktype_name = "Sun Type 4/5/6"; break;
+	case KB_USB:
+	    ktype_name = "USB"; break;
+	case KB_PC:
+	    ktype_name = "PC"; break;
+	default:
+	    ktype_name = "Unknown"; break;
+	}
+	xf86Msg(X_PROBED, "Keyboard type: %s (%d)\n", ktype_name, sun_ktype);
+	xf86Msg(X_PROBED, "Keyboard layout: %d\n", klayout);
 }
 
 int
diff --git a/hw/xfree86/os-support/solaris/sun_kbdEv.c b/hw/xfree86/os-support/solaris/sun_kbdEv.c
index 1e37c4f27..eba420937 100644
--- a/hw/xfree86/os-support/solaris/sun_kbdEv.c
+++ b/hw/xfree86/os-support/solaris/sun_kbdEv.c
@@ -23,7 +23,7 @@
  */
 
 /* [JCH-96/01/21] Extended std reverse map to four buttons. */
-/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_kbdEv.c,v 1.3 2004/07/28 03:57:19 alanc Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_kbdEv.c,v 1.5 2005/05/21 07:46:37 alanc Exp $ */
 
 #include "xf86.h"
 #include "xf86Priv.h"
diff --git a/hw/xfree86/os-support/solaris/sun_mouse.c b/hw/xfree86/os-support/solaris/sun_mouse.c
index 4c8f63e8b..b3fedbd0f 100644
--- a/hw/xfree86/os-support/solaris/sun_mouse.c
+++ b/hw/xfree86/os-support/solaris/sun_mouse.c
@@ -1,5 +1,5 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_mouse.c,v 1.4 2002/01/25 21:56:21 tsi Exp $ */
-/* $XdotOrg: $ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_mouse.c,v 1.5 2005/06/03 21:49:11 alanc Exp $ */
 /*
  * Copyright 1999-2001 The XFree86 Project, Inc.  All Rights Reserved.
  *