summaryrefslogtreecommitdiff
path: root/sys/arch/sparc
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2009-05-20 18:22:34 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2009-05-20 18:22:34 +0000
commitae4392e18d464ca5c9974696dfc309c032c0830c (patch)
tree7b7ddb329ff1c5e9062099a6d93d1211543e3a3e /sys/arch/sparc
parentc18b8a1b0101be40280a8fa45d190b4d7dfa3dba (diff)
Add code to attach sun mice on sparc and sparc64 as wsmouse devices. Since
not all Sun mice run at the canonical 1200 bps, hop between 1200, 4800 and 9600 bps by paying attention to breaks on the line. Attachement and engine code written 7 years ago for OpenBSD/sparc, except for sparc64 com(4) attachment. Speed hop idea borrowed from Opensolaris. This allows sparc and sparc64 users to run X11 without needing a configuration file anymore, as it was in the XFree86 3.x days. Multihead configurations will still need a minimal configuration file, though.
Diffstat (limited to 'sys/arch/sparc')
-rw-r--r--sys/arch/sparc/conf/GENERIC7
-rw-r--r--sys/arch/sparc/conf/SUN47
-rw-r--r--sys/arch/sparc/conf/SUN4C7
-rw-r--r--sys/arch/sparc/conf/SUN4M7
-rw-r--r--sys/arch/sparc/conf/files.sparc4
5 files changed, 26 insertions, 6 deletions
diff --git a/sys/arch/sparc/conf/GENERIC b/sys/arch/sparc/conf/GENERIC
index 61bc21022b1..376630791b2 100644
--- a/sys/arch/sparc/conf/GENERIC
+++ b/sys/arch/sparc/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.90 2007/05/29 09:54:03 sobrado Exp $
+# $OpenBSD: GENERIC,v 1.91 2009/05/20 18:22:32 miod Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -32,6 +32,7 @@ option PROCFS # /proc
option WSEMUL_SUN # provide sun terminal emulation; required
option WSEMUL_NO_VT100 # do not provide vt100 terminal emulation
+option WSDISPLAY_COMPAT_RAWKBD # provide raw scancodes; needed for X11
# Generic swap; second partition of root disk or network.
config bsd swap generic
@@ -108,6 +109,8 @@ zs2 at obio0 addr 0xe0000000 level 12 # sun4/300
zstty* at zs?
zskbd* at zs?
wskbd* at zskbd?
+zsms* at zs?
+wsmouse* at zsms?
# Magma serial/parallel port devices
magma* at sbus? # magma serial cards
@@ -371,3 +374,5 @@ fd* at fdc0 # the drive itself
# Prestoserve NVRAM
#presto* at sbus?
+
+pseudo-device wsmux 2 # mouse & keyboard multiplexor
diff --git a/sys/arch/sparc/conf/SUN4 b/sys/arch/sparc/conf/SUN4
index 5f56dcad435..90177bf8e3e 100644
--- a/sys/arch/sparc/conf/SUN4
+++ b/sys/arch/sparc/conf/SUN4
@@ -1,4 +1,4 @@
-# $OpenBSD: SUN4,v 1.35 2006/12/10 16:14:20 miod Exp $
+# $OpenBSD: SUN4,v 1.36 2009/05/20 18:22:32 miod Exp $
# $NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $
# Machine architecture; required by config(8)
@@ -17,6 +17,7 @@ option PROCFS # /proc
option WSEMUL_SUN # provide sun terminal emulation; required
option WSEMUL_NO_VT100 # do not provide vt100 terminal emulation
+option WSDISPLAY_COMPAT_RAWKBD # provide raw scancodes; needed for X11
maxusers 16 # estimated number of users
@@ -67,6 +68,8 @@ zs2 at obio0 addr 0xe0000000 level 12 # sun4/300
zstty* at zs?
zskbd* at zs?
wskbd* at zskbd?
+zsms* at zs?
+wsmouse* at zsms?
#
# Note the flags on the esp entries below, that work around
@@ -172,3 +175,5 @@ cd* at scsibus? # SCSI CD-ROMs
ch* at scsibus? # SCSI changer devices
ss* at scsibus? # SCSI scanners
uk* at scsibus? # unknown SCSI devices
+
+pseudo-device wsmux 2 # mouse & keyboard multiplexor
diff --git a/sys/arch/sparc/conf/SUN4C b/sys/arch/sparc/conf/SUN4C
index dc29de7ebb7..2eab1f04d60 100644
--- a/sys/arch/sparc/conf/SUN4C
+++ b/sys/arch/sparc/conf/SUN4C
@@ -1,4 +1,4 @@
-# $OpenBSD: SUN4C,v 1.58 2008/01/06 21:15:23 miod Exp $
+# $OpenBSD: SUN4C,v 1.59 2009/05/20 18:22:33 miod Exp $
# $NetBSD: GENERIC,v 1.48 1997/08/23 19:19:01 mjacob Exp $
# Machine architecture; required by config(8)
@@ -20,6 +20,7 @@ option PROCFS # /proc
option WSEMUL_SUN # provide sun terminal emulation; required
option WSEMUL_NO_VT100 # do not provide vt100 terminal emulation
+option WSDISPLAY_COMPAT_RAWKBD # provide raw scancodes; needed for X11
maxusers 18 # estimated number of users
@@ -56,6 +57,8 @@ zs1 at mainbus0 # sun4c
zstty* at zs?
zskbd* at zs?
wskbd* at zskbd?
+zsms* at zs?
+wsmouse* at zsms?
# Magma serial/parallel port devices
magma* at sbus? # magma serial cards
@@ -188,3 +191,5 @@ uk* at scsibus? # unknown SCSI devices
# Floppy controller and drive found on SPARCstations.
fdc0 at mainbus0 # sun4c controller
fd* at fdc0 # the drive itself
+
+pseudo-device wsmux 2 # mouse & keyboard multiplexor
diff --git a/sys/arch/sparc/conf/SUN4M b/sys/arch/sparc/conf/SUN4M
index 28a6ea0038c..a13f8662a06 100644
--- a/sys/arch/sparc/conf/SUN4M
+++ b/sys/arch/sparc/conf/SUN4M
@@ -1,4 +1,4 @@
-# $OpenBSD: SUN4M,v 1.73 2007/05/29 09:54:03 sobrado Exp $
+# $OpenBSD: SUN4M,v 1.74 2009/05/20 18:22:33 miod Exp $
# $NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $
# Machine architecture; required by config(8)
@@ -22,6 +22,7 @@ option PROCFS # /proc
option WSEMUL_SUN # provide sun terminal emulation; required
option WSEMUL_NO_VT100 # do not provide vt100 terminal emulation
+option WSDISPLAY_COMPAT_RAWKBD # provide raw scancodes; needed for X11
maxusers 32 # estimated number of users
@@ -69,6 +70,8 @@ zs1 at obio0 # sun4m
zstty* at zs?
zskbd* at zs?
wskbd* at zskbd?
+zsms* at zs?
+wsmouse* at zsms?
# Magma serial/parallel port devices
magma* at sbus? # magma serial cards
@@ -243,3 +246,5 @@ uk* at scsibus? # unknown SCSI devices
# Floppy controller and drive found on SPARCstations.
fdc0 at obio0 # sun4m controller
fd* at fdc0 # the drive itself
+
+pseudo-device wsmux 2 # mouse & keyboard multiplexor
diff --git a/sys/arch/sparc/conf/files.sparc b/sys/arch/sparc/conf/files.sparc
index 6aff30d6fe9..659808ec82e 100644
--- a/sys/arch/sparc/conf/files.sparc
+++ b/sys/arch/sparc/conf/files.sparc
@@ -1,4 +1,4 @@
-# $OpenBSD: files.sparc,v 1.82 2009/04/15 06:54:44 oga Exp $
+# $OpenBSD: files.sparc,v 1.83 2009/05/20 18:22:33 miod Exp $
# $NetBSD: files.sparc,v 1.44 1997/08/31 21:29:16 pk Exp $
# @(#)files.sparc 8.1 (Berkeley) 7/19/93
@@ -90,7 +90,7 @@ attach zstty at zs
file arch/sparc/dev/z8530tty.c zstty needs-flag
file arch/sparc/dev/zs_kgdb.c kgdb
-device zskbd: tty, wskbddev, sunkbd
+device zskbd: wskbddev, sunkbd
attach zskbd at zs
file arch/sparc/dev/z8530kbd.c zskbd needs-flag