summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>1997-08-08 21:21:39 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>1997-08-08 21:21:39 +0000
commitfa3ac60890d403b6994891797ae40ea98456004a (patch)
treef7ce505f84d0d5b245feb019828e0a71fc2084cb /sys
parent7897cd60201df45bca224c49b20122264c73b21d (diff)
Stab at fixing the locators.h mess, test!
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/sun/kbd.c5
-rw-r--r--sys/dev/sun/ms.c5
2 files changed, 4 insertions, 6 deletions
diff --git a/sys/dev/sun/kbd.c b/sys/dev/sun/kbd.c
index ba522659602..610d4fdc8a2 100644
--- a/sys/dev/sun/kbd.c
+++ b/sys/dev/sun/kbd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kbd.c,v 1.7 1997/08/08 08:17:15 downsj Exp $ */
+/* $OpenBSD: kbd.c,v 1.8 1997/08/08 21:21:38 niklas Exp $ */
/* $NetBSD: kbd.c,v 1.14 1997/07/17 01:17:45 jtk Exp $ */
/*
@@ -80,7 +80,6 @@
#include "event_var.h"
#include "kbd_xlate.h"
-#include "locators.h"
/*
* Ideas:
@@ -213,7 +212,7 @@ kbd_match(parent, vcf, aux)
struct zsc_attach_args *args = aux;
/* Exact match required for keyboard. */
- if (cf->cf_loc[ZSCCF_CHANNEL] == args->channel)
+ if (cf->cf_loc[0] == args->channel)
return 2;
return 0;
diff --git a/sys/dev/sun/ms.c b/sys/dev/sun/ms.c
index c75f6f9d244..c89c8af41bc 100644
--- a/sys/dev/sun/ms.c
+++ b/sys/dev/sun/ms.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ms.c,v 1.7 1997/08/08 08:17:20 downsj Exp $ */
+/* $OpenBSD: ms.c,v 1.8 1997/08/08 21:21:37 niklas Exp $ */
/* $NetBSD: ms.c,v 1.12 1997/07/17 01:17:47 jtk Exp $ */
/*
@@ -76,7 +76,6 @@
#include <machine/z8530var.h>
#include "event_var.h"
-#include "locators.h"
/*
* How many input characters we can buffer.
@@ -171,7 +170,7 @@ ms_match(parent, vcf, aux)
struct zsc_attach_args *args = aux;
/* Exact match required for keyboard. */
- if (cf->cf_loc[ZSCCF_CHANNEL] == args->channel)
+ if (cf->cf_loc[0] == args->channel)
return 2;
return 0;