From 5375e9ca7502ab26bb0b1359757b85449513425c Mon Sep 17 00:00:00 2001 From: Miod Vallat Date: Mon, 12 Jan 2009 21:11:59 +0000 Subject: Oops, sunkbd_decode() still needs to be public for *cngetc() to work; spotted the hard way by kettenis. --- sys/arch/sparc/dev/z8530kbd.c | 14 ++------------ sys/arch/sparc64/dev/z8530kbd.c | 14 ++------------ 2 files changed, 4 insertions(+), 24 deletions(-) (limited to 'sys/arch') diff --git a/sys/arch/sparc/dev/z8530kbd.c b/sys/arch/sparc/dev/z8530kbd.c index 1738294377c..cad933dd4f1 100644 --- a/sys/arch/sparc/dev/z8530kbd.c +++ b/sys/arch/sparc/dev/z8530kbd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: z8530kbd.c,v 1.12 2009/01/11 16:12:14 miod Exp $ */ +/* $OpenBSD: z8530kbd.c,v 1.13 2009/01/12 21:11:56 miod Exp $ */ /* $NetBSD: z8530tty.c,v 1.77 2001/05/30 15:24:24 lukem Exp $ */ /*- @@ -1110,15 +1110,5 @@ zskbd_cngetc(v, type, data) c = *zst->zst_cs->cs_reg_data; splx(s); - switch (c) { - case SKBD_RSP_IDLE: - *type = WSCONS_EVENT_ALL_KEYS_UP; - *data = 0; - break; - default: - *type = (c & 0x80) ? - WSCONS_EVENT_KEY_UP : WSCONS_EVENT_KEY_DOWN; - *data = c & 0x7f; - break; - } + sunkbd_decode(c, type, data); } diff --git a/sys/arch/sparc64/dev/z8530kbd.c b/sys/arch/sparc64/dev/z8530kbd.c index 9509e79797e..0b7c99e58e0 100644 --- a/sys/arch/sparc64/dev/z8530kbd.c +++ b/sys/arch/sparc64/dev/z8530kbd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: z8530kbd.c,v 1.22 2009/01/11 16:12:15 miod Exp $ */ +/* $OpenBSD: z8530kbd.c,v 1.23 2009/01/12 21:11:58 miod Exp $ */ /* $NetBSD: z8530tty.c,v 1.77 2001/05/30 15:24:24 lukem Exp $ */ /*- @@ -1093,15 +1093,5 @@ zskbd_cngetc(v, type, data) c = *zst->zst_cs->cs_reg_data; splx(s); - switch (c) { - case SKBD_RSP_IDLE: - *type = WSCONS_EVENT_ALL_KEYS_UP; - *data = 0; - break; - default: - *type = (c & 0x80) ? - WSCONS_EVENT_KEY_UP : WSCONS_EVENT_KEY_DOWN; - *data = c & 0x7f; - break; - } + sunkbd_decode(c, type, data); } -- cgit v1.2.3