diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1995-10-23 10:34:20 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1995-10-23 10:34:20 +0000 |
| commit | 0ba699dfe97c4aebcd2caae04453736c53af6a23 (patch) | |
| tree | b289651b8de06c95b805b3642ac0076cecaa0bdf /sys/arch | |
| parent | be7443798d99066780ee98392993b09fe27d20e4 (diff) | |
unconditionally set mouse port to CS8/1200
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/sparc/dev/ms.c | 9 | ||||
| -rw-r--r-- | sys/arch/sparc/dev/zs.c | 8 |
2 files changed, 5 insertions, 12 deletions
diff --git a/sys/arch/sparc/dev/ms.c b/sys/arch/sparc/dev/ms.c index 65e468866bb..fb71f4ecb36 100644 --- a/sys/arch/sparc/dev/ms.c +++ b/sys/arch/sparc/dev/ms.c @@ -249,15 +249,6 @@ msopen(dev, flags, mode, p) ms_softc.ms_events.ev_io = p; ev_init(&ms_softc.ms_events); /* may cause sleep */ -#if defined(SUN4) - if (cputyp == CPU_SUN4) { - /* We need to set the baud rate on the mouse. */ - ms_softc.ms_mouse->t_ispeed = - ms_softc.ms_mouse->t_ospeed = 1200; - ms_softc.ms_mouse->t_cflag = CS8; - } -#endif - (*ms_softc.ms_open)(ms_softc.ms_mouse); ms_softc.ms_ready = 1; /* start accepting events */ return (0); diff --git a/sys/arch/sparc/dev/zs.c b/sys/arch/sparc/dev/zs.c index 1e802c78e2d..50c18206d30 100644 --- a/sys/arch/sparc/dev/zs.c +++ b/sys/arch/sparc/dev/zs.c @@ -80,7 +80,7 @@ #include <machine/remote-sl.h> #endif -#define ZSMAJOR 12 /* XXX */ +#define ZSMAJOR 12 /* XXX */ #define ZS_KBD 2 /* XXX */ #define ZS_MOUSE 3 /* XXX */ @@ -155,7 +155,7 @@ static void zs_checkkgdb __P((int, struct zs_chanstate *, struct tty *)); #endif extern void *findzs __P((int)); -volatile static struct zsdevice *zsaddr[NZS]; /* XXX, but saves work */ +static volatile struct zsdevice *zsaddr[NZS]; /* XXX, but saves work */ /* * Console keyboard L1-A processing is done in the hardware interrupt code, @@ -316,6 +316,8 @@ zsattach(parent, dev, aux) /* * Mouse: tell /dev/mouse driver how to talk to us. */ + tp->t_ispeed = tp->t_ospeed = 1200; + tp->t_cflag = CS8; ms_serial(tp, zsiopen, zsiclose); } } @@ -1495,7 +1497,7 @@ zs_kgdb_getc(arg) void *arg; { register volatile struct zschan *zc = (volatile struct zschan *)arg; - int c; + u_char c; while ((zc->zc_csr & ZSRR0_RX_READY) == 0) ZS_DELAY(); |