diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2009-05-20 18:22:34 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2009-05-20 18:22:34 +0000 |
| commit | ae4392e18d464ca5c9974696dfc309c032c0830c (patch) | |
| tree | 7b7ddb329ff1c5e9062099a6d93d1211543e3a3e /sys/arch/sparc64/conf | |
| parent | c18b8a1b0101be40280a8fa45d190b4d7dfa3dba (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/sparc64/conf')
| -rw-r--r-- | sys/arch/sparc64/conf/GENERIC | 6 | ||||
| -rw-r--r-- | sys/arch/sparc64/conf/files.sparc64 | 17 |
2 files changed, 17 insertions, 6 deletions
diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC index 70466853657..f954f7a8b07 100644 --- a/sys/arch/sparc64/conf/GENERIC +++ b/sys/arch/sparc64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.235 2009/05/10 13:33:32 kettenis Exp $ +# $OpenBSD: GENERIC,v 1.236 2009/05/20 18:22:33 miod Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -283,6 +283,8 @@ sabtty* at sab? com* at ebus? comkbd* at ebus? wskbd* at comkbd? mux 1 +comms* at ebus? +wsmouse* at comms? mux 0 # Z8530 based serial ports zs* at sbus? @@ -290,6 +292,8 @@ zs* at fhc? zstty* at zs? zskbd* at zs? wskbd* at zskbd? mux 1 +zsms* at zs? +wsmouse* at zsms? mux 0 # i8042 based serial ports (PS/2 ports) pckbc* at ebus? # controller diff --git a/sys/arch/sparc64/conf/files.sparc64 b/sys/arch/sparc64/conf/files.sparc64 index 6d32e0c4bb4..0d0dd627471 100644 --- a/sys/arch/sparc64/conf/files.sparc64 +++ b/sys/arch/sparc64/conf/files.sparc64 @@ -1,4 +1,4 @@ -# $OpenBSD: files.sparc64,v 1.122 2009/05/16 10:53:06 kettenis Exp $ +# $OpenBSD: files.sparc64,v 1.123 2009/05/20 18:22:33 miod Exp $ # $NetBSD: files.sparc64,v 1.50 2001/08/10 20:53:50 eeh Exp $ # maxpartitions must be first item in files.${ARCH} @@ -80,6 +80,9 @@ include "dev/ata/files.ata" include "dev/pckbc/files.pckbc" include "dev/pcmcia/files.pcmcia" +# Needs to be declared before including files.sun +device zs {[channel = -1]} + # Sun specific files include "../../../dev/sun/files.sun" @@ -240,14 +243,18 @@ file arch/sparc64/dev/com_ebus.c com_ebus attach pckbc at ebus with pckbc_ebus file arch/sparc64/dev/pckbc_ebus.c pckbc_ebus -device comkbd: tty, wskbddev, sunkbd +device comkbd: wskbddev, sunkbd attach comkbd at ebus file arch/sparc64/dev/comkbd_ebus.c comkbd +device comms: wsmousedev, sunms +attach comms at ebus +file arch/sparc64/dev/comms_ebus.c comms + attach lpt at ebus with lpt_ebus file arch/sparc64/dev/lpt_ebus.c lpt_ebus -device zs {[channel = -1]} +#device zs {[channel = -1]} attach zs at sbus with zs_sbus attach zs at fhc with zs_fhc file arch/sparc64/dev/zs.c zs needs-flag @@ -258,9 +265,9 @@ device zstty: tty attach zstty at zs file arch/sparc64/dev/z8530tty.c zstty needs-flag -device zskbd: tty, wskbddev, sunkbd +device zskbd: wskbddev, sunkbd attach zskbd at zs -file arch/sparc64/dev/z8530kbd.c zskbd needs-flag +file arch/sparc64/dev/z8530kbd.c zskbd # Floppy drive device fdc {} |