--- xc/include/extensions/xf86misc.h.orig	Sun Apr 25 13:40:54 1999
+++ xc/include/extensions/xf86misc.h	Sat May  8 11:26:57 1999
@@ -54,6 +54,7 @@
 #define MTYPE_AUTOMOUSE		18
 #define MTYPE_ACECAD		19
 #define MTYPE_WSMOUSE		20
+#define MTYPE_SUN		21
 
 #define MTYPE_XQUEUE		127
 #define MTYPE_OSMOUSE		126
--- xc/programs/Xserver/hw/xfree86/common/xf86_Config.h.orig	Sun Apr 25 13:41:25 1999
+++ xc/programs/Xserver/hw/xfree86/common/xf86_Config.h	Sat May  8 11:31:22 1999
@@ -187,8 +187,9 @@
 #define AUTOMOUSE	1038
 #define ACECAD		1039
 #define WSMOUSE   	1040
-#define XQUE      	1041
-#define OSMOUSE   	1042
+#define SUNMOUSE	1041
+#define XQUE      	1042
+#define OSMOUSE   	1043
 
 #ifdef INIT_CONFIG
 static SymTabRec MouseTab[] = {
@@ -213,6 +214,7 @@
   { AUTOMOUSE,	"auto" },
   { ACECAD,	"acecad" },
   { WSMOUSE,	"wsmouse" },
+  { SUNMOUSE,	"sun" },
   { XQUE,	"xqueue" },
   { OSMOUSE,	"osmouse" },
   { -1,		"" },
@@ -557,6 +559,7 @@
 #define P_AUTO		18		/* automatic */
 #define P_ACECAD	19		/* ACECAD protocol */
 #define P_WSMOUSE	20		/* NetBSD wsmouse */
+#define P_SUN		21		/* NetBSD Atari sun compatible mouse */
 
 #define EMULATE3	50
 #define BAUDRATE	51
--- xc/programs/Xserver/hw/xfree86/common/xf86_Mouse.c.orig	Sun Apr 25 13:41:28 1999
+++ xc/programs/Xserver/hw/xfree86/common/xf86_Mouse.c	Sat May  8 11:30:08 1999
@@ -584,6 +584,10 @@
 #if defined(__NetBSD__)
       case P_WSMOUSE:
 	break;
+#if defined(__atari__)
+      case P_SUN:
+	break;
+#endif
 #endif
 
       default:
@@ -706,6 +710,9 @@
 #endif
 #if defined(__NetBSD__)
 	mouse->mseType != P_WSMOUSE &&
+#if defined(__atari__)
+	mouse->mseType != P_SUN &&
+#endif
 #endif
 	((rBuf[i] & mouse->protoPara[2]) != mouse->protoPara[3] 
 	 || rBuf[i] == 0x80))


--- xc/programs/xdpyinfo/xdpyinfo.c.orig	Sat May  8 11:35:08 1999
+++ xc/programs/xdpyinfo/xdpyinfo.c	Sat May  8 11:35:43 1999
@@ -682,7 +682,7 @@
 		     "GlidePoint", "IntelliMouse", "ThinkingMouse",
 		     "IMPS/2", "ThinkingMousePS/2", "MouseManPlusPS/2",
 		     "GlidePointPS/2", "NetMousePS/2", "NetScrollPS/2",
-		     "SysMouse", "Auto", "AceCad", "wsmouse" };
+		     "SysMouse", "Auto", "AceCad", "wsmouse", "sun" };
 
 char *flgtable[] = { "None", "ClearDTR", "ClearRTS",
 		     "ClearDTR and ClearRTS" };
@@ -714,7 +714,7 @@
 	printf("Xqueue\n");
       else if (mouseinfo.type == MTYPE_OSMOUSE)
 	printf("OSMouse\n");
-      else if (mouseinfo.type <= MTYPE_WSMOUSE)
+      else if (mouseinfo.type <= MTYPE_SUN)
 	printf("%s\n", msetable[mouseinfo.type+1]);
       else
 	  printf("Unknown\n");