summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/sparc/dev/z8530kbd.c6
-rw-r--r--sys/arch/sparc64/dev/comkbd_ebus.c4
-rw-r--r--sys/arch/sparc64/dev/z8530kbd.c4
3 files changed, 10 insertions, 4 deletions
diff --git a/sys/arch/sparc/dev/z8530kbd.c b/sys/arch/sparc/dev/z8530kbd.c
index 08dd87c5405..94d0efa2394 100644
--- a/sys/arch/sparc/dev/z8530kbd.c
+++ b/sys/arch/sparc/dev/z8530kbd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: z8530kbd.c,v 1.14 2010/07/10 19:32:24 miod Exp $ */
+/* $OpenBSD: z8530kbd.c,v 1.15 2011/03/18 21:01:17 miod Exp $ */
/* $NetBSD: z8530tty.c,v 1.77 2001/05/30 15:24:24 lukem Exp $ */
/*-
@@ -552,9 +552,11 @@ zskbd_init(zst)
if (ltries == 0)
continue;
-
/* Send layout request */
if (ss->sc_id == KB_SUN4) {
+ /* Some Sun<=>PS/2 converters need some delay here */
+ DELAY(5000);
+
zskbd_putc(zst, SKBD_CMD_LAYOUT);
ltries = 1000;
diff --git a/sys/arch/sparc64/dev/comkbd_ebus.c b/sys/arch/sparc64/dev/comkbd_ebus.c
index 1ee82f962bd..9c7c9ec0f51 100644
--- a/sys/arch/sparc64/dev/comkbd_ebus.c
+++ b/sys/arch/sparc64/dev/comkbd_ebus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: comkbd_ebus.c,v 1.20 2009/01/11 16:12:15 miod Exp $ */
+/* $OpenBSD: comkbd_ebus.c,v 1.21 2011/03/18 21:01:17 miod Exp $ */
/*
* Copyright (c) 2002 Jason L. Wright (jason@thought.net)
@@ -483,6 +483,8 @@ comkbd_init(sc)
if (ltries == 0)
continue;
+ /* Some Sun<=>PS/2 converters need some delay here */
+ DELAY(5000);
/* Send layout request */
comkbd_putc(sc, SKBD_CMD_LAYOUT);
diff --git a/sys/arch/sparc64/dev/z8530kbd.c b/sys/arch/sparc64/dev/z8530kbd.c
index 0b7c99e58e0..63426e0f466 100644
--- a/sys/arch/sparc64/dev/z8530kbd.c
+++ b/sys/arch/sparc64/dev/z8530kbd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: z8530kbd.c,v 1.23 2009/01/12 21:11:58 miod Exp $ */
+/* $OpenBSD: z8530kbd.c,v 1.24 2011/03/18 21:01:17 miod Exp $ */
/* $NetBSD: z8530tty.c,v 1.77 2001/05/30 15:24:24 lukem Exp $ */
/*-
@@ -538,6 +538,8 @@ zskbd_init(zst)
if (ltries == 0)
continue;
+ /* Some Sun<=>PS/2 converters need some delay here */
+ DELAY(5000);
/* Send layout request */
zskbd_putc(zst, SKBD_CMD_LAYOUT);